kavin/Yotter
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #135 from Christiankoo/background_import

Browse Source 
Background process for importing data - Solves #95
This commit is contained in:
PLUJA 2020-11-04 08:22:38 +01:00 committed by GitHub
commit b5a0f84628
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/routes.py
View File

@ -7,6 +7,7 @@ import random
import re
import time
import urllib
from multiprocessing import Process
from concurrent.futures import as_completed
import bleach
@ -30,6 +31,7 @@ from app.models import User, twitterPost, ytPost, Post, youtubeFollow, twitterFo
from youtube import comments, utils, channel as ytch, search as yts
from youtube import watch as ytwatch
from youtube import video as ytvid
#########################################
#########################################
@ -84,10 +86,10 @@ def twitter(page=0):
c = len(followingList)
for user in followingList:
if c != 0:
nitter_feed_link = nitter_feed_link+"{},".format(user.username)
c = c-1
nitter_feed_link = nitter_feed_link + "{},".format(user.username)
c = c - 1
else:
nitter_feed_link = nitter_feed_link+user.username
nitter_feed_link = nitter_feed_link + user.username
cache_file = glob.glob("app/cache/{}_*".format(current_user.username))
if (len(cache_file) > 0):
@ -443,7 +445,8 @@ def channel(id):
prev_page = "/channel/{q}?s={s}&p={p}".format(q=id, s=sort, p=int(page) - 1)
return render_template('channel.html', form=form, btform=button_form, data=data,
restricted=config['restrictPublicUsage'], config=config, next_page=next_page, prev_page=prev_page)
restricted=config['restrictPublicUsage'], config=config, next_page=next_page,
prev_page=prev_page)
def get_best_urls(urls):
@ -467,6 +470,7 @@ def get_live_urls(urls):
best_urls.append(url)
return best_urls
@app.route('/watch', methods=['GET'])
@login_required
def watch():
@ -484,7 +488,9 @@ def watch():
# Markup description
try:
info['description'] = Markup(bleach.linkify(info['description'].replace("\n", "<br>"))).replace('www.youtube.com', config['serverName']).replace('youtube.com', config['serverName']).replace("/join","")
info['description'] = Markup(bleach.linkify(info['description'].replace("\n", "<br>"))).replace(
'www.youtube.com', config['serverName']).replace('youtube.com', config['serverName']).replace("/join",
"")
except AttributeError or TypeError:
print(info['description'])
@ -495,7 +501,7 @@ def watch():
if videocomments is not None:
videocomments.sort(key=lambda x: x['likes'], reverse=True)
else:
videocomments=False
videocomments = False
return render_template("video.html", info=info, title=info['title'], config=config,
videocomments=videocomments)
@ -679,14 +685,23 @@ def importdata():
flash('No selected file')
return redirect(request.referrer)
else:
importdataasync(file)
return redirect(request.referrer)
return redirect(request.referrer)
def importdataasync(file):
p = Process(target=importdataforprocess, args=(file,))
p.start()
def importdataforprocess(file):
option = request.form['import_format']
if option == 'yotter':
importYotterSubscriptions(file)
elif option == 'youtube':
importYoutubeSubscriptions(file)
return redirect(request.referrer)
return redirect(request.referrer)
@app.route('/deleteme', methods=['GET', 'POST'])
@ -759,7 +774,9 @@ def status():
filen = url_for('static', filename='img/open.png')
caniregister = True
return render_template('status.html', title='STATUS', count=count, max=config['maxInstanceUsers'], file=filen, cani=caniregister)
return render_template('status.html', title='STATUS', count=count, max=config['maxInstanceUsers'], file=filen,
cani=caniregister)
@app.route('/error/<errno>')
def error(errno):
@ -871,7 +888,7 @@ def getFeed(urls):
newPost["twitterName"] = post.find('a', attrs={'class': 'fullname'}).text
newPost["timeStamp"] = date_time_str
newPost["date"] = post.find('span', attrs={'class': 'tweet-date'}).find('a').text
content=post.find('div', attrs={'class': 'tweet-content'})
content = post.find('div', attrs={'class': 'tweet-content'})
newPost["content"] = Markup(str(content).replace("\n", "<br>"))
if post.find('div', attrs={'class': 'retweet-header'}):