Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Custom #1

Open
wants to merge 89 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 87 commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
224f7c3
add favourite hotkey
vgrabovets Jun 30, 2023
1660c24
add_to_favourites function
vgrabovets Jun 30, 2023
41325d9
write favourites to a file
vgrabovets Jun 30, 2023
cc2cdf2
save favourites file in image parent folder
vgrabovets Jun 30, 2023
aef13e8
browse for folder path
vgrabovets Jul 1, 2023
6ef061f
iterate over files in the folder
vgrabovets Jul 2, 2023
f0e6583
shuffle files
vgrabovets Jul 2, 2023
da2d960
use provided get_image_filenames_for_directory
vgrabovets Jul 3, 2023
d844c3d
use scrubber
vgrabovets Jul 3, 2023
3f82c70
"randomize" argument for scrubber
vgrabovets Jul 3, 2023
bc5b4df
walk files
vgrabovets Jul 4, 2023
1ff5475
fix folder that is used to save favourites file
vgrabovets Jul 5, 2023
bfdf9ea
strip prefix
vgrabovets Jul 6, 2023
74cd6ee
Merge branch 'master' into custom
vgrabovets Jul 6, 2023
0549902
update github actions
vgrabovets Jul 8, 2023
713917f
fix cargo check
vgrabovets Jul 8, 2023
03086f7
remove aur-publish
vgrabovets Jul 8, 2023
9dbdb83
Merge branch 'master' into custom
vgrabovets Jul 8, 2023
61a29a0
v0.6.68-dev1
vgrabovets Jul 8, 2023
7532358
v0.6.68-dev2
vgrabovets Jul 9, 2023
f83f653
read favourites file
vgrabovets Jul 9, 2023
88121e9
intersperse files with favourites
vgrabovets Jul 10, 2023
a8358bf
Slideshow (#2)
vgrabovets Jul 14, 2023
3edd9df
Merge branch 'master' into custom
vgrabovets Jul 14, 2023
94984ae
v0.6.68-dev4
vgrabovets Jul 14, 2023
7e5eefd
slideshow settings
vgrabovets Jul 15, 2023
0431796
refactor ui
vgrabovets Jul 15, 2023
d82ff25
send message: number of files loaded
vgrabovets Jul 15, 2023
6fd96b4
get image by index
vgrabovets Jul 15, 2023
b1125d3
additional messages
vgrabovets Jul 15, 2023
ff6cfa5
v0.6.68-dev5
vgrabovets Jul 15, 2023
1dbc013
draw a star for favourite images
vgrabovets Jul 16, 2023
f7dc73e
refactor star
vgrabovets Jul 16, 2023
e8be8a3
open folder shortcut
vgrabovets Jul 16, 2023
7c40c89
0.6.68-dev6
vgrabovets Jul 16, 2023
ae54948
0.6.68-dev7
vgrabovets Jul 16, 2023
670402a
0.6.68-dev8
vgrabovets Jul 16, 2023
4c84bb8
SQLite (#3)
vgrabovets Jul 19, 2023
89056de
reinit scrubber only when n > 0
vgrabovets Jul 19, 2023
f3cbc46
save image path to clipboard
vgrabovets Jul 19, 2023
fdeb704
v0.6.68-dev9
vgrabovets Jul 19, 2023
80a520f
when n=0 add favourites to the beginning
vgrabovets Jul 20, 2023
8504504
zoom with right mouse button
vgrabovets Jul 20, 2023
de0d64d
check that cursor is within image
vgrabovets Jul 20, 2023
e573d39
delete all pressed keys when opening file dialog
vgrabovets Jul 20, 2023
36571bb
use linear texture filter
vgrabovets Jul 20, 2023
034342c
check that cursor is within image for mouse events
vgrabovets Jul 20, 2023
387a886
replace message as soon as new arrives
vgrabovets Jul 21, 2023
698bfe9
Merge branch 'master' into custom
vgrabovets Jul 21, 2023
b18790c
collapse if statements
vgrabovets Jul 21, 2023
05c21ec
delete files
vgrabovets Jul 21, 2023
c43012b
fix zoom by right mouse button
vgrabovets Jul 21, 2023
3d2733a
show tooltip with image data
vgrabovets Jul 22, 2023
79ea794
v0.6.69-dev1
vgrabovets Jul 22, 2023
aae6951
fix image tooltip
vgrabovets Jul 23, 2023
19a730c
state.toast_cooldown is an Instant
vgrabovets Jul 23, 2023
c1c3438
0.6.69-dev2
vgrabovets Jul 23, 2023
02e42f5
Add functionality to read image paths from text file
vgrabovets Aug 3, 2023
0873960
Refactor logging and improve error messaging
vgrabovets Aug 3, 2023
871542e
Add file size to image metadata tooltip
vgrabovets Aug 4, 2023
61e9d8b
v0.6.69-dev3
vgrabovets Aug 5, 2023
0c45aac
Refactor code for readability and efficiency
vgrabovets Aug 6, 2023
e84374a
refactor
vgrabovets Aug 6, 2023
3b1fbb9
Update asset naming and refactor code in main.rs
vgrabovets Aug 10, 2023
3439dc9
Refactor code for simplicity and readability
vgrabovets Aug 12, 2023
fd5a7ae
Optimize scrubber code for unnecessary cloning
vgrabovets Aug 12, 2023
ef554f0
0.6.69-dev4
vgrabovets Aug 12, 2023
d43fd66
Update Rust actions and refactor code for error handling and readability
vgrabovets Aug 12, 2023
4f61621
Simplify asset name in GitHub workflow
vgrabovets Aug 12, 2023
630bc71
Merge branch 'master' into custom2
vgrabovets Aug 22, 2023
93d3fcc
v0.7.2-dev1
vgrabovets Aug 22, 2023
d670451
Merge pull request #4 from vgrabovets/custom2
vgrabovets Aug 25, 2023
e5705a6
Merge branch 'master' into custom-0.7.3
vgrabovets Aug 25, 2023
34801e6
v0.7.3-dev1
vgrabovets Aug 25, 2023
e1f0c18
Merge pull request #5 from vgrabovets/custom-0.7.3
vgrabovets Sep 1, 2023
5898b31
Merge branch 'master' into custom-0.7.4
vgrabovets Sep 6, 2023
129a48d
Merge pull request #6 from vgrabovets/custom-0.7.4
vgrabovets Sep 17, 2023
56a9b7e
Merge branch 'master' into custom-0.7.5
vgrabovets Sep 17, 2023
b0776fe
v0.7.5-dev1
vgrabovets Sep 17, 2023
e25afa3
set lazy loop to false
vgrabovets Sep 18, 2023
dc058e7
Merge pull request #7 from vgrabovets/custom-0.7.5
vgrabovets Sep 21, 2023
03e5c16
Merge branch 'master' into custom-0.7.6
vgrabovets Sep 21, 2023
f15509d
delete_current_image function
vgrabovets Sep 21, 2023
af3ca96
v0.7.6-dev1
vgrabovets Sep 21, 2023
f10b238
fix import; v0.7.6-dev2
vgrabovets Sep 22, 2023
987d2a9
refactor
vgrabovets Sep 22, 2023
28d55ea
Merge pull request #8 from vgrabovets/custom-0.7.6
vgrabovets Sep 29, 2023
8f6505f
Merge branch 'master' into custom-0.7.7
vgrabovets Oct 9, 2023
74506eb
Merge pull request #9 from vgrabovets/custom-0.7.7
vgrabovets Dec 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check_ubuntu_no_default_features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
check:
strategy:
matrix:
os: [ubuntu-latest, ubuntu-20.04]
os: [ubuntu-20.04]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
check:
strategy:
matrix:
os: [windows-latest, windows-2019]
os: [windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
Expand Down
54 changes: 27 additions & 27 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
id: create_release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
Expand All @@ -34,7 +34,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, windows-2019, macOS-latest, ubuntu-latest]
os: [ubuntu-20.04, windows-2019]
rust: [stable]
steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -114,19 +114,19 @@ jobs:
id: upload-release-asset-lin-classic
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
upload_url: ${{ needs.release_job.outputs.upload_url }}
asset_path: target/release/oculante
asset_name: oculante_linux
asset_name: oculante.AppImage
asset_content_type: application/zip

- name: Upload ARMv7 Release
if: matrix.os == 'ubuntu-latest'
id: upload-release-arm
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
upload_url: ${{ needs.release_job.outputs.upload_url }}
asset_path: oculante_armv7_minimal.zip
Expand All @@ -138,7 +138,7 @@ jobs:
id: upload-release-arm64
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
upload_url: ${{ needs.release_job.outputs.upload_url }}
asset_path: oculante_aarch64_minimal.zip
Expand All @@ -150,7 +150,7 @@ jobs:
id: upload-release-asset-lin-classic-zip
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
upload_url: ${{ needs.release_job.outputs.upload_url }}
asset_path: oculante_linux.zip
Expand All @@ -162,7 +162,7 @@ jobs:
id: upload-release-asset-lin-classic-zip-min
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
upload_url: ${{ needs.release_job.outputs.upload_url }}
asset_path: oculante_linux_minimal.zip
Expand All @@ -174,7 +174,7 @@ jobs:
id: upload-release-asset-lin-classic-deb
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
upload_url: ${{ needs.release_job.outputs.upload_url }}
asset_path: oculante.deb
Expand All @@ -186,7 +186,7 @@ jobs:
id: upload-release-asset-mac
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
upload_url: ${{ needs.release_job.outputs.upload_url }}
asset_path: oculante_app.zip
Expand All @@ -198,7 +198,7 @@ jobs:
id: upload-release-asset-bin
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
upload_url: ${{ needs.release_job.outputs.upload_url }}
asset_path: target/release/oculante
Expand All @@ -210,7 +210,7 @@ jobs:
id: upload-release-asset-windows-classic
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
upload_url: ${{ needs.release_job.outputs.upload_url }}
asset_path: target/release/oculante.exe
Expand All @@ -229,21 +229,21 @@ jobs:
- name: Publish
uses: eregon/publish-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.TOKEN }}
with:
release_id: ${{ needs.release_job.outputs.release_id }}

