mirror of
https://github.com/zedeus/nitter.git
synced 2024-12-13 03:26:30 +00:00
use largest resolution mp4 video available
This commit is contained in:
parent
0633ec2c39
commit
e2b8e17f85
4 changed files with 29 additions and 5 deletions
|
@ -87,10 +87,15 @@ proc parseVideo(js: JsonNode): Video =
|
|||
result.description = description.getStr
|
||||
|
||||
for v in js{"video_info", "variants"}:
|
||||
let
|
||||
contentType = parseEnum[VideoType](v{"content_type"}.getStr("summary"))
|
||||
url = v{"url"}.getStr
|
||||
resolution = getMp4Resolution(url) # only available if contentType == mp4
|
||||
result.variants.add VideoVariant(
|
||||
contentType: parseEnum[VideoType](v{"content_type"}.getStr("summary")),
|
||||
contentType: contentType,
|
||||
bitrate: v{"bitrate"}.getInt,
|
||||
url: v{"url"}.getStr
|
||||
url: url,
|
||||
resolution: resolution
|
||||
)
|
||||
|
||||
proc parsePromoVideo(js: JsonNode): Video =
|
||||
|
|
|
@ -137,6 +137,21 @@ proc getSource*(js: JsonNode): string =
|
|||
let src = js{"source"}.getStr
|
||||
result = src.substr(src.find('>') + 1, src.rfind('<') - 1)
|
||||
|
||||
proc getMp4Resolution*(url: string): int =
|
||||
# parses the height out of a URL like this one:
|
||||
# https://video.twimg.com/ext_tw_video/<tweet-id>/pu/vid/720x1280/<random>.mp4
|
||||
const vidSep = "/vid/"
|
||||
let
|
||||
vidIdx = url.find(vidSep) + vidSep.len
|
||||
resIdx = url.find('x', vidIdx) + 1
|
||||
res = url[resIdx ..< url.find("/", resIdx)]
|
||||
|
||||
try:
|
||||
return parseInt(res)
|
||||
except ValueError:
|
||||
# cannot determine resolution (e.g. m3u8/non-mp4 video)
|
||||
return 0
|
||||
|
||||
proc extractSlice(js: JsonNode): Slice[int] =
|
||||
result = js["indices"][0].getInt ..< js["indices"][1].getInt
|
||||
|
||||
|
|
|
@ -75,6 +75,7 @@ type
|
|||
contentType*: VideoType
|
||||
url*: string
|
||||
bitrate*: int
|
||||
resolution*: int
|
||||
|
||||
Video* = object
|
||||
durationMs*: int
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# SPDX-License-Identifier: AGPL-3.0-only
|
||||
import strutils, sequtils, strformat, options
|
||||
import strutils, sequtils, strformat, options, algorithm
|
||||
import karax/[karaxdsl, vdom, vstyles]
|
||||
from jester import Request
|
||||
|
||||
|
@ -105,8 +105,11 @@ proc renderVideo*(video: Video; prefs: Prefs; path: string): VNode =
|
|||
img(src=thumb)
|
||||
renderVideoDisabled(video, path)
|
||||
else:
|
||||
let vid = video.variants.filterIt(it.contentType == playbackType)
|
||||
let source = if prefs.proxyVideos: getVidUrl(vid[0].url) else: vid[0].url
|
||||
let
|
||||
vars = video.variants.filterIt(it.contentType == playbackType)
|
||||
vidUrl = vars.sortedByIt(it.resolution)[^1].url
|
||||
source = if prefs.proxyVideos: getVidUrl(vidUrl)
|
||||
else: vidUrl
|
||||
case playbackType
|
||||
of mp4:
|
||||
if prefs.muteVideos:
|
||||
|
|
Loading…
Reference in a new issue