chore: version 7.10.1

Bionus · Jan 7, 2023 · 71bdba6 · 71bdba6
2 parents 5b76b1c + b010a1e
commit 71bdba6
Show file tree

Hide file tree

Showing 107 changed files with 549 additions and 1,709 deletions.
diff --git a/.github/workflows/homebrew-release.yml b/.github/workflows/homebrew-release.yml
@@ -0,0 +1,33 @@
+name: Homebrew release
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+
+env:
+  BREW_TAP: Bionus/imgbrd-grabber
+  BREW_CASK: imgbrd-grabber
+  HOMEBREW_GIT_NAME: Bionus
+  HOMEBREW_GIT_EMAIL: bio.nus@hotmail.fr
+  HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_TOKEN }}
+
+jobs:
+  homebrew-release:
+    name: Homebrew release
+    runs-on: macos-latest
+
+    steps:
+      - name: Tap repository
+        run: brew tap ${{ env.BREW_TAP }} "https://Bionus:${{ secrets.HOMEBREW_TOKEN }}@github.com/Bionus/homebrew-imgbrd-grabber.git"
+
+      - name: Check new version
+        id: version
+        run: |
+          VERSION=$(brew livecheck --cask --quiet --newer-only --full-name --json --tap=${{ env.BREW_TAP }} ${{ env.BREW_CASK }} | jq -r ".[0].version.latest//empty")
+          echo "Version $VERSION"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+
+      - name: Create bump PR
+        if: steps.version.outputs.version != ''
+        run: brew bump-cask-pr --no-fork --no-audit --no-browse --version=${{ steps.version.outputs.version }} ${{ env.BREW_CASK }}
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 # Grabber
 *.qm
