gauthiier/listservs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

debug double loading

Browse Source
This commit is contained in:
gauthiier 2017-11-07 14:36:05 +01:00
parent f6f08bbba4
commit 28afef6d64
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/archives.py
View File

@ -69,10 +69,5 @@ class Archives(metaclass=Singleton):
return arch return arch
logging.info(' ------- arch = Archives() -------- ')
arch = Archives()
arch.load()
archives_data = arch.data

32
www/routes.py
View File

@ -4,9 +4,15 @@ from www import archives
import search.archive import search.archive
from datetime import datetime from datetime import datetime
logging.info(' ------- arch = Archives() -------- ')
arch = archives.Archives()
arch.load()
archives_data = arch.data
@app.route('/') @app.route('/')
def index(): def index():
k = archives.archives_data.keys() k = archives_data.keys()
return render_template("index.html", archives=k) return render_template("index.html", archives=k)
def get_key(kv_tuple): def get_key(kv_tuple):
@ -35,9 +41,9 @@ def get_key(kv_tuple):
@app.route('/<list>') @app.route('/<list>')
def get_list(list): def get_list(list):
if list in archives.archives_data: if list in archives_data:
d = [] d = []
for k, v in sorted(archives.archives_data[list].items(), key=get_key, reverse=True): for k, v in sorted(archives_data[list].items(), key=get_key, reverse=True):
d.append({"name": k, "url": v['url'], "nbr_threads": len(v['threads'])}) d.append({"name": k, "url": v['url'], "nbr_threads": len(v['threads'])})
return render_template("list.html", list_name=list, list=d) return render_template("list.html", list_name=list, list=d)
@ -51,8 +57,8 @@ def get_sublist(list, sublist):
print(sublist) print(sublist)
sublist = sublist.replace(' ', '_') sublist = sublist.replace(' ', '_')
if list in archives.archives_data and sublist in archives.archives_data[list]: if list in archives_data and sublist in archives_data[list]:
return render_template("threads.html", sublist_name=sublist, threads=archives.archives_data[list][sublist]['threads']) return render_template("threads.html", sublist_name=sublist, threads=archives_data[list][sublist]['threads'])
else: else:
return 'na na' return 'na na'
@ -61,8 +67,8 @@ def get_message(list, sublist, index):
sublist = sublist.replace(' ', '_') sublist = sublist.replace(' ', '_')
index = int(index) index = int(index)
if list in archives.archives_data and sublist in archives.archives_data[list] and index < len(archives.archives_data[list][sublist]['threads']): if list in archives_data and sublist in archives_data[list] and index < len(archives_data[list][sublist]['threads']):
return render_template("message.html", message=archives.archives_data[list][sublist]['threads'][index]) return render_template("message.html", message=archives_data[list][sublist]['threads'][index])
else: else:
'non non' 'non non'
@ -77,8 +83,8 @@ def get_follow_ups(list, sublist, index, follow_ups):
for u in ups: for u in ups:
follow.append(int(u)) follow.append(int(u))
if list in archives.archives_data and sublist in archives.archives_data[list] and index < len(archives.archives_data[list][sublist]['threads']): if list in archives_data and sublist in archives_data[list] and index < len(archives_data[list][sublist]['threads']):
message = archives.archives_data[list][sublist]['threads'][index] message = archives_data[list][sublist]['threads'][index]
for f in follow: for f in follow:
message = message['follow-up'][f] message = message['follow-up'][f]
return render_template("message.html", message=message) return render_template("message.html", message=message)
@ -89,7 +95,7 @@ def get_follow_ups(list, sublist, index, follow_ups):
def searh(): def searh():
if len(request.args) < 1: if len(request.args) < 1:
k = archives.archives_data.keys() k = archives_data.keys()
return render_template("search.html", archives=k, fields=['content', 'from(name)', 'from(email)']) return render_template("search.html", archives=k, fields=['content', 'from(name)', 'from(email)'])
k_arg = request.args.get('keyword') k_arg = request.args.get('keyword')
@ -103,11 +109,11 @@ def searh():
if l_arg is None: if l_arg is None:
return "no list..." return "no list..."
if not (l_arg == "all") and not (l_arg in archives.archives_data): if not (l_arg == "all") and not (l_arg in archives_data):
return "list '" + l_arg + "' does not exist" return "list '" + l_arg + "' does not exist"
if sl_arg is not None: if sl_arg is not None:
if not sl_arg in archives.archives_data[l]: if not sl_arg in archives_data[l]:
return "sublist '" + sl_arg + "' does not exist in list '" + l_arg + "'" return "sublist '" + sl_arg + "' does not exist in list '" + l_arg + "'"
if f_arg == "from(name)": if f_arg == "from(name)":
@ -117,7 +123,7 @@ def searh():
lists = [] lists = []
if l_arg == "all": if l_arg == "all":
for k in archives.archives_data.keys(): for k in archives_data.keys():
lists.append(k) lists.append(k)
else: else:
lists.append(l_arg) lists.append(l_arg)