Added a link cache system to increase speed and cut way down on time spent downloading / hitting the twitter api call limit
This commit is contained in:
parent
d2b1aa1adb
commit
334e8f8ff1
2 changed files with 33 additions and 6 deletions
3
links.json
Normal file
3
links.json
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"test": "test"
|
||||||
|
}
|
24
twitfix.py
24
twitfix.py
|
@ -1,11 +1,17 @@
|
||||||
from flask import Flask, render_template
|
from flask import Flask, render_template
|
||||||
import youtube_dl
|
import youtube_dl
|
||||||
|
import json
|
||||||
import re
|
import re
|
||||||
|
|
||||||
ydl = youtube_dl.YoutubeDL({'outtmpl': '%(id)s.%(ext)s'})
|
ydl = youtube_dl.YoutubeDL({'outtmpl': '%(id)s.%(ext)s'})
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
pathregex = re.compile("\\w{1,15}\\/status\\/\\d{19}")
|
pathregex = re.compile("\\w{1,15}\\/status\\/\\d{19}")
|
||||||
|
|
||||||
|
link_cache = {}
|
||||||
|
f = open('links.json',)
|
||||||
|
link_cache = json.load(f)
|
||||||
|
f.close()
|
||||||
|
|
||||||
@app.route('/<path:subpath>')
|
@app.route('/<path:subpath>')
|
||||||
def twitfix(subpath):
|
def twitfix(subpath):
|
||||||
|
|
||||||
|
@ -16,14 +22,32 @@ def twitfix(subpath):
|
||||||
if match.start() == 0:
|
if match.start() == 0:
|
||||||
twitter_url = "https://twitter.com/" + subpath
|
twitter_url = "https://twitter.com/" + subpath
|
||||||
|
|
||||||
|
if twitter_url in link_cache:
|
||||||
|
print("Link located in cache")
|
||||||
|
return render_template('index.html', vidurl=link_cache[twitter_url]['url'], tweet=link_cache[twitter_url]['description'], pic=link_cache[twitter_url]['thumbnail'], user=link_cache[twitter_url]['uploader'], tweeturl=twitter_url)
|
||||||
|
else:
|
||||||
with ydl:
|
with ydl:
|
||||||
try:
|
try:
|
||||||
|
print("Link not in cache, downloading and adding details to cache file")
|
||||||
result = ydl.extract_info(twitter_url, download=False)
|
result = ydl.extract_info(twitter_url, download=False)
|
||||||
|
|
||||||
|
link_cache[twitter_url] = {
|
||||||
|
"url" :result['url'],
|
||||||
|
"description" :result['description'],
|
||||||
|
"thumbnail" :result['thumbnail'],
|
||||||
|
"uploader" :result['uploader']
|
||||||
|
}
|
||||||
|
|
||||||
|
with open("links.json", "w") as outfile:
|
||||||
|
json.dump(link_cache, outfile, indent=4, sort_keys=True)
|
||||||
|
|
||||||
except Exception: # Just to keep from 500s that are messy
|
except Exception: # Just to keep from 500s that are messy
|
||||||
|
print(Exception)
|
||||||
return "Bad twitter link, try again"
|
return "Bad twitter link, try again"
|
||||||
|
|
||||||
return render_template('index.html', vidurl=result['url'], tweet=result['description'], pic=result['thumbnail'], user=result['uploader'], tweeturl=twitter_url)
|
return render_template('index.html', vidurl=result['url'], tweet=result['description'], pic=result['thumbnail'], user=result['uploader'], tweeturl=twitter_url)
|
||||||
else:
|
else:
|
||||||
|
print("Link invalid")
|
||||||
return "Please use a twitter link"
|
return "Please use a twitter link"
|
||||||
|
|
||||||
@app.route('/info/<path:subpath>')
|
@app.route('/info/<path:subpath>')
|
||||||
|
|
Loading…
Reference in a new issue