Skip to content

fix movedel and rmdirs trailing commas, made always true #231

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.

Sign up for GitHub

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

Open
rob-miller wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix movedel and rmdirs trailing commas, made always true #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/phockup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,17 +49,17 @@ def __init__(self, input_dir, output_dir, **args):
self.date_regex = args.get('date_regex', None)
self.timestamp = args.get('timestamp', False)
self.date_field = args.get('date_field', False)
self.skip_unknown = args.get("skip_unknown", False)
self.movedel = args.get("movedel", False),
self.rmdirs = args.get("rmdirs", False),
self.skip_unknown = args.get('skip_unknown', False)
self.movedel = args.get('movedel', False)
self.rmdirs = args.get('rmdirs', False)
self.dry_run = args.get('dry_run', False)
self.progress = args.get('progress', False)
self.max_depth = args.get('max_depth', -1)
# default to concurrency of one to retain existing behavior
self.max_concurrency = args.get("max_concurrency", 1)
self.max_concurrency = args.get('max_concurrency', 1)

self.from_date = args.get("from_date", None)
self.to_date = args.get("to_date", None)
self.from_date = args.get('from_date', None)
self.to_date = args.get('to_date', None)
if self.from_date is not None:
self.from_date = Date.strptime(f"{self.from_date} 00:00:00", "%Y-%m-%d %H:%M:%S")
if self.to_date is not None:
Expand Down
3 changes: 3 additions & 0 deletions tests/test_phockup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ def test_process_move(mocker):
Exif.data.return_value = {
"MIMEType": "image/jpeg"
}
os.mkdir('input/sub0')
phockup = Phockup('input', 'output', move=True)
open("input/tmp_20170101_010101.jpg", "w").close()
open("input/tmp_20170101_010101.xmp", "w").close()
Expand All @@ -287,7 +288,9 @@ def test_process_move(mocker):
assert not os.path.isfile("input/tmp_20170101_010101.xmp")
assert os.path.isfile("output/2017/01/01/20170101-010101.jpg")
assert os.path.isfile("output/2017/01/01/20170101-010101.xmp")
assert os.path.isdir("input/sub0") # empty dir not deleted
shutil.rmtree('output', ignore_errors=True)
os.rmdir('input/sub0')


def test_process_movedel(mocker, caplog):
Expand Down