maryjane
/
gpodder
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #1465 from steviehs/fix/playlist_absolute_path 

correct absolute path config settings for playlist
This commit is contained in:
auouymous 2023-02-16 22:22:31 -07:00 committed by GitHub
parent 6db358ebb8 47f2b620c3
commit f59d688e89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gpodder/deviceplaylist.py
View File

@ -102,7 +102,7 @@ class gPodderDevicePlaylist(object):
foldername = episode_foldername_on_device(self._config, episode)
if foldername:
filename = os.path.join(foldername, filename)
if self._config.device_sync.playlist.absolute_path:
if self._config.device_sync.playlists.use_absolute_path:
filename = os.path.join(util.relpath(self._config.device_sync.device_folder, self.mountpoint.get_uri()), filename)
return filename

5
src/gpodder/syncui.py
View File

@ -256,7 +256,10 @@ class gPodderSyncUI(object):
# if playlist doesn't exist (yet) episodes_in_playlist will be empty
if episodes_in_playlists:
for episode_filename in episodes_in_playlists:
if not playlist.mountpoint.resolve_relative_path(episode_filename).query_exists():
if ((not self._config.device_sync.playlists.use_absolute_path
and not playlist.playlist_folder.resolve_relative_path(episode_filename).query_exists()) or
(self._config.device_sync.playlists.use_absolute_path
and not playlist.mountpoint.resolve_relative_path(episode_filename).query_exists())):
# episode was synced but no longer on device
# i.e. must have been deleted by user, so delete from gpodder
try: