Merge pull request #142 from kloptops/main

Added muOS sdcard selection, fixed ports with ext4 fs on muOS.

PortMaster/harbourmaster

@@ -527,7 +527,7 @@ def do_device_info(hm, argv):
         website_data[device_name] = {}
 
         for cfw_name in device_data['cfw']:
-            info = {'name': cfw_name.lower(), 'version': 'N/A', 'device': device_data['device']}
+            info = {'name': cfw_name.lower(), 'version': 'N/A', 'device': device_data['device'], 'manufacturer': device_data['manufacturer']}
             harbourmaster.expand_info(info, use_old_cpu_info=True)
 
             website_data[device_name][cfw_name] = info

PortMaster/pylibs/harbourmaster/config.py

@@ -27,9 +27,9 @@
 
 ################################################################################
 ## The following code is a simplification of the PortMaster toolsloc and whichsd code.
-HM_DEFAULT_PORTS_DIR = Path("/roms/ports")
+HM_DEFAULT_PORTS_DIR   = Path("/roms/ports")
 HM_DEFAULT_SCRIPTS_DIR = Path("/roms/ports")
-HM_DEFAULT_TOOLS_DIR = Path("/roms/ports")
+HM_DEFAULT_TOOLS_DIR   = Path("/roms/ports")
 
 if 'XDG_DATA_HOME' not in os.environ:
     os.environ['XDG_DATA_HOME'] = str(Path().home() / '.local' / 'share')
@@ -62,7 +62,9 @@
     HM_DEFAULT_PORTS_DIR   = Path("/mnt/mmc/ports")
     HM_DEFAULT_SCRIPTS_DIR = Path("/mnt/mmc/ROMS/Ports")
 
-    if '/mnt/sdcard' in subprocess.getoutput(['df']):
+    MUOS_MMC_TOGGLE        = Path('/mnt/mmc/MUOS/PortMaster/config/muos_mmc_master_race.txt')
+
+    if not MUOS_MMC_TOGGLE.is_file() and '/mnt/sdcard' in subprocess.getoutput(['df']):
         HM_DEFAULT_PORTS_DIR   = Path("/mnt/sdcard/ports")
         HM_DEFAULT_SCRIPTS_DIR = Path("/mnt/sdcard/ROMS/Ports")
 

PortMaster/pylibs/harbourmaster/harbour.py

@@ -1552,6 +1552,9 @@ def _install_port(self, download_info):
 
         self._fix_permissions()
 
+        if self.ports_dir != self.scripts_dir:
+            self._fix_permissions(self.scripts_dir)
+
         # logger.debug(port_info)
         if port_info['attr'].get('runtime', None) is not None:
             runtime_name = runtime_nicename(port_info['attr']['runtime'])

PortMaster/pylibs/harbourmaster/hardware.py

@@ -34,6 +34,7 @@
     "Anbernic RG552":       {"device": "rg552",       "manufacturer": "Anbernic",  "cfw": ["AmberELEC", "JELOS", "ROCKNIX"]},
     "Anbernic RG35XX PLUS": {"device": "rg35xx-plus", "manufacturer": "Anbernic",  "cfw": ["muOS", "Batocera"]},
     "Anbernic RG35XX H":    {"device": "rg35xx-h",    "manufacturer": "Anbernic",  "cfw": ["muOS", "Batocera"]},
+    "Anbernic RG35XX SP":   {"device": "rg35xx-sp",   "manufacturer": "Anbernic",  "cfw": ["muOS", "Batocera"]},
     "Anbernic RG351P/M":    {"device": "rg351p",      "manufacturer": "Anbernic",  "cfw": ["ArkOS (Wummle)", "AmberELEC", "JELOS", "ROCKNIX"]},
     "Anbernic RG351V":      {"device": "rg351v",      "manufacturer": "Anbernic",  "cfw": ["ArkOS", "AmberELEC", "JELOS", "ROCKNIX"]},
 
