podbird

Merge lp:~einstein21/podbird/playOldDownloadedPodcasts into lp:podbird

  1. playOldDownloadedPodcasts
  2. Merge into trunk
Proposed by stefanweng
Status: Merged
Merged at revision: 191
Proposed branch: lp:~einstein21/podbird/playOldDownloadedPodcasts
Merge into: lp:podbird
Diff against target: 25 lines (+4/-3)
2 files modified
app/ui/EpisodesTab.qml (+4/-2)
clickable.json (+0/-1)
To merge this branch: bzr merge lp:~einstein21/podbird/playOldDownloadedPodcasts
Reviewer Review Type Date Requested Status
Michael Sheldon Approve
Review via email: mp+365093@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Looks good, thanks :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/ui/EpisodesTab.qml'
2--- app/ui/EpisodesTab.qml 2017-01-03 00:02:16 +0000
3+++ app/ui/EpisodesTab.qml 2019-03-26 10:42:12 +0000
4@@ -746,8 +746,10 @@
5 } else {
6 episodesModel.append({"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "favourited": episode.favourited, "diff": "Older"})
7 }
8- } else if (diff >= 7){
9- break
10+ } else if (diff >= 7) {
11+ if (episode.downloadedfile != null) {
12+ episodesModel.append({"guid" : episode.guid, "listened" : episode.listened, "published": episode.published, "name" : episode.name, "description" : episode.description, "duration" : episode.duration, "position" : episode.position, "downloadedfile" : episode.downloadedfile, "image" : podcast.image, "artist" : podcast.artist, "audiourl" : episode.audiourl, "queued": episode.queued, "favourited": episode.favourited, "diff": "Older"})
13+ }
14 }
15 }
16
17
18=== modified file 'clickable.json'
19--- clickable.json 2018-08-17 15:19:43 +0000
20+++ clickable.json 2019-03-26 10:42:12 +0000
21@@ -1,4 +1,3 @@
22 {
23- "sdk": "ubuntu-sdk-16.04",
24 "template": "cmake"
25 }

Subscribers

People subscribed via source and target branches

to status/vote changes: