|
1 | 1 | from urllib.parse import quote, urljoin, urlparse
|
| 2 | +import urllib.parse |
2 | 3 | from flask import Flask, render_template, request, redirect, send_file, abort
|
3 | 4 | from yt_dlp import YoutubeDL
|
4 | 5 | from flask_cors import CORS
|
|
11 | 12 | import base64
|
12 | 13 | import slideshowBuilder
|
13 | 14 | import html
|
| 15 | +import urllib |
14 | 16 | app = Flask(__name__)
|
15 | 17 | CORS(app)
|
16 | 18 |
|
@@ -174,8 +176,9 @@ def embed_tiktok(post_link):
|
174 | 176 |
|
175 | 177 | directURL = f"https://"+config.currentConfig["MAIN"]["domainName"]+"/vid/"+videoInfo["author"]["uniqueId"]+"/"+videoInfo["id"]#+".mp4"
|
176 | 178 | else:
|
177 |
| - vFormat = {"width": 1280, "height": 720} |
178 |
| - directURL = "https://"+config.currentConfig["MAIN"]["domainName"]+"/slideshow.mp4?url="+post_link |
| 179 | + vFormat = {"width": 1280, "height": 720, "cover":videoInfo["slideshowData"]["imageURLs"][0]} |
| 180 | + encoded_url=urllib.parse.quote(post_link) |
| 181 | + directURL = "https://"+config.currentConfig["MAIN"]["domainName"]+"/slideshow.mp4?url="+encoded_url |
179 | 182 | statsLine = quote(build_stats_line(videoInfo))
|
180 | 183 | return render_template('video.html', videoInfo=videoInfo, mp4URL=directURL, vFormat=vFormat, appname=config.currentConfig["MAIN"]["appName"], statsLine=statsLine, domainName=config.currentConfig["MAIN"]["domainName"],original_url = post_link)
|
181 | 184 |
|
@@ -214,7 +217,8 @@ def slideshow():
|
214 | 217 | return "This is not a slideshow", 400
|
215 | 218 | if config.currentConfig["MAIN"]["slideshowRenderer"] != "local":
|
216 | 219 | renderer=config.currentConfig["MAIN"]["slideshowRenderer"] # this is a url to an api that should return raw mp4 data
|
217 |
| - return redirect(f"{renderer}?url={url}",code=307) |
| 220 | + eurl=urllib.parse.quote(url) |
| 221 | + return redirect(f"{renderer}?url={eurl}",code=307) |
218 | 222 | # render locally
|
219 | 223 | if config.currentConfig["MAIN"]["slideshowRenderer"] == "local":
|
220 | 224 | b64 = slideshowBuilder.generateVideo(slideshow)
|
|
0 commit comments