colin/sublime-music
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a bug with seek using DBus

Browse Source
This commit is contained in:
Sumner Evans
2020-06-19 23:49:22 -06:00
parent 06f0968afb
commit 4aa883b10f
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cicd/custom_style_check.py
View File

@@ -49,7 +49,6 @@ def check_file(path: Path) -> bool:
valid = True valid = True
for path in Path("sublime").glob("**/*.py"): for path in Path("sublime").glob("**/*.py"):
valid &= check_file(path) valid &= check_file(path)
print() # noqa: T001
""" """
Checks that the version in the CHANGELOG is the same as the version in ``__init__.py``. Checks that the version in the CHANGELOG is the same as the version in ``__init__.py``.

15
sublime/app.py
View File

@@ -353,13 +353,12 @@ class SublimeMusicApp(Gtk.Application):
params: GLib.Variant, params: GLib.Variant,
invocation: Gio.DBusMethodInvocation, invocation: Gio.DBusMethodInvocation,
): ):
second_microsecond_conversion = 1000000
def seek_fn(offset: float): def seek_fn(offset: float):
if not self.app_config.state.current_song: if not self.app_config.state.current_song:
return return
offset_seconds = timedelta(seconds=offset / second_microsecond_conversion) new_seconds = self.app_config.state.song_progress + timedelta(
new_seconds = self.app_config.state.song_progress + offset_seconds microseconds=offset
)
# This should not ever happen. The current_song should always have # This should not ever happen. The current_song should always have
# a duration, but the Child object has `duration` optional because # a duration, but the Child object has `duration` optional because
@@ -368,7 +367,7 @@ class SublimeMusicApp(Gtk.Application):
self.on_song_scrub( self.on_song_scrub(
None, None,
( (
new_seconds new_seconds.total_seconds()
/ self.app_config.state.current_song.duration.total_seconds() / self.app_config.state.current_song.duration.total_seconds()
) )
* 100, * 100,
@@ -377,7 +376,7 @@ class SublimeMusicApp(Gtk.Application):
def set_pos_fn(track_id: str, position: float = 0): def set_pos_fn(track_id: str, position: float = 0):
if self.app_config.state.playing: if self.app_config.state.playing:
self.on_play_pause() self.on_play_pause()
pos_seconds = timedelta(seconds=position / second_microsecond_conversion) pos_seconds = timedelta(microseconds=position)
self.app_config.state.song_progress = pos_seconds self.app_config.state.song_progress = pos_seconds
track_id, occurrence = track_id.split("/")[-2:] track_id, occurrence = track_id.split("/")[-2:]
@@ -853,7 +852,7 @@ class SublimeMusicApp(Gtk.Application):
self.save_play_queue() self.save_play_queue()
@dbus_propagate() @dbus_propagate()
def on_song_scrub(self, win: Any, scrub_value: float): def on_song_scrub(self, _, scrub_value: float):
if not self.app_config.state.current_song or not self.window: if not self.app_config.state.current_song or not self.window:
return return
@@ -876,7 +875,7 @@ class SublimeMusicApp(Gtk.Application):
self.save_play_queue() self.save_play_queue()
def on_device_update(self, win: Any, device_id: str): def on_device_update(self, _, device_id: str):
assert self.player_manager assert self.player_manager
if device_id == self.app_config.state.current_device: if device_id == self.app_config.state.current_device:
return return