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

corrected error in timeframe #141

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

corrected error in timeframe #141

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ed7d2a
corrected error in timeframe
brinoausrino Feb 15, 2018
a356863
media_count implemented (did not work)
brinoausrino Feb 16, 2018
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
18 changes: 13 additions & 5 deletions instaLooter/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,29 +403,37 @@ def medias(self, media_count=None, with_pbar=False, timeframe=None):
else:
return self._timed_medias(media_count=media_count, with_pbar=with_pbar, timeframe=timeframe)

def _timeless_medias(self, media_count=None, with_pbar=False):
def _timeless_medias(self, media_count=None, with_pbar=False):
seen = set()
n_medias = 0
for page in self.pages(media_count=media_count, with_pbar=with_pbar):
for media in page['entry_data'][self._page_name][0][self._section_name]['media']['nodes']:
n_medias += 1
if media['id'] in seen:
return
yield media
seen.add(media['id'])
if n_medias <= media_count:
yield media
seen.add(media['id'])
elif n_medias > media_count:
return

def _timed_medias(self, media_count=None, with_pbar=False, timeframe=None):
seen = set()
start_time, end_time = get_times(timeframe)
n_medias = 0
for page in self.pages(media_count=media_count, with_pbar=with_pbar):
for media in page['entry_data'][self._page_name][0][self._section_name]['media']['nodes']:
n_medias += 1
media_date = datetime.date.fromtimestamp(media['date'])
if start_time >= media_date >= end_time:
if start_time <= media_date <= end_time and n_medias <= media_count:
if media['id'] in seen:
return
yield media
seen.add(media['id'])
elif media_date < end_time:
elif media_date < end_time or n_medias > media_count:
return


def download_pictures(self, **kwargs):#media_count=None, with_pbar=False, timeframe=None, new_only=False):
"""Download all the pictures from provided target.

Expand Down