From 70630e939ed41259db6ab9ed8ffc3869a73a8a83 Mon Sep 17 00:00:00 2001 From: pluja Date: Sun, 16 Aug 2020 21:47:18 +0200 Subject: [PATCH] Improve loading times, improve proxy, remove invidious links --- app/routes.py | 69 ++++++++++++++-------------------- app/templates/_video_item.html | 2 +- app/templates/base.html | 2 +- app/templates/video.html | 2 +- 4 files changed, 31 insertions(+), 44 deletions(-) diff --git a/app/routes.py b/app/routes.py index fa87e41..ad9b891 100644 --- a/app/routes.py +++ b/app/routes.py @@ -19,8 +19,9 @@ import re # Instances - Format must be instance.tld (No '/' and no 'https://') nitterInstance = "https://nitter.net/" nitterInstanceII = "https://nitter.mastodont.cat/" + +ytChannelRss = "https://www.youtube.com/feeds/videos.xml?channel_id=" invidiousInstance = "invidio.us" -proxy = "" #eg. socks5://IP:PORT ######################### #### Twitter Logic ###### @@ -197,33 +198,16 @@ def user(username): ######################### #### Youtube Logic ###### ######################### -@app.route('/invidious', methods=['GET', 'POST']) +@app.route('/youtube', methods=['GET', 'POST']) @login_required -def invidious(): +def youtube(): start_time = time.time() - form = ChannelForm() - if form.validate_on_submit(): - channelId = form.channelId.data - if requests.get('https://{instance}/feed/channel/{cid}'.format(instance=invidiousInstance, cid=channelId)).status_code == 200: - follow = invidiousFollow() - follow.channelId = channelId - follow.followers.append(current_user) - try: - db.session.add(follow) - db.session.commit() - flash("Added to list!") - except: - flash("Something went wrong. Try again!") - return redirect(url_for('invidious')) - else: - flash("Enter a valid Channel ID. Eg: UCJWCJCWOxBYSi5DhCieLOLQ") - return redirect(url_for('invidious')) ids = current_user.youtube_following_list() videos = getYoutubePosts(ids) if videos: videos.sort(key=lambda x: x.date, reverse=True) print("--- {} seconds fetching invidious feed---".format(time.time() - start_time)) - return render_template('invidious.html', videos=videos, form=form) + return render_template('invidious.html', videos=videos) @app.route('/ytsearch', methods=['GET', 'POST']) @login_required @@ -301,18 +285,16 @@ def ytunfollow(channelId): flash("There was an error unfollowing the user. Try again.") return redirect(url_for('ytsearch')) -@app.route('/video/', methods=['POST', 'GET']) +@app.route('/watch', methods=['POST', 'GET']) @login_required -def video(id): - if proxy: - ydl_opts = { - 'proxy':proxy - } - else: - ydl_opts = {} - - ydl = YoutubeDL(ydl_opts) +def watch(): + id = request.args.get('v', None) + ydl = YoutubeDL() data = ydl.extract_info("{id}".format(id=id), download=False) + if data['formats'][-1]['url'].find("manifest.googlevideo") > 0: + flash("Livestreams are not yet supported!") + return redirect(url_for('youtube')) + video = { 'title':data['title'], 'description':Markup(data['description']), @@ -324,14 +306,20 @@ def video(id): } return render_template("video.html", video=video) -## PROXY -@app.route('/watch/') -def watch(id): - ydl = YoutubeDL() - data = ydl.extract_info("{id}".format(id=id), download=False) - req = requests.get(data['formats'][-2]['url'], stream = True) - return Response(stream_with_context(req.iter_content(chunk_size=4096)), content_type = req.headers['content-type']) - +## PROXY videos through Parasitter server to the client. +@app.route('/stream', methods=['GET']) +@login_required +def stream(): + id = request.args.get('v', None) + if(id): + ydl = YoutubeDL() + data = ydl.extract_info("{id}".format(id=id), download=False) + req = requests.get(data['formats'][-1]['url'], stream = True) + return Response(stream_with_context(req.iter_content(chunk_size=4096)), content_type = req.headers['content-type']) + else: + # Temporarilly play a blank video. + req = requests.get('https://cdn.plyr.io/static/blank.mp4', stream=True) + return Response(stream_with_context(req.iter_content(chunk_size=4096)), content_type = req.headers['content-type']) ######################### #### General Logic ###### @@ -516,9 +504,8 @@ def getPosts(account): def getYoutubePosts(ids): videos = [] ydl = YoutubeDL() - link = ydl.extract_info("https://www.youtube.com/watch?v=XCSfoiD8wUA", download=False)['formats'][-1]['url'] with FuturesSession() as session: - futures = [session.get('https://www.youtube.com/feeds/videos.xml?channel_id={id}'.format(instance=invidiousInstance, id=id.channelId)) for id in ids] + futures = [session.get('https://www.youtube.com/feeds/videos.xml?channel_id={id}'.format(id=id.channelId)) for id in ids] for future in as_completed(futures): resp = future.result() rssFeed=feedparser.parse(resp.content) diff --git a/app/templates/_video_item.html b/app/templates/_video_item.html index 41c1b69..35cf435 100644 --- a/app/templates/_video_item.html +++ b/app/templates/_video_item.html @@ -3,7 +3,7 @@
- {{video.videoTitle}} + {{video.videoTitle}}
{{video.channelName}}
diff --git a/app/templates/base.html b/app/templates/base.html index 830d4ef..5b2f4d7 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -24,7 +24,7 @@ - Youtube + Youtube Search Logout diff --git a/app/templates/video.html b/app/templates/video.html index 93fb29a..861afff 100644 --- a/app/templates/video.html +++ b/app/templates/video.html @@ -3,7 +3,7 @@ {% block content %}