heckyel/yt-local
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support for search filters: upload date, type, duration

Browse Source
This commit is contained in:
James Taylor 2018-10-18 01:41:53 -07:00
parent 697d6e3583
commit 23dfb97309
2 changed files with 61 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
youtube/common.py
View File

@ -317,6 +317,57 @@ header_template = Template('''
<input type="radio" id="sort_rating" name="sort" value="1"> <input type="radio" id="sort_rating" name="sort" value="1">
<label for="sort_rating">Rating</label> <label for="sort_rating">Rating</label>
<h3>Upload date</h3>
<input type="radio" id="time_any" name="time" value="0">
<label for="time_any">Any</label>
<input type="radio" id="time_last_hour" name="time" value="1">
<label for="time_last_hour">Last hour</label>
<input type="radio" id="time_today" name="time" value="2">
<label for="time_today">Today</label>
<input type="radio" id="time_this_week" name="time" value="3">
<label for="time_this_week">This week</label>
<input type="radio" id="time_this_month" name="time" value="4">
<label for="time_this_month">This month</label>
<input type="radio" id="time_this_year" name="time" value="5">
<label for="time_this_year">This year</label>
<h3>Type</h3>
<input type="radio" id="type_any" name="type" value="0">
<label for="type_any">Any</label>
<input type="radio" id="type_video" name="type" value="1">
<label for="type_video">Video</label>
<input type="radio" id="type_channel" name="type" value="2">
<label for="type_channel">Channel</label>
<input type="radio" id="type_playlist" name="type" value="3">
<label for="type_playlist">Playlist</label>
<input type="radio" id="type_movie" name="type" value="4">
<label for="type_movie">Movie</label>
<input type="radio" id="type_show" name="type" value="5">
<label for="type_show">Show</label>
<h3>Duration</h3>
<input type="radio" id="duration_any" name="duration" value="0">
<label for="duration_any">Any</label>
<input type="radio" id="duration_short" name="duration" value="1">
<label for="duration_short">Short (< 4 minutes)</label>
<input type="radio" id="duration_long" name="duration" value="2">
<label for="duration_long">Long (> 20 minutes)</label>
</div> </div>
</div> </div>
</div> </div>

15
youtube/search.py
View File

@ -38,13 +38,14 @@ features = {
'location': 23, 'location': 23,
} }
def page_number_to_sp_parameter(page, autocorrect=1, sort = 0): def page_number_to_sp_parameter(page, autocorrect, sort, filters):
offset = (int(page) - 1)*20 # 20 results per page offset = (int(page) - 1)*20 # 20 results per page
autocorrect = proto.nested(8, proto.uint(1, 1 - int(autocorrect) )) autocorrect = proto.nested(8, proto.uint(1, 1 - int(autocorrect) ))
result = proto.uint(1, sort) + proto.uint(9, offset) + proto.string(61, b'') + autocorrect filters_enc = proto.nested(2, proto.uint(1, filters['time']) + proto.uint(2, filters['type']) + proto.uint(3, filters['duration']))
result = proto.uint(1, sort) + filters_enc + autocorrect + proto.uint(9, offset) + proto.string(61, b'')
return base64.urlsafe_b64encode(result).decode('ascii') return base64.urlsafe_b64encode(result).decode('ascii')
def get_search_json(query, page, autocorrect, sort): def get_search_json(query, page, autocorrect, sort, filters):
url = "https://www.youtube.com/results?search_query=" + urllib.parse.quote_plus(query) url = "https://www.youtube.com/results?search_query=" + urllib.parse.quote_plus(query)
headers = { headers = {
'Host': 'www.youtube.com', 'Host': 'www.youtube.com',
@ -54,7 +55,7 @@ def get_search_json(query, page, autocorrect, sort):
'X-YouTube-Client-Name': '1', 'X-YouTube-Client-Name': '1',
'X-YouTube-Client-Version': '2.20180418', 'X-YouTube-Client-Version': '2.20180418',
} }
url += "&pbj=1&sp=" + page_number_to_sp_parameter(page, autocorrect, sort).replace("=", "%3D") url += "&pbj=1&sp=" + page_number_to_sp_parameter(page, autocorrect, sort, filters).replace("=", "%3D")
content = common.fetch_url(url, headers=headers, report_text="Got search results") content = common.fetch_url(url, headers=headers, report_text="Got search results")
info = json.loads(content) info = json.loads(content)
return info return info
@ -90,7 +91,11 @@ def get_search_page(query_string, parameters=()):
page = qs_query.get("page", "1")[0] page = qs_query.get("page", "1")[0]
autocorrect = int(qs_query.get("autocorrect", "1")[0]) autocorrect = int(qs_query.get("autocorrect", "1")[0])
sort = int(qs_query.get("sort", "0")[0]) sort = int(qs_query.get("sort", "0")[0])
info = get_search_json(query, page, autocorrect, sort) filters = {}
filters['time'] = int(qs_query.get("time", "0")[0])
filters['type'] = int(qs_query.get("type", "0")[0])
filters['duration'] = int(qs_query.get("duration", "0")[0])
info = get_search_json(query, page, autocorrect, sort, filters)
estimated_results = int(info[1]['response']['estimatedResults']) estimated_results = int(info[1]['response']['estimatedResults'])
estimated_pages = ceil(estimated_results/20) estimated_pages = ceil(estimated_results/20)