Добавленна возможность разбора всех отедльных файлов.

Добавленна возможность сборки из исходников.

Author: Сосна Евгений

pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 echo "Start hooks before commit for v8unpack erf and epf"
-python.exe .git/hooks/pyv8unpack.py
+python.exe .git/hooks/pyv8unpack.py --g --index

pyv8unpack.py

@@ -9,17 +9,21 @@
 import tempfile
 import re
 import platform
+import argparse
 
-logging.basicConfig(level=logging.ERROR)  # DEBUG => print ALL msgs
+__version__ = "0.0.2"
+
+logging.basicConfig(level=logging.INFO) # DEBUG => print ALL msgs
+log = logging.getLogger("pyv8unpack")
 
 modified = re.compile('^(?:M|A)(\s+)(?P<name>.*)')
 
 
 def get_config_param(param):
     '''
-    parse config file and find in them source dir 
+    parse config file and find in them source dir
     '''
-    
+
     curdir = os.curdir
     if '__file__' in globals():
         curdir = os.path.dirname(os.path.abspath(__file__))
@@ -43,20 +47,20 @@ def get_config_param(param):
     if not config is None and config.has_option("DEFAULT", param):
         value = config.get("DEFAULT", param)
         return value
-        
+
 
     return None
 
 
 def get_path_to_1c():
     """
-    get path to 1c binary. 
-    fist env, "PATH1C" 
+    get path to 1c binary.
+    fist env, "PATH1C"
     two env "PROGRAMFILES" on windows
     three /opt/1c - only linux
-    
+
     """
-    
+
     cmd = os.getenv("PATH1C")
     if not cmd is None:
         cmd = os.path.join(cmd, "1cv8")
@@ -67,7 +71,7 @@ def get_path_to_1c():
 
         if not os.path.isfile(cmd):
             raise Exception("file not found %s" %(cmd))
-             
+
         return cmd
 
     #read config
@@ -80,14 +84,14 @@ def get_path_to_1c():
 
     onecplatfrorm_config = get_config_param("onecplatfrorm")
     if not onecplatfrorm_config is None:
-        return onecplatfrorm_config        
-    
+        return onecplatfrorm_config
+
     if platform.system() == "Darwin":
         raise Exception("MacOS not run 1C")
     elif platform.system() == "Windows":
         program_files = os.getenv("PROGRAMFILES(X86)")
         if program_files is None:
-            #FIXME: проверить архетиктуру.  
+            #FIXME: проверить архетиктуру.
             program_files = os.getenv("PROGRAMFILES")
             if program_files is None:
                 raise Exeption("path to Program files not found");
@@ -99,11 +103,11 @@ def get_path_to_1c():
 
         if not os.path.isfile(cmd):
             raise Exception("file not found %s" %(cmd))
-        
+
     else:
         cmd = subprocess.Popen(["which", "1cv8"], stdout=PIPE).communicate()[0].strip()
-    
-    return cmd 
+
+    return cmd
 
 def get_list_of_comitted_files():
     """
@@ -127,10 +131,10 @@ def get_list_of_comitted_files():
 
     return files
 
-
-def decompile():
+def decompile(list_of_files, source=None, platform=None):
     """
     Main functions doing be decompile
