Lomanic/NewLeaf
1
0
Fork 0
mirror of https://git.sr.ht/~cadence/NewLeaf synced 2024-11-22 15:47:30 +00:00
Code Issues Releases Wiki Activity

Video extraction fixes

Browse Source
This commit is contained in:
Cadence Ember 2020-08-13 18:54:23 +12:00
parent b58d6aa629
commit 7ae5232424
No known key found for this signature in database
GPG Key ID: 128B99B1B74A6412
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
index.py
View File

@ -69,7 +69,7 @@ def view_count_text_to_number(text):
def get_view_count_or_recommended(view_count_container): def get_view_count_or_recommended(view_count_container):
text = view_count_container.get("viewCountText") or view_count_container["viewCount"] text = view_count_container.get("viewCountText") or view_count_container["viewCount"]
if "runs" in text: # has live viewers if "runs" in text: # has live viewers
return int(combine_runs(text)) return view_count_text_to_number(combine_runs(text))
else: else:
text = text["simpleText"] text = text["simpleText"]
if text == "Recommended for you": if text == "Recommended for you":
@ -80,7 +80,7 @@ def get_view_count_or_recommended(view_count_container):
def get_view_count_text_or_recommended(view_count_container): def get_view_count_text_or_recommended(view_count_container):
text = view_count_container.get("viewCountText") or view_count_container["viewCount"] text = view_count_container.get("viewCountText") or view_count_container["viewCount"]
if "runs" in text: # has live viewers if "runs" in text: # has live viewers
text = combine_runs(text) return combine_runs(text)
else: # has past views else: # has past views
text = text["simpleText"] text = text["simpleText"]
if text == "Recommended for you": if text == "Recommended for you":
@ -273,7 +273,8 @@ class Second(object):
views = yt_initial_data["contents"]["twoColumnWatchNextResults"]["results"]["results"]["contents"][0]\ views = yt_initial_data["contents"]["twoColumnWatchNextResults"]["results"]["results"]["contents"][0]\
["videoPrimaryInfoRenderer"]["viewCount"]["videoViewCountRenderer"] ["videoPrimaryInfoRenderer"]["viewCount"]["videoViewCountRenderer"]
result["second__viewCountText"] = get_view_count_text_or_recommended(views) result["second__viewCountText"] = get_view_count_text_or_recommended(views)
result["second__viewCountTextShort"] = views["shortViewCount"]["simpleText"] if "shortViewCount" in views:
result["second__viewCountTextShort"] = views["shortViewCount"]["simpleText"]
recommendations = yt_initial_data["contents"]["twoColumnWatchNextResults"]["secondaryResults"]\ recommendations = yt_initial_data["contents"]["twoColumnWatchNextResults"]["secondaryResults"]\
["secondaryResults"]["results"] ["secondaryResults"]["results"]
@ -303,6 +304,7 @@ class Second(object):
player_response = json.loads(yt_player_config["args"]["player_response"]) player_response = json.loads(yt_player_config["args"]["player_response"])
if "dashManifestUrl" in player_response["streamingData"]: if "dashManifestUrl" in player_response["streamingData"]:
result["second__providedDashUrl"] = player_response["streamingData"]["dashManifestUrl"] result["second__providedDashUrl"] = player_response["streamingData"]["dashManifestUrl"]
result["liveNow"] = player_response["videoDetails"]["isLiveContent"]
# result = player_response # result = player_response
# return result # return result
itagDict = {} itagDict = {}