vlcsync 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

vlcsync/cli.py

@@ -12,7 +12,7 @@ from vlcsync.vlc_finder import print_exc
 from vlcsync.vlc_state import VlcId
 
 # Also ref in project.toml
-__version__ = "0.3.0"
+__version__ = "0.3.1"
 
 
 @click.command
@@ -43,7 +43,7 @@ __version__ = "0.3.0"
               """)
 def main(rc_host_list: Set[VlcId], no_local_discover, volume_sync):
     """Utility for synchronize multiple instances of VLC. Supports seek, play and pause."""
-    print("Vlcsync started...")
+    print("Vlcsync started...", flush=True)
 
     app_config = AppConfig(rc_host_list, no_local_discover, volume_sync)
     time.sleep(2)  # Wait instances
@@ -57,4 +57,4 @@ def main(rc_host_list: Set[VlcId], no_local_discover, volume_sync):
             sys.exit(0)
         except Exception:
             print_exc()
-            print("Exception detected. Restart sync...")
+            print("Exception detected. Restart sync...", flush=True)

vlcsync/syncer.py

@@ -3,11 +3,11 @@ from __future__ import annotations
 from dataclasses import dataclass
 import sys
 import time
-from typing import Set
+from typing import Set, List
 
 from loguru import logger
 
-from vlcsync.vlc import VLC_IFACE_IP, VlcProcs
+from vlcsync.vlc import VLC_IFACE_IP, VlcProcs, Vlc
 from vlcsync.vlc_finder import LocalProcessFinderProvider, ExtraHostFinder
 from vlcsync.vlc_socket import VlcConnectionError
 
@@ -30,21 +30,21 @@ class Syncer:
         vlc_finders = set()
         if not self.app_config.no_local_discovery:
             vlc_finders.add(LocalProcessFinderProvider(VLC_IFACE_IP))
-            print(f"  Discover instances on {VLC_IFACE_IP} iface...")
+            print(f"  Discover instances on {VLC_IFACE_IP} iface...", flush=True)
         else:
-            print("  Local discovery vlc instances DISABLED...")
+            print("  Local discovery vlc instances DISABLED...", flush=True)
 
         if app_config.extra_rc_hosts:
             vlc_finders.add(ExtraHostFinder(app_config.extra_rc_hosts))
             for rc_host in app_config.extra_rc_hosts:
                 rc_host: VlcId
-                print(f"  Manual host defined {rc_host.addr}:{rc_host.port}")
+                print(f"  Manual host defined {rc_host.addr}:{rc_host.port}", flush=True)
         else:
-            print("""  Manual vlc addresses ("--rc-host" args) NOT provided...""")
+            print("""  Manual vlc addresses ("--rc-host" args) NOT provided...""", flush=True)
 
         if not vlc_finders:
             print("\nTarget vlc instances not selected (nor autodiscover, nor manually). \n"
-                  """See: "vlcsync --help" for more info""")
+                  """See: "vlcsync --help" for more info""", flush=True)
             sys.exit(1)
 
         self.env = VlcProcs(vlc_finders)
@@ -69,11 +69,26 @@ class Syncer:
 
     def sync_playstate(self):
         for vlc_id, vlc in self.env.all_vlc.items():
-            is_changed, state = vlc.is_state_change()
+            is_changed, state, playlist_changed = vlc.is_state_change()
 
             if is_changed:
-                print(f"\nVlc state change detected from ({vlc_id})")
+                # Workaround Save volumes.
+                # When playlist items changed ALSO happen volumes sync by some reason. But SHOULD NOT!
+                volumes: List[tuple[Vlc, int]] = []
+                if not self.app_config.volume_sync and playlist_changed:
+                    volumes = [(vlc1, vlc1.volume()) for _, vlc1 in self.env.all_vlc.items()]
+                #
+
+                print(f"\nVlc state change detected from ({vlc_id})", flush=True)
                 self.env.sync_all(state, vlc)
+
+                # Restore volumes if needed
+                if volumes:
+                    for vlc_next, volume in volumes:
+                        vlc_next.set_volume(volume)
+                # Trying to fix endless resyncing hang
+                # Cannot find reproduce steps for that
+                time.sleep(0.5)
                 break
 
     def sync_volume(self):

vlcsync/vlc.py

@@ -46,7 +46,7 @@ class Vlc:
     def volume(self) -> Optional[int]:
         vol = self.vlc_conn.cmd("volume")
         if vol.strip() != '':
-            return int(vol)
+            return int(float(vol.replace(",",'.')))
         else:
             return None
 
@@ -79,10 +79,10 @@ class Vlc:
     def is_state_change(self) -> (bool, State):
         cur_state: State = self.cur_state()
         prev_state: State = self.prev_state
-        is_change = not cur_state.same(prev_state)
+        full_same, playlist_same = cur_state.same(prev_state)
 
         # Return cur_state for reduce further socket communications
-        return is_change, cur_state
+        return not full_same, cur_state, not playlist_same
 
     def sync_to(self, new_state: State, source: Vlc):
 
@@ -195,7 +195,7 @@ class VlcProcs:
             for vlc_id in vlc_candidates:
                 if vlc_id not in self._vlc_instances.keys():
                     if vlc := self.try_connect(vlc_id):
-                        print(f"Found active instance {vlc_id}, with state {vlc.cur_state()}")
+                        print(f"Found active instance {vlc_id}, with state {vlc.cur_state()}", flush=True)
                         self._vlc_instances[vlc_id] = vlc
 
             logger.debug(f"Compute all_vlc (took {time.time() - start:.3f})...")
@@ -207,31 +207,31 @@ class VlcProcs:
             return Vlc(vlc_id)
         except Exception as e:
             logger.opt(exception=True).debug("Cannot connect to {0}, cause: {1}", vlc_id, e)
-            print(f"Cannot connect to {vlc_id} socket, cause: {e}. Skipping. Enable debug for more info. See --help. ")
+            print(f"Cannot connect to {vlc_id} socket, cause: {e}. Skipping. Enable debug for more info. See --help. ", flush=True)
             return None
 
     @property
     def all_vlc(self) -> dict[VlcId, Vlc]:
         return self._vlc_instances.copy()  # copy: for thread safe
 
-    def sync_all(self, state: State, source: Vlc):
+    def sync_all(self, state: State, source_vlc: Vlc):
         logger.debug(">" * 60)
-        logger.debug(f"Detect change to {state} from {source.vlc_id}")
-        logger.debug(f" old --> {source.prev_state} ")
+        logger.debug(f"Detect change to {state} from {source_vlc.vlc_id}")
+        logger.debug(f" old --> {source_vlc.prev_state} ")
         logger.debug(f" new --> {state} ")
-        logger.debug(f" Time diff abs(old - new) {abs(source.prev_state.vid_start_at - state.vid_start_at)}")
+        logger.debug(f" Time diff abs(old - new) {abs(source_vlc.prev_state.vid_start_at - state.vid_start_at)}")
         logger.debug("<" * 60)
         logger.debug("")
-        print(">>> Sync players...")
+        print(">>> Sync players...", flush=True)
 
         for next_pid, next_vlc in self.all_vlc.items():
             next_vlc: Vlc
-            print(f"    Sync {next_pid} to {state}")
-            next_vlc.sync_to(state, source)
+            print(f"    Sync {next_pid} to {state}", flush=True)
+            next_vlc.sync_to(state, source_vlc)
         print()
 
     def dereg(self, vlc_id: VlcId):
-        print(f"Detect vlc instance closed {vlc_id}")
+        print(f"Detect vlc instance closed {vlc_id}", flush=True)
         if vlc_to_close := self._vlc_instances.pop(vlc_id, None):
             vlc_to_close.close()
 

vlcsync/vlc_finder.py

@@ -90,11 +90,12 @@ class LocalProcessFinderProvider(IVlcListFinder):
 
 def print_exc():
     print("-" * 60)
-    print("Exception in user code: ")
+    print("Exception in user code: ", flush=True)
     print("-" * 60)
     traceback.print_exc(file=sys.stdout)
     print("-" * 60)
     print()
+    sys.stdout.flush()
 
 
 class ExtraHostFinder(IVlcListFinder):

vlcsync/vlc_state.py

@@ -51,14 +51,10 @@ class State:
     vid_start_at: float = field(repr=False)
 
     def same(self, other: State):
-        return (self.same_play_state(other) and
-                self.same_playlist_item(other) and
-                (
-                        self.play_in_same_pos(other) or
-                        self.pause_is_same_pos(other) or
-                        self.both_stopped(other)
-                )
-                )
+        playlist_same = self.same_playlist_item(other)
+        full_same = (self.same_play_state(other) and playlist_same and (
+                    self.play_in_same_pos(other) or self.pause_is_same_pos(other) or self.both_stopped(other)))
+        return full_same, playlist_same
 
     def same_play_state(self, other: State):
         return self.play_state == other.play_state

{vlcsync-0.3.0.dist-info → vlcsync-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vlcsync
-Version: 0.3.0
+Version: 0.3.1
 Summary: Utility for synchronize multiple instances of VLC. Supports seek, play and pause. 
 Home-page: https://github.com/mrkeuz/vlcsync/
 License: MIT

vlcsync-0.3.1.dist-info/RECORD

@@ -0,0 +1,14 @@
+vlcsync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+vlcsync/cli.py,sha256=ssoMtW_DorOs0QK5-mEqm6itQQQVci86B8OA2Ed4Nw0,2005
+vlcsync/cli_utils.py,sha256=hXSljymGPU5AzFr706Ea-81wxkVCYLhZY-ug-JExZ0E,883
+vlcsync/main.py,sha256=An0NQ4jy3mfygwxko_UA3Sdwri9yidcUTTCP3SoyrpI,303
+vlcsync/syncer.py,sha256=x9w0LWmCUtFlMFTi01q8BBos0d9fwUpOQMo0dko6n_0,3854
+vlcsync/vlc.py,sha256=dBrg2TYQswhewtUveBilp0jadfMQAMRZkqgBukUK3F0,8528
+vlcsync/vlc_finder.py,sha256=7BXhOeJG8lRqYJ7dbrLU3Ps8ghUPh666YkAZjNom-cw,2770
+vlcsync/vlc_socket.py,sha256=WQAtNoitc49sst0oRG0bEuTkgw6a2TJXVE9iSWQaMa0,1850
+vlcsync/vlc_state.py,sha256=8RpmxVS_zijqYw9rxpmnN5QwM3Sk1FmqgTxgCH3U8kU,3133
+vlcsync-0.3.1.dist-info/entry_points.txt,sha256=2m_39oATnFzf5kuvlhkayyWSmW0tUefyNk9dVP4A7B0,45
+vlcsync-0.3.1.dist-info/LICENSE.md,sha256=Q6ik40IpumjnuWfS1c69jnEyxAPTBV2v04DesGSgLPM,1074
+vlcsync-0.3.1.dist-info/WHEEL,sha256=DA86_h4QwwzGeRoz62o1svYt5kGEXpoUTuTtwzoTb30,83
+vlcsync-0.3.1.dist-info/METADATA,sha256=UWdLvYjpLAGk9KC_0pGnDrpF9dEdwZM6qs9cmrj-qrs,4258
+vlcsync-0.3.1.dist-info/RECORD,,

vlcsync-0.3.0.dist-info/RECORD

@@ -1,14 +0,0 @@
-vlcsync/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-vlcsync/cli.py,sha256=Qqh7jM6HSeaMCos2s5Uj3e7XjG7NVlnjuNmdMk5LXv0,1981
-vlcsync/cli_utils.py,sha256=hXSljymGPU5AzFr706Ea-81wxkVCYLhZY-ug-JExZ0E,883
-vlcsync/main.py,sha256=An0NQ4jy3mfygwxko_UA3Sdwri9yidcUTTCP3SoyrpI,303
-vlcsync/syncer.py,sha256=7fTcrPLT0qEiGKcBm8QFIwMz1csuxvwsZtHIBUgpFqM,3049
-vlcsync/vlc.py,sha256=pOg8X8dz5E1vr10r47JOM_EbjLfSfriDs0FFTyePt3A,8390
-vlcsync/vlc_finder.py,sha256=dfihlZ6hbA4cocQ70lQo4pYX178arEuSsHnhEbqPPOs,2735
-vlcsync/vlc_socket.py,sha256=WQAtNoitc49sst0oRG0bEuTkgw6a2TJXVE9iSWQaMa0,1850
-vlcsync/vlc_state.py,sha256=9ueuTCxCazsMy2z4QdwhTa39aD1leOfk8FcOOXqN9Nw,3168
-vlcsync-0.3.0.dist-info/entry_points.txt,sha256=2m_39oATnFzf5kuvlhkayyWSmW0tUefyNk9dVP4A7B0,45
-vlcsync-0.3.0.dist-info/LICENSE.md,sha256=Q6ik40IpumjnuWfS1c69jnEyxAPTBV2v04DesGSgLPM,1074
-vlcsync-0.3.0.dist-info/WHEEL,sha256=DA86_h4QwwzGeRoz62o1svYt5kGEXpoUTuTtwzoTb30,83
-vlcsync-0.3.0.dist-info/METADATA,sha256=D3IM0BPRuQBLHeI1sbjoRK5l3ZJ0_xQk8nlzJ2lrQu4,4258
-vlcsync-0.3.0.dist-info/RECORD,,