Improve github config

src/nanosaur/utilities.py

@@ -46,6 +46,8 @@
 
 NANOSAUR_CONFIG_FILE_NAME = 'nanosaur.yaml'
 NANOSAUR_HOME_NAME = 'nanosaur'
+NANOSAUR_MAIN_GITHUB_URL = 'https://github.com/rnanosaur/nanosaur.git'
+NANOSAUR_MAIN_BRANCH = 'nanosaur2'
 
 
 class Robot:
@@ -290,6 +292,19 @@ def items(self):
         return self._params_dict.items()
 
 
+def get_nanosaur_raw_github_url(params: Params) -> str:
+    nanosaur_github_url = params.get('nanosaur_github', NANOSAUR_MAIN_GITHUB_URL)
+    nanosaur_branch = params.get('nanosaur_branch', NANOSAUR_MAIN_BRANCH)
+    # Replace 'github.com' with 'raw.githubusercontent.com' in the URL
+    nanosaur_github_url = nanosaur_github_url.replace('www.github.com', 'raw.githubusercontent.com')
+    nanosaur_github_url = nanosaur_github_url.replace('github.com', 'raw.githubusercontent.com')
+    # Remove '.git' suffix if present
+    if nanosaur_github_url.endswith('.git'):
+        nanosaur_github_url = nanosaur_github_url[:-4]
+    # Append the branch name to the URL
+    return f"{nanosaur_github_url}/{nanosaur_branch}"
+
+
 def create_nanosaur_home() -> str:
     # Get the current nanosaur's home directory
     nanosaur_home_path = get_nanosaur_home()

src/nanosaur/workspace.py

@@ -30,7 +30,7 @@
 from nanosaur.prompt_colors import TerminalFormatter
 from nanosaur import ros
 from nanosaur.simulation import start_robot_simulation
-from nanosaur.utilities import Params, get_nanosaur_home, create_nanosaur_home, require_sudo_password
+from nanosaur.utilities import Params, get_nanosaur_raw_github_url, get_nanosaur_home, create_nanosaur_home, require_sudo_password
 import inquirer
 
 
@@ -118,17 +118,15 @@ def clean(platform, params: Params, args):
 def update(platform, params: Params, args):
     """ Update the workspace """
     # Get the Nanosaur home folder and branch
-    nanosaur_raw_github_repo = params['nanosaur_raw_github_repo']
-    branch = params['nanosaur_branch']
+    nanosaur_raw_url = get_nanosaur_raw_github_url(params)
     # Update shared workspace
-
     def update_shared_workspace(force):
         nanosaur_home_path = get_nanosaur_home()
         shared_src_path = os.path.join(nanosaur_home_path, "shared_src")
         rosinstall_path = os.path.join(shared_src_path, "shared.rosinstall")
         workspace_type = 'shared'
         # Download rosinstall for this device
-        url = f"{nanosaur_raw_github_repo}/{branch}/nanosaur/rosinstall/{workspace_type}.rosinstall"
+        url = f"{nanosaur_raw_url}/nanosaur/rosinstall/{workspace_type}.rosinstall"
         rosinstall_path = ros.download_rosinstall(url, shared_src_path, f"{workspace_type}.rosinstall", force)
         if rosinstall_path is not None:
             print(TerminalFormatter.color_text(f"Update {workspace_type}.rosinstall", bold=True))
@@ -139,15 +137,14 @@ def update_shared_workspace(force):
             if not ros.run_vcs_import(nanosaur_home_path, rosinstall_path, src_folder="shared_src"):
                 return False
     # Update rosinstall file and run vcs import
-
     def update_workspace(params, workspace_type, workspace_name_key, force, skip_rosinstall_update=False):
         workspace_path = get_workspace_path(params, workspace_name_key)
         if not workspace_path:
             return False
         rosinstall_path = os.path.join(workspace_path, f"{workspace_type}.rosinstall")
         if not skip_rosinstall_update:
             # Download rosinstall for this device
-            url = f"{nanosaur_raw_github_repo}/{branch}/nanosaur/rosinstall/{workspace_type}.rosinstall"
+            url = f"{nanosaur_raw_url}/nanosaur/rosinstall/{workspace_type}.rosinstall"
             rosinstall_path = ros.download_rosinstall(url, workspace_path, f"{workspace_type}.rosinstall", force)
             if rosinstall_path is not None:
                 print(TerminalFormatter.color_text(f"Update {workspace_type}.rosinstall", bold=True))