Choose todo archive based on todo name

Author: kw217

app/src/main/java/net/gsantner/markor/model/AppSettings.java

@@ -49,6 +49,8 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import other.de.stanetz.jpencconverter.PasswordStore;
 
@@ -441,11 +443,25 @@ public void setLastTodoDoneName(final String path, final String name) {
         }
     }
 
+    private static final Pattern TODOTXT_STRIP_SUFFIX_PATTERN = Pattern.compile("(?i)(?:^|[-._])todo\\.txt$");
+
     public String getLastTodoDoneName(final String path) {
-        final String def = getLastTodoUsedArchiveFilename();
         if (!fexists(path)) {
-            return def;
+            return getLastTodoUsedArchiveFilename();
         } else {
+            // If possible, derive archive name from todofile name.
+            String def;
+
+            Matcher m = TODOTXT_STRIP_SUFFIX_PATTERN.matcher(fbasename(path));
+            if (m.find()) {
+                def = "." + m.replaceFirst(".todo.archive.txt");
+                if (def.startsWith("..")) {
+                    def = def.substring(1);
+                }
+            } else {
+                def = getLastTodoUsedArchiveFilename();
+            }
+
             return getString(PREF_PREFIX_TODO_DONE_NAME + path, def);
         }
     }

app/src/main/java/net/gsantner/opoc/model/GsSharedPreferencesPropertyBackend.java

@@ -622,4 +622,8 @@ public static boolean ne(final String str) {
     public static boolean fexists(final String fp) {
         return ne(fp) && (new File(fp)).exists();
     }
+
+    public static String fbasename(final String fp) {
+        return new File(fp).getName();
+    }
 }