Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions google/modules/standard_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def _limit_str_size(self, str_element, size_limit):


# PUBLIC
def search(query, pages=1, lang='en', area='com', ncr=False, void=True):
def search(query, pages=1, lang='en', area='com', ncr=False, void=True, time_period=False):
"""Returns a list of GoogleResult.

Args:
Expand All @@ -65,7 +65,7 @@ def search(query, pages=1, lang='en', area='com', ncr=False, void=True):

results = []
for i in range(pages):
url = _get_search_url(query, i, lang=lang, area=area, ncr=ncr)
url = _get_search_url(query, i, lang=lang, area=area, ncr=ncr, time_period=time_period)
html = get_html(url)

if html:
Expand Down
21 changes: 18 additions & 3 deletions google/modules/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,27 @@ def normalize_query(query):
return query.strip().replace(":", "%3A").replace("+", "%2B").replace("&", "%26").replace(" ", "+")


def _get_search_url(query, page=0, per_page=10, lang='en', area='com', ncr=False):
def _get_search_url(query, page=0, per_page=10, lang='en', area='com', ncr=False, time_period=False):
# note: num per page might not be supported by google anymore (because of
# google instant)

params = {'nl': lang, 'q': query.encode(
'utf8'), 'start': page * per_page, 'num': per_page }
params = {
'nl': lang,
'q': query.encode('utf8'),
'start': page * per_page,
'num': per_page
}

time_mapping = {
'hour': 'qdr:h',
'week': 'qdr:w',
'month': 'qdr:m',
'year': 'qdr:y'
}

# Set time period for query if given
if time_period and time_period in time_mapping:
params['tbs'] = time_mapping[time_period]

# This will allow to search Google with No Country Redirect
if ncr:
Expand Down