codexctl 0.3.0__tar.gz → 0.4.0__tar.gz

{codexctl-0.3.0 → codexctl-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: codexctl
-Version: 0.3.0
+Version: 0.4.0
 Summary: Automated update managment for the ReMarkable tablet
 License: GPLv3
 Author: Jayy001

{codexctl-0.3.0 → codexctl-0.4.0}/codexctl/__init__.py

@@ -56,24 +56,20 @@ class Manager:
 
         version = args.get("version", None)
 
-        if version == "latest":
-            version = self.updater.get_latest_version(remarkable_version)
-        elif version == "toltec":
-            version = self.updater.get_toltec_version(remarkable_version)
+        if remarkable_version:
+            if version == "latest":
+                version = self.updater.get_latest_version(remarkable_version)
+            elif version == "toltec":
+                version = self.updater.get_toltec_version(remarkable_version)
 
         ### Download functionalities
         if function == "list":
-            print(
-                f"""
-ReMarkable Paper Pro:
-{'\n'.join(list(self.updater.remarkablepp_versions.keys()))}
-
-ReMarkable 2:
-{'\n'.join(list(self.updater.remarkable2_versions.keys()))}
+            remarkable_pp_versions = "\n".join(self.updater.remarkablepp_versions.keys())
+            remarkable_2_versions = "\n".join(self.updater.remarkable2_versions.keys())
+            remarkable_1_versions = "\n".join(self.updater.remarkable1_versions.keys())
 
-ReMarkable 1:
-{'\n'.join(list(self.updater.remarkable1_versions.keys()))}
-            """
+            print(
+                f"ReMarkable Paper Pro:\n{remarkable_pp_versions}\n\nReMarkable 2:\n{remarkable_2_versions}\n\nReMarkable 1:\n{remarkable_1_versions}"
             )
 
         elif function == "download":
@@ -95,9 +91,6 @@ ReMarkable 1:
                 )
 
             if function == "extract":
-                if sys.platform != "linux":
-                    raise NotImplementedError
-
                 if not args["out"]:
                     args["out"] = os.getcwd() + "/extracted"
 
@@ -135,15 +128,15 @@ ReMarkable 1:
                 )
 
             try:
-                image, volume = get_update_image(args.file)
-                inode = volume.inode_at(args.target_path)
+                image, volume = get_update_image(args["file"])
+                inode = volume.inode_at(args["target_path"])
 
             except FileNotFoundError:
-                print(f"'{args.target_path}': No such file or directory")
+                print(f"{args['target_path']}: No such file or directory")
                 raise FileNotFoundError
 
             except OSError:
-                print(f"'{args.target_path}': {os.strerror(e.errno)}")
+                print(f"{args['target_path']}: {os.strerror(e.errno)}")
                 sys.exit(e.errno)
 
             if function == "cat":
@@ -197,6 +190,11 @@ ReMarkable 1:
                 authentication=args["password"],
             )
 
