Merge pull request #1465 from steviehs/fix/playlist_absolute_path
correct absolute path config settings for playlist
This commit is contained in:
commit
f59d688e89
|
@ -102,7 +102,7 @@ class gPodderDevicePlaylist(object):
|
||||||
foldername = episode_foldername_on_device(self._config, episode)
|
foldername = episode_foldername_on_device(self._config, episode)
|
||||||
if foldername:
|
if foldername:
|
||||||
filename = os.path.join(foldername, filename)
|
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)
|
filename = os.path.join(util.relpath(self._config.device_sync.device_folder, self.mountpoint.get_uri()), filename)
|
||||||
return filename
|
return filename
|
||||||
|
|
||||||
|
|
|
@ -256,7 +256,10 @@ class gPodderSyncUI(object):
|
||||||
# if playlist doesn't exist (yet) episodes_in_playlist will be empty
|
# if playlist doesn't exist (yet) episodes_in_playlist will be empty
|
||||||
if episodes_in_playlists:
|
if episodes_in_playlists:
|
||||||
for episode_filename in 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
|
# episode was synced but no longer on device
|
||||||
# i.e. must have been deleted by user, so delete from gpodder
|
# i.e. must have been deleted by user, so delete from gpodder
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue