Merge pull request #160 from Keeper-of-the-Keys/sfos-40

4.12.0
gpodder · Feb 17, 2021 · 1b06a45 · 1b06a45
2 parents 6c277e6 + e93bd2e
commit 1b06a45
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 25 deletions.
diff --git a/common/main.py b/common/main.py
@@ -19,7 +19,7 @@
 # of gpodder-core, but we might have a different release schedule later on. If
 # we decide to have parallel releases, we can at least start using this version
 # to check if the core version is compatible with the QML UI version.
-__version__ = '4.11.9'
+__version__ = '4.12.0'
 
 import pyotherside
 import gpodder
@@ -120,7 +120,7 @@ def _get_cover(self, podcast):
         filename = self.core.cover_downloader.get_cover(podcast)
         if not filename:
             return ''
-        return 'file://' + filename
+        return filename
 
     def _get_playback_progress(self, episode):
         if episode.total_time > 0 and episode.current_position > 0:
@@ -299,6 +299,7 @@ def progress_callback(progress):
         # TODO: Handle the case where there is already a DownloadTask
         episode.download(progress_callback)
         self.core.save()
+        self.core.cover_downloader.get_cover(self._get_podcast_by_id(episode.podcast_id), download=True, episode=episode)
         self._episode_state_changed(episode)
 
     def delete_episode(self, episode_id):
@@ -370,7 +371,7 @@ def _get_episode_art(self, episode):
         filename = self.core.cover_downloader.get_cover(episode.podcast, False, episode)
         if not filename:
             return ''
-        return 'file://' + filename
+        return filename
 
     def play_episode(self, episode_id):
         episode = self._get_episode_by_id(episode_id)

