junklib: cleanup junk_rewrite_tags, make sure that known field names are written upper case / as specified in remapping table

Author: Oleksiy-Yakovenko

src/junklib.c

@@ -4689,6 +4689,9 @@ junk_recode (const char *in, int inlen, char *out, int outlen, const char *cs) {
 
 int
 junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const char *id3v1_encoding) {
+    if (id3v2_version != 3 && id3v2_version != 4) {
+        trace ("junk_rewrite_tags: can't write id3v2 version %d\n", id3v2_version);
+    }
     trace ("junk_rewrite_tags %X\n", junk_flags);
     int err = -1;
     char *buffer = NULL;
@@ -4927,53 +4930,57 @@ junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const
                 }
             }
 
-            // frames which should not remap to TXXX
-            static const char *txxx_no_fallbacks[] = {
-                "comment",
-                "unsynced lyrics",
-                "track"
-                "numtracks"
-                "disc"
-                "numdiscs",
-                NULL
-            };
-
-            if (!noremap) {
-                if (mapidx >= 0) {
-                    for (int i = 0; txxx_no_fallbacks[i]; i++) {
-                        if (!strcasecmp (txxx_no_fallbacks[i], meta->key)) {
-                            noremap = 1;
-                            break;
-                        }
-                    }
-                }
-            }
-
             // is this a text frame that needs remapping to TXXX?
-            if (!noremap) {
+            if (!noremap && mapidx >= 0) {
                 if (!frame_mapping[mapidx+MAP_ID3V24] || frame_mapping[mapidx+MAP_ID3V24][0] != 'T') {
                     noremap = 1;
                 }
             }
 
+            if (!noremap && mapidx >= 0) {
+                // frames which should not remap to TXXX
+                static const char *txxx_no_fallbacks[] = {
+                    "comment",
+                    "unsynced lyrics",
+                    "track"
+                    "numtracks"
+                    "disc"
+                    "numdiscs",
+                    NULL
+                };
+
+                for (int i = 0; txxx_no_fallbacks[i]; i++) {
+                    if (!strcasecmp (txxx_no_fallbacks[i], meta->key)) {
+                        noremap = 1;
+                        break;
+                    }
+                }
+            }
+
             if (!noremap) {
                 // add as txxx
-                int out_size;
+                int out_size = 0;
+                int needs_free = 0;
+                const char *tag_value = NULL;
 
-                int needs_free;
-                const char *tag_value;
-                if (id3v2.version[0] == 4) {
+                if (id3v2_version == 4) {
                     tag_value = _get_combined_meta_value (meta, &out_size, "\0", 1, &needs_free);
                 }
-                else if (id3v2.version[0] == 3) {
+                else if (id3v2_version == 3) {
                     tag_value = _get_combined_meta_value (meta, &out_size, " / ", 3, &needs_free);
                 }
-                else {
-                    assert (0);
+
+                const char *key;
+                if (mapidx >= 0) {
+                    trace ("remapping unsupported text frame to TXXX %s=%s\n", key, tag_value);
+                    key = frame_mapping[mapidx];
+                } else {
+                    trace ("adding unknown/custom text frame as TXXX %s=%s\n", key, tag_value);
+                    key = meta->key;
                 }
-                trace ("adding unknown frame as TXX %s=%s\n", meta->key, tag_value);
-                junk_id3v2_remove_txxx_frame (&id3v2, meta->key);
-                junk_id3v2_add_txxx_frame (&id3v2, meta->key, tag_value, out_size);
+
+                junk_id3v2_remove_txxx_frame (&id3v2, key);
+                junk_id3v2_add_txxx_frame (&id3v2, key, tag_value, out_size);
                 if (needs_free) {
                     free ((char *)tag_value);
                 }
@@ -5106,22 +5113,30 @@ junk_rewrite_tags (playItem_t *it, uint32_t junk_flags, int id3v2_version, const
             if (strchr (":!_", meta->key[0])) {
                 break;
             }
+            const char *key = NULL;
             int i;
             for (i = 0; frame_mapping[i]; i += FRAME_MAPPINGS) {
-                if (!strcasecmp (meta->key, frame_mapping[i+MAP_DDB]) && frame_mapping[i+MAP_APEV2]) {
-                    trace ("apev2 appending known field: %s=%s\n", meta->key, meta->value);
-                    _apev2_append_combined_text_frame_from_meta (&apev2, frame_mapping[i+MAP_APEV2], meta);
+                if (!strcasecmp (meta->key, frame_mapping[i+MAP_DDB])) {
+                    if (frame_mapping[i+MAP_APEV2]) {
+                        trace ("apev2 appending known field: %s=%s\n", meta->key, meta->value);
+                        _apev2_append_combined_text_frame_from_meta (&apev2, frame_mapping[i+MAP_APEV2], meta);
+                    } else {
+                        key = frame_mapping[i];
+                    }
                     break;
                 }
             }
-            if (!frame_mapping[i]
+            if ((key != NULL || !frame_mapping[i])
                     && strcasecmp (meta->key, "track")
                     && strcasecmp (meta->key, "numtracks")
                     && strcasecmp (meta->key, "disc")
                     && strcasecmp (meta->key, "numdiscs")
                ) {
-                trace ("apev2 writing unknown field: %s=%s\n", meta->key, meta->value);
-                _apev2_append_combined_text_frame_from_meta (&apev2, meta->key, meta);
+                if (key == NULL) {
+                    key = meta->key;
+                }
+                trace ("apev2 writing unknown field: %s=%s\n", key, meta->value);
+                _apev2_append_combined_text_frame_from_meta (&apev2, key, meta);
             }
             meta = meta->next;
         }