Merge pull request #173 from Keeper-of-the-Keys/remove-soundcloud-ui

Remove soundcloud UI
gpodder · Apr 13, 2023 · 6c373d0 · 6c373d0
2 parents 96bf899 + 1214740
commit 6c373d0
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "gpodder-core"]
 	path = gpodder-core
-	url = git://github.com/gpodder/gpodder-core.git
+	url = https://github.com/gpodder/gpodder-core.git
 [submodule "podcastparser"]
 	path = podcastparser
-	url = git://github.com/gpodder/podcastparser.git
+	url = https://github.com/gpodder/podcastparser.git
 [submodule "minidb"]
 	path = minidb
-	url = git://github.com/thp/minidb.git
+	url = https://github.com/thp/minidb.git
diff --git a/common/main.py b/common/main.py
@@ -175,7 +175,8 @@ def convert_episode(self, episode):
             'total_time': episode.total_time,
             'episode_art': self._get_episode_art(episode),
             'cover_art': self._get_cover(episode.podcast),
-            'podcast_title': episode.podcast.title
+            'podcast_title': episode.podcast.title,
+            'source': episode.local_filename(False) if episode.state == gpodder.STATE_DOWNLOADED else episode.url,
         }
 
     def _format_published_section(self, now, tnow, published):

diff --git a/gpodder-core b/gpodder-core
diff --git a/podcastparser b/podcastparser
diff --git a/qml/EpisodeItem.qml b/qml/EpisodeItem.qml
@@ -162,6 +162,7 @@ ListItem {
 
             truncationMode: TruncationMode.Fade
             text: title
+            font.strikeout: (source.indexOf("://api.soundcloud.com/") > 0 ? true : false)
 
             // need to set opacity via color, as truncationMode overrides opacity
             color: {

diff --git a/qml/PodcastItem.qml b/qml/PodcastItem.qml
@@ -154,7 +154,7 @@ ListItem {
         }
 
         truncationMode: TruncationMode.Fade
-        text: title
+        text: (url.indexOf("://soundcloud.com/") > 0? '⚠' : '') + title
         color: (newEpisodes || podcastItem.highlighted) ? Theme.highlightColor : Theme.primaryColor
     }
 

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.12.91
+Version:    4.13.0
 Release:    1
 Group:      System/GUI/Other
 License:    ISC / GPLv3
+1 −1		share/man/man1/gpo.1
+4 −4		src/gpodder/__init__.py
+1 −1		src/gpodder/core.py
+0 −8		README.md
+0 −3		doc/index.rst
+19 −29		podcastparser.py
+0 −5		tests/data/image_url_on_newline.json
+0 −11		tests/data/image_url_on_newline.rss
+1 −6		tests/data/mediarss.json
+0 −4		tests/data/mediarss.rss