summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2017-01-30 20:35:35 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2017-01-30 20:35:35 (GMT)
commit6494fe85e087bad327859dd3103133569ac2ec5b (patch) (side-by-side diff)
tree8daa2bef423a0b62e67fdaf3a177647d796acd7e
parentcb959f75e36fbc08105fdc311fddd50516c5f1d8 (diff)
downloadidest-6494fe85e087bad327859dd3103133569ac2ec5b.tar.gz
idest-6494fe85e087bad327859dd3103133569ac2ec5b.tar.bz2
Apply --broken-8bit-charset only to frames in 8-bit encoding.
* src/frametab.gperf (decode_qv): Passe frame as the 2nd argument to field_to_string. (text_decode): Likewise. * src/idest.h (idest_ucs4_cvt): Remove. (field_to_string): Change the type of the 2nd argument. * src/idop.c (frame_encoding_is_8bit) (frame_is_genre): New auxiliary functions. (idest_ucs4_cvt): Take frame as the 2nd argument. Do recoding only if the frame's encoding in 8-bit. (add_stringlist): Take frame instead of the isgenre boolean; pass it to idest_ucs4_cvt. All uses changed. (field_to_string): Take frame as the 2nd argument. All uses changed. (fixup_charset): Merge with collect_text_frames.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/frametab.gperf7
-rw-r--r--src/idest.h3
-rw-r--r--src/idop.c59
3 files changed, 44 insertions, 25 deletions
diff --git a/src/frametab.gperf b/src/frametab.gperf
index 7863d08..c02b771 100644
--- a/src/frametab.gperf
+++ b/src/frametab.gperf
@@ -42,7 +42,7 @@ decode_qv(struct ed_item *item, struct id3_frame const *frame,
field = id3_frame_field(frame, n + i);
if (!field)
break;
- item->qv[i] = field_to_string(field, 0);
+ item->qv[i] = field_to_string(field, frame);
}
return 0;
}
@@ -346,15 +346,14 @@ text_encode(struct id3_frame *frame, struct ed_item const *item)
static int
text_decode(struct ed_item *item, struct id3_frame const *frame)
{
- int isgenre = strcmp(frame->id, ID3_FRAME_GENRE) == 0;
union id3_field *field;
char *str;
int rc;
-
+
field = id3_frame_field(frame, 1);
if (!field)
return IDEST_ERR_NOFIELD;
- str = field_to_string(field, isgenre);
+ str = field_to_string(field, frame);
rc = utf8_convert(idest_conv_decode, str, &item->value);
free(str);
if (rc)
diff --git a/src/idest.h b/src/idest.h
index 2c10077..787cdad 100644
--- a/src/idest.h
+++ b/src/idest.h
@@ -92,11 +92,10 @@ int guess_file_tag_options(struct id3_file *file, int *modified);
int set_frame_value(struct id3_frame *frame, const struct ed_item *item);
void set_tags(const char *name);
void del_tags(const char *name);
-char *idest_ucs4_cvt(id3_ucs4_t const *ucs4);
void query_tags(const char *name);
void info_id3(const char *name);
-char *field_to_string(union id3_field *field, int isgenre);
+char *field_to_string(union id3_field *field, struct id3_frame const *frame);
int field_binary_from_string(union id3_field *field, const char *str);
char *field_binary_to_string(union id3_field *field);
diff --git a/src/idop.c b/src/idop.c
index 063ff78..c3a3ce2 100644
--- a/src/idop.c
+++ b/src/idop.c
@@ -188,10 +188,31 @@ safe_id3_file_update_and_close(struct id3_file *file)
sigprocmask(SIG_SETMASK, &oldset, NULL);
}
+static int
+frame_encoding_is_8bit(struct id3_frame const *frame)
+{
+ union id3_field const *field;
+
+ if (!frame)
+ return 0;
+ field = id3_frame_field(frame, 0);
+ if (!field)
+ return 0;
+ return id3_field_gettextencoding(field) == ID3_FIELD_TEXTENCODING_ISO_8859_1;
+}
+
+static int
+frame_is_genre(struct id3_frame const *frame)
+{
+ if (!frame)
+ return 0;
+ return strcmp(frame->id, ID3_FRAME_GENRE) == 0;
+}
+
char *
-idest_ucs4_cvt(id3_ucs4_t const *ucs4)
+idest_ucs4_cvt(id3_ucs4_t const *ucs4, struct id3_frame const *frame)
{
- if (broken_8bit_charset) {
+ if (broken_8bit_charset && frame_encoding_is_8bit(frame)) {
char *tempval = (char*)id3_ucs4_latin1duplicate(ucs4);
char *output;
int rc = utf8_convert(idest_conv_recode, tempval, &output);
@@ -205,7 +226,8 @@ idest_ucs4_cvt(id3_ucs4_t const *ucs4)
}
static void
-add_stringlist(gl_list_t list, union id3_field *field, int isgenre,
+add_stringlist(gl_list_t list, union id3_field *field,
+ struct id3_frame const *frame,
size_t *psize)
{
unsigned i, nstrings = id3_field_getnstrings(field);
@@ -218,9 +240,9 @@ add_stringlist(gl_list_t list, union id3_field *field, int isgenre,
ucs4 = id3_field_getstrings(field, i);
if (!ucs4)
continue;
- if (isgenre)
+ if (frame_is_genre(frame))
ucs4 = id3_genre_name(ucs4);
- str = idest_ucs4_cvt(ucs4);
+ str = idest_ucs4_cvt(ucs4, frame);
size += strlen(str);
gl_list_add_last(list, str);
}
@@ -284,7 +306,7 @@ field_binary_from_string(union id3_field *field, const char *str)
}
char *
-field_to_string(union id3_field *field, int isgenre)
+field_to_string(union id3_field *field, struct id3_frame const *frame)
{
id3_ucs4_t const *ucs4;
char *ret = NULL;
@@ -312,13 +334,13 @@ field_to_string(union id3_field *field, int isgenre)
case ID3_FIELD_TYPE_STRING:
ucs4 = id3_field_getstring(field);;
- if (ucs4)
- ret = idest_ucs4_cvt(ucs4);
+ if (ucs4)
+ ret = idest_ucs4_cvt(ucs4, frame);
break;
case ID3_FIELD_TYPE_STRINGFULL:
ucs4 = id3_field_getfullstring(field);
- ret = idest_ucs4_cvt(ucs4);
+ ret = idest_ucs4_cvt(ucs4, frame);
break;
case ID3_FIELD_TYPE_STRINGLIST: {
@@ -328,7 +350,7 @@ field_to_string(union id3_field *field, int isgenre)
const void *p;
list = new_string_list(true);
- add_stringlist(list, field, isgenre, &sz);
+ add_stringlist(list, field, frame, &sz);
ret = xmalloc(sz + 1);
ret[0] = 0;
itr = gl_list_iterator(list);
@@ -528,15 +550,19 @@ update_frames(struct id3_tag *tag)
}
static void
-collect_text_frames(struct id3_tag *tag)
+fixup_charset(struct id3_tag *tag)
{
struct id3_frame *frame;
unsigned i;
+ if (!broken_8bit_charset)
+ return;
+
for (i = 0; (frame = id3_tag_findframe(tag, NULL, i)); i++) {
struct ed_item itm;
const struct idest_frametab *ft =
idest_frame_lookup(frame->id);
+
if (!ft) {
if (verbose_option)
error(0, 0,
@@ -545,6 +571,9 @@ collect_text_frames(struct id3_tag *tag)
continue;
}
+ if (!frame_encoding_is_8bit(frame))
+ continue;
+
ed_item_zero(&itm);
itm.name = xstrdup(frame->id);
memcpy(itm.id, frame->id, 4);
@@ -560,14 +589,6 @@ collect_text_frames(struct id3_tag *tag)
}
}
-static void
-fixup_charset(struct id3_tag *tag)
-{
- if (!broken_8bit_charset)
- return;
- collect_text_frames(tag);
-}
-
void
set_tags(const char *name)
{

Return to:

Send suggestions and report system problems to the System administrator.