Fix name schemes after last change

I knew that was needed somewhere. Oh well.

Author: cyanreg

README.md

@@ -175,7 +175,7 @@ If you would like something different, read on. If for a one-off you'd like to s
 
 The syntax is as follows: everything not inside `{` or `}` tags gets copied as-is unconditionally.
 Everything inside `{` or `}` tags is interpreted: if what's inside the tags matches a metadata key,
-the tag along with its outer brackets is replaced as-is. Otherwise nothing, including the brackets, remains.
+the tag along with its outer brackets is replaced as-is. Otherwise only the tag brackets are removed and what's inside is copied literally.
 
 Conditions are possible and must follow this syntax: `{if #token1# != #token2#album name is |album|}`. Condition tokens must be wrapped in `#` tags, and both must exist.
 In between the 2 tokens must be either `>` or `<` or `==` or `!=`. If any of the tokens inside the `#` tags matches a metadata key, it is replaced with a value, otherwise its taken literally (so if the `album` tag exists, `#album#` resolves to the album name, otherwise to just `album`).

src/cyanrip_main.c

@@ -1077,12 +1077,16 @@ static int process_cond(cyanrip_ctx *ctx, AVBPrint *buf, AVDictionary *meta,
                         continue;
                     }
 
+                    int origin_is_tag = 1;
                     char *true_val = get_dir_tag_val(ctx, meta, ofmt, true_tok);
-                    if (true_val) {
-                        crip_bprint_sanitize(ctx, buf, true_val, dir_list, dir_list_nb, 1);
-                        av_free(true_val);
+                    if (!true_val) {
+                        true_val = av_strdup(true_tok);
+                        origin_is_tag = 0;
                     }
 
+                    crip_bprint_sanitize(ctx, buf, true_val, dir_list, dir_list_nb, origin_is_tag);
+                    av_free(true_val);
+
                     true_tok = av_strtok(NULL, "|", &true_save);
                 }
             }
@@ -1095,12 +1099,16 @@ static int process_cond(cyanrip_ctx *ctx, AVBPrint *buf, AVDictionary *meta,
             continue;
         }
 
+        int origin_is_tag = 1;
         char *val = get_dir_tag_val(ctx, meta, ofmt, tok);
-        if (val) {
-            crip_bprint_sanitize(ctx, buf, val, dir_list, dir_list_nb, 1);
-            av_free(val);
+        if (!val) {
+            val = av_strdup(tok);
+            origin_is_tag = 0;
         }
 
+        crip_bprint_sanitize(ctx, buf, val, dir_list, dir_list_nb, origin_is_tag);
+        av_free(val);
+
         tok = av_strtok(NULL, "{}", &save);
     }