From 86ff96fefb89ea8b6a64d877fc84b9d2acac33d4 Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Sun, 21 Mar 2021 12:18:59 +1100
Subject: [PATCH] now passing single DD var (duplicate data) from files.py for
 simplicity, also added the beginnings of support for regex-d auto keeping /
 auto deleting of files, and paths - noting that path data from dups.py seems
 to not be working with my test data at present, so html showing it needs
 testing too

---
 templates/dups.html | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/templates/dups.html b/templates/dups.html
index ea3f97f..babcc37 100644
--- a/templates/dups.html
+++ b/templates/dups.html
@@ -6,8 +6,8 @@
             <input type="hidden" name="fe_msg_id" value="{{fe_msg_id}}"></input>
             <h5>
             <div class="form-group">
-                <label for="pagesize">{{overall_dup_sets}} sets/dirs of files 
-                    containing {{overall_dup_cnt}} files -- Showing&nbsp;</label>
+                <label for="pagesize">{{DD.overall_dup_sets}} sets/dirs of files 
+                    containing {{DD.overall_dup_cnt}} files -- Showing&nbsp;</label>
                 <select id="pagesize" class="form form-control" name="pagesize" onChange="ResetPageSize()">
                 {% for o in "5", "10", "15", "20", "25", "50", "75", "100", "200" %}
                     <option
@@ -67,14 +67,29 @@
                 {% set page=namespace(cnt=0) %}
                 {% set pref=namespace(have="") %}
                 {% set count=namespace( del=0, keep=0 ) %}
+                {% for dups in DD.ip_to_sp_dups_keep %}
+                    {% set count.keep = count.keep+1 %}
+                    need to do some hidden inputs here to keep these files<br>
+                {% endfor %}
+                {% for dups in DD.ip_to_sp_dups_del %}
+                    {% set count.del = count.del+1 %}
+                    maybe need to do some hidden inputs here to del these files? (not sure it was needed in del code to triple-check)<br>
+                {% endfor %}
+                {% if count.keep or count.del %}
+                    <div class="col-lg-12">
+                    Keeping {{count.keep}} files in storage path and deleting {{count.del}} from import path
+                    </div>
+                    {% set count.keep=0 %}
+                    {% set count.del=0 %}
+                {% endif %}
                 <h5>Choose between these files:</h5>
-                {% for dups in per_file_dups %}
+                {% for dups in DD.per_file_dups %}
                     {% set outer_loop=loop.index %}
                     {% set pref.have="" %}
                     {% for dup in dups %}
-                        {% if preferred[dup.h] %}
+                        {% if DD.preferred_file[dup.h] %}
                             {% set pref.have = "True" %}
-                            {% if preferred[dup.h] == dup.id %}
+                            {% if DD.preferred_file[dup.h] == dup.id %}
                                 <input type="hidden" name="kfhash-{{outer_loop}}" value="{{dup.h}}">
                                 <input type="hidden" id="kfname-{{outer_loop}}" name="kfname-{{outer_loop}}" value="">
                                 {% set count.keep = count.keep + 1 %}
@@ -88,7 +103,7 @@
                                 {% endif %}
                                     <alert id="kf{{outer_loop}}-f{{loop.index}}" style="cursor: pointer;"  class="alert"
                                         onClick="KeepFile({{outer_loop}},{{loop.index}},'success')">{{dup.d}}/{{dup.f}}</alert>
-                                    {% if preferred[dup.h] == dup.id %}
+                                    {% if DD.preferred_file[dup.h] == dup.id %}
                                         {% set pref.have="kf{}-f{}".format(outer_loop,loop.index) %}
                                     {% endif %}
                                     {% if loop.index < dups|length %}
@@ -118,7 +133,7 @@
 
                 {% if page.cnt < pagesize %}
                     <h5 class="mt-3">Choose path to KEEP (same file names in 2 different directories):</h5>
-                    {% for dup in per_path_dups %}
+                    {% for dup in DD.per_path_dups %}
                         <div class="col-lg-12 py-2">
                             {{dup.count}} duplicates in: 
                             <alert id="kd{{loop.index}}-d1" style="cursor: pointer;" onClick="KeepDir({{loop.index}}, 1)" class="alert">{{dup.d1}}</alert> or
@@ -128,6 +143,12 @@
                             <script>
                                 D[{{loop.index}}1]="{{dup.did1}}"
                                 D[{{loop.index}}2]="{{dup.did2}}"
+                                {% if DD.preferred_path[dup.h] == dup.id1 %}
+                                    KeepDir( {{loop.inex}}, 1 )
+                                {% endif %}
+                                {% if DD.preferred_path[dup.h] == dup.id2 %}
+                                    KeepDir( {{loop.inex}}, 2 )
+                                {% endif %}
                             </script>
                         </div>
                         {% set page.cnt = page.cnt + 1 %}