fixed bug with no pagesize on fresh DB / first time in fix_dups. Also passing duplicate data (DD) as single object to dups.html

This commit is contained in:
2021-03-21 12:17:43 +11:00
parent 2939d91092
commit 2292777b83

View File

@@ -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():