Merge lp:~dano6/podbird/podbird into lp:podbird

Proposed by Daniel Kutka on 2020-06-30
Status: Merged
Merged at revision: 207
Proposed branch: lp:~dano6/podbird/podbird
Merge into: lp:podbird
Diff against target: 61 lines (+7/-5)
2 files modified
app/podbird.qml (+2/-0)
app/ui/SearchPage.qml (+5/-5)
To merge this branch: bzr merge lp:~dano6/podbird/podbird
Reviewer Review Type Date Requested Status
Michael Sheldon 2020-06-30 Approve on 2020-07-07
Review via email: mp+386561@code.launchpad.net

Commit message

Fix for unable to play some podcasts and fix regression - unable to add podcast by url

Description of the change

This mr should fix 2 issues - unable to add podcast by url: https://forums.ubports.com/topic/4299/podbird-reignited/67 and issue where function lookup(source) was unable to return meta, because urls was not same

To post a comment you must log in.
Michael Sheldon (michael-sheldon) wrote :

Merged and released, thanks!

review: Approve
Michael Sheldon (michael-sheldon) wrote :

By the way, feel free to add yourself to the Credits.qml page if you'd like :)

lp:~dano6/podbird/podbird updated on 2020-07-07
207. By Michael Sheldon on 2020-07-07

Merge lp:~dano6/podbird/podbird into lp:podbird

* Fix some podcasts not playing
* Fix adding podcasts by URL

Daniel Kutka (dano6) wrote :

Not yet :D

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/podbird.qml'
2--- app/podbird.qml 2020-06-17 16:33:52 +0000
3+++ app/podbird.qml 2020-07-01 13:57:44 +0000
4@@ -316,6 +316,7 @@
5 player.playlist.clear()
6 Podcasts.clearQueue()
7
8+ url = decodeFileURI(url)
9 // Add episode to queue
10 Podcasts.addItemToQueue(guid, image, name, artist, url, position)
11 player.playlist.addItem(url)
12@@ -326,6 +327,7 @@
13 }
14
15 function addEpisodeToQueue(guid, image, name, artist, url, position) {
16+ url = decodeFileURI(url)
17 Podcasts.addItemToQueue(guid, image, name, artist, url, position)
18 player.playlist.addItem(url)
19
20
21=== modified file 'app/ui/SearchPage.qml'
22--- app/ui/SearchPage.qml 2020-04-13 19:43:21 +0000
23+++ app/ui/SearchPage.qml 2020-07-01 13:57:44 +0000
24@@ -136,7 +136,6 @@
25 onTriggered: {
26 resultsView.forceActiveFocus()
27 subscribeFromFeed(feedUrlField.item.text);
28- tabs.selectedTabIndex = 2;
29 }
30 },
31 Action {
32@@ -163,8 +162,7 @@
33 placeholderText: i18n.tr("Feed URL")
34 onAccepted: {
35 resultsView.forceActiveFocus()
36- subscribeFromFeed(feedUrlField.text);
37- tabs.selectedTabIndex = 2;
38+ subscribeFromFeed(feedUrlField.item.text);
39 }
40 }
41 }
42@@ -427,7 +425,7 @@
43 var artist = "";
44 var image = "";
45 if (xhr.readyState === XMLHttpRequest.DONE) {
46- if(loadingDialog.visible)
47+ if(loadingDialog)
48 progressBar.value++
49 if (xhr.status < 200 || xhr.status > 299 || xhr.responseXML === null) {
50 PopupUtils.open(subscribeFailedDialog);
51@@ -456,7 +454,9 @@
52
53 if(name != "") {
54 Podcasts.subscribe(artist, name, feed, image);
55- imageDownloader.addDownload(feed, image)
56+ imageDownloader.addDownload(feed, image);
57+ if (!loadingDialog)
58+ tabs.selectedTabIndex = 2;
59 } else {
60 PopupUtils.open(subscribeFailedDialog);
61 searchPage.header = addHeader

Subscribers

People subscribed via source and target branches

to status/vote changes: