Reliable linking

Author: Fantomas42

term_timer/in_out.py

@@ -18,8 +18,13 @@ def load_solves(cube: int, session: str) -> list[Solve]:
             datas = json.load(fd)
 
         return [
-            Solve(**data, session=session)
-            for data in datas
+            Solve(
+                **data,
+                session=session,
+                cube_size=cube,
+                solve_id=i + 1,
+            )
+            for i, data in enumerate(datas)
         ]
 
     return []

term_timer/solve.py

@@ -51,14 +51,19 @@ def __init__(self,
                  timer: str = '',
                  device: str = '',
                  session: str = '',
+                 solve_id: int = 0,
+                 cube_size: int = 3,
                  moves: str | None = None):
         self.date = int(date)
         self.time = int(time)
         self.scramble = scramble
         self.flag = flag
         self.timer = timer
         self.device = device
+
         self.session = session or 'default'
+        self.solve_id = solve_id
+        self.cube_size = cube_size
 
         self.raw_moves = moves
         self.solution = None
@@ -609,13 +614,14 @@ def link_cube_db(self) -> str:
             self.method_text,
         )
 
-    def link_term_timer(self, cube_size, solve_id) -> str:
+    @cached_property
+    def link_term_timer(self) -> str:
         domain = SERVER_CONFIG.get('domain', 'localhost')
         port = SERVER_CONFIG.get('port', 8333)
 
         return (
             f'http://{ domain }:{ port }'
-            f'/{ cube_size }/{ self.session }/{ solve_id }/'
+            f'/{ self.cube_size }/{ self.session }/{ self.solve_id }/'
         )
 
     @property

term_timer/stats.py

@@ -387,9 +387,8 @@ def listing(self, limit: int, sorting: str) -> None:
 
             header = f'[stats]{ index:{" "}>{max_count}}[/stats]'
             if solve.advanced:
-                url = solve.link_term_timer(self.cube_size, original_index)
                 header = (
-                    f'[localhost][link={ url }]'
+                    f'[localhost][link={ solve.link_term_timer }]'
                     f'{ index:{" "}>{max_count}}'
                     '[/link][/localhost]'
                 )
@@ -590,10 +589,9 @@ def detail(self, solve_id: int, method: str,
 
         if solve.advanced:
             if show_reconstruction:
-                url = solve.link_term_timer(self.cube_size, solve_id)
                 console.print(
                     f'[title]Reconstruction { solve.method.name }[/title]',
-                    f'[localhost][link={ url }]'
+                    f'[localhost][link={ solve.link_term_timer }]'
                     'Term-Timer[/link][/localhost]',
                     f'[algcubing][link={ solve.link_alg_cubing }]'
                     'alg.cubing.net[/link][/algcubing]',

term_timer/timer.py

@@ -243,6 +243,8 @@ async def start(self) -> bool:
                 and self.bluetooth_interface.device.name
             ) or '',
             session=self.session,
+            solve_id=self.counter,
+            cube_size=self.cube_size,
             moves=' '.join(moves),
         )
 

term_timer/trainer.py

@@ -115,6 +115,8 @@ async def start(self) -> bool:
                 and self.bluetooth_interface.device.name
             ) or '',
             session='training',
+            solve_id=self.counter,
+            cube_size=3,
             moves=' '.join(moves),
         )