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.

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

move source #297

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

move source #297

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a9a6e4b
Implements prefer english names setting in config.ini which adds Engl…
DZamataev Dec 26, 2018
120b475
apply suggested changes by @jmathai
DZamataev Dec 28, 2018
b94372b
Implements separating media folders by command line argument.
DZamataev Dec 28, 2018
03d4a9c
update readme to include information about --separate-media-folders c…
DZamataev Jan 15, 2019
5807459
Add tests for prefer_english_names
jmathai Jan 18, 2019
96a47c6
Revert "update readme to include information about --separate-media-f…
jmathai Jan 18, 2019
0b737ad
Revert "Implements separating media folders by command line argument."
jmathai Jan 18, 2019
4142dab
Add support for a %custom placeholder for more complex folder names t…
jmathai Jan 19, 2019
9c7b928
implements moving source files instead of copying them and optionally…
DZamataev Jan 31, 2019
109e291
Merge remote-tracking branch 'jmathai/master' into feature/move-source
DZamataev Jan 31, 2019
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
10 changes: 6 additions & 4 deletions elodie.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
FILESYSTEM = FileSystem()


def import_file(_file, destination, album_from_folder, trash, allow_duplicates):
def import_file(_file, destination, album_from_folder, trash, allow_duplicates, move_source=False):

_file = _decode(_file)
destination = _decode(destination)
Expand Down Expand Up @@ -61,7 +61,7 @@ def import_file(_file, destination, album_from_folder, trash, allow_duplicates):
media.set_album_from_folder()

dest_path = FILESYSTEM.process_file(_file, destination,
media, allowDuplicate=allow_duplicates, move=False)
media, allowDuplicate=allow_duplicates, move=move_source)
if dest_path:
print('%s -> %s' % (_file, dest_path))
if trash:
Expand All @@ -85,8 +85,10 @@ def import_file(_file, destination, album_from_folder, trash, allow_duplicates):
help='Import the file even if it\'s already been imported.')
@click.option('--debug', default=False, is_flag=True,
help='Override the value in constants.py with True.')
@click.option('--move-source', default=False, is_flag=True,
help='Move source instead of copy it.')
@click.argument('paths', nargs=-1, type=click.Path())
def _import(destination, source, file, album_from_folder, trash, allow_duplicates, debug, paths):
def _import(destination, source, file, album_from_folder, trash, allow_duplicates, debug, move_source, paths):
"""Import files or directories by reading their EXIF and organizing them accordingly.
"""
constants.debug = debug
Expand All @@ -112,7 +114,7 @@ def _import(destination, source, file, album_from_folder, trash, allow_duplicate

for current_file in files:
dest_path = import_file(current_file, destination, album_from_folder,
trash, allow_duplicates)
trash, allow_duplicates, move_source)
result.append((current_file, dest_path))
has_errors = has_errors is True or not dest_path

Expand Down