handle error when listing contents of a folder

-if path was a broken link, it threw error and stopped execution
insighio · Sep 7, 2023 · cf0838e · cf0838e
1 parent 1c54fa8
commit cf0838e
Showing 1 changed file with 39 additions and 33 deletions.
diff --git a/microfreezer.py b/microfreezer.py
@@ -205,42 +205,48 @@ def convertFileToBase64(self, sourceFile, destFile):
     def processFiles(self, currentPath=""):
         absoluteCurrentPath = join(self.baseSourceDir, currentPath)
 
-        for f in listdir(absoluteCurrentPath):
-            if f in self.excludeList:
-                logging.debug("ignoring file: {}".format(f))
-                continue
-            absoluteSourceDir = join(absoluteCurrentPath, f)
-
-            if isfile(absoluteSourceDir):
-                logging.debug("File: " + str(absoluteSourceDir))
-                self.convertFileToBase64(absoluteSourceDir, join(currentPath, f))
-            else:
-                logging.debug("Dir:  " + str(absoluteSourceDir))
-
-                if f in self.directoriesKeptInFrozen:
-                    self.copyRecursive(absoluteSourceDir, self.baseDestDirCustom)
+        try:
+            for f in listdir(absoluteCurrentPath):
+                if f in self.excludeList:
+                    logging.debug("ignoring file: {}".format(f))
+                    continue
+                absoluteSourceDir = join(absoluteCurrentPath, f)
+
+                if isfile(absoluteSourceDir):
+                    logging.debug("File: " + str(absoluteSourceDir))
+                    self.convertFileToBase64(absoluteSourceDir, join(currentPath, f))
                 else:
-                    self.processFiles(join(currentPath, f))
+                    logging.debug("Dir:  " + str(absoluteSourceDir))
+
+                    if f in self.directoriesKeptInFrozen:
+                        self.copyRecursive(absoluteSourceDir, self.baseDestDirCustom)
+                    else:
+                        self.processFiles(join(currentPath, f))
+        except Exception as e:
+            logging.exception(e, "processFiles: Error processing file")
 
     def copyRecursive(self, sourceDir, destDir, ignoreFrozenDirectories=False):
-        for f in listdir(sourceDir):
-            if f in self.excludeList:
-                logging.debug("ignoring file: {}".format(f))
-                continue
-
-            absoluteSourceDir = join(sourceDir, f)
-            absoluteDestDir = join(destDir, f)
-            if isfile(absoluteSourceDir):
-                if self.minify and absoluteSourceDir.endswith(".py") and not isAnySubstringInString(self.minifyExcludeFolderList, absoluteSourceDir):
-                    logging.debug("file [M]: " + str(absoluteSourceDir))
-                    self.minifyAndReplaceFile(absoluteSourceDir, absoluteDestDir)
-                else:
-                    logging.debug("file: " + str(absoluteSourceDir))
-                    copyfile(absoluteSourceDir, absoluteDestDir)
-            elif not ignoreFrozenDirectories or f not in self.directoriesKeptInFrozen:
-                logging.debug("dir:  " + str(absoluteSourceDir))
-                mkdir(absoluteDestDir)
-                self.copyRecursive(absoluteSourceDir, absoluteDestDir)
+        try:
+            for f in listdir(sourceDir):
+                if f in self.excludeList:
+                    logging.debug("ignoring file: {}".format(f))
+                    continue
+
+                absoluteSourceDir = join(sourceDir, f)
+                absoluteDestDir = join(destDir, f)
+                if isfile(absoluteSourceDir):
+                    if self.minify and absoluteSourceDir.endswith(".py") and not isAnySubstringInString(self.minifyExcludeFolderList, absoluteSourceDir):
+                        logging.debug("file [M]: " + str(absoluteSourceDir))
+                        self.minifyAndReplaceFile(absoluteSourceDir, absoluteDestDir)
+                    else:
+                        logging.debug("file: " + str(absoluteSourceDir))
+                        copyfile(absoluteSourceDir, absoluteDestDir)
+                elif not ignoreFrozenDirectories or f not in self.directoriesKeptInFrozen:
+                    logging.debug("dir:  " + str(absoluteSourceDir))
+                    mkdir(absoluteDestDir)
+                    self.copyRecursive(absoluteSourceDir, absoluteDestDir)
+        except Exception as e:
+            logging.exception(e, "copyRecursive: Error processing file")
 
     def finalize(self):
         # create md5sum file for package identification