added duration to vods

alamminsalo · Mar 12, 2016 · db0656f · db0656f
1 parent b2ae30c
commit db0656f
Show file tree

Hide file tree

Showing 14 changed files with 204 additions and 113 deletions.
diff --git a/orion.pro b/orion.pro
@@ -29,11 +29,11 @@ SOURCES += src/main.cpp\
     src/util/runguard.cpp \
     src/customapp.cpp \
     src/util/notificationmaker.cpp \
-    src/network/vodoperation.cpp \
     src/model/vod.cpp \
     src/model/vodlistmodel.cpp \
     src/model/vodmanager.cpp \
-    src/network/vodsearchoperation.cpp
+    src/network/vodsearchoperation.cpp \
+    src/network/vodstreamextractoperation.cpp
 
 
 HEADERS  += src/model/channel.h \
@@ -52,12 +52,12 @@ HEADERS  += src/model/channel.h \
     src/util/runguard.h \
     src/customapp.h \
     src/util/notificationmaker.h \
-    src/network/vodoperation.h \
     src/model/vod.h \
     src/model/vodlistmodel.h \
     src/model/vodmanager.h \
     src/network/vodsearchoperation.h \
-    src/network/urls.h
+    src/network/urls.h \
+    src/network/vodstreamextractoperation.h
 
 QMAKE_CXXFLAGS += -std=c++11 -Wall -O2
 

diff --git a/src/model/vodmanager.cpp b/src/model/vodmanager.cpp
@@ -3,7 +3,7 @@
 VodManager::VodManager()
 {
     vodSearch = new VodSearchOperation();
-    vodGet = new VodOperation();
+    vodGet = new VodStreamExtractOperation();
     model = new VodListModel();
 
     connect(vodSearch, SIGNAL(operationFinished()), this, SLOT(onSearchFinished()));
@@ -49,7 +49,7 @@ VodListModel *VodManager::getModel() const
     return model;
 }
 
-VodOperation *VodManager::getVodGet() const
+VodStreamExtractOperation *VodManager::getVodGet() const
 {
     return vodGet;
 }

diff --git a/src/model/vodmanager.h b/src/model/vodmanager.h
@@ -4,7 +4,7 @@
 #include <QObject>
 #include "vodlistmodel.h"
 #include "../network/vodsearchoperation.h"
-#include "../network/vodoperation.h"
+#include "../network/vodstreamextractoperation.h"
 
 class VodManager: public QObject
 {
@@ -20,7 +20,7 @@ class VodManager: public QObject
 
     Q_INVOKABLE void getStreams(const QString vodId);
 
-    VodOperation *getVodGet() const;
+    VodStreamExtractOperation *getVodGet() const;
 
     Q_INVOKABLE QStringList getResults() const;
 
@@ -39,7 +39,7 @@ public slots:
     QString game;
     VodListModel *model;
     VodSearchOperation *vodSearch;
-    VodOperation *vodGet;
+    VodStreamExtractOperation *vodGet;
 };
 
 #endif // VODMANAGER_H
