storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

metadata: Properly escape episode titles from nfo files.

Browse Source
This commit is contained in:
Justin Maggard 2015-04-08 23:27:47 -07:00
parent f09f441607
commit e165dbf7a9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
metadata.c
View File

@ -184,16 +184,16 @@ parse_nfo(const char *path, metadata_t *m)
val = GetValueFromNameValueList(&xml, "title"); val = GetValueFromNameValueList(&xml, "title");
if( val ) if( val )
{ {
char *esc_tag = unescape_tag(val, 1); char *esc_tag, *title;
val2 = GetValueFromNameValueList(&xml, "episodetitle"); val2 = GetValueFromNameValueList(&xml, "episodetitle");
if( val2 ) { if( val2 )
char *esc_tag2 = unescape_tag(val2, 1); xasprintf(&title, "%s - %s", val, val2);
xasprintf(&m->title, "%s - %s", esc_tag, esc_tag2); else
free(esc_tag2); title = strdup(val);
} else { esc_tag = unescape_tag(title, 1);
m->title = escape_tag(esc_tag, 1); m->title = escape_tag(esc_tag, 1);
}
free(esc_tag); free(esc_tag);
free(title);
} }
val = GetValueFromNameValueList(&xml, "plot"); val = GetValueFromNameValueList(&xml, "plot");
@ -406,7 +406,7 @@ GetAudioMetadata(const char *path, char *name)
{ {
for( i = ROLE_ALBUMARTIST; i <= ROLE_BAND; i++ ) for( i = ROLE_ALBUMARTIST; i <= ROLE_BAND; i++ )
{ {
if( song.contributor[i] && *song.contributor[i] ) if( song.contributor[i] && *song.contributor[i] )
break; break;
} }
if( i <= ROLE_BAND ) if( i <= ROLE_BAND )