flifloo/BetterTwitFix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Made links not show the last word of a description (the internal twitter vid link) to clean up embeds

Browse source
This commit is contained in:
robinuniverse 2021-07-10 09:17:33 -05:00
parent 836e0b1f1f
commit 4aa3c9a59e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
twitfix.py
View file

@ -62,7 +62,7 @@ def embedVideo(vidlink): # Return a render template from a video url
dbresult = collection.find_one({'tweet': vidlink}) dbresult = collection.find_one({'tweet': vidlink})
if dbresult != None: if dbresult != None:
print("Link located in DB cache") print("Link located in DB cache")
return render_template('index.html', vidurl=dbresult['url'], desc=dbresult['description'], pic=dbresult['thumbnail'], user=dbresult['uploader'], vidlink=vidlink) return render_template('index.html', vidurl=dbresult['url'], desc=dbresult['description'].rsplit(' ',1)[0], pic=dbresult['thumbnail'], user=dbresult['uploader'], vidlink=vidlink)
else: else:
with youtube_dl.YoutubeDL({'outtmpl': '%(id)s.%(ext)s'}) as ydl: with youtube_dl.YoutubeDL({'outtmpl': '%(id)s.%(ext)s'}) as ydl:
try: try:
@ -76,7 +76,7 @@ def embedVideo(vidlink): # Return a render template from a video url
except Exception: except Exception:
print("Failed to add link to DB cache") print("Failed to add link to DB cache")
return render_template('index.html', vidurl=vnf['url'], desc=vnf['description'], pic=vnf['thumbnail'], user=vnf['uploader'], vidlink=vidlink) return render_template('index.html', vidurl=vnf['url'], desc=vnf['description'].rsplit(' ',1)[0], pic=vnf['thumbnail'], user=vnf['uploader'], vidlink=vidlink)
except Exception: except Exception:
print("Failed to download link") print("Failed to download link")
@ -101,13 +101,13 @@ def embedVideo(vidlink): # Return a render template from a video url
print("Failed to download link") print("Failed to download link")
return render_template('default.html', message="Failed to scan your link!") return render_template('default.html', message="Failed to scan your link!")
return render_template('index.html', vidurl=vnf['url'], desc=vnf['description'], pic=vnf['thumbnail'], user=vnf['uploader'], vidlink=vidlink) return render_template('index.html', vidurl=vnf['url'], desc=vnf['description'].rsplit(' ',1)[0], pic=vnf['thumbnail'], user=vnf['uploader'], vidlink=vidlink)
else: else:
try: try:
with youtube_dl.YoutubeDL({'outtmpl': '%(id)s.%(ext)s'}) as ydl: with youtube_dl.YoutubeDL({'outtmpl': '%(id)s.%(ext)s'}) as ydl:
result = ydl.extract_info(subpath, download=False) result = ydl.extract_info(subpath, download=False)
vnf = vidInfo(result['url'], vidlink, result['description'], result['thumbnail'], result['uploader']) vnf = vidInfo(result['url'], vidlink, result['description'], result['thumbnail'], result['uploader'])
return render_template('index.html', vidurl=vnf['url'], desc=vnf['description'], pic=vnf['thumbnail'], user=vnf['uploader'], vidlink=vidlink) return render_template('index.html', vidurl=vnf['url'], desc=vnf['description'].rsplit(' ',1)[0], pic=vnf['thumbnail'], user=vnf['uploader'], vidlink=vidlink)
except Exception: except Exception:
print("Failed to download link") print("Failed to download link")
return render_template('default.html', message="Failed to scan your link!") return render_template('default.html', message="Failed to scan your link!")