Revert "SW-1180 split the updatescript to use params from a config file (mrbeam#1522)"

This reverts commit 1a0c0e0.

Author: Josef-MrBeam

octoprint_mrbeam/scripts/update_script.py

@@ -1,39 +1,36 @@
 from __future__ import absolute_import, division, print_function
 
-import argparse
 import json
-import logging
 import os
 import re
 import shutil
 import subprocess
 import sys
+from io import BytesIO
+
 import zipfile
 import requests
-from importlib import import_module
-from io import BytesIO
+import argparse
 
 from octoprint.plugins.softwareupdate import exceptions
-from octoprint.settings import _default_basedir
 
-import update_script_config
+from octoprint.settings import _default_basedir
+from octoprint_mrbeam.mrb_logger import mrb_logger
 
+from octoprint_mrbeam.util.pip_util import get_version_of_pip_module, get_pip_caller
 from requests.adapters import HTTPAdapter
 from urllib3 import Retry
 from urllib3.exceptions import MaxRetryError, ConnectionError
 
-pip_util_mod = import_module(
-    "{}.util.pip_util".format(update_script_config.IMPORT_TOP_DIR)
-)
+_logger = mrb_logger("octoprint.plugins.mrbeam.softwareupdate.updatescript")
 
-get_version_of_pip_module = getattr(pip_util_mod, "get_version_of_pip_module")
-get_pip_caller = getattr(pip_util_mod, "get_pip_caller")
 
-_logger = logging.getLogger(
-    "octoprint.plugins.{}.softwareupdate.updatescript".format(
-        update_script_config.PLUGIN_NAME
-    )
-)
+UPDATE_CONFIG_NAME = "mrbeam"
+REPO_NAME = "MrBeamPlugin"
+MAIN_SRC_FOLDER_NAME = "octoprint_mrbeam"
+PLUGIN_NAME = "Mr_Beam"
+DEFAULT_OPRINT_VENV = "/home/pi/oprint/bin/pip"
+PIP_WHEEL_TEMP_FOLDER = "/tmp/wheelhouse"
 
 
 def _parse_arguments():
@@ -129,7 +126,7 @@ def get_dependencies(path):
             mrbeam-ledstrips==0.2.2-alpha.2
     output: [[iobeam][==][0.7.15]]
             [[mrb-hw-info][==][0.0.25]]
-            [[mrbeam-ledstrips][==][0.2.2-alpha.2]]
+            [[mrbeam-ledstrips][==][0.2.2-alpha.2]]        
     """
     try:
         with open(dependencies_path, "r") as f:
@@ -168,33 +165,23 @@ def build_wheels(build_queue):
 
     """
     try:
-        if not os.path.isdir(update_script_config.PIP_WHEEL_TEMP_FOLDER):
-            os.mkdir(update_script_config.PIP_WHEEL_TEMP_FOLDER)
+        if not os.path.isdir(PIP_WHEEL_TEMP_FOLDER):
+            os.mkdir(PIP_WHEEL_TEMP_FOLDER)
     except OSError as e:
-        raise RuntimeError(
-            "can't create wheel tmp folder {} - {}".format(
-                update_script_config.PIP_WHEEL_TEMP_FOLDER, e
-            )
-        )
+        raise RuntimeError("can't create wheel tmp folder {} - {}".format(PIP_WHEEL_TEMP_FOLDER, e))
 
     for venv, packages in build_queue.items():
-        tmp_folder = os.path.join(
-            update_script_config.PIP_WHEEL_TEMP_FOLDER,
-            re.search(r"\w+((?=\/venv)|(?=\/bin))", venv).group(0),
-        )
+        tmp_folder = os.path.join(PIP_WHEEL_TEMP_FOLDER, re.search(r"\w+((?=\/venv)|(?=\/bin))", venv).group(0))
         if os.path.isdir(tmp_folder):
             try:
                 os.system("sudo rm -r {}".format(tmp_folder))
             except Exception as e:
-                raise RuntimeError(
-                    "can't delete pip wheel temp folder {} - {}".format(tmp_folder, e)
-                )
+                raise RuntimeError("can't delete pip wheel temp folder {} - {}".format(tmp_folder, e))
 
         pip_args = [
             "wheel",
             "--disable-pip-version-check",
-            "--wheel-dir={}".format(tmp_folder),
-            # Build wheels into <dir>, where the default is the current working directory.
+            "--wheel-dir={}".format(tmp_folder),  # Build wheels into <dir>, where the default is the current working directory.
             "--no-dependencies",  # Don't install package dependencies.
         ]
         for package in packages:
