From 2292777b8311e06ffcfb2a99ad7843704f409b52 Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Sun, 21 Mar 2021 12:17:43 +1100 Subject: [PATCH] fixed bug with no pagesize on fresh DB / first time in fix_dups. Also passing duplicate data (DD) as single object to dups.html --- files.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/files.py b/files.py index a2621eb..69b032f 100644 --- a/files.py +++ b/files.py @@ -272,18 +272,20 @@ def fix_dups(): return render_template("base.html") if 'pagesize' not in request.form: + # default to 10, see if we have a larger value as someone reset it in the gui, rather than first time invoked + pagesize = 10 jexes = JobExtra.query.join(Job).join(PA_JobManager_Message).filter(PA_JobManager_Message.id==request.form['fe_msg_id']).all() - pagesize=int([jex.value for jex in jexes if jex.name == "pagesize"][0]) + jexes.append( JobExtra( name="pagesize", value=pagesize ) ) else: pagesize=int(request.form['pagesize']) - D=Duplicates() + DD=Duplicates() for row in rows: - D.AddDup( row ) + DD.AddDup( row ) - D.SecondPass() -# print( D.Dump() ) + DD.SecondPass() + print( DD.Dump() ) - return render_template("dups.html", per_file_dups=D.per_file_dups, preferred=D.preferred_file, per_path_dups=D.per_path_dups, fe_msg_id=request.form['fe_msg_id'], overall_dup_cnt=D.overall_dup_cnt, overall_dup_sets=D.overall_dup_sets, pagesize=pagesize ) + return render_template("dups.html", DD=DD, fe_msg_id=request.form['fe_msg_id'], pagesize=pagesize ) @app.route("/rm_dups", methods=["POST"]) def rm_dups():