chore: version 7.11.1

Bionus · Jun 25, 2023 · 13494dc · 13494dc
2 parents 2628a9c + aa02977
commit 13494dc
Show file tree

Hide file tree

Showing 17 changed files with 518 additions and 268 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -583,7 +583,7 @@ jobs:
         export ANDROID_NDK_ROOT="${ANDROID_HOME}/ndk/${ANDROID_NDK_VERSION}"
         cmake ../src -DCMAKE_BUILD_TYPE=Release -DNIGHTLY=$GRABBER_IS_NIGHTLY -DCOMMIT="$GITHUB_SHA" -DVERSION="$GRABBER_VERSION" -DKEYSTORE_PASSWORD="${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" \
           -DANDROID_ABI:STRING=armeabi-v7a \
-          -DANDROID_BUILD_ABI_arm64-v8a:BOOL=OFF \
+          -DANDROID_BUILD_ABI_arm64-v8a:BOOL=ON \
           -DANDROID_BUILD_ABI_armeabi-v7a:BOOL=ON \
           -DANDROID_BUILD_ABI_x86:BOOL=OFF \
           -DANDROID_BUILD_ABI_x86_64:BOOL=OFF \

diff --git a/docs/_posts/2023-06-25-grabber-7-11-1-released.md b/docs/_posts/2023-06-25-grabber-7-11-1-released.md
@@ -0,0 +1,11 @@
+---
+title: "Grabber 7.11.1 released"
+date: 2023-06-25 16:00 +0200
+categories: release
+---
+
+
+Grabber 7.11.1 has been released.
+
+The list of changes and download links can be found on Github:  
+<https://github.com/Bionus/imgbrd-grabber/releases/tag/v7.11.1>
diff --git a/scripts/windows-setup/setup.iss b/scripts/windows-setup/setup.iss
@@ -22,7 +22,7 @@
 #endif
 
 #ifndef MyAppVersion
-# define MyAppVersion "7.11.0"
+# define MyAppVersion "7.11.1"
 #endif
 
 #ifndef QtApngDll

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -37,7 +37,7 @@ if(TRACE)
 endif()
 
 if((NOT DEFINED VERSION) OR ((DEFINED NIGHTLY) AND (NIGHTLY MATCHES "1")))
-	set(VERSION "7.11.0")
+	set(VERSION "7.11.1")
 else()
 	string(REGEX REPLACE "^v" "" VERSION "${VERSION}")
 endif()

diff --git a/src/dist/linux/org.bionus.Grabber.metainfo.xml b/src/dist/linux/org.bionus.Grabber.metainfo.xml
@@ -43,6 +43,7 @@
 	<url type="contribute">https://github.com/Bionus/imgbrd-grabber/blob/master/CONTRIBUTING.md</url>
 
 	<releases>
+		<release  version="7.11.1" date="2023-06-25" />
 		<release  version="7.11.0" date="2023-06-05" />
 		<release  version="7.10.1" date="2023-01-07" />
 		<release  version="7.10.0" date="2022-12-16" />