+            if version == "latest":
+                version = self.updater.get_latest_version(remarkable.hardware)
+            elif version == "toltec":
+                version = self.updater.get_toltec_version(remarkable.hardware)
+
             if function == "status":
                 beta, prev, current, version_id = remarkable.get_device_status()
                 print(
@@ -239,25 +237,35 @@ ReMarkable 1:
 
                 #### PREVENT USERS FROM INSTALLING NON-COMPATIBLE IMAGES ####
 
-                # TODO: Downgrade from versions above 3.11 to versions below 3.11 (We alredy know how to do this with #71)
-                # TODO: Upgrade from versions below 3.11 to versions above 3.11 (Easy way: upgrade to 3.11.2.5 to get the new update engine, then upgrade again to the specific version)
-
-                if device_version_uses_new_engine != update_file_requires_new_engine:
-                    raise SystemError(
-                        "Incompatible update file with current reMarkable update engine. See #71"
-                    )
+                if device_version_uses_new_engine:
+                    if not update_file_requires_new_engine:
+                        raise SystemError("Cannot downgrade to this version as it uses the old update engine, please manually downgrade.")
+                        # TODO: Implement manual downgrading.
+                        # `codexctl download --out . 3.11.2.5`
+                        # `codexctl extract --out 3.11.2.5.img 3.11.2.5_reMarkable2-qLFGoqPtPL.signed`
+                        # `codexctl transfer 3.11.2.5.img ~/root`
+                        # `dd if=/home/root/3.11.2.5.img of=/dev/mmcblk2p2` (depending on fallback partition)
+                        # `codexctl restore`
+                        
+                else:
+                    if update_file_requires_new_engine:
+                        raise SystemError("This version requires the new update engine, please upgrade your device to version 3.11.2.5 first.")
 
                 #############################################################
 
+                update_file_requires_new_engine = False 
+                device_version_uses_new_engine = False 
+
                 if not update_file_requires_new_engine:
-                    if not os.path.exists("updates"):
-                        os.mkdir("updates")
-                    if update_file:
-                        shutil.move(update_file, "updates")
-                        update_file = get_available_version(version)
-                        made_update_folder = True  # Delete at end
+                    if update_file: # Check if file exists
+                        if not (os.path.dirname(os.path.abspath(update_file)) == os.path.abspath("updates")):
+                            if not os.path.exists("updates"):
+                                os.mkdir("updates")
+                            shutil.move(update_file, "updates")
+                            update_file = get_available_version(version)
+                            made_update_folder = True  # Delete at end
 
-                # If version was a valid location file, update_file will be the location.
+                # If version was a valid location file, update_file will be the location else it'll be a version number
 
                 if not update_file:
                     temp_path = tempfile.mkdtemp()
@@ -342,7 +350,7 @@ def main() -> None:
     download.add_argument("version", help="Version to download")
     download.add_argument("--out", "-o", help="Folder to download to", default=None)
     download.add_argument(
-        "--hardware", "--h", help="Hardware to download for", required=True
+        "--hardware", "-hd", help="Hardware to download for", required=True
     )
 
     ### Backup subcommand

{codexctl-0.3.0 → codexctl-0.4.0}/codexctl/device.py

@@ -47,8 +47,11 @@ class DeviceManager:
             with ftp.file("/sys/devices/soc0/machine") as file:
                 machine_contents = file.read().decode("utf-8").strip("\n")
         else:
-            with open("/sys/devices/soc0/machine") as file:
-                machine_contents = file.read().decode("utf-8").strip("\n")
+            try:
+                with open("/sys/devices/soc0/machine") as file:
+                    machine_contents = file.read().decode("utf-8").strip("\n")
+            except FileNotFoundError:
+                machine_contents = "tests"
 
         if "reMarkable Ferrari" in machine_contents:
             self.hardware = "ferrari"

{codexctl-0.3.0 → codexctl-0.4.0}/codexctl/updates.py

@@ -145,6 +145,10 @@ class UpdateManager:
 
         if "ferrari" in device_type:
             raise SystemExit("ReMarkable Paper Pro does not support toltec")
+        elif "1" in device_type:
+            device_type = "rm1"
+        else:
+            device_type = "rm2"
 
         response = requests.get("https://toltec-dev.org/stable/Compatibility")
         if response.status_code != 200:
@@ -349,6 +353,11 @@ class UpdateManager:
 
         return filename
 
+    @staticmethod
+    def __max_version(versions: list) -> str:
+        """Returns the highest avaliable version from a list with semantic versioning"""
+        return sorted(versions, key=lambda v: tuple(map(int, v.split("."))))[-1]
+
     @staticmethod
     def uses_new_update_engine(version: str) -> bool:
         """
@@ -360,9 +369,4 @@ class UpdateManager:
         Returns:
             bool: If it uses the new update engine or not
         """
-        return int(version.split(".")[0]) >= 3 and int(version.split(".")[1]) >= 11
-
-    @staticmethod
-    def __max_version(versions: list) -> str:
-        """Returns the highest avaliable version from a list with semantic versioning"""
-        return sorted(versions, key=lambda v: tuple(map(int, v.split("."))))[-1]
+        return int(version.split(".")[0]) >= 3 and int(version.split(".")[1]) >= 11

{codexctl-0.3.0 → codexctl-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "codexctl"
-version = "0.3.0"
+version = "0.4.0"
 description = "Automated update managment for the ReMarkable tablet"
 authors = ["Jayy001 <github@skii.dev>"]
 license = "GPLv3"