Merge branch 'develop'

setvisible · Nov 11, 2021 · be6fa09 · be6fa09
2 parents d488236 + d2c72a9
commit be6fa09
Show file tree

Hide file tree

Showing 58 changed files with 6,608 additions and 4,382 deletions.
diff --git a/3rd/yt-dlp/bin/yt-dlp b/3rd/yt-dlp/bin/yt-dlp
diff --git a/3rd/yt-dlp/bin/yt-dlp.exe b/3rd/yt-dlp/bin/yt-dlp.exe
diff --git a/3rd/yt-dlp/version b/3rd/yt-dlp/version
@@ -1 +1 @@
-2021.10.22
+2021.11.10.1
diff --git a/docs/assets/images/iexplorer.png b/docs/assets/images/iexplorer.png
diff --git a/docs/category/download-advanced.md b/docs/category/download-advanced.md
@@ -42,9 +42,9 @@ Table of Content:
 
 Choose the browser:
 
-| ![logo](/DownZemAll/assets/images/firefox.png) | ![logo](/DownZemAll/assets/images/chrome.png) |
-|-----------------------------------|----------------------------------|
-| Click here to intall [DownRightNow for Mozilla Firefox](https://addons.mozilla.org/en-US/firefox/addon/down-right-now/ ) | Click here to intall [DownRightNow for Google Chrome](https://chrome.google.com/webstore/detail/down-right-now/modofbhnhlagjmejdbalnijgncppjeio "https://chrome.google.com/webstore/detail/down-right-now/modofbhnhlagjmejdbalnijgncppjeio") |
+| ![logo](/DownZemAll/assets/images/firefox.png) | ![logo](/DownZemAll/assets/images/chrome.png) | ![logo](/DownZemAll/assets/images/iexplorer.png) |
+|-----------------------------------|----------------------------------|----------------------------------|
+| Click here to intall [DownRightNow for Mozilla Firefox](https://addons.mozilla.org/en-US/firefox/addon/down-right-now/ ) | Click here to intall [DownRightNow for Google Chrome](https://chrome.google.com/webstore/detail/down-right-now/modofbhnhlagjmejdbalnijgncppjeio "https://chrome.google.com/webstore/detail/down-right-now/modofbhnhlagjmejdbalnijgncppjeio") | Click here to intall... Just kidding |
 
 
 #### Portable Archives

diff --git a/docs/category/download.md b/docs/category/download.md
@@ -39,7 +39,7 @@ title: Download
             </a>
         </div>
         <div class="general-instruction" style="display: none;">
-            <table>
+            <table style="table-layout:fixed;">
                 <tbody>
                     <tr>
                         <td align="center">
@@ -52,6 +52,9 @@ title: Download
                                 <img src="/DownZemAll/assets/images/chrome.png" alt="chrome logo">
                             </a>
                         </td>
+                        <td align="center">
+                            <img src="/DownZemAll/assets/images/iexplorer.png" alt="internet explorer logo">
+                        </td>
                     </tr>
                     <tr>
                         <td>
@@ -66,6 +69,9 @@ title: Download
                                 <b>DownRightNow for Google Chrome</b>
                             </a>
                         </td>
+                        <td>
+                            Click here to intall... Just kidding
+                        </td>
                     </tr>
                 </tbody>
             </table>

diff --git a/include/Widgets/StreamConfigWidget b/include/Widgets/StreamConfigWidget
diff --git a/include/Widgets/StreamToolBox b/include/Widgets/StreamToolBox
@@ -0,0 +1 @@
+#include "../../src/widgets/streamtoolbox.h"
diff --git a/src/core/format.cpp b/src/core/format.cpp
@@ -289,6 +289,7 @@ QString Format::boolToHtml(bool value)
 
 QString Format::sizeToHtml(int size)
 {
+    /// \todo Add non breaking space?
     return Format::fileSizeToString(size);
 }
 

diff --git a/src/core/resourceitem.cpp b/src/core/resourceitem.cpp
@@ -243,12 +243,12 @@ void ResourceItem::setStreamFileSize(qint64 streamFileSize)
 
 /******************************************************************************
  ******************************************************************************/
-StreamObjectConfig ResourceItem::streamConfig() const
+StreamObject::Config ResourceItem::streamConfig() const
 {
     return m_streamConfig;
 }
 
-void ResourceItem::setStreamConfig(const StreamObjectConfig &config)
+void ResourceItem::setStreamConfig(const StreamObject::Config &config)
 {
     m_streamConfig = config;
 }

diff --git a/src/core/resourceitem.h b/src/core/resourceitem.h
@@ -80,8 +80,8 @@ class ResourceItem
     qint64 streamFileSize() const;
     void setStreamFileSize(qint64 streamFileSize);
 
-    StreamObjectConfig streamConfig() const;
-    void setStreamConfig(const StreamObjectConfig &config);
+    StreamObject::Config streamConfig() const;
+    void setStreamConfig(const StreamObject::Config &config);
 
     QString torrentPreferredFilePriorities() const;
     void setTorrentPreferredFilePriorities(const QString &priorities);
@@ -104,7 +104,7 @@ class ResourceItem
     QString m_streamFormatId;
     qint64 m_streamFileSize{0};
 
-    StreamObjectConfig m_streamConfig;
+    StreamObject::Config m_streamConfig;
 
     /* Torrent-specific properties */
     QString m_torrentPreferredFilePriorities;

diff --git a/src/core/session.cpp b/src/core/session.cpp
@@ -50,31 +50,39 @@ static inline int stateToInt(IDownloadItem::State state)
     }
 }
 