diff --git a/src/gui-qml/src/components/GalleryScreen.qml b/src/gui-qml/src/components/GalleryScreen.qml
@@ -89,7 +89,7 @@ Page {
                 onOpenImage: mainStackView.push(imageScreen, { index: index })
                 onRefresh: galleryLoader.load()
                 onAppendNext: {
-                    if (galleryLoader.hasNext) {
+                    if (infiniteScroll && galleryLoader.hasNext) {
                         root.appendResults = true
                         root.page++
                         galleryLoader.load()

diff --git a/src/gui-qml/src/components/SearchScreen.qml b/src/gui-qml/src/components/SearchScreen.qml
@@ -162,7 +162,7 @@ Page {
                 onOpenImage: mainStackView.push(imageScreen, { index: index })
                 onRefresh: load()
                 onAppendNext: {
-                    if (pageLoader.hasNext) {
+                    if (infiniteScroll && pageLoader.hasNext) {
                         searchTab.appendResults = true
                         searchTab.page++
                         searchTab.load()

diff --git a/src/gui-qml/src/components/settings/pages/SaveSettingsPage.qml b/src/gui-qml/src/components/settings/pages/SaveSettingsPage.qml
@@ -68,63 +68,63 @@ ColumnLayout {
     Repeater {
         model: ListModel {
             ListElement {
-                name: globals.tagTypes["general"]
+                name: qsTr("General")
                 key: "general"
                 enableShorter: false
                 defaultEmpty: ""
                 defaultMultiple: ""
                 defaultSeparator: " "
             }
             ListElement {
-                name: globals.tagTypes["artist"]
+                name: qsTr("Artist")
                 key: "artist"
                 enableShorter: false
                 defaultEmpty: "anonymous"
                 defaultMultiple: "multiple artists"
                 defaultSeparator: "+"
             }
             ListElement {
-                name: globals.tagTypes["copyright"]
+                name: qsTr("Copyright")
                 key: "copyright"
                 enableShorter: true
                 defaultEmpty: "misc"
                 defaultMultiple: "crossover"
                 defaultSeparator: "+"
             }
             ListElement {
-                name: globals.tagTypes["character"]
+                name: qsTr("Character")
                 key: "character"
                 enableShorter: false
                 defaultEmpty: "unknown"
                 defaultMultiple: "group"
                 defaultSeparator: "+"
             }
             ListElement {
-                name: globals.tagTypes["model"]
+                name: qsTr("Model")
                 key: "model"
                 enableShorter: false
                 defaultEmpty: "unknown"
                 defaultMultiple: "multiple"
                 defaultSeparator: "+"
             }
             ListElement {
-                name: globals.tagTypes["photo_set"]
+                name: qsTr("Photo set")
                 key: "photo_set"
                 enableShorter: false
                 defaultEmpty: "unknown"
                 defaultMultiple: "multiple"
                 defaultSeparator: "+"
             }
             ListElement {
-                name: globals.tagTypes["species"]
+                name: qsTr("Species")
                 key: "species"
                 enableShorter: false
                 defaultEmpty: "unknown"
                 defaultMultiple: "multiple"
                 defaultSeparator: "+"
             }
             ListElement {
-                name: globals.tagTypes["meta"]
+                name: qsTr("Meta")
                 key: "meta"
                 enableShorter: false
                 defaultEmpty: "none"

diff --git a/src/gui/src/utils/rename-existing/rename-existing-1.cpp b/src/gui/src/utils/rename-existing/rename-existing-1.cpp
@@ -222,7 +222,7 @@ void RenameExisting1::loadNext()
 
 		// Try to load the image details from the full details API if available
 		Api *api = site->fullDetailsApi();
-		if (api != nullptr) {
+		if (api != nullptr && m_useIdKey) {
 			QString url = api->detailsUrl(m_useIdKey ? det.key.toLongLong() : 0, !m_useIdKey ? det.key : "", site).url;
 			log(QStringLiteral("Loading full image details from `%1`").arg(url), Logger::Info);
 			NetworkReply *reply = site->get(url, Site::QueryType::Details);

diff --git a/src/lib/src/analytics.h b/src/lib/src/analytics.h
@@ -3,7 +3,7 @@
 
 #include <QVariantMap>
 #include "vendor/ganalytics.h"
-#include "utils/google-analytics-4.h"
+#include "vendor/qt-google-analytics/qt-google-analytics.h"
 
 
 class QString;
@@ -38,7 +38,7 @@ class Analytics
 
 		bool m_enabled = false;
 		GAnalytics m_googleAnalytics;
-		GoogleAnalytics4 m_ga4;
+		QtGoogleAnalytics m_ga4;
 };
 
 #endif // ANALYTICS_H
diff --git a/src/lib/src/utils/google-analytics-4.cpp b/src/lib/src/utils/google-analytics-4.cpp