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

metadata: Add episode season and number support

Browse Source 
Add upnp:episodeSeason and upnp:episodeNumber support for video items.
The DISC and TRACK columns are multiplexed to store the data.
This commit is contained in:
Justin Maggard
2018-01-10 18:02:17 -08:00
parent 8bdba2f40d
commit c0e66e9997
2 changed files with 75 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
metadata.c
View File

@ -156,7 +156,7 @@ check_for_captions(const char *path, int64_t detailID)
}
}
void
static void
parse_nfo(const char *path, metadata_t *m)
{
FILE *nfo;
@ -237,6 +237,14 @@ parse_nfo(const char *path, metadata_t *m)
free(esc_tag);
}
val = GetValueFromNameValueList(&xml, "season");
if (val)
m->disc = atoi(val);
val = GetValueFromNameValueList(&xml, "episode");
if (val)
m->track = atoi(val);
ClearNameValueList(&xml);
free(buf);
}
@ -1499,10 +1507,8 @@ video_no_dlna:
if( ext )
{
strcpy(ext+1, "nfo");
if( access(nfo, F_OK) == 0 )
{
if( access(nfo, R_OK) == 0 )
parse_nfo(nfo, &m);
}
}
if( !m.mime )
@ -1539,19 +1545,43 @@ video_no_dlna:
strip_ext(m.title);
}
if (!m.disc && !m.track)
{
/* Search for Season and Episode in the filename */
char *p = (char*)name, *s;
while ((s = strpbrk(p, "Ss")))
{
unsigned season = strtoul(s+1, &p, 10);
unsigned episode = 0;
if (season > 0 && p)
{
while (isblank(*p) || ispunct(*p))
p++;
if (*p == 'E' || *p == 'e')
episode = strtoul(p+1, NULL, 10);
}
if (season && episode)
{
m.disc = season;
m.track = episode;
}
p = s + 1;
}
}
album_art = find_album_art(path, m.thumb_data, m.thumb_size);
freetags(&video);
lav_close(ctx);
ret = sql_exec(db, "INSERT into DETAILS"
" (PATH, SIZE, TIMESTAMP, DURATION, DATE, CHANNELS, BITRATE, SAMPLERATE, RESOLUTION,"
" TITLE, CREATOR, ARTIST, GENRE, COMMENT, DLNA_PN, MIME, ALBUM_ART) "
" TITLE, CREATOR, ARTIST, GENRE, COMMENT, DLNA_PN, MIME, ALBUM_ART, DISC, TRACK) "
"VALUES"
" (%Q, %lld, %lld, %Q, %Q, %u, %u, %u, %Q, '%q', %Q, %Q, %Q, %Q, %Q, '%q', %lld);",
" (%Q, %lld, %lld, %Q, %Q, %u, %u, %u, %Q, '%q', %Q, %Q, %Q, %Q, %Q, '%q', %lld, %u, %u);",
path, (long long)file.st_size, (long long)file.st_mtime, m.duration,
m.date, m.channels, m.bitrate, m.frequency, m.resolution,
m.title, m.creator, m.artist, m.genre, m.comment, m.dlna_pn,
m.mime, album_art);
m.mime, album_art, m.disc, m.track);
if( ret != SQLITE_OK )
{
DPRINTF(E_ERROR, L_METADATA, "Error inserting details for '%s'!\n", path);