pyarmor 8.5.11__zip → 8.5.12__zip

{pyarmor-8.5.11 → pyarmor-8.5.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.11
+Version: 8.5.12
 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.11 → pyarmor-8.5.12}/pyarmor/cli/__init__.py

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

{pyarmor-8.5.11 → pyarmor-8.5.12}/pyarmor/cli/__main__.py

@@ -238,8 +238,8 @@ def cmd_gen(ctx, args):
         packer = Repacker(ctx, args.pack, options['inputs'], args.output)
         packer.check()
         builder.process(options, packer=packer)
-        packer.build()
         Plugin.post_build(ctx, pack=args.pack)
+        packer.build()
     else:
         builder.process(options)
         Plugin.post_build(ctx)
@@ -304,6 +304,7 @@ def cmd_reg(ctx, args):
             logger.error('invalid registeration file "%s"', regfile)
             raise CliError('please use ".zip" file to register group device')
         regsvr = WebRegister(ctx)
+        regsvr.check_request_interval()
         regsvr.register_group_device(regfile, args.device)
         logger.info('The device regfile has been generated successfully')
 
@@ -315,6 +316,7 @@ def cmd_reg(ctx, args):
 
     else:
         regsvr = WebRegister(ctx)
+        regsvr.check_request_interval()
         info, msg = regsvr.prepare(regfile, args.product, upgrade=upgrade)
         prompt = 'Are you sure to continue? (yes/no) '
         if args.confirm:

{pyarmor-8.5.11 → pyarmor-8.5.12}/pyarmor/cli/default.cfg

@@ -3,7 +3,7 @@
 ;; Pyarmor version
 major = 8
 minor = 5
-patch = 11
+patch = 12
 
 ;; Compatible core version
 cli.core = 6.5.3
@@ -205,6 +205,7 @@ clear_frame_locals = 0
 ;; Whether encrypt name in statement import
 rft_mix_import_name = 0
 
+;; Unused, now this option isn't used
 ;; Strip leading name package
 strip_package_name = 1
 

{pyarmor-8.5.11 → pyarmor-8.5.12}/pyarmor/cli/register.py

@@ -362,6 +362,24 @@ class WebRegister(Register):
         conn.request("GET", url[k:])
         return conn.getresponse()
 
+    def check_request_interval(self, delta=30.0):
+        """Make sure no more than 2 requests in 1 minute"""
+        tspath = os.path.join(self.ctx.reg_path, 'last_register')
+        try:
+            st = os.stat(tspath)
+        except FileNotFoundError:
+            os.makedirs(tspath)
+        else:
+            from time import sleep, time
+            d = delta - (time() - st.st_mtime)
+            if d > 0:
+                logger.info('last register was within %d seconds, '
+                            'waiting for %d seconds', delta, d)
+            while time() - st.st_mtime < delta:
+                logger.info('waiting ...')
+                sleep(3.0)
+            os.utime(tspath)
+
     def _send_request(self, url, timeout=6.0):
         try:
             return self._request(url)

{pyarmor-8.5.11 → pyarmor-8.5.12}/pyarmor/config.py

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

{pyarmor-8.5.11 → pyarmor-8.5.12}/pyarmor.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyarmor
-Version: 8.5.11
+Version: 8.5.12
 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