cleaned up global donate_cpu_lib.py configuration variables (#4532)

Author: firewave

tools/donate-cpu.py

@@ -31,12 +31,22 @@
 # Quick start: just run this script without any arguments
 
 import platform
+import os
+import sys
+import re
+import time
+import subprocess
+import donate_cpu_lib as lib
 
 from packaging.version import Version
-from donate_cpu_lib import *
 
+__my_script_name = os.path.splitext(os.path.basename(sys.argv[0]))[0]
+work_path = os.path.expanduser(os.path.join('~', 'cppcheck-' + __my_script_name + '-workfolder'))
 max_packages = None
 package_urls = []
+do_upload = True
+bandwidth_limit = None
+stop_time = None
 
 for arg in sys.argv[1:]:
     # --stop-time=12:00 => run until ~12:00 and then stop
@@ -48,8 +58,8 @@
             print('Argument "{}" is invalid.'.format(arg))
             print('"-j" must be followed by a positive number.')
             sys.exit(1)
-        jobs = arg
-        print('Jobs:' + jobs[2:])
+        print('Jobs:' + arg[2:])
+        lib.set_jobs(arg)
     elif arg.startswith('--package='):
         pkg = arg[arg.find('=')+1:]
         package_urls.append(pkg)
@@ -70,7 +80,7 @@
             print('work path does not exist!')
             sys.exit(1)
     elif arg == '--test':
-        server_address = ('localhost', 8001)
+        lib.set_server_address(('localhost', 8001))
     elif arg.startswith('--bandwidth-limit='):
         bandwidth_limit = arg[arg.find('=')+1:]
     elif arg.startswith('--max-packages='):
@@ -90,7 +100,7 @@
     elif arg.startswith('--no-upload'):
         do_upload = False
     elif arg == '--version':
-        print(get_client_version())
+        print(lib.get_client_version())
         sys.exit(0)
     elif arg == '--help':
         print('Donate CPU to Cppcheck project')
@@ -124,7 +134,7 @@
     sys.exit(1)
 
 print('Thank you!')
-if not check_requirements():
+if not lib.check_requirements():
     sys.exit(1)
 if bandwidth_limit and isinstance(bandwidth_limit, str):
     if subprocess.call(['wget', '--limit-rate=' + bandwidth_limit, '-q', '--spider', 'cppcheck1.osuosl.org']) == 2:
@@ -146,9 +156,9 @@
 
 print('Get Cppcheck..')
 try:
-    try_retry(clone_cppcheck, fargs=(repo_path, migrate_repo_path))
-except:
-    print('Error: Failed to clone Cppcheck, retry later')
+    lib.try_retry(lib.clone_cppcheck, fargs=(repo_path, migrate_repo_path))
+except Exception as e:
+    print('Error: Failed to clone Cppcheck ({}), retry later'.format(e))
     sys.exit(1)
 
 while True:
@@ -163,7 +173,7 @@
         if stop_time < time.strftime('%H:%M'):
             print('Stopping. Thank you!')
             sys.exit(0)
-    cppcheck_versions = get_cppcheck_versions(server_address)
+    cppcheck_versions = lib.get_cppcheck_versions()
     if cppcheck_versions is None:
         print('Failed to communicate with server, retry later')
         sys.exit(1)
@@ -176,34 +186,34 @@
         current_cppcheck_dir = os.path.join(work_path, 'tree-'+ver)
         try:
             print('Fetching Cppcheck-{}..'.format(ver))
-            try_retry(checkout_cppcheck_version, fargs=(repo_path, ver, current_cppcheck_dir))
+            lib.try_retry(lib.checkout_cppcheck_version, fargs=(repo_path, ver, current_cppcheck_dir))
         except KeyboardInterrupt as e:
             # Passthrough for user abort
             raise e
-        except:
-            print('Failed to update Cppcheck, retry later')
+        except Exception as e:
+            print('Failed to update Cppcheck ({}), retry later'.format(e))
             sys.exit(1)
         if ver == 'main':
-            if not compile_cppcheck(current_cppcheck_dir, jobs):
+            if not lib.compile_cppcheck(current_cppcheck_dir):
                 print('Failed to compile Cppcheck-{}, retry later'.format(ver))
                 sys.exit(1)
         else:
-            if not compile_version(current_cppcheck_dir, jobs):
+            if not lib.compile_version(current_cppcheck_dir):
                 print('Failed to compile Cppcheck-{}, retry later'.format(ver))
                 sys.exit(1)
     if package_urls:
         package = package_urls[packages_processed-1]
     else:
-        package = get_package(server_address)
-    tgz = download_package(work_path, package, bandwidth_limit)
+        package = lib.get_package()
+    tgz = lib.download_package(work_path, package, bandwidth_limit)
     if tgz is None:
         print("No package downloaded")
         continue
     skip_files = None
     if package.find('/qtcreator/') > 0:
         # macro_pounder_fn.c is a preprocessor torture test that takes time to finish
         skip_files = ('macro_pounder_fn.c',)
-    source_path, source_found = unpack_package(work_path, tgz, skip_files=skip_files)
+    source_path, source_found = lib.unpack_package(work_path, tgz, skip_files=skip_files)
     if not source_found:
         print("No files to process")
         continue
@@ -218,14 +228,14 @@
     old_timing_info = ''
     cppcheck_head_info = ''
     client_version_head = ''
-    libraries = library_includes.get_libraries(source_path)
+    libraries = lib.library_includes.get_libraries(source_path)
 
     for ver in cppcheck_versions:
         tree_path = os.path.join(work_path, 'tree-'+ver)
         capture_callstack = False
         if ver == 'head':
             tree_path = os.path.join(work_path, 'tree-main')
-            cppcheck_head_info = get_cppcheck_info(tree_path)
+            cppcheck_head_info = lib.get_cppcheck_info(tree_path)
             capture_callstack = True
 
             def get_client_version_head():
@@ -238,12 +248,12 @@ def get_client_version_head():
                     return None
 
             client_version_head = get_client_version_head()
-        c, errout, info, t, cppcheck_options, timing_info = scan_package(tree_path, source_path, jobs, libraries, capture_callstack)
+        c, errout, info, t, cppcheck_options, timing_info = lib.scan_package(tree_path, source_path, libraries, capture_callstack)
         if c < 0:
             if c == -101 and 'error: could not find or open any of the paths given.' in errout:
                 # No sourcefile found (for example only headers present)
                 count += ' 0'
-            elif c == RETURN_CODE_TIMEOUT:
+            elif c == lib.RETURN_CODE_TIMEOUT:
                 # Timeout
                 count += ' TO!'
                 timeout = True
@@ -263,8 +273,8 @@ def get_client_version_head():
     output = 'cppcheck-options: ' + cppcheck_options + '\n'
     output += 'platform: ' + platform.platform() + '\n'
     output += 'python: ' + platform.python_version() + '\n'
-    output += 'client-version: ' + get_client_version() + '\n'
-    output += 'compiler: ' + get_compiler_version() + '\n'
+    output += 'client-version: ' + lib.get_client_version() + '\n'
+    output += 'compiler: ' + lib.get_compiler_version() + '\n'
     output += 'cppcheck: ' + ' '.join(cppcheck_versions) + '\n'
     output += 'head-info: ' + cppcheck_head_info + '\n'
     output += 'count:' + count + '\n'
@@ -276,18 +286,18 @@ def get_client_version_head():
     if 'head' in cppcheck_versions:
         output += 'head results:\n' + results_to_diff[cppcheck_versions.index('head')]
     if not crash and not timeout:
-        output += 'diff:\n' + diff_results(cppcheck_versions[0], results_to_diff[0], cppcheck_versions[1], results_to_diff[1]) + '\n'
+        output += 'diff:\n' + lib.diff_results(cppcheck_versions[0], results_to_diff[0], cppcheck_versions[1], results_to_diff[1]) + '\n'
     if package_urls:
         print('=========================================================')
         print(output)
         print('=========================================================')
         print(info_output)
         print('=========================================================')
     if do_upload:
-        if upload_results(package, output, server_address):
-            upload_info(package, info_output, server_address)
+        if lib.upload_results(package, output):
+            lib.upload_info(package, info_output)
     if not max_packages or packages_processed < max_packages:
         print('Sleep 5 seconds..')
-        if (client_version_head is not None) and (Version(client_version_head) > Version(get_client_version())):
+        if (client_version_head is not None) and (Version(client_version_head) > Version(lib.get_client_version())):
             print("ATTENTION: A newer client version ({}) is available - please update!".format(client_version_head))
         time.sleep(5)