@@ -148,7 +149,7 @@
     "rk3588":        {"capabilities": ["armhf", "aarch64"], "primary_arch": "aarch64"},
     "h700-batocera": {"capabilities": ["aarch64"],          "primary_arch": "aarch64"},
     "h700-muos":     {"capabilities": ["armhf", "aarch64"], "primary_arch": "aarch64"},
-    "h700":          {"capabilities": ["armhf"],            "primary_arch": "armhf"},
+    "h700":          {"capabilities": ["armhf", "aarch64"], "primary_arch": "aarch64"},
     "a133plus":      {"capabilities": ["aarch64"],          "primary_arch": "aarch64"},
     "x86_64":        {"capabilities": ["x86_64"],           "primary_arch": "x86_64"},
     "s922x":         {"capabilities": ["aarch64"],          "primary_arch": "aarch64"},

PortMaster/pylibs/pugscene.py

@@ -2,14 +2,17 @@
 import gettext
 import json
 import os
+import pathlib
 import shutil
+import subprocess
 
 import sdl2
 import sdl2.ext
 
 import harbourmaster
 import pySDL2gui
 
+from pathlib import Path
 from loguru import logger
 
 
@@ -557,6 +560,15 @@ def __init__(self, gui):
                 _("Ports Location: ") +  (self.gui.hm.cfg_data.get('trimui-port-mode', 'roms') == 'roms' and _("Roms section") or _("Ports tab")),
                 description=_("Location where ports should be installed to."))
 
+        if self.gui.hm.device['name'] == 'muOS':
+            if '/mnt/sdcard' in subprocess.getoutput(['df']):
+                MUOS_MMC_TOGGLE = Path('/mnt/mmc/MUOS/PortMaster/config/muos_mmc_master_race.txt')
+
+                self.tags['option_list'].add_option(
+                    'muos-port-mode-toggle',
+                    _("Ports Location: ") +  (MUOS_MMC_TOGGLE.is_file() and _("SD 1") or _("SD 2")),
+                    description=_("Location where ports should be installed to."))
+
         self.tags['option_list'].add_option(None, _("System"))
 
         self.tags['option_list'].add_option(
@@ -844,6 +856,35 @@ def do_update(self, events):
 
                     self.gui.hm.platform.do_move_ports()
 
+            if selected_option == 'muos-port-mode-toggle':
+                if '/mnt/sdcard' in subprocess.getoutput(['df']):
+                    MUOS_MMC_TOGGLE = Path('/mnt/mmc/MUOS/PortMaster/config/muos_mmc_master_race.txt')
+
+                    language_map = {
+                        True:  _('SDCARD 1'),
+                        False: _('SDCARD 2'),
+                        }
+
+                    if self.gui.message_box(
+                            _("Are you sure you want to manage and install ports on {to_loc}?\n\nAlready installed ports will not be moved.\nPortMaster will restart for this to take effect.").format(
+                                to_loc=language_map[(not MUOS_MMC_TOGGLE.is_file())]),
+                            want_cancel=True):
+
+                        self.gui.events.running = False
+
+                        if MUOS_MMC_TOGGLE.is_file():
+                            MUOS_MMC_TOGGLE.unlink()
+
+                        else:
+                            MUOS_MMC_TOGGLE.touch(0o644)
+
+                        if not harbourmaster.HM_TESTING:
+                            reboot_file = (harbourmaster.HM_TOOLS_DIR / "PortMaster" / ".pugwash-reboot")
+                            if not reboot_file.is_file():
+                                reboot_file.touch(0o644)
+
+                        return True
+
             if selected_option == 'runtime-manager':
                 self.gui.push_scene('runtime-manager', RuntimesScene(self.gui))
                 return True

PortMaster/trimui/update.txt

@@ -1,12 +1,12 @@
 #!/bin/bash
 
-LASTPWD="$PWD"
-cd /mnt/SDCARD/
-
-if [ -d "Data/ports" ]; then
+if [ -d "/mnt/SDCARD/Data/ports" ]; then
     exit 0
 fi
 
+LASTPWD="$PWD"
+cd /mnt/SDCARD/
+
 # Function to get the name of a directory with its original case sensitivity
 directory_name() {
     local dir="$1"