diff --git a/files.py b/files.py index 37716fc..cad9c5e 100644 --- a/files.py +++ b/files.py @@ -236,8 +236,6 @@ def fix_dups(): dup_cnt += 1 per_path_dups.append({'count': dup_cnt, 'd1': d1, 'd2': d2 }) - st.SetAlert("warning") - st.SetMessage("Not Yet!") return render_template("dups.html", per_file_dups=per_file_dups, per_path_dups=per_path_dups) @app.route("/move_files", methods=["POST"]) diff --git a/templates/base.html b/templates/base.html index 22487c9..82d1553 100644 --- a/templates/base.html +++ b/templates/base.html @@ -109,14 +109,16 @@ {% endif %} {% if GetJM_Message() != None %} {% set msg=GetJM_Message() %} -
- {% if msg.job_id %} - Job #{{msg.job_id}}: + {% if url_for(request.endpoint) != "/fix_dups" %} +
+ {% if msg.job_id %} + Job #{{msg.job_id}}: + {% endif %} + {{msg.message|safe}} +
+ {% if msg.alert != "danger" %} + {% set dont_print=ClearJM_Message(msg.id) %} {% endif %} - {{msg.message|safe}} -
- {% if msg.alert != "danger" %} - {% set dont_print=ClearJM_Message(msg.id) %} {% endif %} {% endif %} {% endif %} diff --git a/templates/dups.html b/templates/dups.html index 0c757e8..7426642 100644 --- a/templates/dups.html +++ b/templates/dups.html @@ -1,11 +1,11 @@ {% extends "base.html" %} {% block main_content %}

{{page_title}}

-

Duplicate files have been detected. They have the same binary content, +

Duplicate files have been detected. They have the same binary content, but either have a different name or are stored in two different directories. Choose between the options below. NOTE: after you click 'Delete Duplicates', the files / directories in red will be deleted from the file - system, those in green will remain

+ system, those in green will remain