Fix #187 and #186

Logging is now enabled and filters refresh on no package.json

Author: jyapayne

command_line.py

@@ -73,7 +73,7 @@ def __init__(self, quiet=False):
         self.file_tree = FileTree()
 
     def init(self):
-        self.logger = logging.getLogger(__name__)
+        self.logger = config.getLogger(__name__)
         self.update_nw_versions(None)
         self.setup_nw_versions()
 
@@ -907,10 +907,12 @@ def make_output_dirs(self, write_json=True):
                                        ['*'+output_blacklist+'*']),
                             whitelist=whitelist_vals)
 
-        self.copy_files_to_project_folder()
 
         if write_json:
             self.write_package_json()
+            self.file_tree.refresh()
+
+        self.copy_files_to_project_folder()
 
         for ex_setting in self.settings['export_settings'].values():
             self.process_export_setting(ex_setting, output_name)
@@ -1610,11 +1612,7 @@ def setup_logging(args, command_base):
         )
 
 
-    config.logger = logging.getLogger('CMD Logger')
-    config.handler = lh.RotatingFileHandler(config.LOG_FILENAME,
-                                            maxBytes=100000,
-                                            backupCount=2)
-    config.logger.addHandler(config.handler)
+    config.logger = config.getLogger('CMD Logger')
 
     def my_excepthook(type_, value, tback):
         exc_format = traceback.format_exception(type_, value, tback)

config.py

@@ -92,7 +92,34 @@ def is_installed():
 
 LOG_FILENAME = utils.get_data_file_path(ERROR_LOG_FILE)
 
-logger = logging.getLogger(__name__)
+if DEBUG:
+    logging.basicConfig(
+        filename=LOG_FILENAME,
+        format=("%(levelname) -10s %(asctime)s %(module)s.py: "
+                "%(lineno)s %(funcName)s - %(message)s"),
+        level=logging.DEBUG
+    )
+else:
+    logging.basicConfig(
+        filename=LOG_FILENAME,
+        format=("%(levelname) -10s %(asctime)s %(module)s.py: "
+                "%(lineno)s %(funcName)s - %(message)s"),
+        level=logging.INFO
+    )
+
+
+
+def getLogger(name):
+    logger = logging.getLogger(name)
+    handler = lh.RotatingFileHandler(LOG_FILENAME,
+                                     maxBytes=100000,
+                                     backupCount=2)
+    logger.addHandler(handler)
+    return logger
+
+
+logger = getLogger(__name__)
+
 
 ## Custom except hook to log all errors ----------------------
 

main.py

@@ -146,7 +146,7 @@ def __init__(self, width, height, app, parent=None):
 
         self.setup_project_menu()
 
-        self.logger = logging.getLogger(__name__)
+        self.logger = config.getLogger(__name__)
 
         self.gui_app = app
         self.desktop_width = app.desktop().screenGeometry().width()
