Skip to content

Commit

Permalink
chore: version 7.11.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Bionus committed Jun 5, 2023
2 parents 4713ff6 + 267c507 commit 2628a9c
Show file tree
Hide file tree
Showing 447 changed files with 14,933 additions and 11,046 deletions.
32 changes: 28 additions & 4 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,36 @@ coverage:

ignore:
- "build/**/*"
- "src/crash-reporter/tests/**/*"
- "src/tests/**/*"
- "src/*/tests/*"
- "src/*/tests/**/*"
- "src/e2e/**/*"
- "src/gui/tests/**/*"
- "src/gui-qml/**/*"
- "src/lib/src/vendor/*"
- "src/tests/**/*"
- "src/*/vendor/*"
- "src/*/vendor/**/*"

component_management:
individual_components:
- component_id: cli
name: CLI
paths:
- src/cli/*
- component_id: crash_reporter
name: Crash Reporter
paths:
- src/crash-reporter/*
- component_id: gui
name: GUI
paths:
- src/gui/*
- component_id: lib
name: Library
paths:
- src/lib/*
- component_id: sources
name: Sources
paths:
- src/sites/*

comment:
layout: "header, diff"
Expand Down
69 changes: 36 additions & 33 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
- name: Install packages
run: |
sudo apt update
sudo apt install libpulse-dev lcov
sudo apt install libpulse-dev lcov libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libxkbcommon-x11-0
- name: Install Qt
uses: jurplel/install-qt-action@v3
Expand All @@ -114,18 +114,16 @@ jobs:
cmake --build . --config Debug
- name: Test
uses: GabrielBB/xvfb-action@v1
with:
working-directory: src
run: ../build/tests/tests
working-directory: src/lib
run: |
xvfb-run -a ../../build/lib/tests/lib-tests
xvfb-run -a ../../build/cli/tests/cli-tests
- name: Test GUI
uses: GabrielBB/xvfb-action@v1
with:
working-directory: src
run: |
../build/gui/tests/gui-tests
../build/crash-reporter/tests/crash-reporter-tests
working-directory: src/lib
run: |
xvfb-run -a ../../build/gui/tests/gui-tests
xvfb-run -a ../../build/crash-reporter/tests/crash-reporter-tests
- name: Test sites
working-directory: src/sites
Expand Down Expand Up @@ -163,7 +161,7 @@ jobs:
linux:
name: Linux
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
needs: version

env:
Expand All @@ -180,7 +178,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt update
sudo apt install libpulse-dev libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libgstreamer-plugins-base1.0-0 zsync
sudo apt install libpulse-dev libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xinerama0 libxkbcommon-x11-0 libgstreamer-plugins-base1.0-0 zsync xvfb
- name: Install Qt
uses: jurplel/install-qt-action@v3
Expand Down Expand Up @@ -233,18 +231,16 @@ jobs:
cmake --build . --config Release
- name: Test
uses: GabrielBB/xvfb-action@v1
with:
working-directory: src
run: ../build/tests/tests
working-directory: src/lib
run: |
xvfb-run -a ../../build/lib/tests/lib-tests
xvfb-run -a ../../build/cli/tests/cli-tests
- name: Test GUI
uses: GabrielBB/xvfb-action@v1
with:
working-directory: src
run: |
../build/gui/tests/gui-tests
../build/crash-reporter/tests/crash-reporter-tests
working-directory: src/lib
run: |
xvfb-run -a ../../build/gui/tests/gui-tests
xvfb-run -a ../../build/crash-reporter/tests/crash-reporter-tests
- name: Generate AppImage
run: |
Expand Down Expand Up @@ -278,7 +274,7 @@ jobs:

macos:
name: macOS
runs-on: macos-10.15
runs-on: macos-11
needs: version

env:
Expand Down Expand Up @@ -337,14 +333,16 @@ jobs:
cmake --build . --config Release
- name: Test
working-directory: src
run: ../build/tests/tests
working-directory: src/lib
run: |
../../build/lib/tests/lib-tests
../../build/cli/tests/cli-tests
- name: Test GUI
working-directory: src
working-directory: src/lib
run: |
../build/gui/tests/gui-tests
../build/crash-reporter/tests/crash-reporter-tests
../../build/gui/tests/gui-tests
../../build/crash-reporter/tests/crash-reporter-tests
- name: Generate package
run: ./scripts/package-mac.sh
Expand Down Expand Up @@ -440,7 +438,7 @@ jobs:
shell: cmd
run: |
if "${{ matrix.suffix }}"=="x86" (set "OPENSSL_PREFIX=Win32OpenSSL") else (set "OPENSSL_PREFIX=Win64OpenSSL")
curl -Lo OpenSSL.exe "https://slproweb.com/download/%OPENSSL_PREFIX%-1_1_1s.exe" --fail
curl -Lo OpenSSL.exe "https://slproweb.com/download/%OPENSSL_PREFIX%-1_1_1u.exe" --fail
OpenSSL.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- /DIR="%OPENSSL_ROOT_DIR%"
rm OpenSSL.exe
Expand Down Expand Up @@ -481,8 +479,10 @@ jobs:
- name: Test
shell: cmd
working-directory: src
run: ..\build\tests\%BUILD_TYPE%\tests.exe
working-directory: src/lib
run: |
..\..\build\lib\tests\%BUILD_TYPE%\lib-tests.exe
..\..\build\cli\tests\%BUILD_TYPE%\cli-tests.exe
env:
QTDIR: ${{ env.Qt5_Dir }}
QT_PLUGIN_PATH: ${{ env.Qt5_Dir }}\plugins
Expand Down Expand Up @@ -567,7 +567,10 @@ jobs:

- name: Download Android OpenSSL libraries
working-directory: src/cmake
run: git clone https://github.com/KDAB/android_openssl.git
run: |
git clone https://github.com/KDAB/android_openssl.git
cd android_openssl
git checkout f5d857ef1d437595f7c3ab0d06e61beae7ca8b99
- name: Restore keystore file
run: echo "${{ secrets.ANDROID_KEYSTORE_BASE64 }}" | base64 --decode > release.jks
Expand Down
20 changes: 10 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ src/sites/*/*/cookies.txt
src/sites/*/*/settings.ini
src/sites/*/*/tags.txt
src/sites/*/*/tags.db
src/tests/resources/tags.txt
src/tests/resources/tags.db
src/tests/resources/md5s.txt
src/tests/resources/settings.ini
src/tests/resources/settings.ini.*
src/tests/resources/*.txt
src/tests/resources/favorites.*
src/tests/resources/thumbs/
src/tests/resources/tmp/
src/tests/resources/sites/
src/lib/tests/resources/tags.txt
src/lib/tests/resources/tags.db
src/lib/tests/resources/md5s.txt
src/lib/tests/resources/settings.ini
src/lib/tests/resources/settings.ini.*
src/lib/tests/resources/*.txt
src/lib/tests/resources/favorites.*
src/lib/tests/resources/thumbs/
src/lib/tests/resources/tmp/
src/lib/tests/resources/sites/
/test_*
target_wrapper.bat
symbols/
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[submodule "tests/src/vendor/catch"]
path = src/tests/vendor/catch
url = https://github.com/catchorg/Catch2.git
branch = v2.x
branch = devel
[submodule "lib/vendor/lexbor"]
path = src/lib/vendor/lexbor
url = https://github.com/lexbor/lexbor.git
3 changes: 0 additions & 3 deletions docs/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ exclude:
- gui/
- tests/

kramdown:
header_offset: 1

collections:
docs:
permalink: "/:collection/:path.html"
Expand Down
36 changes: 18 additions & 18 deletions docs/_docs/cli.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ title: Command-line interface
---


# Introduction
## Introduction

Starting 4.0.0 version, Grabber can be totally run through the command line.


# Compilation
## Compilation

There is two ways to use the command line.

Expand All @@ -17,23 +17,23 @@ When compiling Grabber, just uncomment "CONFIG += use\_cli" to set the CLI to be
If you keep it commented or just use the precompiled version, Grabber will start with its GUI by default, which can be disabled with the "-c" or "--cli" commands.


# Commands
## Commands

In this part I'll consider that you are using the precompiled version, which has "CONFIG += use\_cli" commented.

## Help
### Help
You can find help with the "-?", "-h", or "--help" commands.

## Sources
### Sources
You can set a source using the "-s" or "--sources" parameter, followed by the list of hosts to connect, separated by spaces. For example:
```
./grabber -c -s "danbooru.donmai.us gelbooru.com"
```


# Usage
## Usage

## Count the number of images
### Count the number of images
Prints the result followed by a new line to stdout.
```
./grabber -c -t "inugami_kira" -s "danbooru.donmai.us" --return-count
Expand All @@ -46,7 +46,7 @@ Prints the result followed by a new line to stdout.
585
```

## Get tags
### Get tags
Prints each result separated by a new line. Each part is separated by a tabulation character.
```
./grabber -c -t "inugami_kira" -s "danbooru.donmai.us" --return-tags
Expand All @@ -66,8 +66,8 @@ thighhighs 613879 general
...
```

## Get images
### Basis
### Get images
#### Basis
Prints each result separated by a new line.
```
./grabber -c -t "inugami_kira" -s "danbooru.donmai.us" -i 5 -p 3 --return-images
Expand Down Expand Up @@ -97,7 +97,7 @@ http://simg2.gelbooru.com/images/2080/7a3fa58e9e669c2fdc2fb6596e13ed40.png
http://simg2.gelbooru.com/images/2077/eea3d1e72f2f33521ccf68874b408d38.png
```

### Duplicates
#### Duplicates
You can use the "-n" or "--no-duplicates" option to remove duplicate results when downloading from several sources based on MD5.
```
./grabber -c -t "inugami_kira" -s "danbooru.donmai.us gelbooru.com" -i 5 -p 3 --return-images --no-duplicates
Expand All @@ -110,7 +110,7 @@ http://simg2.gelbooru.com/images/2080/7a3fa58e9e669c2fdc2fb6596e13ed40.png
http://simg2.gelbooru.com/images/2077/eea3d1e72f2f33521ccf68874b408d38.png
```

### Images per page
#### Images per page
You can use the "-i" or "--perpage" option to choose how many images per page the program should return. Default value is 20.

You can use the "-m" or "--max" option to choose how many images you want to return. By default, the program returns everything it finds on the requested pages.
Expand Down Expand Up @@ -142,8 +142,8 @@ http://danbooru.donmai.us/data/100cd43adb60f390309d14c1ce8bb853.jpg
http://danbooru.donmai.us/data/7a3fa58e9e669c2fdc2fb6596e13ed40.jpg
```

## Get tags list
### Basis
### Get tags list
#### Basis
Prints each result separated by a new line.
```
./grabber -c -s "danbooru.donmai.us" -i 5 --return-pure-tags
Expand All @@ -154,7 +154,7 @@ ksnatc-t_am 1 artist
joyacuson 1 artist
```

### Count filter
#### Count filter
You can use the "--tm" or "--tags-min" to return only tags with a count superior or equal to this option.
```
./grabber -c -s "danbooru.donmai.us" -i 100 --tags-min 10 --return-pure-tags
Expand All @@ -164,7 +164,7 @@ hitomi_(pokemon_ranger) 11 character
seneo 41 artist
```

### Tags format
#### Tags format
You can use the "--tf" or "--tags-format" to change the format tags are returned.

Available replacements are "%tag", "%count", "%type" and "%stype".
Expand All @@ -178,9 +178,9 @@ Default value is "%tag\t%count\t%type"
1 seneo (41)
```

# Examples
## Examples

## Update the auto-completion list manually
### Update the auto-completion list manually
Note that this is long and very constraining for the server. So please don't overdo it. The software already automatically updates the tag list as they arrive. This is just if you notice that many of your searched tags are not in the list.

It can take a while (250 pages of 500ko each), so you might want to turn debugging on to see the current download status.
Expand Down
Loading

0 comments on commit 2628a9c

Please sign in to comment.