refactors, fixes

* Update delete.py

* Update delete.py

* refactor, notify about oudated pkg

* clarify logs

* do not show "," if not needed

* show how to reinstall

* docs

* ruff

* ruff

* ruff + comments

* ruff + comments

* comments

* warning about deletion

* Update existing-packages.txt

Author: mostypc123

existing-packages.txt

@@ -1,7 +1,6 @@
 example
 example2
 crust
-reskin
 vim-build
 vim
 firefox

src/delete.py

@@ -3,12 +3,16 @@
 
 from rich.console import Console
 
-from status import status
 import umbrella.autocorrect_package as Autocorrect
+from status import status
 
 console = Console()
 
+
 def main(package):
+    print(
+        "note that this function is not finished, and it does not delete all package files."
+    )
     autocorrected = Autocorrect.main(package)
     if autocorrected != package:
         package = autocorrected
@@ -19,7 +23,7 @@ def main(package):
         open("/etc/repro.car", "w").close()
         return False
 
-    with open(f"/home/{os.getlogin()}/.config/repro.car") as f:
+    with open("/etc/repro.car") as f:
         repro = f.read()
 
     if package not in repro:
@@ -30,7 +34,7 @@ def main(package):
         if i.startswith(package):
             repro = repro.replace(i, "")
 
-    with open("", "w") as f:
+    with open("/etc/repro.car", "w") as f:
         f.write(repro)
 
     status(f"Uninstalling {package}...", "info")

src/hooks.py

@@ -3,29 +3,30 @@
 
 import status
 
+
 def post_inst(package):
-    status.status("Loading hooks")
-    print("(1/?) Loading hooks")
+    status.status("Running hooks")
 
     hooks_file = f"/etc/car/post-inst-hooks"
 
     if not os.path.exists(hooks_file):
         print(f"No hooks file found at {hooks_file}")
         return
 
+    # read what hooks to run
     with open(hooks_file, "r") as f:
         hooks = [line.strip() for line in f if line.strip()]
 
-    steps = 1 + len(hooks) * 2
+    steps = len(hooks)
     step_counter = 1
 
     for i, hook_path in enumerate(hooks, start=1):
-        step_counter += 1
-        print(f"({step_counter}/{steps}) Loading hook {hook_path}")
+        # load the hook
         spec = importlib.util.spec_from_file_location(f"hook_{i}", hook_path)
         hook = importlib.util.module_from_spec(spec)
         spec.loader.exec_module(hook)
 
-        step_counter += 1
+        # run
         print(f"({step_counter}/{steps}) Running hook {hook_path}")
+        step_counter += 1
         hook.run(package)

src/init.py

@@ -2,28 +2,29 @@
 
 import updatelist
 
+
 def main():
-    base_path = f"/etc/car"
-    
+    base_path = "/etc/car"
+
     print(f"Creating {base_path}/")
     os.makedirs(f"{base_path}/hooks", exist_ok=True)
 
     hook_path = f"{base_path}/hooks/check_core.py"
     with open(hook_path, "w") as f:
         f.write(
-            'import os\n'
-            'def run(package):\n'
+            "import os\n"
+            "def run(package):\n"
             '    os.system("curl -s -L -o cores https://raw.githubusercontent.com/redroselinux/car-coreutils-repo/refs/heads/main/cores")\n'
-            '    with open(\'cores\', \'r\') as f:\n'
-            '        cores = f.read()\n'
-            '    if package in cores.splitlines():\n'
-            '        print("Reboot recommended!")\n'
+            "    with open('cores', 'r') as f:\n"
+            "        cores = f.read()\n"
+            "    if package in cores.splitlines():\n"
+            '        print(":: Reboot recommended!")\n'
         )
 
     post_inst_path = f"{base_path}/post-inst-hooks"
     with open(post_inst_path, "w") as f:
         f.write(f"{hook_path}\n")
-    
+
     print(f"Created hook script at {hook_path}")
     print(f"Created post-inst-hooks file at {post_inst_path}")
 

src/install.py

@@ -1,21 +1,23 @@
-import os
 import importlib.util
-from rich.console import Console
+import os
 import sys
 
-from status import status
-import mirrors
-import hooks
+from rich.console import Console
+
 import get_package_list
-import umbrella.autocorrect_package as Autocorrect
+import hooks
 import install
+import mirrors
+import umbrella.autocorrect_package as Autocorrect
+from status import status
 
 # init rich console
 console = Console()
 
 # Track packages currently being installed to prevent circular dependencies
 _installing = set()
 
+
 def main(package, noconfirm=False):
     local = False
     # check if package is local
@@ -31,7 +33,7 @@ def main(package, noconfirm=False):
         autocorrected = Autocorrect.main(package)
         if autocorrected != package:
             package = autocorrected
-    
+
     # Prevent circular dependencies and infinite loops
     if package in _installing:
         return
@@ -41,7 +43,7 @@ def main(package, noconfirm=False):
         if not local:
             if get_package_list.main(package) != True:
                 return False
-        
+
         # main
         try:
             # save installed package
@@ -75,7 +77,7 @@ def write_installed_versions(path, versions):
             # go to /tmp
             if not local:
                 os.chdir("/tmp/")
-            
+
                 status("Fetching package")
 
                 # fetch all repos for the install script
@@ -84,7 +86,7 @@ def write_installed_versions(path, versions):
                 for mirror in mirrors.install_script_places:
                     url = f"{mirror.rstrip('/')}/{package}/install_script"
 
