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

minor clean up of screen content

Browse Source
This commit is contained in:
Damien De Paoli
2021-09-04 19:50:27 +10:00
parent cf455cca29
commit 4a9c3b4aa3
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
templates/dups.html
View File

@@ -82,7 +82,7 @@
{% set count.del = count.del + DD.ip_to_sp_dups_del[h]|length %} {% set count.del = count.del + DD.ip_to_sp_dups_del[h]|length %}
{% endfor %} {% endfor %}
{% if count.keep %} {% if count.keep %}
{% set auto.str = auto.str + "<li>Keeping {} files in storage path and deleting {} from import path</li>".format(count.keep, count.del) %} {% set auto.str = auto.str + "<li>Keeping {} files in storage path and Deleting {} from import path</li>".format(count.keep, count.del) %}
{% set all_count.k_files = all_count.k_files + count.keep %} {% set all_count.k_files = all_count.k_files + count.keep %}
{% set all_count.d_files = all_count.d_files + count.del %} {% set all_count.d_files = all_count.d_files + count.del %}
{% endif %} {% endif %}
@@ -94,6 +94,7 @@
{% for dup in dups %} {% for dup in dups %}
{# for each hash in preferred_file, auto keep it, only need hidden input, dont process further #} {# for each hash in preferred_file, auto keep it, only need hidden input, dont process further #}
{% if DD.preferred_file[dup.h] %} {% if DD.preferred_file[dup.h] %}
<input type="hidden" name="YES" value="{{dup.h}}">
{% set pref.have = "True" %} {% set pref.have = "True" %}
{% if DD.preferred_file[dup.h] == dup.id %} {% if DD.preferred_file[dup.h] == dup.id %}
{% set kfid.count = kfid.count+1 %} {% set kfid.count = kfid.count+1 %}
@@ -103,7 +104,11 @@
{% else %} {% else %}
{% set count.del = count.del + 1 %} {% set count.del = count.del + 1 %}
{% endif %} {% endif %}
{% elif DD.ip_to_sp_dups_keep[dup.h] %}
{# okay, this is a per file choice, and yet it is in the ip and sp, so sp one was kept, ignore this one it should just be deleted #}
{# TOTHINK: can you have sp to sp here, and be in ip to sp??? so still need an alert choice? #}
{% else %} {% else %}
<input type="hidden" name="NO" value="{{dup.h}}">
{# okay, show an alert / make it choosable for each of these manually processed dups #} {# okay, show an alert / make it choosable for each of these manually processed dups #}
{% if loop.index == 1 %} {% if loop.index == 1 %}
{% set all_count.manual = all_count.manual + 1 %} {% set all_count.manual = all_count.manual + 1 %}
@@ -145,7 +150,7 @@
{% endfor %} {% endfor %}
{% if count.keep %} {% if count.keep %}
{% set auto.str = auto.str + "<li>Keeping {} files inside storage path, Deleting {} duplicates files from storage path</li>".format(count.keep, count.del) %} {% set auto.str = auto.str + "<li>Keeping {} files inside storage path, Deleting {} duplicates files from storage/import path</li>".format(count.keep, count.del) %}
{% set all_count.k_files = all_count.k_files + count.keep %} {% set all_count.k_files = all_count.k_files + count.keep %}
{% set all_count.d_files = all_count.d_files + count.del %} {% set all_count.d_files = all_count.d_files + count.del %}
{% set all_count.mk_files = count.man_keep %} {% set all_count.mk_files = count.man_keep %}
@@ -197,7 +202,7 @@
{% endfor %} {% endfor %}
{% if count.keep_d %} {% if count.keep_d %}
<div class="col-12"> <div class="col-12">
{% 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) %} {% 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) %}
{% set all_count.k_files = all_count.k_files + count.keep_f %} {% set all_count.k_files = all_count.k_files + count.keep_f %}
{% set all_count.d_files = all_count.d_files + count.keep_f %} {% set all_count.d_files = all_count.d_files + count.keep_f %}
{% set all_count.mk_files = all_count.mk_files + count.m_files %} {% set all_count.mk_files = all_count.mk_files + count.m_files %}
@@ -209,8 +214,10 @@
<ul> <ul>
{{auto.str|safe}} {{auto.str|safe}}
</ul> </ul>
Automatically Keeping {{all_count.k_files}} files and deleting {{all_count.d_files}} files<br> Automatically Keeping {{all_count.k_files}} files and Deleting {{all_count.d_files}} files<br>
Leaving {{all_count.manual}} manual choices to make (to keep {{all_count.mk_files}} files and delete {{all_count.md_files}} files) {% if all_count.manual %}
Leaving {{all_count.manual}} manual choices to make (to Keep {{all_count.mk_files}} files and Delete {{all_count.md_files}} files)
{% endif %}
{# {#
So by counting/double-check, uniq files kept = {{all_count.k_files+all_count.mk_files}}, overall dups = {{all_count.k_files+all_count.d_files+all_count.mk_files+all_count.md_files}} So by counting/double-check, uniq files kept = {{all_count.k_files+all_count.mk_files}}, overall dups = {{all_count.k_files+all_count.d_files+all_count.mk_files+all_count.md_files}}