Add option to download audio only

.gitignore

@@ -1,4 +1,10 @@
-/*.pro.user
-/mcc.json
-/youtube-data-api-v3.key
-/youtube-client-id.json
+*.pro.user*
+mcc.json
+youtube-data-api-v3*
+youtube-client-id*
+rpm/*.spec*
+src/config.h
+*.bak
+*.autosave
+scripts/version-str
+youtube-dl-lite

LICENSE.YTPlayer

@@ -1,4 +1,6 @@
 Copyright (c) 2014-2015 Piotr Tworek
+Copyright (c) 2015-2018 Petr Tsymbarovich
+Copyright (c) 2019-2020 Matti Viljanen
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

README.md

@@ -4,17 +4,19 @@ YTPlayer
 YTPlayer is an unofficial YouTube client for SailfishOS.
 
 <div class="row">
-<img width="240px" src="https://raw.githubusercontent.com/tworaz/sailfish-ytplayer/master/artwork/screenshots/20150915210645.jpg" />
-<img width="240px" src="https://raw.githubusercontent.com/tworaz/sailfish-ytplayer/master/artwork/screenshots/20150915210731.jpg" />
-<img width="240px" src="https://raw.githubusercontent.com/tworaz/sailfish-ytplayer/master/artwork/screenshots/20150915210805.jpg" />
+<img width="240px" src="https://github.com/direc85/harbour-ytplayer/raw/master/artwork/screenshots/VirtualBox_Sailfish%20OS%20Emulator_02_12_2018_00_53_48.png" />
+&nbsp;
+<img width="240px" src="https://github.com/direc85/harbour-ytplayer/raw/master/artwork/screenshots/VirtualBox_Sailfish%20OS%20Emulator_12_02_2019_15_00_00.png" />
+&nbsp;
+<img width="240px" src="https://github.com/direc85/harbour-ytplayer/raw/master/artwork/screenshots/VirtualBox_Sailfish%20OS%20Emulator_12_02_2019_15_00_45.png" />
 </div>
 
 Getting the source
 ------------------
 
 Since YTPlayer uses some extra 3rd party components shipped in git submodules it needs to be cloned with --recursive option. Ex:
 
-- git clone --recursive https://github.com/tworaz/sailfish-ytplayer.git
+- git clone --recursive https://github.com/direc85/sailfish-ytplayer.git
 
 Build Prequisites
 -----------------
@@ -33,7 +35,25 @@ Building
 4. Load harbour-ytplayer.pro file.
 5. Build and deploy the application to your phone/tablet/emulator.
 
+If translations don't work, try the following:
+
+1. Select i486/armv7hl > Release > Deploy as ARM package
+2. Build > Clean project "harbour-ytplayer"
+3. Build > Build project "harbour-ytplayer" (or click the hammer icon)
+4. Build > Deploy project "harbour-ytplayer" (or click the play icon)
+
 Translating
 -----------
 
-If you want to translate YTPlayer into your native language you can use Transifex (https://www.transifex.com/tworaz/ytplayer).
+If you would like to create a new translation for YTPlayer, this is roughly how it's done:
+- Fork the project
+- Copy translations/en_GB.ts file to your language (e.g. no.ts for Norwgian)
+- Add the new file to translations/translations.pri files TRANSLATIONS section accordingly
+- Translate the new file
+  - Qt Linguist comes with Sailfish Application SDK
+  - Your generic UTF-8 capable text editor will work, too
+- Test the translation
+- Commit the changes
+- Make a pull request
+
+Or you can avoid forking by just creating a new issue and attach the new translated .ts file in the issue.

YTPlayer.qrc

@@ -1,22 +1,35 @@
 <RCC>
     <qresource prefix="/">
         <file alias="mcc-data.json">resources/mcc-data.json</file>
-        <file alias="logo.png">resources/logo.png</file>
-        <file alias="translations.json">languages/translations.json</file>
+        <file alias="translations.json">translations/translations.json</file>
+        <file alias="logo.png">harbour-ytplayer.png</file>
+        <file alias="ko-fi.png">artwork/Ko-fi_Icon_RGB_rounded.png</file>
     </qresource>
     <qresource prefix="/icons">
-        <file alias="approval-64.png">resources/icons/approval-64.png</file>
-        <file alias="dislike-m.png">resources/icons/dislike-m.png</file>
-        <file alias="downloaded-videos-64.png">resources/icons/downloaded-videos-64.png</file>
-        <file alias="like-m.png">resources/icons/like-m.png</file>
-        <file alias="rss-m.png">resources/icons/rss-m.png</file>
-        <file alias="search-m.png">resources/icons/search-m.png</file>
-        <file alias="video-multi-m.png">resources/icons/video-multi-m.png</file>
-        <file alias="categorize-64.png">resources/icons/categorize-64.png</file>
-        <file alias="bookmark-2-64.png">resources/icons/bookmark-2-64.png</file>
-        <file alias="star-8-64.png">resources/icons/star-8-64.png</file>
-        <file alias="play-64.png">resources/icons/play-64.png</file>
-        <file alias="pause-64.png">resources/icons/pause-64.png</file>
+        <file alias="approval-64-white.png">resources/icons/approval-64-white.png</file>
+        <file alias="dislike-m-white.png">resources/icons/dislike-m-white.png</file>
+        <file alias="downloaded-videos-64-white.png">resources/icons/downloaded-videos-64-white.png</file>
+        <file alias="like-m-white.png">resources/icons/like-m-white.png</file>
+        <file alias="rss-m-white.png">resources/icons/rss-m-white.png</file>
+        <file alias="search-m-white.png">resources/icons/search-m-white.png</file>
+        <file alias="video-multi-m-white.png">resources/icons/video-multi-m-white.png</file>
+        <file alias="categorize-64-white.png">resources/icons/categorize-64-white.png</file>
+        <file alias="bookmark-2-64-white.png">resources/icons/bookmark-2-64-white.png</file>
+        <file alias="star-8-64-white.png">resources/icons/star-8-64-white.png</file>
+        <file alias="play-64-white.png">resources/icons/play-64-white.png</file>
+        <file alias="pause-64-white.png">resources/icons/pause-64-white.png</file>
+        <file alias="approval-64-black.png">resources/icons/approval-64-black.png</file>
+        <file alias="dislike-m-black.png">resources/icons/dislike-m-black.png</file>
+        <file alias="downloaded-videos-64-black.png">resources/icons/downloaded-videos-64-black.png</file>
+        <file alias="like-m-black.png">resources/icons/like-m-black.png</file>
+        <file alias="rss-m-black.png">resources/icons/rss-m-black.png</file>
+        <file alias="search-m-black.png">resources/icons/search-m-black.png</file>
+        <file alias="video-multi-m-black.png">resources/icons/video-multi-m-black.png</file>
+        <file alias="categorize-64-black.png">resources/icons/categorize-64-black.png</file>
+        <file alias="bookmark-2-64-black.png">resources/icons/bookmark-2-64-black.png</file>
+        <file alias="star-8-64-black.png">resources/icons/star-8-64-black.png</file>
+        <file alias="play-64-black.png">resources/icons/play-64-black.png</file>
+        <file alias="pause-64-black.png">resources/icons/pause-64-black.png</file>
     </qresource>
     <qresource prefix="/fonts">
         <file alias="youtube-icons.ttf">resources/fonts/youtube-icons.ttf</file>
@@ -41,6 +54,7 @@
         <file>qml/cover/VideoOverview.qml</file>
         <file>qml/pages/About.qml</file>
         <file>qml/pages/Account.qml</file>
+		<file>qml/pages/APIKeys.qml</file>
         <file>qml/pages/CacheSettings.qml</file>
         <file>qml/pages/CategoryVideoList.qml</file>
         <file>qml/pages/ChannelBrowser.qml</file>

harbour-ytplayer.pro

@@ -4,90 +4,81 @@
 
 TARGET = harbour-ytplayer
 
-CONFIG += sailfishapp sailfishapp_no_deploy_qml
-QT += dbus sql concurrent
+CONFIG += sailfishapp sailfishapp_no_deploy_qml # sailfishapp_i18n
+
+PKGCONFIG += nemonotifications-qt5
+
+QT += dbus sql concurrent qml core multimedia
 
 SOURCES += \
-        src/YTPlayer.cpp \
-        src/YTUtils.cpp \
-        src/YTLogger.cpp \
-        src/YTPrefs.cpp  \
-        src/YTRequest.cpp \
-        src/YTListModel.cpp \
-        src/YTNetworkManager.cpp \
-        src/YTLocalVideo.cpp \
-        src/YTLocalVideoData.cpp \
-        src/YTLocalVideoManager.cpp \
-        src/YTLocalVideoListModel.cpp \
-        src/YTVideoDownloadNotification.cpp \
-        src/YTVIdeoUrlFetcher.cpp \
-        src/YTSuggestionEngine.cpp \
-        src/YTTranslations.cpp \
-        src/YTWatchedRecently.cpp \
-        src/YTFavorites.cpp \
-        src/YTSqlListModel.cpp
+    src/YTPlayer.cpp \
+    src/YTUtils.cpp \
+    src/YTLogger.cpp \
+    src/YTPrefs.cpp  \
+    src/YTRequest.cpp \
+    src/YTListModel.cpp \
+    src/YTNetworkManager.cpp \
+    src/YTLocalVideo.cpp \
+    src/YTLocalVideoData.cpp \
+    src/YTLocalVideoManager.cpp \
+    src/YTLocalVideoListModel.cpp \
+    src/YTVideoDownloadNotification.cpp \
+    src/YTVIdeoUrlFetcher.cpp \
+    src/YTSuggestionEngine.cpp \
+    src/YTTranslations.cpp \
+    src/YTWatchedRecently.cpp \
+    src/YTFavorites.cpp \
+    src/YTSqlListModel.cpp \
+    src/YTUpdater.cpp \
+    src/YTUpdateWorker.cpp
 
 HEADERS += \
-        src/YTPlayer.h \
-        src/YTUtils.h  \
-        src/YTLogger.h \
-        src/YTPrefs.h \
-        src/YTRequest.h \
-        src/YTListModel.h \
-        src/YTNetworkManager.h \
-        src/YTLocalVideo.h \
-        src/YTLocalVideoData.h \
-        src/YTLocalVideoManager.h \
-        src/YTLocalVideoListModel.h \
-        src/YTVideoDownloadNotification.h \
-        src/YTVideoUrlFetcher.h \
-        src/YTSuggestionEngine.h \
-        src/YTTranslations.h \
-        src/YTWatchedRecently.h \
-        src/YTFavorites.h \
-        src/YTSqlListModel.h
+    src/YTPlayer.h \
+    src/YTUtils.h  \
+    src/YTLogger.h \
+    src/YTPrefs.h \
+    src/YTRequest.h \
+    src/YTListModel.h \
+    src/YTNetworkManager.h \
+    src/YTLocalVideo.h \
+    src/YTLocalVideoData.h \
+    src/YTLocalVideoManager.h \
+    src/YTLocalVideoListModel.h \
+    src/YTVideoDownloadNotification.h \
+    src/YTVideoUrlFetcher.h \
+    src/YTSuggestionEngine.h \
+    src/YTTranslations.h \
+    src/YTWatchedRecently.h \
+    src/YTFavorites.h \
+    src/YTSqlListModel.h \
+    src/YTUpdater.h \
+    src/YTUpdateWorker.h
 
 QML_SOURCES = \
-        qml/*.qml \
-        qml/pages/*.qml \
-        qml/cover/*.qml \
-        qml/common/*.qml \
-        qml/common/*.js
+    qml/*.qml \
+    qml/pages/*.qml \
+    qml/cover/*.qml \
+    qml/common/*.qml \
+    qml/common/*.js
 
 OTHER_FILES += \
-        $$QML_SOURCES \
-        harbour-ytplayer.desktop \
-        scripts/mcc-data-util.py \
-        scripts/generate-config-h.py \
-        scripts/get_version_str.sh \
-        rpm/harbour-ytplayer.spec
-
-include(third_party/youtube_dl.pri)
-include(languages/translations.pri)
-
-KEY_FILE = $$top_srcdir/youtube-data-api-v3.key
-CLIENT_ID_FILE = $$top_srcdir/youtube-client-id.json
+    $$QML_SOURCES \
+    harbour-ytplayer.desktop \
+    scripts/get_version_str.sh \
+    translations/*.ts
 
-!exists($$KEY_FILE) {
-    error("YouTube data api key file not found: youtube-data-api-v3.key")
-}
-!exists($$CLIENT_ID_FILE) {
-    warning("YouTube client ID file not found, client authotization won't work!")
-}
+DISTFILES += \
+    rpm/harbour-ytplayer.spec \
+    rpm/harbour-ytplayer.yaml \
+    translations/*.qm \
+    rpm/harbour-ytplayer.changes
 
-configh.input = KEY_FILE
-configh.output = $$top_builddir/config.h
-configh.commands = \
-    $$top_srcdir/scripts/generate-config-h.py \
-            --keyfile=$$KEY_FILE \
-            --idfile=$$CLIENT_ID_FILE \
-            --outfile=$$top_builddir/config.h
-configh.CONFIG += no_link
+SAILFISHAPP_ICONS = 86x86 108x108 128x128 172x172
 
-QMAKE_EXTRA_COMPILERS += configh
-PRE_TARGETDEPS += compiler_configh_make_all
+include(translations/translations.pri)
 
-DEFINES += VERSION_STR=\\\"$$system($${top_srcdir}/scripts/get_version_str.sh)\\\"
+VERSION_RUN = $$system(bash $${top_srcdir}/scripts/get_version_str.sh)
+DEFINES += VERSION_STR=\\\"$$system(cat $${top_srcdir}/scripts/version-str)\\\"
 
 licenses.files = $$files($$top_srcdir/LICENSE.*)
 licenses.path = /usr/share/$${TARGET}/licenses
@@ -99,13 +90,3 @@ SOURCES += $$QML_SOURCES
 
 RESOURCES += \
     YTPlayer.qrc
-
-mcc_data.target = mcc-data
-mcc_data.commands = \
-    $$top_srcdir/scripts/mcc-data-util.py \
-        --keyfile=$$top_srcdir/youtube-data-api-v3.key \
-        --mccfile=$$top_srcdir/resources/mcc-data.json \
-        --verbose --mode check
-
-QMAKE_EXTRA_TARGETS += mcc-data
-PRE_TARGETDEPS += mcc-data