-                    result = os.system(f"curl -s -L -o install_script.py {url}")
+                    os.system(f"curl -s -L -o install_script.py {url}")
 
                     with open("install_script.py", "r") as f:
                         script = f.read()
@@ -102,7 +104,9 @@ def write_installed_versions(path, versions):
                     exit(1)
 
             # import the script as a python library
-            spec = importlib.util.spec_from_file_location("install_script", "install_script.py")
+            spec = importlib.util.spec_from_file_location(
+                "install_script", "install_script.py"
+            )
             install_script = importlib.util.module_from_spec(spec)
             spec.loader.exec_module(install_script)
 
@@ -122,9 +126,16 @@ def write_installed_versions(path, versions):
             installed_version = installed_versions.get(package)
             if installed_version is not None and installed_version == script_version:
                 status(f"{package} is up to date ({script_version}). Exiting.", "ok")
+                status(
+                    f"You can use\n   sudo car delete {package} && sudo car get {package}"
+                )
+                status("to reinstall it")
                 return
             elif installed_version is not None and installed_version != script_version:
-                status(f"New version available for {package}: {installed_version} -> {script_version}. Reinstalling.", "warn")
+                status(
+                    f"New version available for {package}: {installed_version} -> {script_version}. Reinstalling.",
+                    "warn",
+                )
             elif installed_version is None:
                 if not os.path.isfile(repro_path):
                     status("No repro.car file. Creating", "warn")
@@ -138,11 +149,28 @@ def write_installed_versions(path, versions):
             # ask for confirmation
             if not noconfirm:
                 status("The following packages are going to be installed:")
-                print("     ", end="")
+                if "description" not in script:
+                    description = "No description defined."
+                else:
+                    description = install_script.description
+                print(
+                    f"    {package}={install_script.version} - {description}"
+                )  # appending to the list did not work for some reason
                 if "car_deps" in script:
-                    for i in install_script.car_deps:
-                        print(i, end=", ")
-                print(package) # appending to the list did not work for some reason
+                    counter = 1
+                    if len(install_script.car_deps) != 0:
+                        print("    dependencies: ", end="")
+                        for i in install_script.car_deps:
+                            if counter != len(install_script.car_deps):
+                                print(f"{i}, ", end="")
+                            else:
+                                print(f"{i}", end="")
+                        print()
+                if "outdated = True" in script:
+                    if (
+                        package != "example"
+                    ):  # example is set to be outdated for demonstration
+                        status(f'The package "{package}" is outdated! ', "error")
                 console.print("::", style="blue bold", end=" ")
                 sure = input("Install dependencies and build? (Y/n) ")
                 if sure not in ("", "y", "Y"):
@@ -152,7 +180,8 @@ def write_installed_versions(path, versions):
             if "deps" in script:
                 try:
                     install_script.deps()
-                except Exception:pass
+                except Exception:
+                    pass
             if "car_deps" in script:
                 for i in install_script.car_deps:
                     install.main(i, noconfirm=True)
@@ -161,7 +190,8 @@ def write_installed_versions(path, versions):
             if "build" in script:
                 try:
                     install_script.build()
-                except Exception:pass
+                except Exception:
+                    pass
 
             # ask for confirmation
             # todo: make confirmation prompts better by mixing into one
@@ -175,7 +205,6 @@ def write_installed_versions(path, versions):
             status("Installing", "ok")
             install_script.install()
 
-
             if not "DoNotWriteVersion = True" in script:
                 installed_versions[package] = script_version
                 write_installed_versions(repro_path, installed_versions)
@@ -197,7 +226,10 @@ def write_installed_versions(path, versions):
         except KeyboardInterrupt:
             # keyboard interrupt, suggest cleaning up
             status("Installation interrupted", "error")
-            status("There might be some files that were installed, but not removed. You can remove them manually.", "warn")
+            status(
+                "There might be some files that were installed, but not removed. You can remove them manually.",
+                "warn",
+            )
             status("If you want to remove them, run the following command:", "warn")
             status("sudo car delete " + package, "warn")
             sys.exit(1)

src/lspkgs.py

@@ -1,12 +1,17 @@
-import os
-
 def main():
+    # open repro.car
     with open("/etc/repro.car", "r") as f:
         repro = f.read()
 
+    # sometimes, car writes the same package multiple times. for this reason,
+    # do not only print content but filter specifically the PACKAGES from the file
     alr_used = []
     for i in repro.splitlines():
-        if i in alr_used: continue
+        if i in alr_used:
+            # already printed, continue
+            continue
+        # we have used this just now, write it into alr_used
         alr_used.append(i)
 
+        # print the current package
         print(i)

src/main.py

@@ -10,7 +10,11 @@
 import update
 import updatelist
 
-parser = argparse.ArgumentParser(description="A simple package manager")
+parser = argparse.ArgumentParser(
+    prog="car",
+    description="A simple package manager for Redrose Linux. Documentation is available at: https://redroselinux.miraheze.org/wiki/Car_Package_Manager",
+    epilog="Authors: Juraj Kollár (mostypc123) <mostypc7@gmail.com>",
+)
 subparsers = parser.add_subparsers(dest="command", required=True)
 
 # install

src/search.py

@@ -1,9 +1,12 @@
 import mirrors
-import status
-import os
+
 
 def main(package):
+    # get list of packages
     packages = mirrors.fetch_all_packages(mirrors.packagelist_places)
+
+    # loop through the packages
     for i in packages:
+        # found, print it
         if package in i:
-            status.status("Found: " + i, "ok")
+            print(i)