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

* Fix false positives in playlist caching optimization when we have duplicate file names in different directories.

Browse Source
This commit is contained in:
Justin Maggard
2012-02-10 23:35:11 +00:00
parent 6064099fb0
commit ab33ab34bc
5 changed files with 54 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
playlist.c
View File

@ -20,6 +20,7 @@
#include <stdlib.h>
#include <sys/stat.h>
#include <libgen.h>
#include <limits.h>
#include <unistd.h>
#include <sys/types.h>
@ -84,12 +85,36 @@ insert_playlist(const char * path, char * name)
return 0;
}
static unsigned int
gen_dir_hash(const char *path)
{
char dir[PATH_MAX], *base;
int len;
strncpy(dir, path, sizeof(dir));
dir[sizeof(dir)-1] = '\0';
base = strrchr(dir, '/');
if( !base )
base = strrchr(dir, '\\');
if( base )
{
*base = '\0';
len = base - dir;
}
else
return 0;
return DJBHash(dir, len);
}
int
fill_playlists()
{
int rows, i, found, len;
char **result;
char *plpath, *plname, *fname, *last_dir;
unsigned int hash, last_hash = 0;
char class[] = "playlistContainer";
struct song_metadata plist;
struct stat file;
@ -111,6 +136,7 @@ fill_playlists()
plname = result[++i];
plpath = result[++i];
last_dir = NULL;
last_hash = 0;
strncpy(type, strrchr(plpath, '.')+1, 4);
@ -133,6 +159,7 @@ fill_playlists()
found = 0;
while( next_plist_track(&plist, &file, NULL, type) == 0 )
{
hash = gen_dir_hash(plist.path);
if( sql_get_int_field(db, "SELECT 1 from OBJECTS where OBJECT_ID = '%s$%llX$%d'",
MUSIC_PLIST_ID, plID, plist.track) == 1 )
{
@ -143,8 +170,13 @@ fill_playlists()
}
if( last_dir )
{
fname = basename(plist.path);
detailID = sql_get_int_field(db, "SELECT ID from DETAILS where PATH = '%q/%q'", last_dir, fname);
if( hash == last_hash )
{
fname = basename(plist.path);
detailID = sql_get_int_field(db, "SELECT ID from DETAILS where PATH = '%q/%q'", last_dir, fname);
}
else
detailID = -1;
if( detailID <= 0 )
{
sqlite3_free(last_dir);
@ -192,6 +224,7 @@ found:
fname = strrchr(last_dir, '/');
if( fname )
*fname = '\0';
last_hash = hash;
}
found++;
}