-
Notifications
You must be signed in to change notification settings - Fork 345
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
Alternative folder for repost images and -norepost command line argument #93
Open
msk-nightingale
wants to merge
1
commit into
dixudx:master
Choose a base branch
from
msk-nightingale:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -181,9 +181,12 @@ def download_photos(self, site): | |
|
||
def _download_media(self, site, medium_type, start): | ||
current_folder = os.getcwd() | ||
target_folder = os.path.join(current_folder, site) | ||
if not os.path.isdir(target_folder): | ||
os.mkdir(target_folder) | ||
target_folder_base = os.path.join(current_folder, site) | ||
if not os.path.isdir(target_folder_base): | ||
os.mkdir(target_folder_base) | ||
target_folder_other = os.path.join(current_folder, site+'-other') | ||
if not os.path.isdir(target_folder_other): | ||
os.mkdir(target_folder_other) | ||
|
||
base_url = "http://{0}.tumblr.com/api/read?type={1}&num={2}&start={3}" | ||
start = START | ||
|
@@ -201,6 +204,13 @@ def _download_media(self, site, medium_type, start): | |
data = xmltodict.parse(xml_cleaned) | ||
posts = data["tumblr"]["posts"]["post"] | ||
for post in posts: | ||
if '@reblogged-from-url' in post: | ||
target_folder=target_folder_other | ||
if len (sys.argv) > 2 and sys.argv[2] == '-norepost': | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Better add some help message on this new flag in the main function. Update README as well please. |
||
print ("Skipped\n") | ||
continue | ||
else: | ||
target_folder=target_folder_base | ||
try: | ||
# if post has photoset, walk into photoset for each photo | ||
photoset = post["photoset"]["photo"] | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not using the origin site name as the new folder name? And we could avoid downloading the duplicate photos/videos as well.
I mean if the media in A is reblogged from B, you can just create a new folder B to store this media, instead of current
A-other
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is not comfortable when threre ara many reposts from many different blogs and a user need to see lot of photos / videos...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still use A and B as an example.
What if a user is trying to downloading media2 from site A, you will save it to
A-other
folder. And later if downloading from site B,media2
will be downloaded again and save toB-other
folder.Actually they are identical, which should not be save multiple times.
Then why not directly saving it to folder
C
(for site C)?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe... I made this feature for me and it's bad for me what you say.