Fresh commit

Author: enjoysmath

BootstrapStudioToDjango.wpr

@@ -12,12 +12,12 @@ proj.directory-list = [{'dirloc': loc('.'),
  'watch_for_changes': True}]
 proj.file-type = 'shared'
 proj.launch-config = {loc('bss_to_django.py'): ('project',
- ('../DiagramChaseDatabase/BSSExport',
+ ('../DiagramChaseDatabase/BSSToDjango/BSSExport',
  '')),
  loc('converter.py'): ('project',
  ('../DiagramChaseDatabase/BSSExport',
  '')),
  loc('dev_bss_to_django.py'): ('project',
  ('BSSExport',
  ''))}
-proj.main-file = loc('bss_to_django.py')
+proj.main-file = loc('twin_primes2.py')

BootstrapStudioToDjango.wpu

@@ -7,76 +7,65 @@
 import math
 import re
 
-class CodeGenerator(QObject): 
+class CodeGenerator(QObject):
  status_message_signal = pyqtSignal(str)
 
- def __init__(self, django_root:str, app_folder:str, indent:int, pickled=False):
+ def __init__(self, code_gen_widget, pickled=False):
  super().__init__()
- self._djangoRoot = django_root
- self._indentSpaces = indent
- self._appFolder = app_folder
+ 
+ self._codeGenWidget = code_gen_widget
 
  if not pickled: 
  self._djangoTree = {}
  self.finish_setup()
 
  def __setstate__(self, data):
- self.__init__(data['django root'], data['app folder'], data['indent'], pickled=True)
+ self.__init__(data['code gen widget'], pickled=True)
  self._djangoTree = data['django tree']
  self.finish_setup()
 
  def __getstate__(self):
  return {
  'django tree' : self._djangoTree,
- 'django root' : self._djangoRoot,
- 'indent' : self._indentSpaces,
- 'app folder' : self._appFolder,
+ 'django root' : self.code_generation_widget,
+ 'code gen widget' : self.code_generation_widget,
  }
 
  def finish_setup(self):
  pass
 
+ @property
+ def code_generation_widget(self):
+ return self._codeGenWidget
+ 
  @property
  def django_project_tree(self):
  return self._djangoTree
 
  @property
  def django_project_root(self):
- return self._djangoRoot
+ return self.code_generation_widget.django_project_root
 
  @property
  def num_indent_spaces(self):
- return self._indentSpaces
+ return self.code_generation_widget.indent_spaces_setting
 
  @property
- def app_folder(self):
- return self._appFolder
+ def input_file(self):
+ return self.code_generation_widget.input_file
 
  def list_files_matching(self, path_pattern:str, recurse:bool=False):
  files = glob(path_pattern, recurse)
  return files
- 
- def output_view_code(self, function, name=None):
- module_path, module, attribs = self.get_module_attributes(self.django_project_root, self.app_folder, 'views.py')
-
- if (name and name not in attribs) or function.__name__ not in attribs:
- if callable(function):
- source = inspect.getsource(function)
- else:
- source = str(function)
- 
- source = f'\n{source}'
- 
- with open(module_path, 'a') as module_file:
- module_file.write(source) 
- 
+ 
  def load_module_with_path(self, module_path:str):
  parts = os.path.normpath(module_path)
  parts = parts.split(os.sep)
  module_name = parts[-1]
  module_name,_ = os.path.splitext(module_name)
  module_spec = importlib.util.spec_from_file_location(module_name, location=module_path)
- module = importlib.util.module_from_spec(module_spec) 
+ module = importlib.util.module_from_spec(module_spec)
+ module_spec.loader.exec_module(module)
  return module
 
  def tabify_code(self, code:str):
@@ -110,33 +99,14 @@ def tabify_code(self, code:str):
 
  return "\n".join(tabified)
 
- def get_module_attributes(self, *args):
- module_path = os.path.join(*args)
- module = self.load_module_with_path(module_path)
- attribs = set(dir(module)) 
- return module_path, module, attribs
- 
- def delete_view_code_if_unmodified(self, function):
- module_path, module, attribs = self.get_module_attributes(self.django_project_root, self.app_folder, 'views.py')
- 
- if callable(function):
- func_name = function.__name__
- else:
- func_name = str(function)
- 
- if func_name in attribs:
- existing = getattr(module, func_name)
- 
- source = inspect.getsource(function)
- existing_source = inspect.getsource(existing)
- 
- if source == existing_source:
- with open(module_path, 'rw') as module_file:
- module_str = module_file.read()
- module_str = module_str.replace(source, '')
- module_file.write(module_str)
- else:
- self.status_message_signal.emit(f"{func_name} code has been modified in {module_path}, so we won't delete it.")
+ def module_attributes(self, *args):
+ try: 
+ module_path = os.path.join(*args)
+ module = self.load_module_with_path(module_path)
+ attribs = dir(module)
+ return module_path, module, attribs
+ except:
+ return None, None, []
 
  func_def_name_regex = re.compile(r"(?P<prefix>.*def\s+)(?P<name>[a-zA-Z_][a-zA-Z_0-9]*)(?P<suffix>\s*\(.*\)\s*:.*)", flags=re.DOTALL)
  def function_def_renamed(self, code_str:str, new_name:str):
@@ -147,19 +117,61 @@ def function_def_renamed(self, code_str:str, new_name:str):
  suffix = match.group('suffix')
  if name != new_name:
  return f'{prefix}{new_name}{suffix}'
+ 
+ @property
+ def export_mapper(self):
+ return self._codeGenWidget.export_mapper
+ 
+ def app_folder(self, absolute=False):
+ django_file = self.export_mapper.django_output_file_mapping(self.input_file)
+ django_file = self.export_mapper.filename_rel_root(django_file, root=self.export_mapper.django_project_root)
+ 
+ parts = django_file.split(os.sep)
+ 
+ if parts:
+ if parts[0] == 'templates':
+ return self.django_settings_folder(absolute)
+ else:
+ if absolute == False:
+ return parts[0] 
+ return os.path.join(self.export_mapper.django_project_root, parts[0])
 
- def rename_view_code(self, old_name:str, new_name:str):
- module_path, module, attribs = self.get_module_attributes(self.django_project_root, self.app_folder, 'views.py')
-
- if old_name in attribs:
- function = getattr(module, old_name)
- old_source = inspect.getsource(function)
- new_source = self.function_def_renamed(old_source, new_name)
+ def django_settings_folder(self, absolute=False):
+ django_root = self.export_mapper.django_project_root
+ 
+ for folder in os.listdir(django_root):
+ filename = os.path.join(django_root, folder)
 
- with open(module_path, 'rw') as module_file:
- string = module_file.read()
- string = string.replace(old_source, new_source)
- module_file.write(string)
+ if os.path.isdir(filename):
+ for file in os.listdir(filename):
+ if file == 'settings.py':
+ if absolute == False:
+ return folder
+ return filename
+ 
+ def jump_to_code_by_boilerplate(self, boiler_plate:str):
+ raise NotImplementedError
+ 
+ def _jump_to_code_by_boilerplate(self, boiler_plate:str):
+ raise NotImplementedError
+ 
+ def jump_to_code(self):
+ pass
+ 
+ @property
+ def type_name(self):
+ return self.__class__.__name__[:-len('Generator')]
+ 
+ def get_boilerplate_attributes(self, base_file:str):
+ return self.module_attributes(self.django_project_root, self.export_mapper.bss_to_django_folder, self.export_mapper.boilerplates_folder, base_file) 
+ 
+ @property
+ def django_project_root(self):
+ return self.export_mapper.django_project_root
+ 
+ def list_boilerplates(self):
+ raise NotImplementedError
+ 
 
 if __name__ == '__main__':
  from PyQt5.QtWidgets import QApplication

code_generators/code_generator.py code_gen/code_generator.pycode_generators/code_generator.py renamed to code_gen/code_generator.py

@@ -0,0 +1,113 @@
+from code_gen.code_generator import CodeGenerator
+import inspect
+
+
+class ViewGenerator(CodeGenerator): 
+ def __init__(self, code_gen_widget, pickled=False):
+ super().__init__(code_gen_widget, pickled)
+ 
+ if not pickled:
+ self._viewName = None
+ self._templatePath = None
+ self.finish_setup()
+ 
+ def __setstate__(self, data):
+ super().__setstate__(data)
+ self._viewName = data['view name']
+ self._templatePath = data['template path']
+ 
+ def __getstate__(self):
+ data = super().__getstate__()
+ data['view name'] = self._viewName
+ data['template path'] = self._templatePath
+ return data
+ 
+ @property
+ def template_path(self):
+ return self._templatePath
+ 
+ @property
+ def view_name(self) -> str:
+ return self._viewName
+ 
+ def set_view_name(self, name:str):
+ if self._viewName != name:
+ self.rename_view_code(self.view_name, new_name=name)
+ self._viewName = name
+ 
+ def set_template_path(self, path:str):
+ if self._templatePath != path:
+ # TODO
+ self._templatePath = path
+ 
+ def output_view_code(self, function=None):
+ if function is None:
+ function = boilerplate_view_function
+ view_name = self.view_name
+ source = inspect.getsource(function)
+ source = source.format(template_path=f'"{self.template_path}"')
+ source = self.function_def_renamed(source, view_name)
+ super().output_view_code(function=source, name=view_name)
+ 
+ def list_boilerplates(self) -> list:
+ _, module, attributes = self.get_boilerplate_attributes('views.py')
+ boilerplates = []
+ 
+ for name in attributes:
+ attrib = getattr(module, name)
+ 
+ if callable(attrib):
+ args = inspect.getargspec(attrib).args
+ if args and args[0] == 'request':
+ boilerplates.append(name)
+ 
+ return boilerplates
+ 
+ def rename_view_code(self, old_name:str, new_name:str):
+ module_path, module, attribs = self.module_attributes(self.django_project_root, self.app_folder, 'views.py')
+
+ if old_name in attribs:
+ function = getattr(module, old_name)
+ old_source = inspect.getsource(function)
+ new_source = self.function_def_renamed(old_source, new_name)
+ 
+ with open(module_path, 'rw') as module_file:
+ string = module_file.read()
+ string = string.replace(old_source, new_source)
+ module_file.write(string)
+ 
+ def delete_view_code_if_unmodified(self, function):
+ module_path, module, attribs = self.module_attributes(self.django_project_root, self.app_folder, 'views.py')
+ 
+ if callable(function):
+ func_name = function.__name__
+ else:
+ func_name = str(function)
+ 
+ if func_name in attribs:
+ existing = getattr(module, func_name)
+ 
+ source = inspect.getsource(function)
+ existing_source = inspect.getsource(existing)
+ 
+ if source == existing_source:
+ with open(module_path, 'rw') as module_file:
+ module_str = module_file.read()
+ module_str = module_str.replace(source, '')
+ module_file.write(module_str)
+ else:
+ self.status_message_signal.emit(f"{func_name} code has been modified in {module_path}, so we won't delete it.") 
+ 
+ def output_view_code(self, function, name=None):
+ module_path, module, attribs = self.module_attributes(self.django_project_root, self.app_folder, 'views.py')
+
+ if (name and name not in attribs) or function.__name__ not in attribs:
+ if callable(function):
+ source = inspect.getsource(function)
+ else:
+ source = str(function)
+ 
+ source = f'\n{source}'
+ 
+ with open(module_path, 'a') as module_file:
+ module_file.write(source)