Merge pull request #6 from OS2borgerPC/4-gør-os2borgerpc-client-konfigurerbar-via-konfigurationer-fra-admin-site

4 gør os2borgerpc client konfigurerbar via konfigurationer fra admin site

Author: henrikmagni

bin/jobmanager

@@ -5,58 +5,34 @@ import pkg_resources
 import random
 import semver
 import sys
-import subprocess
-
-try:
-    from os2borgerpc.client.updater import (  # noqa: F401
-        get_newest_client_version,
-        update_client,
-        update_client_test,
-    )
-    from os2borgerpc.client.jobmanager import update_and_run  # noqa: E402
-except ImportError:
-    # If any of the imports fail, reinstall the client
-    try:
-        subprocess.check_call(
-            [
-                sys.executable,
-                "-m",
-                "pip",
-                "install",
-                "--force-reinstall",
-                "os2borgerpc-client",
-            ]
-        )
-        sys.exit(0)
-    except subprocess.CalledProcessError:
-        print("Restoring client failed\n", file=sys.stderr)
-
-# Higher values: Check for updates less often
-UPDATE_FREQUENCY = 200
-
-if not os.geteuid() == 0:
-    sys.exit("\n Only root can run this program. \n")
-
-# We are root!
-
-# Keep this in sync with package name in setup.py
-# This is deliberatly duplicated here from jobmanager.py to not be
-# dependent on jobmanager.py at this point
-OS2BORGERPC_CLIENT_VERSION = pkg_resources.get_distribution(
-    "os2borgerpc_client"
-).version
-
-# Perform an update-check with a random interval.
-if random.randint(1, UPDATE_FREQUENCY) == 1:
-    print("Checking for new update to client.")
-    newest_client_version = get_newest_client_version()
-    print(
-        f"Newest client version: {newest_client_version}, "
-        f"Installed version: {OS2BORGERPC_CLIENT_VERSION}"
-    )
-    # update_client_test()
-    if semver.compare(newest_client_version, OS2BORGERPC_CLIENT_VERSION) == 1:
+
+from os2borgerpc.client.config import get_config
+from os2borgerpc.client.updater import get_newest_client_version, update_client
+from os2borgerpc.client.jobmanager import update_and_run
+
+# Ensure the script is run as root
+if os.geteuid() != 0:
+    sys.exit("\nOnly root can run this program.\n")
+
+# Constants
+UPDATE_FREQUENCY = 200  # Higher values: Check for updates less often
+
+# Get the current and desired client versions
+CURRENT_CLIENT_VERSION = pkg_resources.get_distribution("os2borgerpc_client").version
+DESIRED_CLIENT_VERSION = get_config("os2borgerpc_client_version")
+
+# Automatically fetch the newest version if configured
+if DESIRED_CLIENT_VERSION.lower() == "auto" and random.randint(1, UPDATE_FREQUENCY) == 1:
+    DESIRED_CLIENT_VERSION = get_newest_client_version()
+
+# Check for updates if a desired version is specified
+if DESIRED_CLIENT_VERSION and DESIRED_CLIENT_VERSION.lower() != "auto":
+    stripped_version = DESIRED_CLIENT_VERSION.lstrip("v")
+    if semver.compare(stripped_version, CURRENT_CLIENT_VERSION) == 1:
+        print(f"Installed client version: {CURRENT_CLIENT_VERSION}")
+        print(f"Desired client version: {DESIRED_CLIENT_VERSION}")
         print("Updating client, please re-run jobmanager.")
-        update_client()
+        update_client(DESIRED_CLIENT_VERSION)
 
+# Run the job manager
 update_and_run()

bin/os2borgerpc_register_in_admin

@@ -13,7 +13,7 @@ data = config.get_data()
 
 mac = data['mac']
 site = data['site']
-admin_url = data.get('admin_url', 'http://os2borgerpc-admin.magenta.dk/')
+admin_url = data.get('admin_url')
 xml_rpc_url = data.get('xml_rpc_url', '/admin-xml/')
 urllib.parse.urljoin(admin_url, xml_rpc_url)
 

os2borgerpc/client/admin_client.py

@@ -8,7 +8,7 @@ def get_default_admin(verbose=False):
     from os2borgerpc.client.config import OS2borgerPCConfig
 
     conf_data = OS2borgerPCConfig().get_data()
-    admin_url = conf_data.get("admin_url", "https://os2borgerpc.magenta-aps.dk")
+    admin_url = conf_data.get("admin_url")
     xml_rpc_url = conf_data.get("xml_rpc_url", "/admin-xml/")
     return OS2borgerPCAdmin("".join([admin_url, xml_rpc_url]), verbose=verbose)
 

os2borgerpc/client/updater.py

@@ -6,23 +6,70 @@
 
 import requests
 
+from os2borgerpc.client.config import get_config
 
-def get_newest_client_version():
-    """Get the newest client version from Pypi."""
-    response = requests.get("https://pypi.org/pypi/os2borgerpc-client/json")
-    json_object = response.json()
-    newest_version = json_object["info"]["version"]
+def get_latest_version_from_github(repo_url):
+    """Get the latest version tag from a GitHub repository."""
+    try:
+        response = requests.get(f"https://api.github.com/repos/{repo_url}/tags")
+        response.raise_for_status()
+        tags = response.json()
+        if tags:
+            return tags[0]["name"]
+        else:
+            return None
+    except requests.RequestException as e:
+        print(f"Failed to fetch tags from GitHub: {e}", file=sys.stderr)
+        return None
 
-    return newest_version
 
+def get_newest_client_version():
+    """Get the newest client version from GitHub or PyPI based on configuration."""
+    client_package = get_config("os2borgerpc_client_package")
+    
+    if client_package.startswith("https://github.com/"):
+        repo_parts = client_package.split("/")
+        if len(repo_parts) >= 5:
+            repo_user = repo_parts[3]
+            repo_name = repo_parts[4].removesuffix('.git')
+            repo_url = f"{repo_user}/{repo_name}"
+            newest_version = get_latest_version_from_github(repo_url)
+            if newest_version:
+                return newest_version
+            else:
+                print("Could not determine the latest version from GitHub.", file=sys.stderr)
+                return None
+    else:
+        try:
+            response = requests.get(f"https://pypi.org/pypi/{client_package}/json")
+            response.raise_for_status()
+            json_object = response.json()
+            newest_version = json_object["info"]["version"]
+            return newest_version
+        except requests.RequestException as e:
+            print(f"Failed to fetch version from PyPI: {e}", file=sys.stderr)
+            return None
+        
+def get_versioned_client_package(version):
+    client_package = get_config("os2borgerpc_client_package")
+
+    if client_package.startswith("https://github.com/"):
+        return f"git+{client_package}@{version}"
+    
+    return f"{client_package}@{version}"
 
-def update_client():
-    """Update the client via pip."""
+def update_client(version):
+    """Update the client via pip based on the latest version."""
     try:
-        subprocess.check_call(
-            [sys.executable, "-m", "pip", "install", "-U", "os2borgerpc-client"]
-        )
-        sys.exit(0)
+        versioned_client_package = get_versioned_client_package(version)
+        if version:
+            subprocess.check_call(
+                [sys.executable, "-m", "pip", "install", "-U", versioned_client_package]
+            )
+            sys.exit(0)
+        else:
+            print("Could not determine the latest version to update.", file=sys.stderr)
+            sys.exit(1)
     except subprocess.CalledProcessError:
         print("update_client failed\n", file=sys.stderr)
         traceback.print_exc()