diff --git a/gpodder-core b/gpodder-core
diff --git a/podcastparser b/podcastparser
diff --git a/qml/EpisodeItem.qml b/qml/EpisodeItem.qml
@@ -65,9 +65,9 @@ ListItem {
     onClicked: openMenu()
 
     menu: Component {
-        IconContextMenu {
-            IconMenuItem {
-                text: episodeItem.isPlaying ? qsTr("Pause") : qsTr("Play")
+        GpodderIconContextMenu {
+            GpodderIconMenuItem {
+                text: episodeItem.isPlaying ? qsTr('Pause') : qsTr('Play')
                 icon.source: 'image://theme/icon-m-' + (episodeItem.isPlaying ? 'pause' : 'play')
                 onClicked: {
                     if (episodeItem.isPlaying) {
@@ -78,7 +78,7 @@ ListItem {
                 }
             }
 
-            IconMenuItem {
+            GpodderIconMenuItem {
                 text: qsTr("Download")
                 icon.source: 'image://theme/icon-m-download'
                 visible: downloadState !== Constants.state.downloaded
@@ -88,7 +88,7 @@ ListItem {
                 }
             }
 
-            IconMenuItem {
+            GpodderIconMenuItem {
 				text: qsTr("Enqueue")
                 icon.source: 'image://theme/icon-m-add'
 				onClicked: {
@@ -101,7 +101,7 @@ ListItem {
                 }
 			}
 
-            IconMenuItem {
+            GpodderIconMenuItem {
                 text: qsTr("Delete")
                 icon.source: 'image://theme/icon-m-delete'
                 visible: downloadState !== Constants.state.deleted
@@ -114,14 +114,14 @@ ListItem {
                 }
             }
 
-            IconMenuItem {
+            GpodderIconMenuItem {
                 id: toggleNew
                 text: qsTr("Toggle New")
                 icon.source: 'image://theme/icon-m-favorite' + (isNew ? '-selected' : '')
                 onClicked: Util.disableUntilReturn(toggleNew, py, 'main.toggle_new', [id]);
             }
 
-            IconMenuItem {
+            GpodderIconMenuItem {
                 text: qsTr("Shownotes")
                 icon.source: 'image://theme/icon-m-about'
                 onClicked: {

diff --git a/qml/IconContextMenu.qml → qml/GpodderIconContextMenu.qml b/qml/IconContextMenu.qml → qml/GpodderIconContextMenu.qml
diff --git a/qml/IconMenuItem.qml → qml/GpodderIconMenuItem.qml b/qml/IconMenuItem.qml → qml/GpodderIconMenuItem.qml
diff --git a/qml/PlayerPage.qml b/qml/PlayerPage.qml
@@ -188,7 +188,7 @@ Page {
                 height: Theme.itemSizeLarge
                 spacing: Theme.paddingMedium
 
-                IconMenuItem {
+                GpodderIconMenuItem {
                     text: qsTr("- 1 min")
                     icon.source: 'image://theme/icon-m-previous'
 
@@ -198,7 +198,7 @@ Page {
                     }
                 }
 
-                IconMenuItem {
+                GpodderIconMenuItem {
                     text: qsTr("- 10 sec")
                     icon.source: 'image://theme/icon-m-previous'
                     GPodderAutoFire {
@@ -207,7 +207,7 @@ Page {
                     }
                 }
 
-                IconMenuItem {
+                GpodderIconMenuItem {
                     text: player.isPlaying ? qsTr("Pause") : qsTr("Play")
                     onClicked: {
                         if (player.isPlaying) {
@@ -219,7 +219,7 @@ Page {
                     icon.source: player.isPlaying ? 'image://theme/icon-m-pause' : 'image://theme/icon-m-play'
                 }
 
-                IconMenuItem {
+                GpodderIconMenuItem {
                     text: qsTr("+ 10 sec")
                     icon.source: 'image://theme/icon-m-next'
                     GPodderAutoFire {
@@ -228,7 +228,7 @@ Page {
                     }
                 }
 
-                IconMenuItem {
+                GpodderIconMenuItem {
                     text: qsTr("+ 1 min")
                     icon.source: 'image://theme/icon-m-next'
                     GPodderAutoFire {

diff --git a/qml/PodcastItem.qml b/qml/PodcastItem.qml
@@ -25,8 +25,8 @@ ListItem {
     id: podcastItem
 
     menu: Component {
-        IconContextMenu {
-            IconMenuItem {
+        GpodderIconContextMenu {
+            GpodderIconMenuItem {
                 text: qsTr("Refresh")
                 icon.source: 'image://theme/icon-m-sync'
                 onClicked: {
@@ -35,7 +35,7 @@ ListItem {
                 }
             }
 
-            IconMenuItem {
+            GpodderIconMenuItem {
                 text: qsTr("Unsubscribe")
                 icon.source: 'image://theme/icon-m-delete'
                 onClicked: {
@@ -47,7 +47,7 @@ ListItem {
                 }
             }
 
-            IconMenuItem {
+            GpodderIconMenuItem {
                 text: qsTr("Rename")
                 icon.source: 'image://theme/icon-m-edit'
                 onClicked: {
@@ -65,7 +65,7 @@ ListItem {
                 }
             }
 
-            IconMenuItem {
+            GpodderIconMenuItem {
                 text: qsTr("Change section")
                 icon.source: 'image://theme/icon-m-shuffle'
                 onClicked: {
@@ -83,7 +83,7 @@ ListItem {
                 }
             }
 
-            IconMenuItem {
+            GpodderIconMenuItem {
                 text: qsTr("Podcast detail")
                 icon.source: 'image://theme/icon-m-about'
                 onClicked: {

diff --git a/rpm/harbour-org.gpodder.sailfish.spec b/rpm/harbour-org.gpodder.sailfish.spec
@@ -8,7 +8,7 @@
 
 Summary:    Media and podcast aggregator
 Name:       harbour-org.gpodder.sailfish
-Version:    4.11.9
+Version:    4.12.0
 Release:    1
 Group:      System/GUI/Other
 License:    ISC / GPLv3