@@ -669,6 +669,9 @@ def done_making_files(self):
         otherwise run the user's custom script.
         """
         self.ex_button.setEnabled(self.required_settings_filled())
+
+        self.tree_browser.refresh()
+
         self.progress_text = 'Done Exporting.'
         self.delete_files()
 
@@ -1202,6 +1205,7 @@ def create_export_settings(self):
     def create_blacklist_layout(self, blacklist_layout):
 
         self.tree_browser = TreeBrowser()
+        self.file_tree = self.tree_browser.file_tree
         self.tree_browser.setContentsMargins(0, 0, 0, 0)
 
         self.blacklist_text = QtGui.QPlainTextEdit()
@@ -1270,14 +1274,6 @@ def whitelist_changed(self, text, whitelist_setting):
         new_val = text.toPlainText()
         self.tree_browser.refresh(whitelist=re.split('\n?,?', new_val))
 
-    @property
-    def used_project_files(self):
-        return self.tree_browser.files
-
-    @property
-    def used_project_dirs(self):
-        return self.tree_browser.dirs
-
     def create_output_name_pattern_line(self):
         output_name_layout = QtGui.QHBoxLayout()
 

util_classes.py

@@ -42,7 +42,7 @@ def __init__(self, directory=None,
     def init(self, directory=None,
              whitelist=None, blacklist=None):
 
-        self.logger = logging.getLogger(__name__)
+        self.logger = config.getLogger(__name__)
 
         if directory:
             self.directory = directory + os.sep
@@ -52,15 +52,12 @@ def init(self, directory=None,
         self.refresh(whitelist, blacklist)
 
     def clear(self):
-        pass
+        self.files = []
+        self.dirs = []
 
     def refresh(self, whitelist=None,
                 blacklist=None):
-        self.whitelist = whitelist or self.whitelist or []
-        self.blacklist = blacklist or self.blacklist or []
-
-        self.files = []
-        self.dirs = []
+        self.set_filters(whitelist, blacklist)
 
         self.clear()
 
@@ -79,23 +76,35 @@ def walk(self, directory):
 
         return self.walkcache[directory]
 
-    def determine_skip(self, path):
+    def determine_skip(self, path, *args, **kwargs):
         skip = False
 
         for blacklist in self.blacklist:
             match = fnmatch(path, blacklist)
             if match:
                 skip = True
+                self.on_blacklist_match(path, *args, **kwargs)
                 break
 
         for whitelist in self.whitelist:
             match = fnmatch(path, whitelist)
             if match:
                 skip = False
+                self.on_whitelist_match(path, *args, **kwargs)
                 break
 
         return skip
 
+    def set_filters(self, whitelist=None, blacklist=None):
+        self.whitelist = whitelist or self.whitelist or []
+        self.blacklist = blacklist or self.blacklist or []
+
+    def on_whitelist_match(self, path, *args, **kwargs):
+        pass
+
+    def on_blacklist_match(self, path, *args, **kwargs):
+        pass
+
     def init_cache(self):
         if self.walkcache.get(self.directory) is None:
             self.walkcache[self.directory] = []
@@ -168,7 +177,7 @@ def generate_files(self):
                 self.files.append(path)
 
 
-class TreeBrowser(QtGui.QWidget, FileTree):
+class TreeBrowser(QtGui.QWidget):
     def __init__(self, directory=None,
                  whitelist=None, blacklist=None, parent=None):
         QtGui.QWidget.__init__(self, parent=parent)
@@ -184,10 +193,25 @@ def __init__(self, directory=None,
         layout.addWidget(self.root)
         self.setLayout(layout)
 
-        FileTree.__init__(self, directory, whitelist, blacklist)
+        self.file_tree = FileTree(directory, whitelist, blacklist)
+        self.init(directory, whitelist, blacklist)
 
     def clear(self):
         self.root.clear()
+        self.file_tree.clear()
+
+    def init(self, directory=None,
+             whitelist=None, blacklist=None):
+
+        self.file_tree.init(directory, whitelist, blacklist)
+
+        self.refresh(whitelist, blacklist)
+
+    def refresh(self, whitelist=None,
+                blacklist=None):
+        self.file_tree.set_filters(whitelist, blacklist)
+        self.clear()
+        self.generate_files()
 
     def fix_tree(self, path, parent):
         temp = parent
@@ -232,62 +256,49 @@ def fix_tree(self, path, parent):
             temp.addChild(child)
             temp = child
 
-    def determine_skip(self, path, parent):
-        skip = False
-
-        for blacklist in self.blacklist:
-            match = fnmatch(path, blacklist)
-            if match:
-                skip = True
-                break
-
-        for whitelist in self.whitelist:
-            match = fnmatch(path, whitelist)
-            if match:
-                skip = False
-                if parent is None:
-                    self.fix_tree(path, parent)
-                break
-
-        return skip
+    def on_whitelist_match(self, path, parent=None):
+        if parent is None:
+            self.fix_tree(path, parent)
 
     def generate_files(self):
-        if self.directory is None:
+        directory = self.file_tree.directory
+
+        if directory is None:
             return
 
         self.parent_map = {'': self.root}
 
-        self.init_cache()
+        self.file_tree.init_cache()
 
-        for root, dirs, files in self.walk(self.directory):
-            self.add_to_cache(root, dirs, files)
+        for root, dirs, files in self.file_tree.walk(directory):
+            self.file_tree.add_to_cache(root, dirs, files)
 
-            proj_path = root.replace(self.directory, '')
+            proj_path = root.replace(directory, '')
 
-            for directory in dirs:
+            for dir in dirs:
                 parent = self.parent_map.get(proj_path)
 
-                path = os.path.join(proj_path, directory)
+                path = os.path.join(proj_path, dir)
 
-                if self.determine_skip(path, parent) or parent is None:
+                if self.file_tree.determine_skip(path, parent=parent) or parent is None:
                     continue
 
                 child = FileItem(parent, path)
-                child.setText(0, directory)
+                child.setText(0, dir)
                 self.parent_map[path] = child
-                self.dirs.append(path)
+                self.file_tree.dirs.append(path)
 
             for file in files:
                 parent = self.parent_map.get(proj_path)
 
                 path = os.path.join(proj_path, file)
 
-                if self.determine_skip(path, parent) or parent is None:
+                if self.file_tree.determine_skip(path, parent=parent) or parent is None:
                     continue
 
                 child = FileItem(parent, path)
                 child.setText(0, file)
-                self.files.append(path)
+                self.file_tree.files.append(path)
 
         self.root.sortItems(0, Qt.AscendingOrder)