diff --git a/src/network/vodsearchoperation.cpp b/src/network/vodsearchoperation.cpp
@@ -19,8 +19,13 @@ void VodSearchOperation::search(const QString channelName, quint32 offset, quint
     QString url = QString(KRAKEN_API)
             + QString("/channels/%1/videos").arg(channelName)
             + QString("?offset=%1").arg(offset)
-            + QString("&limit=%1").arg(limit)
-            + "&hls=true";
+            + QString("&limit=%1").arg(limit);
+
+    if (ONLY_BROADCASTS)
+        url += "&broadcasts=true";
+
+    if (USE_HLS)
+        url += "&hls=true";
 
     QNetworkRequest request;
     request.setUrl(QUrl(url));

diff --git a/src/network/vodsearchoperation.h b/src/network/vodsearchoperation.h
@@ -9,6 +9,9 @@
 #include "../model/vod.h"
 #include "urls.h"
 
+#define ONLY_BROADCASTS true
+#define USE_HLS true
+
 class VodSearchOperation: public QNetworkAccessManager
 {
     Q_OBJECT

diff --git a/src/network/vodoperation.cpp → src/network/vodstreamextractoperation.cpp b/src/network/vodoperation.cpp → src/network/vodstreamextractoperation.cpp
@@ -1,36 +1,36 @@
-#include "vodoperation.h"
+#include "vodstreamextractoperation.h"
 #include "../util/jsonparser.h"
 #include "../util/m3u8parser.h"
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QDebug>
 
-VodOperation::VodOperation()
+VodStreamExtractOperation::VodStreamExtractOperation()
 {
     connect(this, SIGNAL(finished(QNetworkReply*)), this, SLOT(handleReply(QNetworkReply*)));
 }
 
-VodOperation::~VodOperation()
+VodStreamExtractOperation::~VodStreamExtractOperation()
 {
     result.clear();
 }
 
-QString VodOperation::getVod() const
+QString VodStreamExtractOperation::getVod() const
 {
     return vod;
 }
 
-void VodOperation::setVod(const QString &value)
+void VodStreamExtractOperation::setVod(const QString &value)
 {
     vod = value;
 }
 
-QStringList VodOperation::getResult() const
+QStringList VodStreamExtractOperation::getResult() const
 {
     return result;
 }
 
-void VodOperation::run(const QString vod_id)
+void VodStreamExtractOperation::run(const QString vod_id)
 {
     vod = vod_id;
 
@@ -40,7 +40,7 @@ void VodOperation::run(const QString vod_id)
     getExtractionData();
 }
 
-void VodOperation::getExtractionData()
+void VodStreamExtractOperation::getExtractionData()
 {
     phase = 0;
 
@@ -53,7 +53,7 @@ void VodOperation::getExtractionData()
     get(request);
 }
 
-void VodOperation::getM3U(QString url)
+void VodStreamExtractOperation::getM3U(QString url)
 {
     phase = 1;
 
@@ -67,7 +67,7 @@ void VodOperation::getM3U(QString url)
     get(request);
 }
 
-void VodOperation::handleReply(QNetworkReply* reply)
+void VodStreamExtractOperation::handleReply(QNetworkReply* reply)
 {
     if (reply->error() != QNetworkReply::NoError){
         qDebug() << reply->errorString();

diff --git a/src/network/vodoperation.h → src/network/vodstreamextractoperation.h b/src/network/vodoperation.h → src/network/vodstreamextractoperation.h
@@ -1,22 +1,22 @@
-#ifndef VODOPERATION_H
-#define VODOPERATION_H
+#ifndef VODSTREAMEXTRACTOPERATION_H
+#define VODSTREAMEXTRACTOPERATION_H
 
 #include <QObject>
 #include <QNetworkAccessManager>
 #include "urls.h"
 
 //Fetches the network streams data for player
 
-class VodOperation: public QNetworkAccessManager
+class VodStreamExtractOperation: public QNetworkAccessManager
 {
     Q_OBJECT
 
     void getExtractionData();
     void getM3U(QString url);
 
 public:
-    VodOperation();
-    ~VodOperation();
+    VodStreamExtractOperation();
+    ~VodStreamExtractOperation();
 
     Q_INVOKABLE void run(const QString vod_id);
 
@@ -37,4 +37,4 @@ public slots:
     quint8 phase;
 };
 
-#endif // VODOPERATION_H
+#endif // VODSTREAMEXTRACTOPERATION_H
diff --git a/src/qml/FavouritesView.qml b/src/qml/FavouritesView.qml
@@ -38,7 +38,7 @@ Item{
 
         onItemClicked: {
             if (currentItem.online){
-                player.play(currentItem)
+                player.getStreams(currentItem)
             }
         }
 
@@ -54,20 +54,20 @@ Item{
                 text: "Watch;play"
                 onTriggered: {
                     if (_menu.item.online){
-                        player.play(_menu.item)
+                        player.getStreams(_menu.item)
                     }
                 }
             }
             MenuItem {
-                text: "Remove;remove"
+                text: "Videos;video"
                 onTriggered: {
-                    g_cman.removeFromFavourites(_menu.item._id)
+                    vods.search(_menu.item)
                 }
             }
             MenuItem {
-                text: "Videos;video"
+                text: "Remove;remove"
                 onTriggered: {
-                    vods.search(_menu.item)
+                    g_cman.removeFromFavourites(_menu.item._id)
                 }
             }
         }

diff --git a/src/qml/FeaturedView.qml b/src/qml/FeaturedView.qml
@@ -49,14 +49,14 @@ Item {
 
         onItemClicked: {
             if (currentItem.online){
-                player.play(currentItem)
+                player.getStreams(currentItem)
             }
         }
 
         onItemRightClicked: {
             _menu.item = currentItem
             _menu.items[0].enabled = _menu.item.online
-            var item = _menu.items[1]
+            var item = _menu.items[2]
             item.text = !_menu.item.favourite ? "Add favourite;fav" : "Remove favourite;remove"
             _menu.state = !_menu.item.favourite ? 1 : 2
 
@@ -78,24 +78,26 @@ Item {
                 text: "Watch;play"
                 onTriggered: {
                     if (_menu.item.online){
-                        player.play(_menu.item)
+                        player.getStreams(_menu.item)
                     }
                 }
             }
 
             MenuItem {
-                id: _fav
+                text: "Videos;video"
                 onTriggered: {
-                    _menu.addRemoveFavourite()
+                    vods.search(_menu.item)
                 }
             }
 
             MenuItem {
-                text: "Videos;video"
+                id: _fav
                 onTriggered: {
-                    vods.search(_menu.item)
+                    _menu.addRemoveFavourite()
                 }
             }
+
+
         }
 
         Timer {