+src/cmake/android_openssl/
 src/e2e/viewer/result.json
 src/sites/helper.js
 src/sites/*/model.js

diff --git a/.gitmodules b/.gitmodules
@@ -5,7 +5,7 @@
 	path = src/cmake/cotire
 	url = https://github.com/sakra/cotire.git
 [submodule "tests/src/vendor/catch"]
-	path = src/tests/src/vendor/catch
+	path = src/tests/vendor/catch
 	url = https://github.com/catchorg/Catch2.git
 	branch = v2.x
 [submodule "lib/vendor/lexbor"]

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 [![GitHub issues](https://img.shields.io/github/issues/Bionus/imgbrd-grabber.svg)](https://github.com/Bionus/imgbrd-grabber/issues)
 [![Donate with PayPal](https://img.shields.io/badge/paypal-donate-orange.svg)](https://www.paypal.me/jvasti)
 [![Donate with Patreon](https://img.shields.io/badge/patreon-donate-orange.svg)](https://www.patreon.com/bionus)
-[![Build Status](https://img.shields.io/github/workflow/status/Bionus/imgbrd-grabber/Build)](https://github.com/Bionus/imgbrd-grabber/actions)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/Bionus/imgbrd-grabber/build.yml)](https://github.com/Bionus/imgbrd-grabber/actions)
 [![Code Coverage](https://img.shields.io/codecov/c/github/Bionus/imgbrd-grabber.svg)](https://codecov.io/gh/Bionus/imgbrd-grabber)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/044edd1462094c6e8d35cb0bcdd86a2b)](https://www.codacy.com/app/bionus/imgbrd-grabber)
 [![Project license](https://img.shields.io/github/license/bionus/imgbrd-grabber.svg)](https://raw.githubusercontent.com/Bionus/imgbrd-grabber/develop/LICENSE)

diff --git a/docs/_posts/2023-01-07-grabber-7-10-1-released.md b/docs/_posts/2023-01-07-grabber-7-10-1-released.md
@@ -0,0 +1,11 @@
+---
+title: "Grabber 7.10.1 released"
+date: 2023-01-07 18:00 +0100
+categories: release
+---
+
+
+Grabber 7.10.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.10.1>
diff --git a/docs/index.md b/docs/index.md
@@ -48,7 +48,9 @@ Grabber works on Windows, Mac, and Linux.
 
 {% for asset in site.github.latest_release.assets %}
 {% if asset.name contains '.AppImage' %}
+{% unless asset.name contains '.AppImage.zsync' %}
 [Linux (AppImage)]({{ asset.browser_download_url }})
+{% endunless %}
 {% endif %}
 {% endfor %}
 
@@ -57,11 +59,17 @@ Grabber works on Windows, Mac, and Linux.
 [Linux (tar.gz)]({{ asset.browser_download_url }})
 {% endif %}
 {% endfor %}
+
+[Linux (Flathub)](https://flathub.org/apps/details/org.bionus.Grabber)
+
+[Arch Linux (AUR)]({{ site.baseurl }}{% link _docs/install/linux.md %}#via-the-aur-arch-linux)
 </div>
 
 <div class="download" markdown="1">
 ![MacOS](assets/img/downloads/macos.png)
 
+[MacOS (homebrew)]({{ site.baseurl }}{% link _docs/install/macos.md %}#via-homebrew)
+
 {% for asset in site.github.latest_release.assets %}
 {% if asset.name contains '.dmg' %}
 [MacOS (dmg)]({{ asset.browser_download_url }})

diff --git a/scripts/windows-setup/setup.iss b/scripts/windows-setup/setup.iss
@@ -22,7 +22,7 @@
 #endif
 
 #ifndef MyAppVersion
-# define MyAppVersion "7.10.0"
+# define MyAppVersion "7.10.1"
 #endif
 
 #ifndef QtApngDll

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

diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
@@ -2,13 +2,21 @@ project(cli)
 
 add_definitions(-DCLI=1)
 
-find_package(Qt5 COMPONENTS Network REQUIRED)
-set(QT_LIBRARIES Qt5::Core Qt5::Network)
+find_package(Qt5 COMPONENTS Gui Network REQUIRED)
+set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Network)
 
 file(GLOB_RECURSE SOURCES "src/*.cpp")
 include_directories("src/" "../lib/src/" "..")
 
+# CLI library (to be included in the CLI executable)
+add_library(${PROJECT_NAME}-lib STATIC ${SOURCES})
+target_link_libraries(${PROJECT_NAME}-lib ${QT_LIBRARIES} ${LIBS})
+
+# CLI executable
 add_executable(${PROJECT_NAME} ${SOURCES})
 target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} lib)
 set_target_properties(${PROJECT_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/cli/$<0:>" OUTPUT_NAME "Grabber-cli")
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+
+# Tests
+add_subdirectory(tests)
diff --git a/src/lib/src/cli/commands/cli-command.cpp → src/cli/src/cli-commands/cli-command.cpp b/src/lib/src/cli/commands/cli-command.cpp → src/cli/src/cli-commands/cli-command.cpp
diff --git a/src/lib/src/cli/commands/cli-command.h → src/cli/src/cli-commands/cli-command.h b/src/lib/src/cli/commands/cli-command.h → src/cli/src/cli-commands/cli-command.h
diff --git a/.../commands/download-images-cli-command.cpp → ...-commands/download-images-cli-command.cpp b/.../commands/download-images-cli-command.cpp → ...-commands/download-images-cli-command.cpp
@@ -3,7 +3,7 @@
 #include <QList>
 #include <utility>
 #include "downloader/image-downloader.h"
-#include "downloader/printers/printer.h"
+#include "printers/printer.h"
 #include "logger.h"
 
 

diff --git a/...li/commands/download-images-cli-command.h → ...li-commands/download-images-cli-command.h b/...li/commands/download-images-cli-command.h → ...li-commands/download-images-cli-command.h
diff --git a/.../cli/commands/get-details-cli-command.cpp → .../cli-commands/get-details-cli-command.cpp b/.../cli/commands/get-details-cli-command.cpp → .../cli-commands/get-details-cli-command.cpp
@@ -3,7 +3,7 @@
 #include "cli-command.h"
 #include "logger.h"
 #include "models/image.h"
-#include "downloader/printers/printer.h"
+#include "printers/printer.h"
 
 
 GetDetailsCliCommand::GetDetailsCliCommand(Profile *profile, Printer *printer, const QList<Site*> &sites, const QString &pageUrl, QObject *parent)

diff --git a/...rc/cli/commands/get-details-cli-command.h → ...rc/cli-commands/get-details-cli-command.h b/...rc/cli/commands/get-details-cli-command.h → ...rc/cli-commands/get-details-cli-command.h
diff --git a/...c/cli/commands/get-images-cli-command.cpp → ...c/cli-commands/get-images-cli-command.cpp b/...c/cli/commands/get-images-cli-command.cpp → ...c/cli-commands/get-images-cli-command.cpp
@@ -1,7 +1,7 @@
 #include "get-images-cli-command.h"
 #include <QList>
 #include <utility>
-#include "downloader/printers/printer.h"
+#include "printers/printer.h"
 #include "logger.h"
 #include "models/page.h"
 

diff --git a/...src/cli/commands/get-images-cli-command.h → ...src/cli-commands/get-images-cli-command.h b/...src/cli/commands/get-images-cli-command.h → ...src/cli-commands/get-images-cli-command.h
diff --git a/...i/commands/get-page-count-cli-command.cpp → ...i-commands/get-page-count-cli-command.cpp b/...i/commands/get-page-count-cli-command.cpp → ...i-commands/get-page-count-cli-command.cpp
@@ -1,7 +1,7 @@
 #include "get-page-count-cli-command.h"
 #include <QList>
 #include <utility>
-#include "downloader/printers/printer.h"
+#include "printers/printer.h"
 #include "logger.h"
 #include "models/page.h"
 

diff --git a/...cli/commands/get-page-count-cli-command.h → ...cli-commands/get-page-count-cli-command.h b/...cli/commands/get-page-count-cli-command.h → ...cli-commands/get-page-count-cli-command.h
diff --git a/...li/commands/get-page-tags-cli-command.cpp → ...li-commands/get-page-tags-cli-command.cpp b/...li/commands/get-page-tags-cli-command.cpp → ...li-commands/get-page-tags-cli-command.cpp
@@ -1,7 +1,7 @@
 #include "get-page-tags-cli-command.h"
 #include <QList>
 #include <utility>
-#include "downloader/printers/printer.h"
+#include "printers/printer.h"
 #include "logger.h"
 #include "models/page.h"
 

diff --git a/.../cli/commands/get-page-tags-cli-command.h → .../cli-commands/get-page-tags-cli-command.h b/.../cli/commands/get-page-tags-cli-command.h → .../cli-commands/get-page-tags-cli-command.h
diff --git a/...src/cli/commands/get-tags-cli-command.cpp → ...src/cli-commands/get-tags-cli-command.cpp b/...src/cli/commands/get-tags-cli-command.cpp → ...src/cli-commands/get-tags-cli-command.cpp
@@ -3,7 +3,7 @@
 #include <QList>
 #include <QtMath>
 #include "cli-command.h"
-#include "downloader/printers/printer.h"
+#include "printers/printer.h"
 #include "logger.h"
 #include "models/site.h"
 #include "tags/tag-api.h"

diff --git a/...b/src/cli/commands/get-tags-cli-command.h → ...i/src/cli-commands/get-tags-cli-command.h b/...b/src/cli/commands/get-tags-cli-command.h → ...i/src/cli-commands/get-tags-cli-command.h
diff --git a/...ommands/load-tag-database-cli-command.cpp → ...ommands/load-tag-database-cli-command.cpp b/...ommands/load-tag-database-cli-command.cpp → ...ommands/load-tag-database-cli-command.cpp
diff --git a/.../commands/load-tag-database-cli-command.h → ...-commands/load-tag-database-cli-command.h b/.../commands/load-tag-database-cli-command.h → ...-commands/load-tag-database-cli-command.h
diff --git a/...b/src/cli/commands/search-cli-command.cpp → ...i/src/cli-commands/search-cli-command.cpp b/...b/src/cli/commands/search-cli-command.cpp → ...i/src/cli-commands/search-cli-command.cpp
diff --git a/...lib/src/cli/commands/search-cli-command.h → ...cli/src/cli-commands/search-cli-command.h b/...lib/src/cli/commands/search-cli-command.h → ...cli/src/cli-commands/search-cli-command.h
diff --git a/...li/commands/search-images-cli-command.cpp → ...li-commands/search-images-cli-command.cpp b/...li/commands/search-images-cli-command.cpp → ...li-commands/search-images-cli-command.cpp
diff --git a/.../cli/commands/search-images-cli-command.h → .../cli-commands/search-images-cli-command.h b/.../cli/commands/search-images-cli-command.h → .../cli-commands/search-images-cli-command.h
diff --git a/src/lib/src/cli/cli.cpp → src/cli/src/cli.cpp b/src/lib/src/cli/cli.cpp → src/cli/src/cli.cpp
@@ -5,16 +5,16 @@
 #include <QStringList>
 #include <QTimer>
 #include <QUrl>
-#include "cli/cli.h"
-#include "cli/commands/download-images-cli-command.h"
-#include "cli/commands/get-details-cli-command.h"
-#include "cli/commands/get-images-cli-command.h"
-#include "cli/commands/get-page-count-cli-command.h"
-#include "cli/commands/get-page-tags-cli-command.h"
-#include "cli/commands/get-tags-cli-command.h"
-#include "cli/commands/load-tag-database-cli-command.h"
-#include "downloader/printers/json-printer.h"
-#include "downloader/printers/simple-printer.h"
+#include "cli.h"
+#include "cli-commands/download-images-cli-command.h"
+#include "cli-commands/get-details-cli-command.h"
+#include "cli-commands/get-images-cli-command.h"
+#include "cli-commands/get-page-count-cli-command.h"
+#include "cli-commands/get-page-tags-cli-command.h"
+#include "cli-commands/get-tags-cli-command.h"
+#include "cli-commands/load-tag-database-cli-command.h"
+#include "printers/json-printer.h"
+#include "printers/simple-printer.h"
 #include "logger.h"
 #include "models/filtering/blacklist.h"
 #include "models/profile.h"
@@ -31,10 +31,9 @@ int parseAndRunCliArgs(QCoreApplication *app, Profile *profile, bool defaultToGu
 	parser.addHelpOption();
 	parser.addVersionOption();
 
-	QCommandLineOption *cliOption = nullptr;
+	const QCommandLineOption cliOption(QStringList() << "c" << "cli", "Disable the GUI.");
 	if (defaultToGui) {
-		cliOption = new QCommandLineOption(QStringList() << "c" << "cli", "Disable the GUI.");
-		parser.addOption(*cliOption);
+		parser.addOption(cliOption);
 	}
 
 	const QCommandLineOption tagsOption(QStringList() << "t" << "tags", "Tags to search for.", "tags");
@@ -96,7 +95,7 @@ int parseAndRunCliArgs(QCoreApplication *app, Profile *profile, bool defaultToGu
 
 	parser.process(*app);
 
-	const bool gui = defaultToGui && !parser.isSet(*cliOption);
+	const bool gui = defaultToGui && !parser.isSet(cliOption);
 
 	// Log messages output and level
 	const bool verbose = parser.isSet(verboseOption);

diff --git a/src/lib/src/cli/cli.h → src/cli/src/cli.h b/src/lib/src/cli/cli.h → src/cli/src/cli.h
diff --git a/src/cli/src/main.cpp b/src/cli/src/main.cpp
@@ -5,7 +5,7 @@
 #include <QStringList>
 #include "functions.h"
 #include "models/profile.h"
-#include "cli/cli.h"
+#include "cli.h"
 
 
 int main(int argc, char *argv[])

diff --git a/.../src/downloader/printers/json-printer.cpp → src/cli/src/printers/json-printer.cpp b/.../src/downloader/printers/json-printer.cpp → src/cli/src/printers/json-printer.cpp
diff --git a/...ib/src/downloader/printers/json-printer.h → src/cli/src/printers/json-printer.h b/...ib/src/downloader/printers/json-printer.h → src/cli/src/printers/json-printer.h
diff --git a/src/lib/src/downloader/printers/printer.h → src/cli/src/printers/printer.h b/src/lib/src/downloader/printers/printer.h → src/cli/src/printers/printer.h
diff --git a/...rc/downloader/printers/simple-printer.cpp → src/cli/src/printers/simple-printer.cpp b/...rc/downloader/printers/simple-printer.cpp → src/cli/src/printers/simple-printer.cpp
diff --git a/.../src/downloader/printers/simple-printer.h → src/cli/src/printers/simple-printer.h b/.../src/downloader/printers/simple-printer.h → src/cli/src/printers/simple-printer.h