Move strategy will delete empty dirs.

[mdujava]

Hello,

This change adds feature mentioned in #20. After processing all files, it will walk dirs in reverse order and delete empty dirs.

[ivandokov]

I see you've added two test files in test_files directory, but I don't see new tests.
Actually here is my test for the same functionality that I've wrote some time ago but pushed just few hours ago.

phockup/tests.py

Lines 195 to 210 in 183e423

	def test_handle_move_removes_empty_dirs():
	tempdir = tempfile.mkdtemp(suffix='first')
	firstnesteddir = os.path.join(tempdir, 'one')
	nesteddir = os.path.join(firstnesteddir, 'two', 'three')
	os.makedirs(nesteddir, exist_ok=True)
	open(os.path.join(nesteddir, "move.txt"), "w").close()
	handle_file(os.path.join(nesteddir, "move.txt"), tempdir, "%Y/%m/%d", True)
	assert not os.path.isfile(os.path.join(nesteddir, "move.txt"))
	assert os.path.isfile(os.path.join(tempdir, "unknown/move.txt"))
	# shutil.rmtree(tempdir)
	assert not os.path.isdir(firstnesteddir)

The code that I wrote is not working exactly as expected. It deletes only the currently processed directory, but leaves the parent empty directory.

Ideally the directories should be deleted right after all files are processed because in case of error in the process the processed directories will be already deleted. Do you have an idea how to implement it?

[mdujava]

Hello,
I updated this PR, can You check it?
Basicly after procesing all files in some dir, it will try to remove current dir and if it is successful it will try to remove all parent dirs inside of INPUTDIR. It is default behaivor of os.removedirs function.

[ivandokov]

To be honest that os.removedirs bothers me a bit.
What if the user has the following directory structure:

Photos/
├── MyCamera/
│   ├── photo1.jpg
│   ├── photo2.jpg
│   └── ...

and the input path is Photos/MyCamera. Since MyCamera is the only directory in Photos from os.removedirs docs I assume the folder Photos will be deleted too. Am I right?

If I am I think the code should be changed to manually look for parent directory and stop if it reached the input directory.

[mdujava]

os.removedirs by definition will delete as far as input dir, but not further (meaning up in hierarhy). In your example tree, os.removedirs can recieve path MyCamera/some/path/inside/ and it will not delete Photos, it will stop at MyCamera (if you run inside of Photos folder).

But if we run it like

~$ phockup.py Photos/MyCamera output/sorted --move

it will delete Photos folder.

We can truncate INPUTDIR path to only last portion (MyCamera and cd to its parrent dir Photos) and then it will only delete desaired dir. I will update this PR.

[mdujava]

I have some problems. On linux we can use dir_fd to act like we are in inputdir and then remove everything inside it (in unix philosophy we souldn't change working dir, in case of kill, our process should create core dump inside original cwd). But this dir_fd is not supported on Windows, so we probably need to change dir or do removing manualy in some loop.

Is it ok to separate code if os supports dir_fd or should I create one universal code?

[ivandokov]

I think one universal function is more predictable for cross platform.

[ivandokov]

@mdujava do you have any updates?

[ivandokov]

@mdujava, the code is obsolete and I will be closing this PR. If you want to update it to work with the latest release please submit a new PR and I will be more than happy to take a look.