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

Merge pull request #798 from auouymous/dont-clear-custom-youtube-formats 

don't clear custom youtube formats
This commit is contained in:
Eric Le Lay 2020-05-08 10:55:02 +02:00 committed by GitHub
parent 3bbed0d83c 3da287791d
commit e0cde8a277
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/gpodder/gtkui/desktop/preferences.py
View File

@ -112,37 +112,24 @@ class YouTubeVideoFormatListModel(Gtk.ListStore):
def __init__(self, config):
Gtk.ListStore.__init__(self, str, int)
self._config = config
self.custom_fmt_ids = self._config.youtube.preferred_fmt_ids
if self._config.youtube.preferred_fmt_ids:
caption = _('Custom (%(format_ids)s)') % {
'format_ids': ', '.join(str(x) for x in self.custom_fmt_ids),
'format_ids': ', '.join(str(x) for x in self._config.youtube.preferred_fmt_ids),
}
self.append((caption, -1))
self.append((caption, 0))
for id, (fmt_id, path, description) in youtube.formats:
self.append((description, id))
def get_index(self):
if self._config.youtube.preferred_fmt_ids:
return 0
for index, row in enumerate(self):
if self._config.youtube.preferred_fmt_id == row[self.C_ID]:
return index
return 0
def set_index(self, index):
value = self[index][self.C_ID]
if value > 0:
self._config.youtube.preferred_fmt_id = value
# If we set a value, we need to unset the custom one, so that
# the single value (preferred_fmt_id) gets used instead
self._config.youtube.preferred_fmt_ids = []
else:
# If the user selects the -1 value, it's our custom one, and
# we need to restore the value for preferred_fmt_ids
self._config.youtube.preferred_fmt_ids = self.custom_fmt_ids
self._config.youtube.preferred_fmt_id = self[index][self.C_ID]
class VimeoVideoFormatListModel(Gtk.ListStore):

13
src/gpodder/youtube.py
View File

@ -138,14 +138,13 @@ class YouTubeError(Exception):
def get_fmt_ids(youtube_config):
fmt_ids = youtube_config.preferred_fmt_ids
if not fmt_ids:
format = formats_dict.get(youtube_config.preferred_fmt_id)
if format is None:
fmt_ids = []
else:
fmt_ids, path, description = format
if youtube_config.preferred_fmt_id == 0:
return (youtube_config.preferred_fmt_ids if youtube_config.preferred_fmt_ids else [])
format = formats_dict.get(youtube_config.preferred_fmt_id)
if format is None:
return []
fmt_ids, path, description = format
return fmt_ids