pyarmor 8.5.5__zip → 8.5.7__zip

{pyarmor-8.5.5 → pyarmor-8.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.5
+Version: 8.5.7
 Summary: A tool used to obfuscate python scripts, bind obfuscated scripts to fixed machine or expire obfuscated scripts.
 Home-page: https://github.com/dashingsoft/pyarmor
 Author: Jondy Zhao

{pyarmor-8.5.5 → pyarmor-8.5.7}/pyarmor/cli/__init__.py

@@ -1,6 +1,6 @@
 import logging
 
-__VERSION__ = '8.5.5'
+__VERSION__ = '8.5.7'
 
 logger = logging.getLogger('cli')
 

{pyarmor-8.5.5 → pyarmor-8.5.7}/pyarmor/cli/default.cfg

@@ -3,7 +3,7 @@
 ;; Pyarmor version
 major = 8
 minor = 5
-patch = 5
+patch = 7
 
 ;; Compatible core version
 cli.core = 6.5.1

{pyarmor-8.5.5 → pyarmor-8.5.7}/pyarmor/cli/repack.py

@@ -6,6 +6,7 @@ import struct
 import sys
 import tempfile
 
+from fnmatch import fnmatch
 from importlib._bootstrap_external import _code_to_timestamp_pyc
 from subprocess import check_call, check_output, DEVNULL
 
@@ -451,30 +452,34 @@ class Repacker:
 #    All of them will be obfuscated automatically
 #
 spec_patch_code = '''
-from PyInstaller.compat import base_prefix
 import marshal
 import os
 
+from PyInstaller.compat import base_prefix
+from sys import prefix, exec_prefix
+
+exlist = set([base_prefix, prefix, exec_prefix])
+exlist = [os.path.normpath(x) for x in exlist]
+
+src = {src}
+sn = len(src) + 1
+sdir = os.path.relpath(src)
+sdir = '' if sdir == '.' else sdir
+
 hiddenimports = set([])
 plist = set([])
 mlist = []
-src = {src}
-sn = len(src) + 1
-prefix = os.path.relpath(src)
-prefix = '' if prefix == '.' else prefix
 
 for name, path, kind in a.pure:
     if name.startswith('pyi_rth'):
         continue
-    if path.startswith(src) and not path.startswith(base_prefix):
-        hiddenimports.add(name)
+    hiddenimports.add(name)
+    if path.startswith(src) and not any([path.startswith(x) for x in exlist]):
         if name.find('.') == -1 and os.path.basename(path) != '__init__.py':
-            mlist.append(os.path.join(prefix, path[sn:]))
+            mlist.append(os.path.join(sdir, path[sn:]))
         else:
             pkgname = os.path.dirname(path[sn:]).split(os.sep)[0]
-            plist.add(os.path.join(prefix, pkgname))
-    else:
-        hiddenimports.add(name.split('.')[0])
+            plist.add(os.path.join(sdir, pkgname))
 
 with open({resfile}, 'wb') as f:
     marshal.dump(mlist + list(plist), f)
@@ -488,46 +493,44 @@ class Repacker6:
 
     Args:
         ctx: build context
-        mode: onefile or onefolder
+        mode: onefile or onedir
         inputs: main script to pack
+        output: path to store final bundle, default is `dist`
     """
 
     def __init__(self, ctx, mode, inputs, output):
         self.ctx = ctx
         self.inputs = inputs
-        self.output = 'dist' if output is None else os.path.normpath(output)
+        self.output = os.path.normpath(output) if output else 'dist'
 
         self.script = self.inputs[0]
+        self.name = os.path.splitext(os.path.basename(self.script))[0]
         self.obfpath = os.path.normpath(self.ctx.pack_obfpath)
         self.packpath = os.path.normpath(self.ctx.pack_basepath)
         self.workpath = os.path.join(self.packpath, 'build')
         self.pyicmd = [sys.executable, '-m', 'PyInstaller']
-        self.pyiopts = self.init_opts(mode)
         self.autoclean = mode in ('FC', 'DC')
+        self.modeopt = '-F' if mode in ('onefile', 'F', 'FC') else '-D'
+        self.init_opts()
 
-    def init_opts(self, mode):
-        opts = []
-        exopts = '--noconfirm', '-y'
-        if mode == 'auto':
-            exopts += ('--onefile', '-F', '--onefolder', '-D')
-        else:
-            opts.append('-F' if mode in ('onefile', 'F', 'FC') else '-D')
-        opts.extend(self.ctx.pyi_options)
-
+    def init_opts(self):
+        opts = self.ctx.pyi_options
+        exopts = '--noconfirm', '-y', '--onefile', '-F', '--onedir', '-D'
         exvalues = '--distpath', '--specpath', '--workpath'
-        return self.filter_opts(opts, exvalues, exopts)
-
-    def filter_opts(self, opts, exvalues, exopts=None):
-        result = []
-        isvalue = False
-        for x in opts:
-            if isvalue:
-                isvalue = False
-            elif x in exvalues:
-                isvalue = True
-            elif exopts is None or x not in exopts:
-                result.append(x)
-        return result
+
+        self.pyiopts = []
+
+        n = 0
+        while n < len(opts):
+            x = opts[n]
+            if x in ('--name', '-n'):
+                self.name = opts[n+1]
+
+            if x in exvalues:
+                n += 1
+            elif x not in exopts:
+                self.pyiopts.append(x)
+            n += 1
 
     def analysis(self):
         """Got imported modules and packages by PyInstaller
@@ -535,25 +538,20 @@ class Repacker6:
         Generate hook script
         Return file/dir list need to be obfuscated
         """
-        cmdspec = [
-            sys.executable, '-m', 'PyInstaller.utils.cliutils.makespec',
-            '--specpath', self.packpath
-        ]
-        cmdspec.extend(self.filter_opts(self.pyiopts, ('--name', '-N')))
+        cmdspec = [sys.executable, '-m', 'PyInstaller.utils.cliutils.makespec']
+        cmdspec.extend(self.pyiopts)
         cmdspec.append(self.script)
         logger.debug('%s', ' '.join(cmdspec))
         logger.info('call PyInstaller to generate specfile')
         check_call(cmdspec, stdout=DEVNULL, stderr=DEVNULL)
 
-        name = os.path.splitext(os.path.basename(self.script))[0]
+        specfile = self.name + '.spec'
         rtname = self.ctx.runtime_package_name
-        specfile = os.path.join(self.packpath, name + '.spec')
         resfile = os.path.join(self.packpath, 'resources.list')
         hookscript = os.path.join(self.packpath, 'hook-%s.py' % rtname)
         self.patch_specfile(specfile, hookscript, resfile)
 
         cmdlist = self.pyicmd + ['--clean', '--workpath', self.workpath]
-        cmdlist.extend(self.pyiopts)
         cmdlist.append(specfile)
         logger.debug('%s', ' '.join(cmdlist))
         logger.info('call PyInstaller to analysis, '
@@ -561,26 +559,33 @@ class Repacker6:
         check_call(cmdlist, stdout=DEVNULL, stderr=DEVNULL)
 
         with open(resfile, 'rb') as f:
-            return marshal.load(f)
+            reslist = marshal.load(f)
+
+        resoptions = self.ctx.get_res_options('')
+        excludes = resoptions.get('excludes', '').split()
+        if excludes:
+            reslist = [x for x in reslist
+                       if not any([fnmatch(x, pat) for pat in excludes])]
+        return reslist
 
     def build(self):
         """Generate final bundle to output"""
-        script = os.path.join(self.obfpath, os.path.basename(self.inputs[0]))
+        obfscript = os.path.join(self.obfpath, os.path.basename(self.script))
         cmdlist = self.pyicmd + [
             '--clean',
             '--distpath', self.output,
             '--workpath', self.workpath,
-            '--specpath', self.packpath,
             '--additional-hooks-dir', self.packpath,
+            self.modeopt
         ]
         cmdlist.extend(self.pyiopts)
-        cmdlist.append(script)
+        cmdlist.append(obfscript)
 
         logger.debug('%s', ' '.join(cmdlist))
         logger.info('call PyInstaller to generate final bundle ...\n')
         check_call(cmdlist)
         logger.info('')
-        logger.info('the final bundle "%s" has been generate successfully',
+        logger.info('the final bundle has been generated to "%s" successfully',
                     self.output)
 
     def repack(self, *unused):

{pyarmor-8.5.5 → pyarmor-8.5.7}/pyarmor/config.py

@@ -1,6 +1,6 @@
 from sys import platform
 
-version = '8.5.5'
+version = '8.5.7'
 
 # The corresponding version of pytransform.so
 core_version = 'r52.6'

{pyarmor-8.5.5 → pyarmor-8.5.7}/pyarmor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.5
+Version: 8.5.7
 Summary: A tool used to obfuscate python scripts, bind obfuscated scripts to fixed machine or expire obfuscated scripts.
 Home-page: https://github.com/dashingsoft/pyarmor
 Author: Jondy Zhao