@@ -226,23 +213,22 @@ def install_wheels(install_queue):
         raise RuntimeError("install queue is not a dict")
 
     for venv, packages in install_queue.items():
-        tmp_folder = os.path.join(
-            update_script_config.PIP_WHEEL_TEMP_FOLDER,
-            re.search(r"\w+((?=\/venv)|(?=\/bin))", venv).group(0),
-        )
+        tmp_folder = os.path.join(PIP_WHEEL_TEMP_FOLDER, re.search(r"\w+((?=\/venv)|(?=\/bin))", venv).group(0))
         pip_args = [
             "install",
             "--disable-pip-version-check",
-            "--upgrade",
-            # Upgrade all specified packages to the newest available version. The handling of dependencies depends on the upgrade-strategy used.
+            "--upgrade",  # Upgrade all specified packages to the newest available version. The handling of dependencies depends on the upgrade-strategy used.
             "--force-reinstall",  # Reinstall all packages even if they are already up-to-date.
             "--no-index",  # Ignore package index (only looking at --find-links URLs instead).
-            "--find-links={}".format(tmp_folder),
-            # If a URL or path to an html file, then parse for links to archives such as sdist (.tar.gz) or wheel (.whl) files. If a local path or file:// URL that's a directory, then look for archives in the directory listing. Links to VCS project URLs are not supported.
+            "--find-links={}".format(tmp_folder),  # If a URL or path to an html file, then parse for links to archives such as sdist (.tar.gz) or wheel (.whl) files. If a local path or file:// URL that's a directory, then look for archives in the directory listing. Links to VCS project URLs are not supported.
             "--no-dependencies",  # Don't install package dependencies.
         ]
         for package in packages:
