Created branch develop

setup.py

@@ -17,9 +17,7 @@
 #  limitations under the License.
 
 import os
-import glob
-import sys
-import re
+import stat
 from distutils.core import setup, Extension
 from distutils.command.build_ext import build_ext
 from distutils.command.install_lib import install_lib
@@ -37,72 +35,32 @@ data_dirs_share = ['i18n']
 
 data_files += var_data_files
 
-def scanDirs(profilesDirs):
-    """Recursive scanning directories"""
+def __scanDir(scanDir, prefix, dirData, flagDir=False):
+    """Scan directory"""
+    files = []
     dirs = []
-    class dirProf:
-        def __init__(self):
-            self.baseDir = False
-            self.dirs = []
-            self.files = []
-    def getFilesDir(dirP, dirname,names):
-        if '/.svn' in dirname:
-            return False
-        for nameFile in names:
-            absNameFile = dirname + "/" + nameFile
-            if '/.svn' in absNameFile:
-                continue
-            if os.path.isfile(absNameFile):
-                dirP.files.append(absNameFile)
-            elif os.path.isdir(absNameFile):
-                dirP.dirs.append(absNameFile)
-        return True
-    for profileDir in profilesDirs:
-        if profileDir:
-            dirP = dirProf()
-            dirP.baseDir = profileDir
-            dirs.append(dirP)
-            os.path.walk(profileDir,getFilesDir, dirP)
-    return dirs
-
-def create_data_files (data_dirs, prefix=""):
-    test1_files = []
+    if flagDir or stat.S_ISDIR(os.stat(scanDir)[stat.ST_MODE]):
+        for fileOrDir in os.listdir(scanDir):
+            absPath = os.path.join(scanDir,fileOrDir)
+            statInfo = os.stat(absPath)[stat.ST_MODE]
+            if stat.S_ISREG(statInfo):
+                files.append(absPath)
+            elif stat.S_ISDIR(statInfo):
+                dirs.append(absPath)
+        if prefix:
+            scanDir = os.path.join(prefix,scanDir)
+        dirData.append((scanDir, files))
+        for sDir in dirs:
+            __scanDir(sDir, prefix, dirData, True)
+    return dirData
+
+def create_data_files(data_dirs, prefix=""):
+    """Create data_files"""
     data_files = []
-    dirs = scanDirs(data_dirs)
-    i = 0
-    for obj in dirs:
-        if not obj.dirs:
-            obj.dirs.append(data_dirs[i])
-        i += 1
-    for obj in dirs:
-        files_obj_dirs = []
-        for dir_name in obj.dirs:
-            for file_name in obj.files:
-                if re.match(dir_name,file_name):
-                    files_obj_dirs.append(dir_name)
-                    break
-        for files_obj_dir in files_obj_dirs:
-            obj.dirs.remove(files_obj_dir)
-        files_obj_dirs.sort(lambda x, y: cmp(len(y), len(x)))
-        for dir_name in files_obj_dirs:
-            wr_sp = (prefix+dir_name,[])
-            file_dirs = []
-            for file_name in obj.files:
-                if re.match(dir_name,file_name):
-                    file_dirs.append(file_name)
-            for file_name in file_dirs:
-                wr_sp[1].append(file_name)
-                obj.files.remove(file_name)
-            test1_files.append(wr_sp)
-    test1_files.reverse()
-    test2_files = []
-    for obj in dirs:
-        for dir_name in obj.dirs:
-            wr_sp = (prefix+dir_name,[])
-            test2_files.append(wr_sp)
-
-    test1_files = test2_files + test1_files
-    return test1_files
+    for data_dir in data_dirs:
+        data = []
+        data_files += __scanDir(data_dir, prefix, data)
+    return data_files
 
 data_files += create_data_files (data_dirs_local)
 data_files += create_data_files (data_dirs_share, share_calculate_dir)
@@ -169,7 +127,7 @@ exec_file = Extension('calculate-server.bin.repbin',
                       sources = ['./bin/repbin.c'])
 setup(
     name = 'calculate-server',
-    version = "2.1.6",
+    version = "2.2.0",
     description = "The program for configuring server-data linux",
     author = "Calculate Pack",
     author_email = "support@calculate.ru",