Changeset 25b14be in flex_extract.git for source/python/classes/UioFiles.py

Timestamp:

Sep 23, 2018, 11:40:28 AM (6 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

4971f63

Parents:

5d42acd

Message:

changed whole tree structure of flex_extract to have better overview

File:

• source/python/classes/UioFiles.py (moved) (moved from python/pythontest/TestInstallTar/flex_extract_v7.1/python/UioFiles.py) (5 diffs)

source/python/classes/UioFiles.py

@@ -52 +52 @@
 # software specific module from flex_extract
 #import profiling
-from tools import silent_remove, get_list_as_string
+from mods.tools import silent_remove, get_list_as_string
 
 # ------------------------------------------------------------------------------
@@ -60 +60 @@
 class UioFiles(object):
     '''
-    Class to manipulate files. At initialisation it has the attribute
-    pattern which stores a regular expression pattern for the files associated
-    with the instance of the class.
+    Class to manipulate files. At initialisation it has the pattern
+    which stores a regular expression pattern for the files, the path
+    to the files and the files already.
     '''
     # --------------------------------------------------------------------------
@@ -88 +88 @@
         self.path = path
         self.pattern = pattern
-        self.files = None
+        self.files = []
 
         self.__list_files__(self.path)
@@ -95 +95 @@
 
     #@profiling.timefn
-    def __list_files__(self, path, callid=0):
+    def __list_files__(self, path):
         '''
         @Description:
@@ -108 +108 @@
                 Path to the files.
 
-            callid: integer
-                Id which tells the function if its the first call
-                or a recursive call. Default and first call is 0.
-                Everything different from 0 is ment to be a recursive case.
-
         @Return:
             <nothing>
         '''
-
-        # initialize variable in first function call
-        if callid == 0:
-            self.files = []
-
         # Get the absolute path
         path = os.path.abspath(path)
 
-        # get the file list of the path if its not a directory and
-        # if it contains the pattern
-        self.files.extend([os.path.join(path, k) for k in os.listdir(path)
-                           if fnmatch.fnmatch(k, self.pattern)])
-
-        # find possible sub-directories in the path
-        subdirs = [s for s in os.listdir(path)
-                   if os.path.isdir(os.path.join(path, s))]
-
-        # do recursive calls for sub-direcorties
-        if subdirs:
-            for subdir in subdirs:
-                self.__list_files__(os.path.join(path, subdir), callid=1)
+        # get all files in the dir and subdir as absolut path
+        for root, dirnames, filenames in os.walk(path):
+            for filename in fnmatch.filter(filenames, self.pattern):
+                self.files.append(os.path.join(root, filename))
 
         return