-            pip_args.append("{package}".format(package=package["name"]))
+            pip_args.append(
+                "{package}".format(
+                    package=package["name"]
+                )
+            )
 
         returncode, exec_stdout, exec_stderr = get_pip_caller(venv, _logger).execute(
             *pip_args
@@ -268,21 +254,18 @@ def build_queue(update_info, dependencies, plugin_archive):
     install_queue = {}
 
     install_queue.setdefault(
-        update_info.get(update_script_config.UPDATE_CONFIG_NAME).get(
-            "pip_command", update_script_config.DEFAULT_OPRINT_VENV
-        ),
-        [],
+        update_info.get(UPDATE_CONFIG_NAME).get("pip_command", DEFAULT_OPRINT_VENV), []
     ).append(
         {
-            "name": update_script_config.PLUGIN_NAME,
+            "name": PLUGIN_NAME,
             "archive": plugin_archive,
-            "target": "",
+            "target": '',
         }
     )
     print("dependencies - {}".format(dependencies))
     if dependencies:
         for dependency in dependencies:
-            plugin_config = update_info.get(update_script_config.UPDATE_CONFIG_NAME)
+            plugin_config = update_info.get(UPDATE_CONFIG_NAME)
             plugin_dependencies_config = plugin_config.get("dependencies")
             dependency_config = plugin_dependencies_config.get(dependency["name"])
 
@@ -309,17 +292,12 @@ def build_queue(update_info, dependencies, plugin_archive):
 
             installed_version = get_version_of_pip_module(
                 dependency["name"],
-                dependency_config.get(
-                    "pip_command", update_script_config.DEFAULT_OPRINT_VENV
-                ),
+                dependency_config.get("pip_command", DEFAULT_OPRINT_VENV),
             )
 
             if installed_version != version_needed:
                 install_queue.setdefault(
-                    dependency_config.get(
-                        "pip_command", update_script_config.DEFAULT_OPRINT_VENV
-                    ),
-                    [],
+                    dependency_config.get("pip_command", DEFAULT_OPRINT_VENV), []
                 ).append(
                     {
                         "name": dependency["name"],
@@ -349,7 +327,9 @@ def run_update():
     # get update config of dependencies
     update_info = get_update_info()
 
-    install_queue = build_queue(update_info, dependencies, args.archive)
+    install_queue = build_queue(
+        update_info, dependencies, args.archive
+    )
 
     print("install_queue", install_queue)
     if install_queue is not None:
@@ -409,14 +389,11 @@ def loadPluginTarget(archive, folder):
         )
 
     # unzip repo
-    plugin_extracted_path = os.path.join(
-        folder, update_script_config.UPDATE_CONFIG_NAME
-    )
+    plugin_extracted_path = os.path.join(folder, UPDATE_CONFIG_NAME)
     plugin_extracted_path_folder = os.path.join(
         plugin_extracted_path,
         "{repo_name}-{target}".format(
-            repo_name=update_script_config.REPO_NAME,
-            target=re.sub(r"^v", "", filename.split(".zip")[0]),
+            repo_name=REPO_NAME, target=re.sub(r"^v", "", filename.split(".zip")[0])
         ),
     )
     try:
@@ -427,57 +404,30 @@ def loadPluginTarget(archive, folder):
         raise RuntimeError("Could not unzip plugin repo - error: {}".format(e))
 
     # copy new dependencies to working directory
-    _copy_file_to_working_dir(
-        folder=folder,
-        plugin_extracted_path_folder=plugin_extracted_path_folder,
-        origin_file="dependencies.txt",
-        destination_file="dependencies.txt",
-    )
+    try:
+        shutil.copy2(
+            os.path.join(
+                plugin_extracted_path_folder, MAIN_SRC_FOLDER_NAME, "dependencies.txt"
+            ),
+            os.path.join(folder, "dependencies.txt"),
+        )
+    except IOError:
+        raise RuntimeError("Could not copy dependencies to working directory")
 
     # copy new update script to working directory
-    _copy_file_to_working_dir(
-        folder=folder,
-        plugin_extracted_path_folder=plugin_extracted_path_folder,
-        origin_file="scripts/update_script.py",
-        destination_file="update_script.py",
-    )
-
-    # copy new update script config to working directory
-    _copy_file_to_working_dir(
-        folder=folder,
-        plugin_extracted_path_folder=plugin_extracted_path_folder,
-        origin_file="scripts/update_script_config.py",
-        destination_file="update_script_config.py",
-    )
-
-    return zip_file_path
-
-
-def _copy_file_to_working_dir(
-    folder, plugin_extracted_path_folder, origin_file, destination_file
-):
-    """
-    copy a file from the downloaded copy of the plugin to the working directory
-
-    Args:
-        folder: the destination directory
-        plugin_extracted_path_folder: the path to the extracted plugin code
-        origin_file: the path of the original file inside the plugin
-        destination_file: the destination path
-    """
     try:
         shutil.copy2(
             os.path.join(
                 plugin_extracted_path_folder,
-                update_script_config.MAIN_SRC_FOLDER_NAME,
-                origin_file,
+                MAIN_SRC_FOLDER_NAME,
+                "scripts/update_script.py",
             ),
-            os.path.join(folder, destination_file),
-        )
-    except IOError as ioe:
-        raise RuntimeError(
-            "Could not copy {} to working directory: {}".format(origin_file, ioe)
+            os.path.join(folder, "update_script.py"),
         )
+    except IOError:
+        raise RuntimeError("Could not copy update_script to working directory")
+
+    return zip_file_path
 
 
 def main():
@@ -492,7 +442,9 @@ def main():
     args = _parse_arguments()
     if args.call:
         if args.archive is None:
-            raise RuntimeError("Could not run update archive is missing")
+            raise RuntimeError(
+                "Could not run update archive is missing"
+            )
         run_update()
     else:
 
@@ -505,14 +457,17 @@ def main():
 
         update_info = get_update_info()
         archive = loadPluginTarget(
-            update_info.get(update_script_config.UPDATE_CONFIG_NAME)
+            update_info.get(UPDATE_CONFIG_NAME)
             .get("pip")
             .format(target_version=args.target),
             folder,
         )
 
         # call new update script with args
-        sys.argv = ["--call=true", "--archive={}".format(archive)] + sys.argv[1:]
+        sys.argv = [
+            "--call=true",
+            "--archive={}".format(archive)
+        ] + sys.argv[1:]
         try:
             result = subprocess.call(
                 [sys.executable, os.path.join(folder, "update_script.py")] + sys.argv,