Version 7.10.0

Bionus · Dec 16, 2022 · 5b76b1c · 5b76b1c
2 parents f50175a + aef453a
commit 5b76b1c
Show file tree

Hide file tree

Showing 159 changed files with 18,203 additions and 11,022 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -77,4 +77,4 @@ If you want to ensure your pull request is merged in a timely manner, it is bett
 
 ## Translations
 
-Check the [Translation](https://bionus.github.io/imgbrd-grabber/docs/plugins/translation.html) documentation page for information on how to add or update a translation.
+Check the [translation documentation page](https://www.bionus.org/imgbrd-grabber/docs/plugins/translation.html) for information on how to add or update a translation.
diff --git a/README.md b/README.md
@@ -25,19 +25,16 @@ You can download the latest release [here](https://github.com/Bionus/imgbrd-grab
 
 For users interested, a nightly version is built automatically on every commit on the `develop` branch, and can be downloaded [here](https://github.com/Bionus/imgbrd-grabber/releases/nightly). Note that it might be less stable than official releases, so use at your own risk.
 
-### Installation on Arch Linux
-For Arch Linux users, there are packages on the AUR
-* [imgbrd-grabber-bin](https://aur.archlinux.org/packages/imgbrd-grabber-bin) which pulls the latest `tar.gz` release.
-* [imgbrd-grabber-appimage](https://aur.archlinux.org/packages/imgbrd-grabber-appimage) which pulls the latest `appimage` release.
-* [imgbrd-grabber](https://aur.archlinux.org/packages/imgbrd-grabber) which builds the package from source.
-
-Install by issuing the command, substituting the package you want to install: `paru -Sy imgbrd-grabber-bin`
+* [Install steps for Windows](https://www.bionus.org/imgbrd-grabber/docs/install/windows.html)
+* [Install steps for Linux](https://www.bionus.org/imgbrd-grabber/docs/install/linux.html)
+* [Install steps for MacOS](https://www.bionus.org/imgbrd-grabber/docs/install/macos.html)
+* [Install steps for Android](https://www.bionus.org/imgbrd-grabber/docs/install/android.html)
 
 ## Features
 
 ### Browse
 
-[<img src="https://bionus.github.io/imgbrd-grabber/assets/img/screenshots/search-basic-thumb.png" align="right" />](https://bionus.github.io/imgbrd-grabber/assets/img/screenshots/search-basic.png)
+[<img src="https://www.bionus.org/imgbrd-grabber/assets/img/screenshots/search-basic-thumb.png" align="right" />](https://www.bionus.org/imgbrd-grabber/assets/img/screenshots/search-basic.png)
 
 * Tabs to make multiple searches at the same time
 * Able to show results from multiple imageboards at the same time in a single tab
@@ -50,7 +47,7 @@ Install by issuing the command, substituting the package you want to install: `p
 
 ### Download
 
-[<img src="https://bionus.github.io/imgbrd-grabber/assets/img/screenshots/download-thumb.png" align="right" />](https://bionus.github.io/imgbrd-grabber/assets/img/screenshots/download.png)
+[<img src="https://www.bionus.org/imgbrd-grabber/assets/img/screenshots/download-thumb.png" align="right" />](https://www.bionus.org/imgbrd-grabber/assets/img/screenshots/download.png)
 
 * Download thousands of images at once
 * Download single images using their MD5 or ID
@@ -64,11 +61,11 @@ Install by issuing the command, substituting the package you want to install: `p
 
 ### Customize
 
-[<img src="https://bionus.github.io/imgbrd-grabber/assets/img/screenshots/sources-thumb.png" align="right" />](https://bionus.github.io/imgbrd-grabber/assets/img/screenshots/sources.png)
+[<img src="https://www.bionus.org/imgbrd-grabber/assets/img/screenshots/sources-thumb.png" align="right" />](https://www.bionus.org/imgbrd-grabber/assets/img/screenshots/sources.png)
 
 * Add your own imageboards very easily
 * Authentication for sources behind a login wall
-* Theme support using CSS. See [Themes](https://bionus.github.io/imgbrd-grabber/docs/plugins/theme.html) for details.
+* Theme support using CSS. See [Themes](https://www.bionus.org/imgbrd-grabber/docs/plugins/theme.html) for details.
 * Lots of options to customize the program's behaviour
 
 <p>&nbsp;</p>
@@ -77,13 +74,13 @@ Install by issuing the command, substituting the package you want to install: `p
 
 ### Organize
 
-[<img src="https://bionus.github.io/imgbrd-grabber/assets/img/screenshots/filename-thumb.png" align="right" />](https://bionus.github.io/imgbrd-grabber/assets/img/screenshots/filename.png)
+[<img src="https://www.bionus.org/imgbrd-grabber/assets/img/screenshots/filename-thumb.png" align="right" />](https://www.bionus.org/imgbrd-grabber/assets/img/screenshots/filename.png)
 
-* Save images using a custom format, for example `%artist%/%copyright%/%character%/%md5%.%ext%`, or using JavaScript code. See [Filename](https://bionus.github.io/imgbrd-grabber/docs/filename.html) for details.
+* Save images using a custom format, for example `%artist%/%copyright%/%character%/%md5%.%ext%`, or using JavaScript code. See [Filename](https://www.bionus.org/imgbrd-grabber/docs/filename.html) for details.
 * Favorite tags to keep track of new images
 * "View it later" tags to save a search for later
-* Support saving images directly to a local booru, such as [Szurubooru](https://bionus.github.io/imgbrd-grabber/docs/commands/szurubooru.html), [MyImouto](https://bionus.github.io/imgbrd-grabber/docs/commands/my-imouto.html), [Gelbooru](https://bionus.github.io/imgbrd-grabber/docs/commands/gelbooru.html), or [Shimmie](https://bionus.github.io/imgbrd-grabber/docs/commands/shimmie.html).
-* Can add entries to a database for each image or tag while downloading. See [Commands](https://bionus.github.io/imgbrd-grabber/docs/commands/) for details.
+* Support saving images directly to a local booru, such as [Szurubooru](https://www.bionus.org/imgbrd-grabber/docs/commands/szurubooru.html), [MyImouto](https://www.bionus.org/imgbrd-grabber/docs/commands/my-imouto.html), [Gelbooru](https://www.bionus.org/imgbrd-grabber/docs/commands/gelbooru.html), or [Shimmie](https://www.bionus.org/imgbrd-grabber/docs/commands/shimmie.html).
+* Can add entries to a database for each image or tag while downloading. See [Commands](https://www.bionus.org/imgbrd-grabber/docs/commands/) for details.
 * Conditional filenames triggered by a tag
 * Rename already downloaded images
 

diff --git a/docs/_data/docs_navigation.yml b/docs/_data/docs_navigation.yml
@@ -1,3 +1,9 @@
+- name: Installation
+  children:
+    - link: /docs/install/windows.html
+    - link: /docs/install/linux.html
+    - link: /docs/install/macos.html
+    - link: /docs/install/android.html
 - name: Basics
   children:
     - link: /docs/

diff --git a/docs/_docs/index.md b/docs/_docs/index.md
@@ -6,25 +6,10 @@ permalink: /docs/
 
 # Installation
 
-## Windows
-
-1. Download the latest Windows installer [here](https://github.com/Bionus/imgbrd-grabber/releases/latest).
-2. Launch the installer, then follow the instructions. By default, the program will be installed to "C:/Program Files/Grabber" (note that all your settings will be stored in "%USERPROFILE%/AppData/Local/Bionus/Grabber").
-3. If you haven't left the "start Grabber" checked at the end of the installation, go to the installation folder, then launch "Grabber.exe" (or use the shortcut created on the desktop during the installation).
-
-## Arch Linux
-For Arch Linux users, there are packages on the AUR
-* [imgbrd-grabber-bin](https://aur.archlinux.org/packages/imgbrd-grabber-bin) which pulls the latest `tar.gz` release.
-* [imgbrd-grabber-appimage](https://aur.archlinux.org/packages/imgbrd-grabber-appimage) which pulls the latest `appimage` release.
-* [imgbrd-grabber](https://aur.archlinux.org/packages/imgbrd-grabber) which builds the package from source.
-
-Install by issuing the command, substituting the package you want to install: `paru -Sy imgbrd-grabber-bin`
-
-## Linux
-Compile Grabber by following the instructions on the [Compilation]({{ site.baseurl }}{% link _docs/compilation.md %}#linux) page. Upon completion run `make install`.
-
-### Linux Configuration
-After installation you will need to copy the example configuration files from `$INSTALLATIONPREFIX/Grabber/example/` to your local Grabber directory, usually `~/.Grabber/`. Grabber will not run without these files.
+* [Install steps for Windows]({{ site.baseurl }}{% link _docs/install/windows.md %})
+* [Install steps for Linux]({{ site.baseurl }}{% link _docs/install/linux.md %})
+* [Install steps for MacOS]({{ site.baseurl }}{% link _docs/install/macos.md %})
+* [Install steps for Android]({{ site.baseurl }}{% link _docs/install/android.md %})
 
 # Usage
 

diff --git a/docs/_docs/install/android.md b/docs/_docs/install/android.md
@@ -0,0 +1,12 @@
+---
+title: Android
+---
+
+
+# Installing Grabber on Android
+
+## Via the APK
+1. Go to the latest release [here](https://github.com/Bionus/imgbrd-grabber/releases/latest)
+2. Download the `.apk` file
+3. Install it
+4. Run the application called `Grabber`
diff --git a/docs/_docs/install/linux.md b/docs/_docs/install/linux.md
@@ -0,0 +1,40 @@
+---
+title: Linux
+---
+
+
+# Installing Grabber on Linux
+
+## Via the AppImage
+1. Go to the latest release [here](https://github.com/Bionus/imgbrd-grabber/releases/latest)
+2. Download the `.AppImage` file
+3. Make it executable using the command:
+    ```
+    chmod +x Grabber_*-x86_64.AppImage
+    ```
+4. Double click on the AppImage file to start Grabber
+
+## Via the pre-built binary archive
+1. Go to the latest release [here](https://github.com/Bionus/imgbrd-grabber/releases/latest)
+2. Download the `.tar.gz` file
+3. Extract it anywhere using the command:
+    ```
+    tar -xzf Grabber_*.tar.gz
+    ```
+4. Launch the `Grabber` executable to start Grabber
+
+ℹ️ Grabber requires Qt5 libraries to run. If you see a "error while loading shared libraries" error, make sure you have the Qt5 packages installed. On Ubuntu, they can be installed with:
+```
+sudo apt install libqt5gui5 libqt5qml5 libqt5xml5 libqt5networkauth5 libqt5sql5 libqt5multimedia5 libqt5multimediawidgets5
+```
+
+## Via the AUR (Arch Linux)
+Grabber has packages on the AUR for Arch Linux:
+* [imgbrd-grabber-bin](https://aur.archlinux.org/packages/imgbrd-grabber-bin) which pulls the latest `tar.gz` release.
+* [imgbrd-grabber-appimage](https://aur.archlinux.org/packages/imgbrd-grabber-appimage) which pulls the latest `appimage` release.
+* [imgbrd-grabber](https://aur.archlinux.org/packages/imgbrd-grabber) which builds the package from source.
+
+You can install Grabber by running this command, substituting the package you want to install:
+```
+paru -Sy imgbrd-grabber-bin
+```
diff --git a/docs/_docs/install/macos.md b/docs/_docs/install/macos.md
@@ -0,0 +1,27 @@
+---
+title: MacOS
+---
+
+
+# Installing Grabber on MacOS
+
+## Via Homebrew
+1. Install [Homebrew](https://brew.sh/)
+2. Add the Grabber tap using the command:
+    ```
+    brew tap Bionus/imgbrd-grabber
+    ```
+3. Install the Grabber cask using the command:
+    ```
+    brew install imgbrd-grabber
+    ```
+
+## Via the DMG
+1. Go to the latest release [here](https://github.com/Bionus/imgbrd-grabber/releases/latest)
+2. Download the `.dmg` file
+3. Open the `.dmg` file
+4. Drag and drop the `Grabber.app` file to your `Applications` directory
+5. Eject and remove the `.dmg` file
+5. Launch Grabber via Launchpad
+
+⚠️ Grabber is not a verified Apple application, so you might get a "the developer cannot be verified" error. In that case, you should open Finder, go to your `Applications` directory, then right click `Grabber.app` then choose "Open". Then, you'll be able to choose "Open" to start Grabber anyway. You only need to do this once. More information [here](https://support.apple.com/guide/mac-help/open-a-mac-app-from-an-unidentified-developer-mh40616/mac).
diff --git a/docs/_docs/install/windows.md b/docs/_docs/install/windows.md
@@ -0,0 +1,20 @@
+---
+title: Windows
+---
+
+
+# Installing Grabber on Windows
+
+## Via the installer
+1. Go to the latest release [here](https://github.com/Bionus/imgbrd-grabber/releases/latest)
+2. Download the `.exe` file corresponding to your CPU architecture,`x64` for 64-bit, `x86` for 32-bit (if you're not sure, you likely have a 64-bit CPU)
+3. Launch the installer and follow the steps
+4. If you haven't left the "start Grabber" checked at the end of the installation, go to the installation folder then launch `Grabber.exe` (or use the shortcut created on the desktop during the installation).
+
+ℹ️ By default, the program will be installed to `C:/Program Files/Grabber` and your settings will be stored in `%LocalAppData%/Bionus/Grabber`
+
+## Via the portable version
+1. Go to the latest release [here](https://github.com/Bionus/imgbrd-grabber/releases/latest)
+2. Download the `.zip` file corresponding to your CPU architecture,`x64` for 64-bit, `x86` for 32-bit (if you're not sure, you likely have a 64-bit CPU)
+3. Extract the archive anywhere on your computer
+4. Launch `Grabber.exe`
diff --git a/docs/_posts/2021-01-21-tag-databases.md b/docs/_posts/2021-01-21-tag-databases.md
@@ -8,7 +8,7 @@ Hey everyone!
 
 &nbsp;
 
-Tag databases, while documented [on this very website](https://bionus.github.io/imgbrd-grabber/docs/tools/tag-loader.html), is a little-known feature of Grabber.
+Tag databases, while documented [on this very website](https://www.bionus.org/imgbrd-grabber/docs/tools/tag-loader.html), is a little-known feature of Grabber.
 However, they are very useful, and as such there is ongoing work to make them more easy to use.
 
 <!--more-->

diff --git a/docs/_posts/2022-12-16-grabber-7-10-0-released.md b/docs/_posts/2022-12-16-grabber-7-10-0-released.md
@@ -0,0 +1,11 @@
+---
+title: "Grabber 7.10.0 released"
+date: 2022-12-16 22:00 +0100
+categories: release
+---
+
+
+Grabber 7.10.0 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.0>
diff --git a/docs/_sources/mastodon.md b/docs/_sources/mastodon.md
@@ -11,4 +11,13 @@ title: Mastodon
 * `search`: search for statuses matching the search (requires login)
 * `user_id:ID`: get all media for a given user ID
 
-_Note: getting an user ID on Mastodon is not trivial. You can do it by opening a status from a given user, then opening `https://domain/api/v1/statuses/STATUS_ID`. There, you'll see the user ID in the "account.id" JSON field._
+_Note: getting an user ID on Mastodon is not trivial. You can do it by opening a status from a given user, then opening `https://domain/api/v1/statuses/STATUS_ID`. There, you'll see the user ID in the "account.id" JSON field._
+## Login
+
+You need an OAuth app to login. To do so, you need to have cURL (or equivalent) installed, and run this command:
+
+```
+curl -X POST -F "client_name=Grabber" -F "redirect_uris=http://127.0.0.1/" https://pawoo.net/api/v1/apps
+```
+
+The output will output a `client_id` and `client_secret` that you can use for the OAuth login.
diff --git a/docs/index.md b/docs/index.md
@@ -188,7 +188,7 @@ Behoimi
 
 * Add your own imageboards very easily
 * Authentication for sources behind a login wall
-* Theme support using CSS. See [Themes](https://bionus.github.io/imgbrd-grabber/docs/plugins/theme.html) for details.
+* Theme support using CSS. See [Themes](https://www.bionus.org/imgbrd-grabber/docs/plugins/theme.html) for details.
 * Lots of options to customize the program's behaviour
 </div>
 
@@ -197,11 +197,11 @@ Behoimi
 
 ## Organize
 
-* Save images using a custom format, for example `%artist%/%copyright%/%character%/%md5%.%ext%`, or using Javascript code. See [Filename](https://bionus.github.io/imgbrd-grabber/docs/filename.html) for details.
+* Save images using a custom format, for example `%artist%/%copyright%/%character%/%md5%.%ext%`, or using Javascript code. See [Filename](https://www.bionus.org/imgbrd-grabber/docs/filename.html) for details.
 * Favorite tags to keep track of new images
 * "View it later" tags to save a search for later
-* Support saving images directly to a local booru, such as [Szurubooru](https://bionus.github.io/imgbrd-grabber/docs/commands/szurubooru.html), [MyImouto](https://bionus.github.io/imgbrd-grabber/docs/commands/my-imouto.html), [Gelbooru](https://bionus.github.io/imgbrd-grabber/docs/commands/gelbooru.html), or [Shimmie](https://bionus.github.io/imgbrd-grabber/docs/commands/shimmie.html).
-* Can add entries to a database for each image or tag while downloading. See [Commands](https://bionus.github.io/imgbrd-grabber/docs/commands/) for details.
+* Support saving images directly to a local booru, such as [Szurubooru](https://www.bionus.org/imgbrd-grabber/docs/commands/szurubooru.html), [MyImouto](https://www.bionus.org/imgbrd-grabber/docs/commands/my-imouto.html), [Gelbooru](https://www.bionus.org/imgbrd-grabber/docs/commands/gelbooru.html), or [Shimmie](https://www.bionus.org/imgbrd-grabber/docs/commands/shimmie.html).
+* Can add entries to a database for each image or tag while downloading. See [Commands](https://www.bionus.org/imgbrd-grabber/docs/commands/) for details.
 * Conditional filenames triggered by a tag
 * Rename already downloaded images
 </div>

diff --git a/scripts/package-appimage.sh b/scripts/package-appimage.sh
@@ -14,8 +14,9 @@ popd
 
 # See https://github.com/probonopd/linuxdeployqt
 export VERSION=$GRABBER_VERSION
-./vendor/linuxdeployqt.AppImage "$APP_DIR/usr/share/applications/grabber.desktop" -appimage
+./vendor/linuxdeployqt.AppImage "$APP_DIR/usr/share/applications/org.bionus.Grabber.desktop" -appimage -updateinformation="gh-releases-zsync|Bionus|imgbrd-grabber|latest|Grabber_*-x86_64.AppImage.zsync"
 mv "Grabber-$VERSION-x86_64.AppImage" "Grabber_$VERSION-x86_64.AppImage"
+mv "Grabber-$VERSION-x86_64.AppImage.zsync" "Grabber_$VERSION-x86_64.AppImage.zsync"
 
 # Cleanup
 rm -rf $APP_DIR
diff --git a/scripts/package-windows.bat b/scripts/package-windows.bat
@@ -3,8 +3,9 @@
 :: Copy all required files to the release directory
 bash scripts/package.sh "release"
 rmdir /S /Q "release/sites/"
-xcopy /I /E /Y /EXCLUDE:src\sites\exclude_xcopy.txt "src/sites" "release/sites/"
-xcopy /I /E /Y /K /H "src/dist/windows" "release"
+mkdir "release/sites"
+xcopy /I /E /Y /K /F /EXCLUDE:src\sites\exclude_xcopy.txt "src/sites" "release/sites/"
+xcopy /I /E /Y /K /F /H "src/dist/windows" "release"
 
 :: Add Qt DLL and files
 %Qt5_Dir%/bin/windeployqt --dir "release" "release/Grabber.exe" --release --no-quick-import --angle --no-opengl-sw

diff --git a/scripts/windows-setup/setup.iss b/scripts/windows-setup/setup.iss
@@ -22,7 +22,7 @@
 #endif
 
 #ifndef MyAppVersion
-# define MyAppVersion "7.9.1"
+# define MyAppVersion "7.10.0"
 #endif
 
 #ifndef QtApngDll
@@ -115,6 +115,7 @@ Source: "{#QtDir}\Qt5MultimediaWidgets.dll";    DestDir: "{app}"; Flags: ignorev
 Source: "{#QtDir}\Qt5Network.dll";              DestDir: "{app}"; Flags: ignoreversion
 Source: "{#QtDir}\Qt5NetworkAuth.dll";          DestDir: "{app}"; Flags: ignoreversion
 Source: "{#QtDir}\Qt5OpenGL.dll";               DestDir: "{app}"; Flags: ignoreversion
+Source: "{#QtDir}\Qt5PrintSupport.dll";         DestDir: "{app}"; Flags: ignoreversion
 Source: "{#QtDir}\Qt5Qml.dll";                  DestDir: "{app}"; Flags: ignoreversion
 Source: "{#QtDir}\Qt5Sql.dll";                  DestDir: "{app}"; Flags: ignoreversion
 Source: "{#QtDir}\Qt5Svg.dll";                  DestDir: "{app}"; Flags: ignoreversion
@@ -246,6 +247,9 @@ Source: "{#SrcDir}\sites\Reddit\www.reddit.com\defaults.ini";              DestD
 Source: "{#SrcDir}\sites\Shimmie\icon.png";   DestDir: "{app}\sites\Shimmie"; Flags: ignoreversion
 Source: "{#SrcDir}\sites\Shimmie\model.js";   DestDir: "{app}\sites\Shimmie"; Flags: ignoreversion
 Source: "{#SrcDir}\sites\Shimmie\sites.txt";  DestDir: "{app}\sites\Shimmie"; Flags: ignoreversion
+Source: "{#SrcDir}\sites\Szurubooru\icon.png";   DestDir: "{app}\sites\Szurubooru"; Flags: ignoreversion
+Source: "{#SrcDir}\sites\Szurubooru\model.js";   DestDir: "{app}\sites\Szurubooru"; Flags: ignoreversion
+Source: "{#SrcDir}\sites\Szurubooru\sites.txt";  DestDir: "{app}\sites\Szurubooru"; Flags: ignoreversion
 Source: "{#SrcDir}\sites\Twitter\icon.png";   DestDir: "{app}\sites\Twitter"; Flags: ignoreversion
 Source: "{#SrcDir}\sites\Twitter\model.js";   DestDir: "{app}\sites\Twitter"; Flags: ignoreversion
 Source: "{#SrcDir}\sites\Twitter\sites.txt";  DestDir: "{app}\sites\Twitter"; Flags: ignoreversion