heathrow 0.2__tar.gz → 0.2.2__tar.gz

{heathrow-0.2 → heathrow-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: heathrow
-Version: 0.2
+Version: 0.2.2
 Summary: Reference client for the Aquarius protocol
 Author: Data Airspace Transport Authority
 License-Expression: GPL-3.0-only

{heathrow-0.2 → heathrow-0.2.2}/src/heathrow/driver/heathrow/__init__.py

@@ -19,7 +19,7 @@ from heathrow.bencode import bencode, bdecode
 
 from ..base import Driver
 from .constants import CONFIG_IDENTITY, CONFIG_METADATA, CONFIG_RESUME
-from .util import string_to_fileset
+from .util import string_to_fileset, id_to_filename
 from .windows import TUIWindow, SplashWindow
 
 
@@ -50,7 +50,7 @@ class HeathrowDriverConfig:
         parser.add_argument("targets", help="Start downloading these magnet link / file URIs", nargs="*")
         args = parser.parse_args()
         discovery = getattr(heathrow.discovery, args.discovery + "Discovery")
-        wirefactory = getattr(heathrow.wire, args.wirefactory + "WireFactory")
+        wirefactory = getattr(heathrow.wire, args.wire + "WireFactory")
         fileset = getattr(heathrow.fileset, args.fileset + "Fileset")
         economy = getattr(heathrow.economy, args.economy + "Economy")
         return cls(config_dir=args.config_directory, tui=args.tui, debug=args.debug, discovery=discovery, wirefactory=wirefactory, fileset=fileset, economy=economy, targets=args.targets)
@@ -94,7 +94,7 @@ class HeathrowDriver(Driver):
         self.run()
 
     def create_resume_file(self, fileset: heathrow.fileset.Fileset):
-        resume_path = self.config.config_dir / CONFIG_RESUME / (fileset.fileset_id.replace(":", "_") + ".resume")
+        resume_path = self.config.config_dir / CONFIG_RESUME / id_to_filename(fileset.fileset_id, extension="resume")
         download_dir = fileset
         if resume_path.exists():
             pass  # We have it already
@@ -133,8 +133,8 @@ class HeathrowDriver(Driver):
         for cliarg in self.config.targets:
             fs = string_to_fileset(cliarg, self.config.fileset, Path(os.path.expanduser("~/Downloads")), self.config.config_dir / CONFIG_METADATA)
             if fs is not None:
-                self._driver.create_resume_file(fs)
-                self._driver.add_fileset(fs)
+                self.create_resume_file(fs)
+                filesets.append(fs)
         return filesets
 
     def add_fileset(self, fileset):
@@ -195,7 +195,7 @@ class HeathrowDriver(Driver):
             curses.wrapper(self.curses_main)
         else:
             self.init_filesets_and_economies()
-            self._driver._tracked_filesets_loaded = True
+            self._tracked_filesets_loaded = True
             try:
                 while True:
                     time.sleep(1)

{heathrow-0.2 → heathrow-0.2.2}/src/heathrow/driver/heathrow/util.py

@@ -20,3 +20,8 @@ def string_to_fileset(inp: str, fileset_type: type[Fileset], download_dir: Path,
         file_data = Path(inp).read_bytes()
         fileset = fileset_type.from_file(file_data, download_dir, metadata_dir)
     return fileset
+
+
+def id_to_filename(id_: str, extension="torrent"):
+    """Turn a Heathrow ID to a filename."""
+    return id_.replace(":", "_") + "." + extension

{heathrow-0.2 → heathrow-0.2.2}/src/heathrow/driver/heathrow/windows/dialogue.py

@@ -10,7 +10,7 @@ from textwrap import dedent
 from heathrow.fileset import MissingMetadata
 from .base import TUIWindow
 from ..constants import CONFIG_RESUME, CONFIG_METADATA
-from ..util import string_to_fileset
+from ..util import string_to_fileset, id_to_filename
 
 
 logger = logging.getLogger(__name__)
@@ -296,10 +296,6 @@ class InfoDialogueWindow(TUIWindow):
         return key != "\n"
 
 
-def _id_to_filename(id_: str, extension="torrent"):
-    return id_.split(":", 2)[2] + "." + extension
-
-
 class DeleteDialogueWindow(TUIWindow):
     def __init__(self, curses_window, driver, fileset):
         super().__init__(curses_window, driver)
@@ -351,7 +347,7 @@ class DeleteDialogueWindow(TUIWindow):
                     self._driver._discovery.unsubscribe(self._fileset.fileset_id)
                 except KeyError:
                     pass
-                (self._driver.config.config_dir / CONFIG_RESUME / _id_to_filename(self._fileset.fileset_id, extension="resume")).unlink()
+                (self._driver.config.config_dir / CONFIG_RESUME / id_to_filename(self._fileset.fileset_id, extension="resume")).unlink()
                 return False
         return True
 

{heathrow-0.2 → heathrow-0.2.2}/src/heathrow.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: heathrow
-Version: 0.2
+Version: 0.2.2
 Summary: Reference client for the Aquarius protocol
 Author: Data Airspace Transport Authority
 License-Expression: GPL-3.0-only

heathrow-0.2.2/src/heathrow.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.2.2",
+  "distance": 0,
+  "node": "g41b20d859e052bcd44d324c8ec1100e6a46e373d",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-11"
+}

heathrow-0.2/src/heathrow.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "0.2",
-  "distance": 0,
-  "node": "ge8d6d2e54689135c1890da04999763ac19716870",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-10-08"
-}