-
Notifications
You must be signed in to change notification settings - Fork 109
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
Implementation of --maxdepth to limit recursion of input directory #104
Conversation
Arbitrary limit of 255 set for command line option ivandokov#92
* Migrated to a more compatible filename for testing exiftool * --Migrated Windows escaping to quoted input rather than shlex.quote escaping. --Added space and punctuation test --Added additional test image * --Updated trailing slash test to use Windows specific slashes on win32 * --Updated trailing slash test to use Windows specific slashes on win32 * --revert unintended commit
# Conflicts: # phockup.py # src/phockup.py
You have to pull master and go to your branch |
Thanks for the suggestion. I am pretty sure I did this: P:\Projects\phockup>git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
P:\Projects\phockup>git pull
Already up to date.
P:\Projects\phockup>git checkout feature/maxdepth
Switched to branch 'feature/maxdepth'
Your branch is up to date with 'origin/feature/maxdepth'.
P:\Projects\phockup>git merge master
Already up to date.
P:\Projects\phockup> Looking at the diffs, I can't tell what's different between my feature branch and your master. I'll maybe try updating from |
Appologies for the misleading steps. Here is a proper guide how to sync your repo with the upstream https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork |
Okay... so, I moved over to Linux for the upstream work to get the changes pulled (same steps as on Windows), but here they work. I'm pretty sure the weird filename was preventing something from actually going through, but it was failing silently. Every time I tried to fetch upstream and merge to master or my branch I had the same error with the file and regardless of how I dealt with it, it came back if I re-ran the fetch. Anyway, we look clean now for merging. I'm just working through the issues list to get practice in Python and since I use phockup. Hopefully some value added here. |
Looking good now. Can you please add information about the new flag in the readme. |
Updated defaults to support --maxdepth=0 to allow processsing only the input directory without any subdirectory traversal.
Implementation of --maxdepth from #92.
No tests were written because it's actually beyond my capabilities to write the test. Maybe someone can help.
Merge collisions exist from the prior commit, possibly related to the Windows platform, but I'm unclear how to resolve them.