pyarmor.cli 9.2.3__tar.gz → 9.2.4__tar.gz

{pyarmor_cli-9.2.3 → pyarmor_cli-9.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyarmor.cli
-Version: 9.2.3
+Version: 9.2.4
 Summary: A comand line tool to obfuscate python scripts
 Home-page: https://github.com/dashingsoft/pyarmor
 Author: Jondy Zhao
@@ -27,7 +27,7 @@ Pyarmor is a command line tool used to obfuscate python scripts, bind obfuscated
 Key Features
 ------------
 
-* The obfuscated scritpt is still a normal `.py` script, in most of cases the original python scripts can be replaced with obfuscated scripts seamlessly.
+* The obfuscated script is still a normal `.py` script, in most of cases the original python scripts can be replaced with obfuscated scripts seamlessly.
 * Provide many ways to obfuscate the scripts to balance security and performance
 * Rename functions/methods/classes/variables/arguments, irreversible obfuscation
 * Convert part of Python functions to C function, compile to binary by high optimize option, irreversible obfuscation
@@ -37,7 +37,7 @@ Key Features
 Support Platforms
 -----------------
 
-* Python 3.7~3.13
+* Python 3.7~3.15
 * Windows
 * Many linuxs, include embedded systems
 * Apple Intel and Apple Silicon

{pyarmor_cli-9.2.3 → pyarmor_cli-9.2.4}/README.rst

@@ -6,7 +6,7 @@ Pyarmor is a command line tool used to obfuscate python scripts, bind obfuscated
 Key Features
 ------------
 
-* The obfuscated scritpt is still a normal `.py` script, in most of cases the original python scripts can be replaced with obfuscated scripts seamlessly.
+* The obfuscated script is still a normal `.py` script, in most of cases the original python scripts can be replaced with obfuscated scripts seamlessly.
 * Provide many ways to obfuscate the scripts to balance security and performance
 * Rename functions/methods/classes/variables/arguments, irreversible obfuscation
 * Convert part of Python functions to C function, compile to binary by high optimize option, irreversible obfuscation
@@ -16,7 +16,7 @@ Key Features
 Support Platforms
 -----------------
 
-* Python 3.7~3.13
+* Python 3.7~3.15
 * Windows
 * Many linuxs, include embedded systems
 * Apple Intel and Apple Silicon

{pyarmor_cli-9.2.3 → pyarmor_cli-9.2.4}/pyarmor/cli/__init__.py

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

{pyarmor_cli-9.2.3 → pyarmor_cli-9.2.4}/pyarmor/cli/__main__.py

@@ -791,11 +791,19 @@ def main_entry(argv):
         parser.print_help()
 
 
+def map_error(e):
+    if str(e) == 'invalid license token':
+        return ('invalid license token or failed to update license token. '
+                'please make sure this device is online '
+                'and can connect to Pyarmor License Server')
+    return e
+
+
 def main():
     try:
         main_entry(sys.argv[1:])
     except Exception as e:
-        logger.error(e)
+        logger.error(map_error(e))
         log_bug(e)
         sys.exit(1 if isinstance(e, CliError) else 2)
 

{pyarmor_cli-9.2.3 → pyarmor_cli-9.2.4}/pyarmor/cli/command.py

@@ -442,7 +442,7 @@ class Commander:
             logger.info('build target %s end', args.target)
 
     def _build(self, project, target, output, value=None):
-        from .core import Pytransform3
+        from pyarmor.cli.core import Pytransform3
         args = [self.ctx, target, project, output, value]
         m = Pytransform3.init(self.ctx)
         m.pre_build(args)

{pyarmor_cli-9.2.3 → pyarmor_cli-9.2.4}/pyarmor/cli/default.cfg

@@ -3,7 +3,7 @@
 ;; Pyarmor version
 major = 9
 minor = 2
-patch = 3
+patch = 4
 
 ;; Compatible core version for package: pyarmor.cli.core
 cli.core = 8.1.0
@@ -235,6 +235,13 @@ rft_mix_import_name = 0
 ;; Strip leading name package
 strip_package_name = 1
 
+;; Enable ProcessPoolExecuter to generate the obfuscated scripts
+;;
+;;    0: normal build
+;;    1: use ProcessPoolExecutor with max_workers=None
+;;    N > 1: use ProcessPoolExecutor with max_workers=N
+max_workers = 0
+
 ;;
 ;; Compatiable options
 ;;

{pyarmor_cli-9.2.3 → pyarmor_cli-9.2.4}/pyarmor/cli/generate.py

@@ -22,8 +22,9 @@
 import os
 import shutil
 
+from pyarmor.cli.core import Pytransform3
+
 from . import logger, CliError
-from .core import Pytransform3
 from .resource import FileResource, PathResource
 
 
@@ -185,7 +186,71 @@ class Builder(object):
             logger.info('generate runtime files OK')
 
         logger.info('start to obfuscate scripts')
-        self._obfuscate_scripts()
+        n = self.ctx.cfg.getint('builder', 'max_workers')
+        async_obfuscate_scripts(self, n) if n else self._obfuscate_scripts()
         logger.info('obfuscate scripts OK')
 
         Pytransform3.post_build(self.ctx)
+
+
+def async_obfuscate_scripts(builder, max_workers):
+    from concurrent.futures import ProcessPoolExecutor, wait
+
+    ctx = builder.ctx
+    rev = ctx.version_info()
+    template = ctx.bootstrap_template
+    relative = ctx.import_prefix
+    pkgname = ctx.runtime_package_name
+    bootpath = ctx.cfg.get('builder', 'bootstrap_file')
+    encoding = ctx.cfg.get('builder', 'encoding')
+    max_workers = None if max_workers < 2 else max_workers
+
+    plugins = [x for x in ctx.plugins if hasattr(x, 'post_script')]
+
+    namelist = []
+    futures = []
+
+    with ProcessPoolExecutor(max_workers=max_workers) as executor:
+        for res in ctx.resources + ctx.extra_resources:
+            logger.info('process resource "%s"', res.fullname)
+            name = res.name
+            path = builder.format_output(ctx.outputs, namelist.count(name))
+            namelist.append(name)
+            os.makedirs(path, exist_ok=True)
+
+            for r in res:
+                if not r.is_script():
+                    logger.info('copy data file %s', r.fullpath)
+                    data_path = os.path.join(path, r.output_path)
+                    os.makedirs(data_path, exist_ok=True)
+                    shutil.copy2(r.fullpath, data_path)
+                    continue
+
+                logger.info('obfuscating %s', r)
+                futures.append(executor.submit(aysnc_generate_script, *(
+                    r, path, ctx, template, relative, pkgname, bootpath,
+                    rev, plugins, encoding)))
+
+    wait(futures)
+    for x in futures:
+        x.result()
+
+
+def aysnc_generate_script(r, path, ctx, template, relative,
+                          pkgname, bootpath, rev, plugins, encoding):
+    code = Pytransform3.generate_obfuscated_script(ctx, r)
+    source = r.generate_output(
+        template, code, relative=relative, pkgname=pkgname,
+        bootpath=bootpath, rev=rev
+    )
+
+    fullpath = os.path.join(path, r.output_filename)
+    os.makedirs(os.path.dirname(fullpath), exist_ok=True)
+
+    for plugin in plugins:
+        patched_source = plugin.post_script(ctx, r, source)
+        if patched_source:
+            source = patched_source
+
+    with open(fullpath, 'w', encoding=encoding) as f:
+        f.write(source)

{pyarmor_cli-9.2.3 → pyarmor_cli-9.2.4}/pyarmor/cli/register.py

@@ -171,7 +171,7 @@ class Register(object):
         return url
 
     def update_token(self):
-        from .core import Pytransform3
+        from pyarmor.cli.core import Pytransform3
         assert Pytransform3._pytransform3 is None
         with open(self.ctx.license_token, 'wb') as f:
             f.close()
@@ -208,6 +208,10 @@ class Register(object):
                 if len(line) == 192 and line.find(' ') == -1:
                     return regname, line
 
+        logger.error('please make sure the activation file is '
+                     'pure text file, the content starts with `Dear `, '
+                     'and includes the activation code'
+                     '(its length is 192 and no line break)')
         raise CliError('invalid activation file "%s"' % filename)
 
     def _register_offline_license(self, fzip, namelist):
@@ -359,7 +363,7 @@ class Register(object):
             logger.debug('%s:%d:%s', host, port, str(e))
 
     def _get_machine_id(self, devflag=11):
-        from .core import Pytransform3
+        from pyarmor.cli.core import Pytransform3
         try:
             return Pytransform3.get_hd_info(devflag)
         except SystemError:
@@ -817,7 +821,7 @@ class WebRegister(Register):
         ucode = reginfo['ucode']
         rcode = reginfo['rcode']
         if len(ucode) != 192:
-            raise CliError('invalid registration file "%s"', regfile)
+            raise CliError('invalid ci registration file "%s"', regfile)
 
         url = self.regurl('ci/%s' % ucode)
         paras = ('rev', str(rev)), ('cirev', str(cirev))

{pyarmor_cli-9.2.3 → pyarmor_cli-9.2.4}/pyarmor.cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyarmor.cli
-Version: 9.2.3
+Version: 9.2.4
 Summary: A comand line tool to obfuscate python scripts
 Home-page: https://github.com/dashingsoft/pyarmor
 Author: Jondy Zhao
@@ -27,7 +27,7 @@ Pyarmor is a command line tool used to obfuscate python scripts, bind obfuscated
 Key Features
 ------------
 
-* The obfuscated scritpt is still a normal `.py` script, in most of cases the original python scripts can be replaced with obfuscated scripts seamlessly.
+* The obfuscated script is still a normal `.py` script, in most of cases the original python scripts can be replaced with obfuscated scripts seamlessly.
 * Provide many ways to obfuscate the scripts to balance security and performance
 * Rename functions/methods/classes/variables/arguments, irreversible obfuscation
 * Convert part of Python functions to C function, compile to binary by high optimize option, irreversible obfuscation
@@ -37,7 +37,7 @@ Key Features
 Support Platforms
 -----------------
 
-* Python 3.7~3.13
+* Python 3.7~3.15
 * Windows
 * Many linuxs, include embedded systems
 * Apple Intel and Apple Silicon

{pyarmor_cli-9.2.3 → pyarmor_cli-9.2.4}/setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup
 
-__VERSION__ = ' 9.2.3'
+__VERSION__ = ' 9.2.4'
 
 with open('README.rst') as f:
     long_description = f.read()