Added support for -a, --force-album argument #491
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Test failures and permission denied when I run tox locally: But when I checkout main the tests also fail albeit without the permission errors or verbosity. |
saimn
reviewed
Jun 3, 2023
src/sigal/gallery.py
Outdated
| @@ -823,7 +824,7 @@ def get_albums(self, path): | |||
| for subname, album in self.get_albums(subdir): | |||
| yield subname, self.albums[subdir] | |||
|
|
|||
| def build(self, force=False): | |||
| def build(self, force=None): | |||
There was a problem hiding this comment.
Good catch, I was trying to avoid the implying it could just be a bool
src/sigal/gallery.py
Outdated
Comment on lines
949
to
950
| if fnmatch(a.path, f): | ||
| return True |
There was a problem hiding this comment.
Suggested change
| if fnmatch(a.path, f): | |
| return True | |
| return fnmatch(a.path, f) |
There was a problem hiding this comment.
I don't think that works because a False would be an early return
src/sigal/gallery.py
Outdated
Comment on lines
951
to
952
| elif a.name == f: | ||
| return True |
There was a problem hiding this comment.
Suggested change
| elif a.name == f: | |
| return True | |
| else: | |
| return a.name == f |
|
Permission denied: this depends on your system, it seems the process cannot write a file (in |
|
Also please rebase on main, I fixed an issue with tox for the CI jobs. |
KaibutsuX
force-pushed
the
supportAlbumForce
branch
from
d82b376
to
6ade36c
Compare
|
Added tests and addressed comments. After fixing all of the permissions, tox finally runs, but it it won't get past the 2nd dot in the cli_tests after running for an hour. Pytest shows the same behavior and even on main without my changes, it looks like some tests fail, but without it actually completing, I can't tell what the errors are. |
|
Sorry for the delay @KaibutsuX, I forgot about this... |
Like --force, but can specify multiple specific album names or wildcard patterns to apply to entire album paths like: -a Pics/* -a *Wedding* -a 'Landscape Photos'
KaibutsuX
force-pushed
the
supportAlbumForce
branch
from
d655a51
to
81c0d81
Compare
Codecov Report
@@ Coverage Diff @@
## main #491 +/- ##
==========================================
+ Coverage 87.53% 87.60% +0.07%
==========================================
Files 24 24
Lines 2053 2065 +12
==========================================
+ Hits 1797 1809 +12
Misses 256 256
|
|
FYI, I dont know what is going on with the local testing env. When I run |
|
Maybe an issue with opening an HTTP port ? Does it work with |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Like --force, but can specify multiple specific album names or wildcard patterns to apply to entire album paths like:
-a Pics/*
-a Wedding
-a 'Landscape Photos'