+    возвращает list
     """
 
     #list of files to decompile and results decompile
@@ -140,28 +144,27 @@ def decompile():
     exit_code = 0
 
     #Find datapocessor files
-    for filename in get_list_of_comitted_files():
+    for filename in list_of_files:
         #Check the file extensions
-        logging.info("file to check %s" % filename)
+        logging.debug("file to check %s" % filename)
         if filename[-3:] in ['epf', 'erf']:
             dataprocessor_files.append(filename)
-            logging.info("file %s" % filename)
+            logging.debug("file %s" % filename)
             continue
     if len(dataprocessor_files) == 0:
         exit(exit_code)
-    
-    source_dir = get_config_param("source")
+
+    source_dir = source or get_config_param("source")
     if source_dir is None:
         source_dir = "src"
 
     dirsource = os.path.abspath(os.path.join(os.path.curdir, source_dir))
     curabsdirpath = os.path.abspath(os.path.curdir)
-    #pathbin1c = "C:\\Program Files\\1cv82\8.2.17.153\\bin\\1cv8.exe"
-    #pathbin1c = "c:\\Program Files (x86)\\1cv8\\8.3.4.304\\bin\\1cv8.exe"
-    pathbin1c = get_path_to_1c()
+    pathbin1c = platform or get_path_to_1c()
+    returnlist = []
 
     for filename in dataprocessor_files:
-        print("file %s" % filename)
+        logging.info("file %s" % filename)
         #TODO: добавить копирование этих же файлов в каталог src/имяфайла/...
         #get file name.
         fullpathfile = os.path.abspath(filename)
@@ -174,29 +177,137 @@ def decompile():
             os.makedirs(dirsource)
         #для каждого файла определим новую папку.
         newsourcepath = os.path.join(dirsource, newdirname, basename)
+        if(os.path.isabs(newdirname)):
+            newsourcepath = os.path.join(dirsource, basename)
         if not os.path.exists(newsourcepath):
-            logging.info("create new dir %s" % newsourcepath)
+            logging.debug("create new dir %s" % newsourcepath)
             os.makedirs(newsourcepath)
 
-        logging.info("file to copy %s, new path %s, new file %s" % (filename, newsourcepath,
-                      os.path.join(newsourcepath,fullbasename)))
+        logging.debug("file to copy %s, new path %s, new file %s"
+            % (filename, newsourcepath, os.path.join(newsourcepath, fullbasename))
+        )
 
         formatstring = format('/C"decompile;pathtocf;%s;pathout;%s;ЗавершитьРаботуПосле;"' % (fullpathfile, newsourcepath))
         base = '/F"'+os.path.join(curabsdirpath,".git", "hooks","ibService")+'"'
         V8Reader = '/execute"'+os.path.join(curabsdirpath,".git", "hooks", "V8Reader.epf")+'"'
         tempbat = tempfile.mktemp(".bat")
-        logging.info("formatstring is %s , base is %s, V8Reader is %s, temp is %s" % (formatstring, base, V8Reader, tempbat))
+        logging.debug("formatstring is %s , base is %s, V8Reader is %s, temp \
+            is %s" % (formatstring, base, V8Reader, tempbat))
+
 
         with open(tempbat, 'w', encoding='cp866') as temp:
             temp.write('@echo off\n')
             temp.write(format('"%s" %s /DisableStartupMessages %s %s'%(pathbin1c, base, V8Reader, formatstring)))
             temp.close()
             result = subprocess.check_call(['cmd.exe', '/C', tempbat])
-            result = subprocess.check_call(['git', 'add', '--all', newsourcepath])
             if not result == 0:
-                logging.error(result)
-                exit(result)
+                logging.error(format("Не удалось разобрать \
+                    обработку %s" % (fullpathfile)))
+                raise format("Не удалось разобрать обработку %s" %(fullpathfile))
+            returnlist.append(newsourcepath)
+            logging.info("Разобран в %s" % (newsourcepath))
+
+    return returnlist
+
+def add_to_git(pathlists):
+
+    for l in pathlists:
+        result = subprocess.check_call(['git', 'add', '--all', l])
+        if not result == 0:
+            logging.error(result)
+            exit(result)
+
+def compile(input, output, ext):
+    import codecs
+    if input is None:
+        raise "Не указан путь к входящему каталогу"
+    if output is None:
+        raise "Не указан путь к исходящему файлу"
+    extfile = "epf" if ext == "auto" else ext
+
+    dirsource = os.path.abspath(os.path.join(os.path.curdir, input))
+    if not os.path.exists(dirsource) or not os.path.isdir(dirsource):
+        raise "Не существует входящего каталога"
+
+    renamesFile = os.path.join(dirsource, "renames.txt")
+    if not os.path.exists(renamesFile):
+        raise "Не существует файла {}".format(renamesFile)
+    tempPath = tempfile.mkdtemp()
+
+    with codecs.open(renamesFile, "rb", encoding='utf-8') as r:
+        lines = r.read()
+        lines = lines.split('\r\n')
+        for l in lines:
+            list = l.split("-->")
+            if len(list) < 2:
+                continue
+            log.error(l)
+            newPath = os.path.join(tempPath, list[0])
+            dirname = os.path.dirname(newPath)
+            if not os.path.exists(dirname):
+                os.mkdir(dirname)
+            oldPath = os.path.join(dirsource, list[1].replace("\\", os.path.sep))
+            if os.path.isdir(oldPath):
+                #tempFile = tempfile.mkstemp()
+                newPath = os.path.join(tempPath, list[0])
+                shutil.copytree(oldPath, newPath)
+            else:
+                log.error(oldPath)
+                shutil.copy(
+                    os.path.normpath(oldPath),
+                    newPath
+                )
+
+        #вызовем v8unpack, для сборки файла из исходников.
+        tempFile = tempfile.mktemp("."+extfile)
+        log.debug(["UnpackV8.exe", "-PACK", '{}{}'.format(tempPath, os.path.sep), tempFile])
+        log.error('UnpackV8.exe -B "{}" "{}"'.format('{}{}'.format(tempPath, os.path.sep), tempFile))
+        result = subprocess.check_call(['UnpackV8.exe', '-PACK', '{}{}'.format(tempPath, os.path.sep), tempFile])
+        shutil.move(tempFile, output)
+
+def main():
+
+    parser = argparse.ArgumentParser(description="Утилита \
+        для автоматической распаковки внешних обработок")
+    parser.add_argument("--version", action="version",
+        version="%(prog)s {}".format(__version__))
+    parser.add_argument("-v", "--verbose", dest="verbose_count",
+        action="count", default=0,
+        help="increases log verbosity for each occurence.")
+    parser.add_argument("--index", action="store_true",
+        default=False, help="Добавляем в индекс исходники")
+    parser.add_argument("--g", action="store_true", default=False,
+        help="Запуситить чтение индекса из git и определить\
+        список файлов для разбора")
+    parser.add_argument("--compile", action="store_true", default=False,
+                        help = "Собрать внешний файл/обработку")
+    parser.add_argument("--type", action="store", default="auto",
+                        help="Тип файла для сборки epf, erf. По умолчанию авто epf")
+    parser.add_argument("--platform", action="store", help="Путь \
+        к платформе 1С")
+    parser.add_argument("inputPath", nargs="?", help="Путь к \
+        файлам необходимым для распаковки")
+    parser.add_argument("output", nargs="?", help="Путь к \
+        каталогу, куда распаковывать")
+
+    args = parser.parse_args()
+
+    log.setLevel(max(3 - args.verbose_count, 0) * 10)
+
+    if args.g is True:
+        files = get_list_of_comitted_files()
+        indexes = decompile(files, args.output, args.platform)
+        if args.index is True:
+            add_to_git(indexes)
+
+    if(args.compile):
+        compile(args.inputPath, args.output, args.type)
+    if args.inputPath is not None:
+        files = [os.path.abspath(
+            os.path.join(os.path.curdir, args.inputPath))]
+        decompile(
+            files, args.output, args.platform)
 
 
 if __name__ == '__main__':
-    decompile()
+    sys.exit(main())