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

[Daniel Kutka]

Implement importing podcast with OPML files.

[Daniel Kutka (dano6)]

Version bump is because of AppArmor changes. Tested with OPML files from PodcastAddict for android and GNOME Podcasts.

[Michael Sheldon (michael-sheldon)]

This is very cool, thanks! I'll try to find some time to review it over the next few days

[lp:~dano6/podbird/podbird]

198. By Michael Sheldon on 2020-04-09

Merge lp:~dano6/podbird/podbird

[Michael Sheldon (michael-sheldon)]

Merged, thanks!

[Daniel Kutka (dano6)]

Thanks for the merge, I made small fix in new proposal

=== modified file 'Podbird.apparmor'
--- Podbird.apparmor	2018-08-17 15:19:43 +0000
+++ Podbird.apparmor	2020-04-04 17:46:04 +0000
@@ -3,7 +3,8 @@
         "networking",
         "audio",
         "connectivity",
-        "usermetrics"
+        "usermetrics",
+        "content_exchange"
     ],
     "policy_version": 16.04
 }
 
=== added file 'app/ui/ImportPage.qml'
--- app/ui/ImportPage.qml	1970-01-01 00:00:00 +0000
+++ app/ui/ImportPage.qml	2020-04-04 17:46:04 +0000
@@ -0,0 +1,62 @@
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Content 1.3
+
+
+
+Page {
+    id: picker
+    property var activeTransfer
+
+    property var url
+    property var handler
+    property var contentType
+
+    signal cancel()
+    signal imported(string fileUrl)
+
+    header: PageHeader {
+        title: i18n.tr("Choose")
+    }
+
+    ContentPeerPicker {
+        anchors { fill: parent; topMargin: picker.header.height }
+        visible: parent.visible
+        showTitle: false
+        contentType: picker.contentType //ContentType.Pictures
+        handler: picker.handler //ContentHandler.Source
+
+        onPeerSelected: {
+            peer.selectionType = ContentTransfer.Single
+            picker.activeTransfer = peer.request()
+            picker.activeTransfer.stateChanged.connect(function() {
+                if (picker.activeTransfer.state === ContentTransfer.InProgress) {
+                    console.log("In progress");
+                    picker.activeTransfer.items = picker.activeTransfer.items[0].url = url;
+                    picker.activeTransfer.state = ContentTransfer.Charged;
+                }
+                if (picker.activeTransfer.state === ContentTransfer.Charged) {
+                    console.log("Charged");
+                    picker.imported(picker.activeTransfer.items[0].url)
+                    console.log(picker.activeTransfer.items[0].url)
+                    picker.activeTransfer = null
+                }
+            })
+        }
+
+
+        onCancelPressed: {
+            pageStack.pop()
+        }
+    }
+
+    ContentTransferHint {
+        id: transferHint
+        anchors.fill: parent
+        activeTransfer: picker.activeTransfer
+    }
+    Component {
+        id: resultComponent
+        ContentItem {}
+    }
+}
 
=== modified file 'app/ui/SearchPage.qml'
--- app/ui/SearchPage.qml	2016-03-29 11:30:03 +0000
+++ app/ui/SearchPage.qml	2020-04-04 17:46:04 +0000
@@ -19,7 +19,9 @@
 import QtQuick 2.4
 import Ubuntu.Components 1.3
 import QtQuick.LocalStorage 2.0
+import QtQuick.XmlListModel 2.0
 import Ubuntu.Components.Popups 1.3
+import Ubuntu.Content 1.3
 import "../podcasts.js" as Podcasts
 import "../components"
 
@@ -66,6 +68,17 @@
                     searchPage.header = addHeader
                     feedUrlField.item.forceActiveFocus()
                 }
+            },
+            Action {
+                text:i18n.tr("Import Podcasts")
+                iconName: "import"
+                onTriggered: {
+                    var importPage = mainStack.push(Qt.resolvedUrl("ImportPage.qml"),{"contentType": ContentType.Unknown, "handler": ContentHandler.Source})
+                    importPage.imported.connect(function(fileUrl) {
+                        mainStack.pop()
+                        parseOPML(fileUrl)
+                    })
+                }
             }
         ]
     }
@@ -123,6 +136,7 @@
                 onTriggered: {
                     resultsView.forceActiveFocus()
                     subscribeFromFeed(feedUrlField.item.text);
+                    tabs.selectedTabIndex = 2;
                 }
             },
             Action {
@@ -150,6 +164,7 @@
             onAccepted: {
                 resultsView.forceActiveFocus()
                 subscribeFromFeed(feedUrlField.text);
+                tabs.selectedTabIndex = 2;
             }
         }
     }
@@ -292,7 +307,6 @@
                                 }
                             });
                         }
-                        tabs.selectedTabIndex = 2;
                     }
                 }
             }
@@ -412,6 +426,8 @@
             var artist = "";
             var image = "";
             if (xhr.readyState === XMLHttpRequest.DONE) {
+                if(loadingDialog.visible)
+                    progressBar.value++
                 if (xhr.status < 200 || xhr.status > 299 || xhr.responseXML === null) {
                     PopupUtils.open(subscribeFailedDialog);
                     searchPage.header = addHeader
@@ -440,7 +456,6 @@
                 if(name != "") {
                     Podcasts.subscribe(artist, name, feed, image);
                     imageDownloader.addDownload(feed, image)
-                    tabs.selectedTabIndex = 2;
                 } else {
                     PopupUtils.open(subscribeFailedDialog);
                     searchPage.header = addHeader
@@ -451,4 +466,56 @@
         }
         xhr.send();
     }
+
+    function parseOPML(fileUrl) {
+        opmlModel.source = fileUrl;
+        opmlModel.reload()
+    }
+
+    XmlListModel {
+        id:opmlModel
+
+        query: "/opml/body/outline"
+        XmlRole { name: "text"; query: "@text/string()" }
+        XmlRole { name: "type"; query: "@type/string()" }
+        XmlRole { name: "xmlUrl"; query: "@xmlUrl/string()" }
+
+        onRowsInserted: {
+            progressBar.minimumValue = first
+            progressBar.maximumValue = last
+            progressBar.value = first
+            loadingDialog.show()
+            for(var i=first;i<=last;i++){
+                subscribeFromFeed(opmlModel.get(i).xmlUrl)
+            }
+        }
+    }
+
+    Dialog {
+        id: loadingDialog
+
+        modal: true;
+        title: i18n.tr("Please wait!")
+        text: i18n.tr("Importing podcasts.")
+
+        ActivityIndicator {
+            running: true
+        }
+
+        ProgressBar {
+            id:progressBar
+
+            onValueChanged: {
+                if(value > maximumValue) {
+                    PopupUtils.close(loadingDialog)
+                    tabs.selectedTabIndex = 2;
+                }
+            }
+        }
+
+        Label {
+            text: progressBar.value + "/" + (progressBar.maximumValue+1) + " " + i18n.tr("imported")
+            horizontalAlignment: Text.AlignHCenter
+        }
+    }
 }
 
=== modified file 'manifest.json.in'
--- manifest.json.in	2020-03-25 14:39:34 +0000
+++ manifest.json.in	2020-04-04 17:46:04 +0000
@@ -9,7 +9,7 @@
             "desktop": "Podbird.desktop"
         }
     },
-    "version": "0.8.4",
+    "version": "0.8.5",
     "maintainer": "Michael Sheldon <[e-mail]>",
     "framework": "ubuntu-sdk-16.04.2"
 }