aur-publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Publish AUR package
uses: KSXGitHub/github-actions-deploy-aur@v2.7.0
with:
pkgname: oculante
pkgbuild: ./PKGBUILD
commit_username: ${{ secrets.AUR_USERNAME }}
commit_email: ${{ secrets.AUR_EMAIL }}
ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
commit_message: Update oculante AUR package
ssh_keyscan_types: rsa,dsa,ecdsa,ed25519
# aur-publish:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2
# - name: Publish AUR package
# uses: KSXGitHub/github-actions-deploy-aur@v2.7.0
# with:
# pkgname: oculante
# pkgbuild: ./PKGBUILD
# commit_username: ${{ secrets.AUR_USERNAME }}
# commit_email: ${{ secrets.AUR_EMAIL }}
# ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
# commit_message: Update oculante AUR package
# ssh_keyscan_types: rsa,dsa,ecdsa,ed25519
6 changes: 3 additions & 3 deletions .github/workflows/rust-clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ name: rust-clippy analyze

on:
push:
branches: [ "master" ]
branches: [ "master", "custom" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "master" ]
branches: [ "master", "custom" ]
schedule:
- cron: '28 16 * * 6'

Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
continue-on-error: true

- name: Upload analysis results to GitHub
uses: github/codeql-action/upload-sarif@v1
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: rust-clippy-results.sarif
wait-for-processing: true
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ perf.*
flamegraph.svg
.notes
TODO
.idea
# for dev profile optimisations
.cargo/config.toml
.cargo/config.toml
Loading
Loading