-static inline StreamObjectConfig readStreamConfig(const QJsonObject &json)
+static inline StreamObject::Config readStreamConfig(const QJsonObject &json)
 {
-    StreamObjectConfig config;
+    StreamObject::Config config;
     {
         auto j = json["overview"].toObject();
-        config.overview.skipVideo = j["skipVideo"].isBool();
+        config.overview.skipVideo = j["skipVideo"].toBool();
         config.overview.markWatched = j["markWatched"].toBool();
     }
+    {
+        auto j = json["subtitle"].toObject();
+        config.subtitle.writeSubtitle = j["writeSubtitle"].toBool();
+        config.subtitle.isAutoGenerated = j["isAutoGenerated"].toBool();
+        config.subtitle.extensions = j["extensions"].toString();
+        config.subtitle.languages = j["languages"].toString();
+        config.subtitle.convert = j["convert"].toString();
+    }
     {
         auto j = json["chapter"].toObject();
-        config.chapter.writeChapters = j["writeChapters"].isBool();
+        config.chapter.writeChapters = j["writeChapters"].toBool();
     }
     {
         auto j = json["thumbnail"].toObject();
-        config.thumbnail.writeDefaultThumbnail = j["writeDefaultThumbnail"].isBool();
+        config.thumbnail.writeDefaultThumbnail = j["writeDefaultThumbnail"].toBool();
     }
     {
         auto j = json["comment"].toObject();
-        config.comment.writeComment = j["writeComment"].isBool();
+        config.comment.writeComment = j["writeComment"].toBool();
     }
     {
         auto j = json["metadata"].toObject();
-        config.metadata.writeDescription = j["writeDescription"].isBool();
-        config.metadata.writeMetadata = j["writeMetadata"].isBool();
-        config.metadata.writeInternetShortcut = j["writeInternetShortcut"].isBool();
+        config.metadata.writeDescription = j["writeDescription"].toBool();
+        config.metadata.writeMetadata = j["writeMetadata"].toBool();
+        config.metadata.writeInternetShortcut = j["writeInternetShortcut"].toBool();
     }
     {
         auto j = json["processing"].toObject();
@@ -85,7 +93,7 @@ static inline StreamObjectConfig readStreamConfig(const QJsonObject &json)
     return config;
 }
 
-static inline QJsonObject writeStreamConfig(const StreamObjectConfig &config)
+static inline QJsonObject writeStreamConfig(const StreamObject::Config &config)
 {
     QJsonObject json;
     {
@@ -94,6 +102,15 @@ static inline QJsonObject writeStreamConfig(const StreamObjectConfig &config)
         j["markWatched"] = config.overview.markWatched;
         json["overview"] = j;
     }
+    {
+        QJsonObject j;
+        j["writeSubtitle"] = config.subtitle.writeSubtitle;
+        j["isAutoGenerated"] = config.subtitle.isAutoGenerated;
+        j["extensions"] = config.subtitle.extensions;
+        j["languages"] = config.subtitle.languages;
+        j["convert"] = config.subtitle.convert;
+        json["subtitle"] = j;
+    }
     {
         QJsonObject j;
         j["writeChapters"] = config.chapter.writeChapters;