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

fix E128 continuation line under-indented for visual indent

This commit is contained in:
MarkusHackspacher 2018-08-18 12:27:24 +02:00
parent d724b81218
commit 9a45b04c23
5 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/gpo
View File

@ -405,8 +405,10 @@ class gPodderCli(object):
return ' '
episodes = ('%3d.%s %s %s' % (i + 1, ((' %s' % e.guid) if
show_guid else ''),
def guid_str(episode):
return ((' %s' % episode.guid) if show_guid else '')
episodes = ('%3d.%s %s %s' % (i + 1, guid_str(e),
status_str(e), e.title)
for i, e in enumerate(podcast.get_all_episodes()))
return episodes
@ -815,8 +817,8 @@ class gPodderCli(object):
defaults = defaults or ()
minarg, maxarg = len(args) - len(defaults), len(args)
if len(command_line) < minarg or (len(command_line) > maxarg and
varargs is None):
if (len(command_line) < minarg or
(len(command_line) > maxarg and varargs is None)):
self._error('Wrong argument count for %s.' % func.__name__)
return False

30
src/gpodder/gtkui/desktop/sync.py
View File

@ -37,14 +37,14 @@ logger = logging.getLogger(__name__)
class gPodderSyncUI(object):
def __init__(self, config, notification, parent_window,
show_confirmation,
show_preferences,
channels,
download_status_model,
download_queue_manager,
enable_download_list_update,
commit_changes_to_database,
delete_episode_list):
show_confirmation,
show_preferences,
channels,
download_status_model,
download_queue_manager,
enable_download_list_update,
commit_changes_to_database,
delete_episode_list):
self.device = None
self._config = config
@ -181,11 +181,11 @@ class gPodderSyncUI(object):
# get playlist object
playlist = gPodderDevicePlaylist(self._config,
current_channel.title)
current_channel.title)
# need to refresh episode list so that
# deleted episodes aren't included in playlists
episodes_for_playlist = sorted(current_channel.get_episodes(gpodder.STATE_DOWNLOADED),
key=lambda ep: ep.published)
key=lambda ep: ep.published)
# don't add played episodes to playlist if skip_played_episodes is True
if self._config.device_sync.skip_played_episodes:
episodes_for_playlist = [ep for ep in episodes_for_playlist if ep.is_new]
@ -203,7 +203,7 @@ class gPodderSyncUI(object):
@util.run_in_background
def sync_thread_func():
device.add_sync_tasks(episodes, force_played=force_played,
done_callback=self.enable_download_list_update)
done_callback=self.enable_download_list_update)
return
@ -254,7 +254,7 @@ class gPodderSyncUI(object):
# episodes need to be deleted from gpodder
for episode_to_delete in episodes:
logger.info("Deleting episode %s",
episode_to_delete.title)
episode_to_delete.title)
logger.info('Will start sync - after deleting episodes')
self.delete_episode_list(episodes, False,
@ -294,8 +294,8 @@ class gPodderSyncUI(object):
# played tracks will be copied then immediately deleted
if (self._config.device_sync.delete_played_episodes and
self._config.device_sync.skip_played_episodes):
all_episodes = self._filter_sync_episodes(channels,
only_downloaded=False)
all_episodes = self._filter_sync_episodes(
channels, only_downloaded=False)
for local_episode in all_episodes:
episode = device.episode_on_device(local_episode)
if episode is None:
@ -303,7 +303,7 @@ class gPodderSyncUI(object):
if local_episode.state == gpodder.STATE_DELETED:
logger.info('Removing episode from device: %s',
episode.title)
episode.title)
device.remove_track(episode)
# When this is done, start the callback in the UI code

2
src/gpodder/gtkui/desktop/welcome.py
View File

@ -33,7 +33,7 @@ class gPodderWelcome(BuilderWidget):
for child in widget.get_children():
if isinstance(child, Gtk.Alignment):
child.set_padding(self.PADDING, self.PADDING,
self.PADDING, self.PADDING)
self.PADDING, self.PADDING)
else:
child.set_padding(self.PADDING, self.PADDING)

10
src/gpodder/gtkui/model.py
View File

@ -161,9 +161,10 @@ class EpisodeListModel(Gtk.ListStore):
PROGRESS_STEPS = 20
def __init__(self, config, on_filter_changed=lambda has_episodes: None):
Gtk.ListStore.__init__(self, str, str, str, object,
str, str, str, str, bool, bool, bool,
GObject.TYPE_INT64, GObject.TYPE_INT64, str, bool, GObject.TYPE_INT64, bool)
Gtk.ListStore.__init__(self, str, str, str, object, str, str, str,
str, bool, bool, bool, GObject.TYPE_INT64,
GObject.TYPE_INT64, str, bool,
GObject.TYPE_INT64, bool)
self._config = config
@ -848,7 +849,8 @@ class PodcastListModel(Gtk.ListStore):
description = '<span size="16000"> </span><b>%s</b>' % (
cgi.escape(section))
self.set(iter,
self.set(
iter,
self.C_DESCRIPTION, description,
self.C_SECTION, section,
self.C_VIEW_SHOW_UNDELETED, total - deleted > 0,

14
src/gpodder/plugins/soundcloud.py
View File

@ -138,18 +138,18 @@ class SoundcloudUser(object):
track it can find for its user."""
global CONSUMER_KEY
try:
json_url = 'https://api.soundcloud.com/users/%(user)s/%(feed)s.' \
'json?filter=downloadable&consumer_key=%' \
'(consumer_key)s&limit=200' \
% {"user": self.get_user_id(),
"feed": feed,
"consumer_key": CONSUMER_KEY}
json_url = ('https://api.soundcloud.com/users/%(user)s/%(feed)s.'
'json?filter=downloadable&consumer_key=%'
'(consumer_key)s&limit=200'
% {"user": self.get_user_id(),
"feed": feed,
"consumer_key": CONSUMER_KEY})
logger.debug("loading %s", json_url)
json_tracks = json.loads(util.urlopen(json_url).read().decode('utf-8'))
tracks = [track for track in json_tracks if track['downloadable']]
total_count = len(tracks) + len([track for track in json_tracks
if not track['downloadable']])
if not track['downloadable']])
if len(tracks) == 0 and total_count > 0:
logger.warn("Download of all %i %s of user %s is disabled" %