From bb11b5dcacc6ad8f6dfeb9ccb9e98a4bca7a39bd Mon Sep 17 00:00:00 2001
From: ljf <ljf+git@grimaud.me>
Date: Tue, 31 Aug 2021 04:20:21 +0200
Subject: [PATCH] [enh] Be able to delete source file

---
 data/helpers.d/configpanel | 10 +++++++++-
 src/yunohost/app.py        | 10 +++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/data/helpers.d/configpanel b/data/helpers.d/configpanel
index cfdbfc331..e99a66d4c 100644
--- a/data/helpers.d/configpanel
+++ b/data/helpers.d/configpanel
@@ -187,7 +187,11 @@ _ynh_panel_apply() {
                     ynh_die "File '${short_setting}' can't be stored in settings"
                 fi
                 local source_file="$(echo "$source" | sed s@__FINALPATH__@$final_path@ | sed s/__APP__/$app/)"
-                cp "${!short_setting}" "$source_file"
+                if [[ "${!short_setting}" == "" ]] ; then
+                    rm -f "$source_file"
+                else
+                    cp "${!short_setting}" "$source_file"
+                fi
             
             # Save value in app settings 
             elif [[ "$source" == "settings" ]] ; then
@@ -247,6 +251,10 @@ _ynh_panel_validate() {
             file_hash[new__$short_setting]=""
             if [ -f "${old[$short_setting]}" ] ; then
                 file_hash[old__$short_setting]=$(sha256sum "${old[$short_setting]}" | cut -d' ' -f1)
+                if [ -z "${!short_setting}" ] ; then
+                    changed[$short_setting]=true
+                    is_error=false
+                fi
             fi
             if [ -f "${!short_setting}" ] ; then
                 file_hash[new__$short_setting]=$(sha256sum "${!short_setting}" | cut -d' ' -f1)
diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 2ea1a3b70..425f04023 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -3190,20 +3190,24 @@ class FileArgumentParser(YunoHostArgumentFormatParser):
         else:
             question_parsed.accept = []
         if Moulinette.interface.type== 'api':
-            if user_answers.get(question_parsed.name):
+            if user_answers.get(f"{question_parsed.name}[name]"):
                 question_parsed.value = {
                     'content': question_parsed.value,
                     'filename': user_answers.get(f"{question_parsed.name}[name]", question_parsed.name),
                 }
+        # If path file are the same
+        if question_parsed.value and str(question_parsed.value) == question_parsed.current_value:
+            question_parsed.value = None
+
         return question_parsed
 
     def _prevalidate(self, question):
         super()._prevalidate(question)
-        if isinstance(question.value, str) and not os.path.exists(question.value):
+        if isinstance(question.value, str) and question.value and not os.path.exists(question.value):
             raise YunohostValidationError(
                 "app_argument_invalid", name=question.name, error=m18n.n("invalid_number1")
             )
-        if question.value is None or not question.accept:
+        if question.value in [None, ''] or not question.accept:
             return
 
         filename = question.value if isinstance(question.value, str) else question.value['filename']