ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add in file cnt inside dup paths

Browse Source
This commit is contained in:
Damien De Paoli
2021-03-24 19:35:49 +11:00
parent 6e50390886
commit a6161d1fa2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
templates/dups.html
View File

@@ -124,10 +124,10 @@
{% endfor %} {% endfor %}
{% if count.keep %} {% if count.keep %}
{% set auto.str = auto.str + "<li>Duplicates in storage path matching naming convention: Keep={}, Delete={}</li>".format(count.keep, count.del) %} {% set auto.str = auto.str + "<li>Keeping {} files inside storage path, Deleting {} duplicates files from storage path</li>".format(count.keep, count.del) %}
{% endif %} {% endif %}
{% set count=namespace( del=0, keep=0 ) %} {% set count=namespace( keep_d=0, keep_f=0 ) %}
{% for dup in DD.per_path_dups %} {% for dup in DD.per_path_dups %}
{% if DD.preferred_path[dup.did1] or DD.preferred_path[dup.did2] %} {% if DD.preferred_path[dup.did1] or DD.preferred_path[dup.did2] %}
<input id="kdid-{{loop.index}}" type="hidden" name="kdid-1"> <input id="kdid-{{loop.index}}" type="hidden" name="kdid-1">
@@ -137,7 +137,8 @@
{% else %} {% else %}
<input type="hidden" name="kdid-{{loop.index}}" value="DD.preferred_path[dup.did2]"> <input type="hidden" name="kdid-{{loop.index}}" value="DD.preferred_path[dup.did2]">
{% endif %} {% endif %}
{% set count.keep = count.keep + 1 %} {% set count.keep_d = count.keep_d + 1 %}
{% set count.keep_f = count.keep_f + dup.hashes|wordcount %}
{% elif page.cnt <= pagesize %} {% elif page.cnt <= pagesize %}
<div class="col-lg-12 py-2"> <div class="col-lg-12 py-2">
<h5 class="col-lg-12 mt-3">Choose path to KEEP (same file names in 2 different directories):</h5> <h5 class="col-lg-12 mt-3">Choose path to KEEP (same file names in 2 different directories):</h5>
@@ -165,9 +166,9 @@
{% set page.cnt = page.cnt + 1 %} {% set page.cnt = page.cnt + 1 %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% if count.keep %} {% if count.keep_d %}
<div class="col-lg-12"> <div class="col-lg-12">
{% set auto.str = auto.str + "<li>Keeping={}, Deleting={} paths of duplicates</li>".format(count.keep, count.keep) %} {% set auto.str = auto.str + "<li>Keeping {} files in {} paths, Deleting={} file in {} paths</li>".format( count.keep_f, count.keep_d, count.keep_f, count.keep_d) %}
</div> </div>
{% endif %} {% endif %}
{% if auto.str|length %} {% if auto.str|length %}