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

* Allow users to specify the file names and order that the Album Art scanner will search for.

Browse Source 
* Lots of changes for inotify support.
This commit is contained in:
Justin Maggard 2009-02-10 03:10:09 +00:00
parent a1d385241d
commit 42be3989bf
16 changed files with 800 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -28,7 +28,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdescgen.o upnpsoap.o \
upnpreplyparse.o minixml.o \ upnpreplyparse.o minixml.o \
getifaddr.o daemonize.o upnpglobalvars.o \ getifaddr.o daemonize.o upnpglobalvars.o \
options.o minissdp.o upnpevents.o \ options.o minissdp.o upnpevents.o \
sql.o utils.o metadata.o albumart.o scanner.o sql.o utils.o metadata.o albumart.o scanner.o inotify.o
ALLOBJS = $(BASEOBJS) $(LNXOBJS) ALLOBJS = $(BASEOBJS) $(LNXOBJS)

16
albumart.c
View File

@ -174,25 +174,15 @@ char *
check_for_album_file(char * dir, char * dlna_pn) check_for_album_file(char * dir, char * dlna_pn)
{ {
char * file = malloc(PATH_MAX); char * file = malloc(PATH_MAX);
char * album_art_names[] = struct album_art_name_s * album_art_name;
{
"AlbumArtSmall.jpg", "albumartsmall.jpg",
"Cover.jpg", "cover.jpg",
"AlbumArt.jpg", "albumart.jpg",
"Album.jpg", "album.jpg",
"Folder.jpg", "folder.jpg",
"Thumb.jpg", "thumb.jpg",
0
};
struct jpeg_decompress_struct cinfo; struct jpeg_decompress_struct cinfo;
struct jpeg_error_mgr jerr; struct jpeg_error_mgr jerr;
FILE *infile; FILE *infile;
int width=0, height=0; int width=0, height=0;
int i;
for( i=0; album_art_names[i]; i++ ) for( album_art_name = album_art_names; album_art_name; album_art_name = album_art_name->next )
{ {
sprintf(file, "%s/%s", dir, album_art_names[i]); sprintf(file, "%s/%s", dir, album_art_name->name);
if( access(file, R_OK) == 0 ) if( access(file, R_OK) == 0 )
{ {
infile = fopen(file, "r"); infile = fopen(file, "r");

532
inotify.c Normal file
View File

@ -0,0 +1,532 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <errno.h>
#include <unistd.h>
#include <dirent.h>
#include <libgen.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/inotify.h>
#include "upnpglobalvars.h"
#include "utils.h"
#include "sql.h"
#include "scanner.h"
#define EVENT_SIZE ( sizeof (struct inotify_event) )
#define BUF_LEN ( 1024 * ( EVENT_SIZE + 16 ) )
#define DESIRED_WATCH_LIMIT 65536
#define PATH_BUF_SIZE PATH_MAX
struct watch
{
int wd; /* watch descriptor */
char *path; /* watched path */
struct watch *next;
struct watch *prev;
};
static struct watch *watches;
static struct watch *lastwatch = NULL;
char *get_path_from_wd(int wd)
{
struct watch *w = watches;
while( w != NULL )
{
if( w->wd == wd )
return w->path;
w = w->next;
}
return NULL;
}
int
add_watch(int fd, const char * path)
{
struct watch *nw;
int wd;
wd = inotify_add_watch(fd, path, IN_CREATE|IN_CLOSE_WRITE|IN_DELETE);
if( wd < 0 )
{
perror("inotify_add_watch()");
return -1;
}
nw = malloc(sizeof(struct watch));
if( nw == NULL )
{
perror("malloc()");
return -1;
}
nw->wd = wd;
nw->prev = lastwatch;
nw->next = NULL;
nw->path = strdup(path);
if( watches == NULL )
{
watches = nw;
}
if( lastwatch != NULL )
{
lastwatch->next = nw;
}
lastwatch = nw;
return wd;
}
int
remove_watch(int fd, const char * path)
{
struct watch *w;
for( w = watches; w; w = w->next )
{
if( strcmp(path, w->path) == 0 )
return(inotify_rm_watch(fd, w->wd));
}
return 1;
}
unsigned int
next_highest(unsigned int num)
{
num |= num >> 1;
num |= num >> 2;
num |= num >> 4;
num |= num >> 8;
num |= num >> 16;
return(++num);
}
int
inotify_create_watches(int fd)
{
FILE * max_watches;
unsigned int num_watches = 0, watch_limit = 8192;
char **result;
int i, rows = 0;
if( sql_get_table(db, "SELECT count(ID) from DETAILS where SIZE is NULL and PATH is not NULL", &result, &rows, NULL) == SQLITE_OK )
{
if( rows )
{
num_watches = strtoul(result[1], NULL, 10);
}
sqlite3_free_table(result);
}
max_watches = fopen("/proc/sys/fs/inotify/max_user_watches", "r");
if( max_watches )
{
fscanf(max_watches, "%u", &watch_limit);
fclose(max_watches);
if( (watch_limit < DESIRED_WATCH_LIMIT) || (watch_limit < (num_watches*3/4)) )
{
max_watches = fopen("/proc/sys/fs/inotify/max_user_watches", "w");
if( max_watches )
{
if( DESIRED_WATCH_LIMIT >= (num_watches*3/4) )
{
fprintf(max_watches, "%u", DESIRED_WATCH_LIMIT);
}
else if( next_highest(num_watches) >= (num_watches*3/4) )
{
fprintf(max_watches, "%u", next_highest(num_watches));
}
else
{
fprintf(max_watches, "%u", next_highest(next_highest(num_watches)));
}
fclose(max_watches);
}
else
{
printf("WARNING: Inotify max_user_watches [%u] is low or close to the number of used watches [%u] "
"and I do not have permission to increase this limit. Please do so manually by "
"writing a higher value into /proc/sys/fs/inotify/max_user_watches.\n", watch_limit, num_watches);
}
}
}
else
{
printf("WARNING: Could not read inotify max_user_watches! "
"Hopefully it is enough to cover %u current directories plus any new ones added.\n", num_watches);
}
sql_get_table(db, "SELECT PATH from DETAILS where SIZE is NULL and PATH is not NULL", &result, &rows, NULL);
for( i=1; i <= rows; i++ )
{
//DEBUG printf("Add watch to %s\n", result[i]);
add_watch(fd, result[i]);
}
sqlite3_free_table(result);
return rows;
}
int
inotify_remove_watches(int fd)
{
struct watch *w = watches;
int rm_watches = 0;
while( w )
{
inotify_rm_watch(fd, w->wd);
rm_watches++;
w = w->next;
}
return rm_watches;
}
int add_dir_watch(int fd, char * path, char * filename)
{
DIR *ds;
struct dirent *e;
char *buf;
int wd;
int i = 0;
if( filename )
asprintf(&buf, "%s/%s", path, filename);
else
buf = strdup(path);
wd = add_watch(fd, buf);
if( wd == -1 )
{
perror("add_watch()");
}
else
{
printf("Added watch to %s [%d]\n", buf, wd);
}
ds = opendir(buf);
if( ds != NULL )
{
while( (e = readdir(ds)) )
{
if( strcmp(e->d_name, ".") == 0 ||
strcmp(e->d_name, "..") == 0 )
continue;
if( e->d_type == DT_DIR )
i += add_dir_watch(fd, buf, e->d_name);
}
}
else
{
perror(strerror(errno));
}
closedir(ds);
i++;
free(buf);
return(i);
}
int
inotify_insert_file(char * name, const char * path)
{
char * sql;
char **result;
int rows;
char * last_dir = strdup(path);
char * path_buf = strdup(path);
char * base_name = malloc(strlen(path));
char * base_copy = base_name;
char * parent_buf = NULL;
char * id;
int depth = 1;
/* If it's already in the database, just skip it for now.
* TODO: compare modify timestamps */
sql = sqlite3_mprintf("SELECT ID from DETAILS where PATH = '%q'", path);
if( sql_get_table(db, sql, &result, &rows, NULL) == SQLITE_OK )
{
if( rows )
{
free(last_dir);
free(path_buf);
free(base_name);
sqlite3_free(sql);
sqlite3_free_table(result);
return -1;
}
sqlite3_free_table(result);
}
sqlite3_free(sql);
/* Find the parentID. If it's not found, create all necessary parents. */
while( depth )
{
depth = 0;
strcpy(path_buf, path);
parent_buf = dirname(path_buf);
strcpy(last_dir, path_buf);
do
{
printf("Checking %s\n", parent_buf);
sql = sqlite3_mprintf("SELECT OBJECT_ID from OBJECTS o left join DETAILS d on (d.ID = o.DETAIL_ID)"
" where d.PATH = '%q' and REF_ID is NULL", parent_buf);
if( (sql_get_table(db, sql, &result, &rows, NULL) == SQLITE_OK) && rows )
{
id = strdup(result[1]);
sqlite3_free_table(result);
sqlite3_free(sql);
if( !depth )
break;
printf("Found first known parentID: %s\n", id);
/* Insert newly-found directory */
strcpy(base_name, last_dir);
base_copy = basename(base_name);
insert_directory(base_copy, last_dir, BROWSEDIR_ID, id+2, get_next_available_id("OBJECTS", id));
free(id);
break;
}
depth++;
strcpy(last_dir, path_buf);
parent_buf = dirname(parent_buf);
sqlite3_free_table(result);
sqlite3_free(sql);
}
while( strcmp(parent_buf, "/") != 0 );
if( strcmp(parent_buf, "/") == 0 )
{
printf("No parents found!\n");
break;
}
strcpy(path_buf, path);
}
free(last_dir);
free(path_buf);
free(base_name);
if( !depth )
{
insert_file(name, path, id+2, get_next_available_id("OBJECTS", id));
free(id);
}
return depth;
}
int
inotify_insert_directory(int fd, char *name, const char * path)
{
DIR * ds;
struct dirent * e;
char * sql;
char **result;
char *id, *path_buf, *parent_buf, *esc_name;
int wd;
int rows, i = 0;
parent_buf = dirname(strdup(path));
sql = sqlite3_mprintf("SELECT OBJECT_ID from OBJECTS o left join DETAILS d on (d.ID = o.DETAIL_ID)"
" where d.PATH = '%q' and REF_ID is NULL", parent_buf);
if( sql_get_table(db, sql, &result, &rows, NULL) == SQLITE_OK )
{
if( rows )
{
id = strdup(result[1]);
sqlite3_free_table(result);
insert_directory(name, path, BROWSEDIR_ID, id+2, get_next_available_id("OBJECTS", id));
free(id);
}
else
{
sqlite3_free_table(result);
}
}
free(parent_buf);
sqlite3_free(sql);
wd = add_watch(fd, path);
if( wd == -1 )
{
perror("add_watch()");
}
else
{
printf("Added watch to %s [%d]\n", path, wd);
}
ds = opendir(path);
if( ds != NULL )
{
while( (e = readdir(ds)) )
{
if( strcmp(e->d_name, ".") == 0 ||
strcmp(e->d_name, "..") == 0 )
continue;
esc_name = modifyString(strdup(e->d_name), "&", "&amp;amp;", 0);
asprintf(&path_buf, "%s/%s", path, e->d_name);
if( e->d_type == DT_DIR )
{
inotify_insert_directory(fd, esc_name, path_buf);
}
else if( e->d_type == DT_REG )
{
inotify_insert_file(esc_name, path_buf);
}
free(esc_name);
free(path_buf);
}
}
else
{
perror(strerror(errno));
}
closedir(ds);
i++;
return(i);
}
int
inotify_remove_file(const char * path)
{
char * sql;
char **result;
sqlite_int64 detailID = 0;
int rows, ret = 1;
sql = sqlite3_mprintf("SELECT ID from DETAILS where PATH = '%q'", path);
if( (sql_get_table(db, sql, &result, &rows, NULL) == SQLITE_OK) )
{
if( rows )
{
detailID = strtoll(result[1], NULL, 10);
ret = 0;
}
sqlite3_free_table(result);
}
sqlite3_free(sql);
if( detailID )
{
asprintf(&sql, "DELETE from DETAILS where ID = %lld", detailID);
sql_exec(db, sql);
free(sql);
asprintf(&sql, "DELETE from OBJECTS where DETAIL_ID = %lld", detailID);
sql_exec(db, sql);
free(sql);
}
return ret;
}
int
inotify_remove_directory(int fd, const char * path)
{
char * sql;
char * sql2;
char **result;
sqlite_int64 detailID = 0;
int rows, i, ret = 1;
remove_watch(fd, path);
sql = sqlite3_mprintf("SELECT ID from DETAILS where PATH glob '%q/*'"
" UNION ALL SELECT ID from DETAILS where PATH = '%q'", path, path);
if( (sql_get_table(db, sql, &result, &rows, NULL) == SQLITE_OK) )
{
if( rows )
{
for( i=1; i <= rows; i++ )
{
detailID = strtoll(result[i], NULL, 10);
asprintf(&sql2, "DELETE from DETAILS where ID = %lld", detailID);
sql_exec(db, sql2);
free(sql2);
asprintf(&sql2, "DELETE from OBJECTS where DETAIL_ID = %lld", detailID);
sql_exec(db, sql2);
free(sql2);
}
ret = 0;
}
sqlite3_free_table(result);
}
sqlite3_free(sql);
/* Clean up any album art entries in the deleted directory */
sql = sqlite3_mprintf("DELETE from ALBUM_ART where PATH glob '%q/*'", path);
sql_exec(db, sql);
sqlite3_free(sql);
return ret;
}
void *
start_inotify()
{
int fd;
char buffer[BUF_LEN];
int length, i = 0;
char * esc_name = NULL;
char * path_buf = NULL;
fd = inotify_init();
if ( fd < 0 ) {
perror( "inotify_init" );
}
inotify_create_watches(fd);
while( 1 )
{
length = read(fd, buffer, BUF_LEN);
if ( length < 0 ) {
perror( "read" );
}
i = 0;
while( i < length )
{
struct inotify_event * event = ( struct inotify_event * ) &buffer[ i ];
if ( event->len )
{
esc_name = modifyString(strdup(event->name), "&", "&amp;amp;", 0);
asprintf(&path_buf, "%s/%s", get_path_from_wd(event->wd), event->name);
if ( event->mask & IN_CREATE && event->mask & IN_ISDIR )
{
//DEBUG printf( "The directory %s was created.\n", path_buf );
inotify_insert_directory(fd, esc_name, path_buf);
}
else if ( event->mask & IN_CLOSE_WRITE )
{
//DEBUG printf( "The file %s was changed.\n", path_buf );
inotify_insert_file(esc_name, path_buf);
}
else if ( event->mask & IN_DELETE )
{
if ( event->mask & IN_ISDIR ) {
//DEBUG printf("The directory %s was deleted.\n", path_buf);
inotify_remove_directory(fd, path_buf);
}
else {
//DEBUG printf( "The file %s was deleted.\n", path_buf);
inotify_remove_file(path_buf);
}
}
free(esc_name);
free(path_buf);
}
i += EVENT_SIZE + event->len;
}
}
inotify_remove_watches(fd);
close(fd);
exit( 0 );
}

3
inotify.h Normal file
View File

@ -0,0 +1,3 @@
void *
start_inotify();

29
metadata.c
View File

@ -100,16 +100,16 @@ get_fourcc(const char *s)
} }
sqlite_int64 sqlite_int64
GetFolderMetadata(const char * name, const char * artist, const char * genre, const char * album_art, const char * art_dlna_pn) GetFolderMetadata(const char * name, const char * path, const char * artist, const char * genre, const char * album_art, const char * art_dlna_pn)
{ {
char * sql; char * sql;
int ret; int ret;
sql = sqlite3_mprintf( "INSERT into DETAILS" sql = sqlite3_mprintf( "INSERT into DETAILS"
" (TITLE, CREATOR, ARTIST, GENRE, ALBUM_ART, ART_DLNA_PN) " " (TITLE, PATH, CREATOR, ARTIST, GENRE, ALBUM_ART, ART_DLNA_PN) "
"VALUES" "VALUES"
" ('%q', %Q, %Q, %Q, %lld, %Q);", " ('%q', %Q, %Q, %Q, %Q, %lld, %Q);",
name, artist, artist, genre, name, path, artist, artist, genre,
album_art ? strtoll(album_art, NULL, 10) : 0, album_art ? strtoll(album_art, NULL, 10) : 0,
art_dlna_pn); art_dlna_pn);
@ -134,7 +134,6 @@ GetAudioMetadata(const char * path, char * name)
TagLib_Tag *tag; TagLib_Tag *tag;
const TagLib_AudioProperties *properties; const TagLib_AudioProperties *properties;
char *sql; char *sql;
char *zErrMsg = NULL;
char *title, *artist, *album, *genre, *comment; char *title, *artist, *album, *genre, *comment;
int free_flags = 0; int free_flags = 0;
sqlite_int64 album_art; sqlite_int64 album_art;
@ -285,11 +284,9 @@ GetAudioMetadata(const char * path, char * name)
free(comment); free(comment);
//DEBUG printf("SQL: %s\n", sql); //DEBUG printf("SQL: %s\n", sql);
if( sqlite3_exec(db, sql, 0, 0, &zErrMsg) != SQLITE_OK ) if( sql_exec(db, sql) != SQLITE_OK )
{ {
fprintf(stderr, "Error inserting details for '%s'! [%s]\n", path, zErrMsg); fprintf(stderr, "Error inserting details for '%s'!\n", path);
if (zErrMsg)
sqlite3_free(zErrMsg);
ret = 0; ret = 0;
} }
else else
@ -327,7 +324,6 @@ GetImageMetadata(const char * path, char * name)
struct stat file; struct stat file;
sqlite_int64 ret; sqlite_int64 ret;
char *sql; char *sql;
char *zErrMsg = NULL;
metadata_t m; metadata_t m;
memset(&m, '\0', sizeof(metadata_t)); memset(&m, '\0', sizeof(metadata_t));
@ -442,11 +438,9 @@ GetImageMetadata(const char * path, char * name)
" (%Q, '%q', %llu, '%s', %Q, %d, '%q', %Q, %Q);", " (%Q, '%q', %llu, '%s', %Q, %d, '%q', %Q, %Q);",
path, name, size, date, m.resolution, thumb, model, m.dlna_pn, m.mime); path, name, size, date, m.resolution, thumb, model, m.dlna_pn, m.mime);
//DEBUG printf("SQL: %s\n", sql); //DEBUG printf("SQL: %s\n", sql);
if( sqlite3_exec(db, sql, 0, 0, &zErrMsg) != SQLITE_OK ) if( sql_exec(db, sql) != SQLITE_OK )
{ {
fprintf(stderr, "Error inserting details for '%s'! [%s]\n", path, zErrMsg); fprintf(stderr, "Error inserting details for '%s'!\n", path);
if (zErrMsg)
sqlite3_free(zErrMsg);
ret = 0; ret = 0;
} }
else else
@ -499,7 +493,6 @@ GetVideoMetadata(const char * path, char * name)
off_t size = 0; off_t size = 0;
struct stat file; struct stat file;
char *sql; char *sql;
char *zErrMsg = NULL;
int ret, i; int ret, i;
struct tm *modtime; struct tm *modtime;
char date[20]; char date[20];
@ -876,11 +869,9 @@ GetVideoMetadata(const char * path, char * name)
m.resolution, m.resolution,
name, m.dlna_pn, m.mime); name, m.dlna_pn, m.mime);
//DEBUG printf("SQL: %s\n", sql); //DEBUG printf("SQL: %s\n", sql);
if( sqlite3_exec(db, sql, 0, 0, &zErrMsg) != SQLITE_OK ) if( sql_exec(db, sql) != SQLITE_OK )
{ {
fprintf(stderr, "Error inserting details for '%s'! [%s]\n", path, zErrMsg); fprintf(stderr, "Error inserting details for '%s'!\n", path);
if (zErrMsg)
sqlite3_free(zErrMsg);
ret = 0; ret = 0;
} }
else else

2
metadata.h
View File

@ -44,7 +44,7 @@ char *
modifyString(char * string, const char * before, const char * after, short like); modifyString(char * string, const char * before, const char * after, short like);
sqlite_int64 sqlite_int64
GetFolderMetadata(const char * name, const char * artist, const char * genre, const char * album_art, const char * art_dlna_pn); GetFolderMetadata(const char * name, const char * path, const char * artist, const char * genre, const char * album_art, const char * art_dlna_pn);
sqlite_int64 sqlite_int64
GetAudioMetadata(const char * path, char * name); GetAudioMetadata(const char * path, char * name);

101
minidlna.c
View File

@ -24,19 +24,13 @@
#include <time.h> #include <time.h>
#include <signal.h> #include <signal.h>
#include <sys/param.h> #include <sys/param.h>
#if defined(sun) #include <pthread.h>
#include <kstat.h>
#else
/* for BSD's sysctl */
#include <sys/sysctl.h>
#endif
#include <sqlite3.h>
/* unix sockets */ /* unix sockets */
#include "config.h" #include "config.h"
#include "upnpglobalvars.h" #include "upnpglobalvars.h"
#include "sql.h"
#include "upnphttp.h" #include "upnphttp.h"
#include "upnpdescgen.h" #include "upnpdescgen.h"
#include "minidlnapath.h" #include "minidlnapath.h"
@ -48,6 +42,7 @@
#include "daemonize.h" #include "daemonize.h"
#include "upnpevents.h" #include "upnpevents.h"
#include "scanner.h" #include "scanner.h"
#include "inotify.h"
#include "commonrdr.h" #include "commonrdr.h"
/* MAX_LAN_ADDR : maximum number of interfaces /* MAX_LAN_ADDR : maximum number of interfaces
@ -303,10 +298,6 @@ init(int argc, char * * argv)
if(strcmp(ary_options[i].value, "yes") == 0) if(strcmp(ary_options[i].value, "yes") == 0)
SETFLAG(SYSUPTIMEMASK); /*sysuptime = 1;*/ SETFLAG(SYSUPTIMEMASK); /*sysuptime = 1;*/
break; break;
case UPNPPACKET_LOG:
if(strcmp(ary_options[i].value, "yes") == 0)
SETFLAG(LOGPACKETSMASK); /*logpackets = 1;*/
break;
case UPNPSERIAL: case UPNPSERIAL:
strncpy(serialnumber, ary_options[i].value, SERIALNUMBER_MAX_LEN); strncpy(serialnumber, ary_options[i].value, SERIALNUMBER_MAX_LEN);
serialnumber[SERIALNUMBER_MAX_LEN-1] = '\0'; serialnumber[SERIALNUMBER_MAX_LEN-1] = '\0';
@ -315,10 +306,6 @@ init(int argc, char * * argv)
strncpy(modelnumber, ary_options[i].value, MODELNUMBER_MAX_LEN); strncpy(modelnumber, ary_options[i].value, MODELNUMBER_MAX_LEN);
modelnumber[MODELNUMBER_MAX_LEN-1] = '\0'; modelnumber[MODELNUMBER_MAX_LEN-1] = '\0';
break; break;
case UPNPSECUREMODE:
if(strcmp(ary_options[i].value, "yes") == 0)
SETFLAG(SECUREMODEMASK);
break;
case UPNPFRIENDLYNAME: case UPNPFRIENDLYNAME:
strncpy(friendly_name, ary_options[i].value, FRIENDLYNAME_MAX_LEN); strncpy(friendly_name, ary_options[i].value, FRIENDLYNAME_MAX_LEN);
friendly_name[FRIENDLYNAME_MAX_LEN-1] = '\0'; friendly_name[FRIENDLYNAME_MAX_LEN-1] = '\0';
@ -373,6 +360,29 @@ init(int argc, char * * argv)
break; break;
} }
break; break;
case UPNPALBUMART_NAMES:
usleep(1);
char *string, *word;
for( string = ary_options[i].value; (word = strtok(string, "/")); string = NULL ) {
struct album_art_name_s * this_name = calloc(1, sizeof(struct album_art_name_s));
this_name->name = strdup(word);
if( !album_art_names )
{
album_art_names = this_name;
}
else
{
struct album_art_name_s * all_names = album_art_names;
while( all_names->next )
all_names = all_names->next;
all_names->next = this_name;
}
}
break;
case UPNPINOTIFY:
if( (strcmp(ary_options[i].value, "yes") != 0) && !atoi(ary_options[i].value) )
CLEARFLAG(INOTIFYMASK);
break;
default: default:
fprintf(stderr, "Unknown option in file %s\n", fprintf(stderr, "Unknown option in file %s\n",
optionsfile); optionsfile);
@ -416,13 +426,6 @@ init(int argc, char * * argv)
/*case 'l': /*case 'l':
logfilename = argv[++i]; logfilename = argv[++i];
break;*/ break;*/
case 'L':
/*logpackets = 1;*/
SETFLAG(LOGPACKETSMASK);
break;
case 'S':
SETFLAG(SECUREMODEMASK);
break;
case 'p': case 'p':
if(i+1 < argc) if(i+1 < argc)
runtime_vars.port = atoi(argv[++i]); runtime_vars.port = atoi(argv[++i]);
@ -594,43 +597,26 @@ main(int argc, char * * argv)
#endif #endif
struct timeval timeout, timeofday, lasttimeofday = {0, 0}; struct timeval timeout, timeofday, lasttimeofday = {0, 0};
int max_fd = -1; int max_fd = -1;
int last_changecnt = 0;
char * sql;
pthread_t thread;
if(init(argc, argv) != 0) if(init(argc, argv) != 0)
return 1; return 1;
LIST_INIT(&upnphttphead); LIST_INIT(&upnphttphead);
if( access(DB_PATH, F_OK) ) if( sqlite3_open(DB_PATH, &db) != SQLITE_OK )
{ {
struct media_dir_s * media_path = media_dirs; fprintf(stderr, "ERROR: Failed to open sqlite database! Exiting...\n");
sqlite3_open(DB_PATH, &db); exit(-1);
freopen("/dev/null", "a", stderr);
if( CreateDatabase() != 0 )
{
fprintf(stderr, "Error creating database!\n");
return -1;
}
#if USE_FORK
pid_t newpid = fork();
if( newpid )
goto fork_done;
#endif
while( media_path )
{
ScanDirectory(media_path->path, NULL, media_path->type);
media_path = media_path->next;
}
freopen("/proc/self/fd/2", "a", stderr);
#if USE_FORK
_exit(0);
#endif
} }
else else
{ {
char **result; char **result;
int rows; int rows;
sqlite3_open(DB_PATH, &db); sqlite3_busy_timeout(db, 2000);
if( sqlite3_get_table(db, "pragma user_version", &result, &rows, 0, 0) == SQLITE_OK ) if( sql_get_table(db, "pragma user_version", &result, &rows, 0) == SQLITE_OK )
{ {
if( atoi(result[1]) != DB_VERSION ) { if( atoi(result[1]) != DB_VERSION ) {
struct media_dir_s * media_path = media_dirs; struct media_dir_s * media_path = media_dirs;
@ -662,6 +648,11 @@ main(int argc, char * * argv)
} }
sqlite3_free_table(result); sqlite3_free_table(result);
} }
if( GETFLAG(INOTIFYMASK) && pthread_create(&thread, NULL, start_inotify, NULL) )
{
printf("ERROR: pthread_create() failed\n");
exit(-1);
}
} }
#if USE_FORK #if USE_FORK
fork_done: fork_done:
@ -697,6 +688,8 @@ main(int argc, char * * argv)
{ {
/* Check if we need to send SSDP NOTIFY messages and do it if /* Check if we need to send SSDP NOTIFY messages and do it if
* needed */ * needed */
/* Also check if we need to increment our SystemUpdateID
* at most once every 2 seconds */
if(gettimeofday(&timeofday, 0) < 0) if(gettimeofday(&timeofday, 0) < 0)
{ {
syslog(LOG_ERR, "gettimeofday(): %m"); syslog(LOG_ERR, "gettimeofday(): %m");
@ -730,6 +723,15 @@ main(int argc, char * * argv)
timeout.tv_usec = lasttimeofday.tv_usec - timeofday.tv_usec; timeout.tv_usec = lasttimeofday.tv_usec - timeofday.tv_usec;
} }
} }
if(timeofday.tv_sec >= (lasttimeofday.tv_sec + 2))
{
if( sqlite3_total_changes(db) != last_changecnt )
{
updateID++;
last_changecnt = sqlite3_total_changes(db);
upnp_event_var_change_notify(EContentDirectory);
}
}
} }
/* select open sockets (SSDP, HTTP listen, and all HTTP soap sockets) */ /* select open sockets (SSDP, HTTP listen, and all HTTP soap sockets) */
@ -868,6 +870,9 @@ shutdown:
for(i=0; i<n_lan_addr; i++) for(i=0; i<n_lan_addr; i++)
close(snotify[i]); close(snotify[i]);
asprintf(&sql, "UPDATE SETTINGS set UPDATE_ID = %u", updateID);
sql_exec(db, sql);
free(sql);
sqlite3_close(db); sqlite3_close(db);
if(unlink(pidfilename) < 0) if(unlink(pidfilename) < 0)

10
minidlna.conf
View File

@ -16,9 +16,13 @@ media_dir=/opt
# set this if you want to customize the name that shows up on your clients # set this if you want to customize the name that shows up on your clients
#friendly_name=My DLNA Server #friendly_name=My DLNA Server
# "secure" mode : UPnP client are allowed to add mappings only # this should be a list of file names to check for when searching for album art
# to their IP # note: names should be delimited with a forward slash ("/")
secure_mode=no album_art_names=Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg/AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg/Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg
# set this to no to disable inotify monitoring to automatically discover new files
# note: the default is yes
inotify=yes
# default presentation url is http address on port 80 # default presentation url is http address on port 80
#presentation_url=http://www.mylan/index.php #presentation_url=http://www.mylan/index.php

5
minidlnatypes.h
View File

@ -34,4 +34,9 @@ struct media_dir_s {
struct media_dir_s * next; struct media_dir_s * next;
}; };
struct album_art_name_s {
char * name; /* Base path */
struct album_art_name_s * next;
};
#endif #endif

4
options.c
View File

@ -28,14 +28,14 @@ static const struct {
{ UPNPPRESENTATIONURL, "presentation_url" }, { UPNPPRESENTATIONURL, "presentation_url" },
{ UPNPNOTIFY_INTERVAL, "notify_interval" }, { UPNPNOTIFY_INTERVAL, "notify_interval" },
{ UPNPSYSTEM_UPTIME, "system_uptime" }, { UPNPSYSTEM_UPTIME, "system_uptime" },
{ UPNPPACKET_LOG, "packet_log" },
{ UPNPUUID, "uuid"}, { UPNPUUID, "uuid"},
{ UPNPSERIAL, "serial"}, { UPNPSERIAL, "serial"},
{ UPNPMODEL_NUMBER, "model_number"}, { UPNPMODEL_NUMBER, "model_number"},
{ UPNPENABLE, "enable_upnp"}, { UPNPENABLE, "enable_upnp"},
{ UPNPFRIENDLYNAME, "friendly_name"}, { UPNPFRIENDLYNAME, "friendly_name"},
{ UPNPMEDIADIR, "media_dir"}, { UPNPMEDIADIR, "media_dir"},
{ UPNPSECUREMODE, "secure_mode"} { UPNPALBUMART_NAMES, "album_art_names"},
{ UPNPINOTIFY, "inotify" }
}; };
int int

5
options.h
View File

@ -20,14 +20,13 @@ enum upnpconfigoptions {
UPNPPRESENTATIONURL, /* presentation_url */ UPNPPRESENTATIONURL, /* presentation_url */
UPNPNOTIFY_INTERVAL, /* notify_interval */ UPNPNOTIFY_INTERVAL, /* notify_interval */
UPNPSYSTEM_UPTIME, /* "system_uptime" */ UPNPSYSTEM_UPTIME, /* "system_uptime" */
UPNPPACKET_LOG, /* "packet_log" */
UPNPUUID, /* uuid */ UPNPUUID, /* uuid */
UPNPSERIAL, /* serial */ UPNPSERIAL, /* serial */
UPNPMODEL_NUMBER, /* model_number */ UPNPMODEL_NUMBER, /* model_number */
UPNPENABLENATPMP, /* enable_natpmp */
UPNPSECUREMODE, /* secure_mode */
UPNPFRIENDLYNAME, /* how the system should show up to DLNA clients */ UPNPFRIENDLYNAME, /* how the system should show up to DLNA clients */
UPNPMEDIADIR, /* directory to search for UPnP-A/V content */ UPNPMEDIADIR, /* directory to search for UPnP-A/V content */
UPNPALBUMART_NAMES, /* list of '/'-delimited file names to check for album art */
UPNPINOTIFY, /* enable inotify on the media directories */
UPNPENABLE /* enable_upnp */ UPNPENABLE /* enable_upnp */
}; };

257
scanner.c
View File

@ -32,6 +32,13 @@
#include "sql.h" #include "sql.h"
#include "scanner.h" #include "scanner.h"
struct virtual_item
{
int objectID;
char parentID[64];
char name[256];
};
int int
is_video(const char * file) is_video(const char * file)
{ {
@ -62,14 +69,14 @@ get_next_available_id(const char * table, const char * parentID)
{ {
char * sql; char * sql;
char **result; char **result;
int ret; int ret, rows;
sqlite_int64 objectID = 0; sqlite_int64 objectID = 0;
asprintf(&sql, "SELECT OBJECT_ID, max(ID) from %s where PARENT_ID = '%s'", table, parentID); asprintf(&sql, "SELECT OBJECT_ID, max(ID) from %s where PARENT_ID = '%s'", table, parentID);
ret = sql_get_table(db, sql, &result, NULL, NULL); ret = sql_get_table(db, sql, &result, &rows, NULL);
if( result[2] && (sscanf(rindex(result[2], '$')+1, "%llX", &objectID) == 1) ) if( result[2] )
{ {
objectID++; objectID = strtoll(rindex(result[2], '$')+1, NULL, 16) + 1;
} }
sqlite3_free_table(result); sqlite3_free_table(result);
free(sql); free(sql);
@ -78,8 +85,8 @@ get_next_available_id(const char * table, const char * parentID)
} }
long long int long long int
insert_container(const char * tmpTable, const char * item, const char * rootParent, const char *subParent, insert_container(const char * item, const char * rootParent, const char * refID, const char *class,
const char *class, const char *artist, const char *genre, const char *album_art, const char *art_dlna_pn) const char *artist, const char *genre, const char *album_art, const char *art_dlna_pn)
{ {
char **result; char **result;
char *sql; char *sql;
@ -87,30 +94,25 @@ insert_container(const char * tmpTable, const char * item, const char * rootPare
int parentID = 0, objectID = 0; int parentID = 0, objectID = 0;
sqlite_int64 detailID; sqlite_int64 detailID;
sql = sqlite3_mprintf("SELECT * from %s where ITEM = '%q' and SUBITEM = '%q'", tmpTable, item, subParent); sql = sqlite3_mprintf("SELECT OBJECT_ID from OBJECTS where OBJECT_ID glob '%s$*' and NAME = '%q'", rootParent, item);
ret = sql_get_table(db, sql, &result, &rows, &cols); ret = sql_get_table(db, sql, &result, &rows, &cols);
sqlite3_free(sql); sqlite3_free(sql);
if( cols ) if( cols )
{ {
sscanf(result[4], "%X", &parentID); parentID = strtol(rindex(result[1], '$')+1, NULL, 16);
asprintf(&sql, "%s$%X", rootParent, parentID); objectID = get_next_available_id("OBJECTS", result[1]);
objectID = get_next_available_id("OBJECTS", sql);
free(sql);
} }
else else
{ {
parentID = get_next_available_id("OBJECTS", rootParent); parentID = get_next_available_id("OBJECTS", rootParent);
detailID = GetFolderMetadata(item, artist, genre, album_art, art_dlna_pn); detailID = GetFolderMetadata(item, NULL, artist, genre, album_art, art_dlna_pn);
sql = sqlite3_mprintf( "INSERT into OBJECTS" sql = sqlite3_mprintf( "INSERT into OBJECTS"
" (OBJECT_ID, PARENT_ID, DETAIL_ID, CLASS, NAME) " " (OBJECT_ID, PARENT_ID, REF_ID, DETAIL_ID, CLASS, NAME) "
"VALUES" "VALUES"
" ('%s$%X', '%s', %lld, 'container.%s', '%q')", " ('%s$%X', '%s', %Q, %lld, 'container.%s', '%q')",
rootParent, parentID, rootParent, detailID, class, item); rootParent, parentID, rootParent, refID, detailID, class, item);
ret = sql_exec(db, sql); ret = sql_exec(db, sql);
sqlite3_free(sql); sqlite3_free(sql);
sql = sqlite3_mprintf("INSERT into %s values ('%q', '%X', '%q')", tmpTable, item, parentID, subParent);
sql_exec(db, sql);
sqlite3_free(sql);
} }
sqlite3_free_table(result); sqlite3_free_table(result);
@ -126,8 +128,6 @@ insert_containers(const char * name, const char *path, const char * refID, const
int ret; int ret;
int cols, row; int cols, row;
long long int container; long long int container;
int parentID;
int objectID = -1;
sprintf(sql_buf, "SELECT * from DETAILS where ID = %lu", detailID); sprintf(sql_buf, "SELECT * from DETAILS where ID = %lu", detailID);
ret = sql_get_table(db, sql_buf, &result, &row, &cols); ret = sql_get_table(db, sql_buf, &result, &row, &cols);
@ -135,52 +135,84 @@ insert_containers(const char * name, const char *path, const char * refID, const
if( strstr(class, "imageItem") ) if( strstr(class, "imageItem") )
{ {
char *date = result[13+cols], *cam = result[16+cols]; char *date = result[13+cols], *cam = result[16+cols];
char date_taken[11]; date_taken[10] = '\0'; char date_taken[11];
static int last_all_objectID = 0; static struct virtual_item last_date;
static struct virtual_item last_cam;
static struct virtual_item last_camdate;
static sqlite_int64 last_all_objectID = 0;
if( date ) if( date )
{ {
if( strcmp(date, "0000-00-00") == 0 ) if( *date == '0' )
{ {
strcpy(date_taken, "Unknown"); strcpy(date_taken, "Unknown");
} }
else else
{ {
strncpy(date_taken, date, 10); strncpy(date_taken, date, 10);
date_taken[10] = '\0';
} }
container = insert_container("DATES", date_taken, "3$12", NULL, "album.photoAlbum", NULL, NULL, NULL, NULL); if( strcmp(last_date.name, date_taken) == 0 )
parentID = container>>32;
objectID = container;
sql = sqlite3_mprintf( "INSERT into OBJECTS"
" (OBJECT_ID, PARENT_ID, REF_ID, CLASS, DETAIL_ID, NAME) "
"VALUES"
" ('3$12$%X$%X', '3$12$%X', '%s', '%s', %lu, %Q)",
parentID, objectID, parentID, refID, class, detailID, name);
sql_exec(db, sql);
sqlite3_free(sql);
}
if( cam && date )
{ {
container = insert_container("CAMS", cam, "3$13", NULL, "storageFolder", NULL, NULL, NULL, NULL); last_date.objectID++;
parentID = container>>32; //DEBUG printf("Using last date item: %s/%s/%X\n", last_date.name, last_date.parentID, last_date.objectID);
//objectID = container; }
char parent[64]; else
sprintf(parent, "3$13$%X", parentID); {
long long int subcontainer = insert_container("CAMDATE", date_taken, parent, cam, "storageFolder", NULL, NULL, NULL, NULL); container = insert_container(date_taken, "3$12", NULL, "album.photoAlbum", NULL, NULL, NULL, NULL);
int subParentID = subcontainer>>32; sprintf(last_date.parentID, "3$12$%llX", container>>32);
int subObjectID = subcontainer; last_date.objectID = (int)container;
strcpy(last_date.name, date_taken);
//DEBUG printf("Creating cached date item: %s/%s/%X\n", last_date.name, last_date.parentID, last_date.objectID);
}
sql = sqlite3_mprintf( "INSERT into OBJECTS" sql = sqlite3_mprintf( "INSERT into OBJECTS"
" (OBJECT_ID, PARENT_ID, REF_ID, CLASS, DETAIL_ID, NAME) " " (OBJECT_ID, PARENT_ID, REF_ID, CLASS, DETAIL_ID, NAME) "
"VALUES" "VALUES"
" ('3$13$%X$%X$%X', '3$13$%X$%X', '%s', '%s', %lu, %Q)", " ('%s$%X', '%s', '%s', '%s', %lu, %Q)",
parentID, subParentID, subObjectID, parentID, subParentID, refID, class, detailID, name); last_date.parentID, last_date.objectID, last_date.parentID, refID, class, detailID, name);
sql_exec(db, sql); sql_exec(db, sql);
sqlite3_free(sql); sqlite3_free(sql);
if( cam )
{
if( strcmp(cam, last_cam.name) != 0 )
{
container = insert_container(cam, "3$13", NULL, "storageFolder", NULL, NULL, NULL, NULL);
sprintf(last_cam.parentID, "3$13$%llX", container>>32);
strcpy(last_cam.name, cam);
last_camdate.name[0] = '\0';
}
if( strcmp(last_camdate.name, date_taken) == 0 )
{
last_camdate.objectID++;
//DEBUG printf("Using last camdate item: %s/%s/%s/%X\n", cam, last_camdate.name, last_camdate.parentID, last_camdate.objectID);
}
else
{
container = insert_container(date_taken, last_cam.parentID, NULL, "album.photoAlbum", NULL, NULL, NULL, NULL);
sprintf(last_camdate.parentID, "%s$%llX", last_cam.parentID, container>>32);
last_camdate.objectID = (int)container;
strcpy(last_camdate.name, date_taken);
//DEBUG printf("Creating cached camdate item: %s/%s/%s/%X\n", cam, last_camdate.name, last_camdate.parentID, last_camdate.objectID);
}
sql = sqlite3_mprintf( "INSERT into OBJECTS"
" (OBJECT_ID, PARENT_ID, REF_ID, CLASS, DETAIL_ID, NAME) "
"VALUES"
" ('%s$%X', '%s', '%s', '%s', %lu, %Q)",
last_camdate.parentID, last_camdate.objectID, last_camdate.parentID, refID, class, detailID, name);
sql_exec(db, sql);
sqlite3_free(sql);
}
} }
/* All Images */ /* All Images */
if( !last_all_objectID )
{
last_all_objectID = get_next_available_id("OBJECTS", "1$4");
}
sql = sqlite3_mprintf( "INSERT into OBJECTS" sql = sqlite3_mprintf( "INSERT into OBJECTS"
" (OBJECT_ID, PARENT_ID, REF_ID, CLASS, DETAIL_ID, NAME) " " (OBJECT_ID, PARENT_ID, REF_ID, CLASS, DETAIL_ID, NAME) "
"VALUES" "VALUES"
" ('3$11$%X', '3$11', '%s', '%s', %lu, %Q)", " ('3$11$%llX', '3$11', '%s', '%s', %lu, %Q)",
last_all_objectID++, refID, class, detailID, name); last_all_objectID++, refID, class, detailID, name);
sql_exec(db, sql); sql_exec(db, sql);
sqlite3_free(sql); sqlite3_free(sql);
@ -189,104 +221,114 @@ insert_containers(const char * name, const char *path, const char * refID, const
{ {
char *artist = cols ? result[7+cols]:NULL, *album = cols ? result[8+cols]:NULL, *genre = cols ? result[9+cols]:NULL; char *artist = cols ? result[7+cols]:NULL, *album = cols ? result[8+cols]:NULL, *genre = cols ? result[9+cols]:NULL;
char *album_art = cols ? result[19+cols]:NULL, *art_dlna_pn = cols ? result[20+cols]:NULL; char *album_art = cols ? result[19+cols]:NULL, *art_dlna_pn = cols ? result[20+cols]:NULL;
static char last_artist[1024] = "0"; static struct virtual_item last_album;
static int last_artist_parentID, last_artist_objectID; static struct virtual_item last_artist;
static char last_album[1024]; static struct virtual_item last_artistalbum;
static int last_album_parentID, last_album_objectID; static struct virtual_item last_genre;
static char last_genre[1024]; static sqlite_int64 last_all_objectID = 0;
static int last_genre_parentID, last_genre_objectID;
static int last_all_objectID = 0;
if( artist ) if( album )
{ {
if( strcmp(artist, last_artist) == 0 ) if( strcmp(album, last_album.name) == 0 )
{ {
objectID = ++last_artist_objectID; last_album.objectID++;
parentID = last_artist_parentID; //DEBUG printf("Using last album item: %s/%s/%X\n", last_album.name, last_album.parentID, last_album.objectID);
} }
else else
{ {
strcpy(last_artist, artist); strcpy(last_album.name, album);
container = insert_container("ARTISTS", artist, "1$6", NULL, "person.musicArtist", NULL, genre, NULL, NULL); container = insert_container(album, "1$7", NULL, "album.musicAlbum", artist, genre, album_art, art_dlna_pn);
parentID = container>>32; sprintf(last_album.parentID, "1$7$%llX", container>>32);
objectID = container; last_album.objectID = (int)container;
last_artist_objectID = objectID; //DEBUG printf("Creating cached album item: %s/%s/%X\n", last_album.name, last_album.parentID, last_album.objectID);
last_artist_parentID = parentID;
} }
sql = sqlite3_mprintf( "INSERT into OBJECTS" sql = sqlite3_mprintf( "INSERT into OBJECTS"
" (OBJECT_ID, PARENT_ID, REF_ID, CLASS, DETAIL_ID, NAME) " " (OBJECT_ID, PARENT_ID, REF_ID, CLASS, DETAIL_ID, NAME) "
"VALUES" "VALUES"
" ('1$6$%X$%X', '1$6$%X', '%s', '%s', %lu, %Q)", " ('%s$%X', '%s', '%s', '%s', %lu, %Q)",
parentID, objectID, parentID, refID, class, detailID, name); last_album.parentID, last_album.objectID, last_album.parentID, refID, class, detailID, name);
sql_exec(db, sql); sql_exec(db, sql);
sqlite3_free(sql); sqlite3_free(sql);
} }
if( album ) if( artist )
{ {
if( strcmp(album, last_album) == 0 ) if( strcmp(artist, last_artist.name) != 0 )
{ {
objectID = ++last_album_objectID; container = insert_container(artist, "1$6", NULL, "person.musicArtist", NULL, genre, NULL, NULL);
parentID = last_album_parentID; sprintf(last_artist.parentID, "1$6$%llX", container>>32);
strcpy(last_artist.name, artist);
last_artistalbum.name[0] = '\0';
}
if( strcmp(album?album:"Unknown", last_artistalbum.name) == 0 )
{
last_artistalbum.objectID++;
//DEBUG printf("Using last artist/album item: %s/%s/%X\n", last_artist.name, last_artist.parentID, last_artist.objectID);
} }
else else
{ {
strcpy(last_album, album); container = insert_container(album?album:"Unknown", last_artist.parentID, album?last_album.parentID:NULL, "album.musicAlbum", artist, genre, album_art, art_dlna_pn);
container = insert_container("ALBUMS", album, "1$7", NULL, "album.musicAlbum", artist, genre, album_art, art_dlna_pn); sprintf(last_artistalbum.parentID, "%s$%llX", last_artist.parentID, container>>32);
parentID = container>>32; last_artistalbum.objectID = (int)container;
objectID = container; strcpy(last_artistalbum.name, album?album:"Unknown");
last_album_objectID = objectID; //DEBUG printf("Creating cached artist/album item: %s/%s/%X\n", last_artist.name, last_artist.parentID, last_artist.objectID);
last_album_parentID = parentID;
} }
sql = sqlite3_mprintf( "INSERT into OBJECTS" sql = sqlite3_mprintf( "INSERT into OBJECTS"
" (OBJECT_ID, PARENT_ID, REF_ID, CLASS, DETAIL_ID, NAME) " " (OBJECT_ID, PARENT_ID, REF_ID, CLASS, DETAIL_ID, NAME) "
"VALUES" "VALUES"
" ('1$7$%X$%X', '1$7$%X', '%s', '%s', %lu, %Q)", " ('%s$%X', '%s', '%s', '%s', %lu, %Q)",
parentID, objectID, parentID, refID, class, detailID, name); last_artistalbum.parentID, last_artistalbum.objectID, last_artistalbum.parentID, refID, class, detailID, name);
sql_exec(db, sql); sql_exec(db, sql);
sqlite3_free(sql); sqlite3_free(sql);
} }
if( genre ) if( genre )
{ {
if( strcmp(genre, last_genre) == 0 ) if( strcmp(genre, last_genre.name) == 0 )
{ {
objectID = ++last_genre_objectID; last_genre.objectID++;
parentID = last_genre_parentID; //DEBUG printf("Using last genre item: %s/%s/%X\n", last_genre.name, last_genre.parentID, last_genre.objectID);
} }
else else
{ {
strcpy(last_genre, genre); strcpy(last_genre.name, genre);
container = insert_container("GENRES", genre, "1$5", NULL, "genre.musicGenre", NULL, NULL, NULL, NULL); container = insert_container(genre, "1$5", NULL, "genre.musicGenre", NULL, NULL, NULL, NULL);
parentID = container>>32; sprintf(last_genre.parentID, "1$5$%llX", container>>32);
objectID = container; last_genre.objectID = (int)container;
last_genre_objectID = objectID; //DEBUG printf("Creating cached genre item: %s/%s/%X\n", last_genre.name, last_genre.parentID, last_genre.objectID);
last_genre_parentID = parentID;
} }
sql = sqlite3_mprintf( "INSERT into OBJECTS" sql = sqlite3_mprintf( "INSERT into OBJECTS"
" (OBJECT_ID, PARENT_ID, REF_ID, CLASS, DETAIL_ID, NAME) " " (OBJECT_ID, PARENT_ID, REF_ID, CLASS, DETAIL_ID, NAME) "
"VALUES" "VALUES"
" ('1$5$%X$%X', '1$5$%X', '%s', '%s', %lu, %Q)", " ('%s$%X', '%s', '%s', '%s', %lu, %Q)",
parentID, objectID, parentID, refID, class, detailID, name); last_genre.parentID, last_genre.objectID, last_genre.parentID, refID, class, detailID, name);
sql_exec(db, sql); sql_exec(db, sql);
sqlite3_free(sql); sqlite3_free(sql);
} }
/* All Music */ /* All Music */
if( !last_all_objectID )
{
last_all_objectID = get_next_available_id("OBJECTS", "1$4");
}
sql = sqlite3_mprintf( "INSERT into OBJECTS" sql = sqlite3_mprintf( "INSERT into OBJECTS"
" (OBJECT_ID, PARENT_ID, REF_ID, CLASS, DETAIL_ID, NAME) " " (OBJECT_ID, PARENT_ID, REF_ID, CLASS, DETAIL_ID, NAME) "
"VALUES" "VALUES"
" ('1$4$%X', '1$4', '%s', '%s', %lu, %Q)", " ('1$4$%llX', '1$4', '%s', '%s', %lu, %Q)",
last_all_objectID++, refID, class, detailID, name); last_all_objectID++, refID, class, detailID, name);
sql_exec(db, sql); sql_exec(db, sql);
sqlite3_free(sql); sqlite3_free(sql);
} }
else if( strstr(class, "videoItem") ) else if( strstr(class, "videoItem") )
{ {
static int last_all_objectID = 0; static sqlite_int64 last_all_objectID = 0;
/* All Music */ /* All Videos */
if( !last_all_objectID )
{
last_all_objectID = get_next_available_id("OBJECTS", "1$4");
}
sql = sqlite3_mprintf( "INSERT into OBJECTS" sql = sqlite3_mprintf( "INSERT into OBJECTS"
" (OBJECT_ID, PARENT_ID, REF_ID, CLASS, DETAIL_ID, NAME) " " (OBJECT_ID, PARENT_ID, REF_ID, CLASS, DETAIL_ID, NAME) "
"VALUES" "VALUES"
" ('2$8$%X', '2$8', '%s', '%s', %lu, %Q)", " ('2$8$%llX', '2$8', '%s', '%s', %lu, %Q)",
last_all_objectID++, refID, class, detailID, name); last_all_objectID++, refID, class, detailID, name);
sql_exec(db, sql); sql_exec(db, sql);
sqlite3_free(sql); sqlite3_free(sql);
@ -298,7 +340,7 @@ int
insert_directory(const char * name, const char * path, const char * base, const char * parentID, int objectID) insert_directory(const char * name, const char * path, const char * base, const char * parentID, int objectID)
{ {
char * sql; char * sql;
int ret, found = 0; int ret, rows, found = 0;
sqlite_int64 detailID; sqlite_int64 detailID;
char * refID = NULL; char * refID = NULL;
char class[] = "container.storageFolder"; char class[] = "container.storageFolder";
@ -333,7 +375,7 @@ insert_directory(const char * name, const char * path, const char * base, const
sqlite3_free(sql); sqlite3_free(sql);
/* Does not exist. Need to create, and may need to create parents also */ /* Does not exist. Need to create, and may need to create parents also */
sql = sqlite3_mprintf("SELECT DETAIL_ID from OBJECTS where OBJECT_ID = '%s'", refID); sql = sqlite3_mprintf("SELECT DETAIL_ID from OBJECTS where OBJECT_ID = '%s'", refID);
if( (sql_get_table(db, sql, &result, NULL, NULL) == SQLITE_OK) && atoi(result[1]) ) if( (sql_get_table(db, sql, &result, &rows, NULL) == SQLITE_OK) && rows )
{ {
detailID = atoi(result[1]); detailID = atoi(result[1]);
} }
@ -361,7 +403,7 @@ insert_directory(const char * name, const char * path, const char * base, const
return 1; return 1;
} }
detailID = GetFolderMetadata(name, NULL, NULL, NULL, NULL); detailID = GetFolderMetadata(name, path, NULL, NULL, NULL, NULL);
sql = sqlite3_mprintf( "INSERT into OBJECTS" sql = sqlite3_mprintf( "INSERT into OBJECTS"
" (OBJECT_ID, PARENT_ID, REF_ID, DETAIL_ID, CLASS, NAME) " " (OBJECT_ID, PARENT_ID, REF_ID, DETAIL_ID, CLASS, NAME) "
"VALUES" "VALUES"
@ -475,6 +517,7 @@ CreateDatabase(void)
0 }; 0 };
sql_exec(db, "pragma temp_store = MEMORY"); sql_exec(db, "pragma temp_store = MEMORY");
sql_exec(db, "pragma journal_mode = OFF");
sql_exec(db, "pragma synchronous = OFF;"); sql_exec(db, "pragma synchronous = OFF;");
sql_exec(db, "pragma cache_size = 8192;"); sql_exec(db, "pragma cache_size = 8192;");
@ -523,6 +566,14 @@ CreateDatabase(void)
"PATH TEXT NOT NULL, " "PATH TEXT NOT NULL, "
"EMBEDDED BOOL DEFAULT 0" "EMBEDDED BOOL DEFAULT 0"
");"); ");");
if( ret != SQLITE_OK )
goto sql_failed;
ret = sql_exec(db, "CREATE TABLE SETTINGS ("
"UPDATE_ID INTEGER PRIMARY KEY"
");");
if( ret != SQLITE_OK )
goto sql_failed;
ret = sql_exec(db, "INSERT into SETTINGS values (0)");
if( ret != SQLITE_OK ) if( ret != SQLITE_OK )
goto sql_failed; goto sql_failed;
for( i=0; containers[i]; i=i+3 ) for( i=0; containers[i]; i=i+3 )
@ -530,18 +581,11 @@ CreateDatabase(void)
sprintf(sql_buf, "INSERT into OBJECTS (OBJECT_ID, PARENT_ID, DETAIL_ID, CLASS, NAME)" sprintf(sql_buf, "INSERT into OBJECTS (OBJECT_ID, PARENT_ID, DETAIL_ID, CLASS, NAME)"
" values " " values "
"('%s', '%s', %lld, 'container.storageFolder', '%s')", "('%s', '%s', %lld, 'container.storageFolder', '%s')",
containers[i], containers[i+1], GetFolderMetadata(containers[i+2], NULL, NULL, NULL, NULL), containers[i+2]); containers[i], containers[i+1], GetFolderMetadata(containers[i+2], NULL, NULL, NULL, NULL, NULL), containers[i+2]);
ret = sql_exec(db, sql_buf); ret = sql_exec(db, sql_buf);
if( ret != SQLITE_OK ) if( ret != SQLITE_OK )
goto sql_failed; goto sql_failed;
} }
sql_exec(db, "create TEMP TABLE ARTISTS (ITEM TEXT, OBJECT_ID TEXT, SUBITEM TEXT DEFAULT NULL);");
sql_exec(db, "create TEMP TABLE ALBUMS (ITEM TEXT, OBJECT_ID TEXT, SUBITEM TEXT DEFAULT NULL);");
sql_exec(db, "create TEMP TABLE GENRES (ITEM TEXT, OBJECT_ID TEXT, SUBITEM TEXT DEFAULT NULL);");
sql_exec(db, "create TEMP TABLE DATES (ITEM TEXT, OBJECT_ID TEXT, SUBITEM TEXT DEFAULT NULL);");
sql_exec(db, "create TEMP TABLE CAMS (ITEM TEXT, OBJECT_ID TEXT, SUBITEM TEXT DEFAULT NULL);");
sql_exec(db, "create TEMP TABLE CAMDATE (ITEM TEXT, OBJECT_ID TEXT, SUBITEM TEXT DEFAULT NULL);");
sql_exec(db, "create INDEX IDX_OBJECTS_OBJECT_ID ON OBJECTS(OBJECT_ID);"); sql_exec(db, "create INDEX IDX_OBJECTS_OBJECT_ID ON OBJECTS(OBJECT_ID);");
sql_exec(db, "create INDEX IDX_OBJECTS_PARENT_ID ON OBJECTS(PARENT_ID);"); sql_exec(db, "create INDEX IDX_OBJECTS_PARENT_ID ON OBJECTS(PARENT_ID);");
sql_exec(db, "create INDEX IDX_OBJECTS_DETAIL_ID ON OBJECTS(DETAIL_ID);"); sql_exec(db, "create INDEX IDX_OBJECTS_DETAIL_ID ON OBJECTS(DETAIL_ID);");
@ -636,13 +680,6 @@ ScanDirectory(const char * dir, const char * parent, enum media_types type)
return; return;
} }
/* sql = sqlite3_mprintf("SELECT OBJECT_ID, max(ID) from OBJECTS where PARENT_ID = '%s$%X'", rootParent, parentID);
ret = sql_get_table(db, sql, &result, 0, &cols);
if( result[2] && (sscanf(rindex(result[2], '$')+1, "%X", &objectID) == 1) )
{
objectID++;
}
*/
if( !parent ) if( !parent )
startID = get_next_available_id("OBJECTS", BROWSEDIR_ID); startID = get_next_available_id("OBJECTS", BROWSEDIR_ID);

9
scanner.h
View File

@ -15,6 +15,15 @@
#define VIDEO_DIR_ID "2$21" #define VIDEO_DIR_ID "2$21"
#define IMAGE_DIR_ID "3$22" #define IMAGE_DIR_ID "3$22"
sqlite_int64
get_next_available_id(const char * table, const char * parentID);
int
insert_directory(const char * name, const char * path, const char * base, const char * parentID, int objectID);
int
insert_file(char * name, const char * path, const char * parentID, int object);
int int
CreateDatabase(void); CreateDatabase(void);

15
upnpglobalvars.c
View File

@ -17,17 +17,8 @@
/* startup time */ /* startup time */
time_t startup_time = 0; time_t startup_time = 0;
#if 0
/* use system uptime */
int sysuptime = 0;
/* log packets flag */
int logpackets = 0;
#endif
struct runtime_vars_s runtime_vars; struct runtime_vars_s runtime_vars;
int runtime_flags = 0; int runtime_flags = INOTIFYMASK;
const char * pidfilename = "/var/run/minidlna.pid"; const char * pidfilename = "/var/run/minidlna.pid";
@ -45,5 +36,7 @@ struct lan_addr_s lan_addr[MAX_LAN_ADDR];
/* UPnP-A/V [DLNA] */ /* UPnP-A/V [DLNA] */
sqlite3 * db; sqlite3 * db;
struct media_dir_s * media_dirs = NULL;
char friendly_name[FRIENDLYNAME_MAX_LEN]; char friendly_name[FRIENDLYNAME_MAX_LEN];
struct media_dir_s * media_dirs = NULL;
struct album_art_name_s * album_art_names = NULL;
__u32 updateID = 0;

10
upnpglobalvars.h
View File

@ -8,6 +8,8 @@
#define __UPNPGLOBALVARS_H__ #define __UPNPGLOBALVARS_H__
#include <time.h> #include <time.h>
#include <signal.h> // Defines __u32
#include "minidlnatypes.h" #include "minidlnatypes.h"
#include "config.h" #include "config.h"
@ -50,10 +52,9 @@ extern time_t startup_time;
extern struct runtime_vars_s runtime_vars; extern struct runtime_vars_s runtime_vars;
/* runtime boolean flags */ /* runtime boolean flags */
extern int runtime_flags; extern int runtime_flags;
#define LOGPACKETSMASK 0x0001 #define INOTIFYMASK 0x0001
#define SYSUPTIMEMASK 0x0002 #define SYSUPTIMEMASK 0x0002
#define CHECKCLIENTIPMASK 0x0008 #define CHECKCLIENTIPMASK 0x0008
#define SECUREMODEMASK 0x0010
#define SETFLAG(mask) runtime_flags |= mask #define SETFLAG(mask) runtime_flags |= mask
#define GETFLAG(mask) runtime_flags & mask #define GETFLAG(mask) runtime_flags & mask
@ -81,9 +82,10 @@ extern struct lan_addr_s lan_addr[];
/* UPnP-A/V [DLNA] */ /* UPnP-A/V [DLNA] */
extern sqlite3 *db; extern sqlite3 *db;
#define MEDIADIR_MAX_LEN (256)
extern struct media_dir_s * media_dirs;
#define FRIENDLYNAME_MAX_LEN (64) #define FRIENDLYNAME_MAX_LEN (64)
extern char friendly_name[]; extern char friendly_name[];
extern struct media_dir_s * media_dirs;
extern struct album_art_name_s * album_art_names;
extern __u32 updateID;
#endif #endif

16
upnpsoap.c
View File

@ -78,7 +78,7 @@ GetSystemUpdateID(struct upnphttp * h, const char * action)
bodylen = snprintf(body, sizeof(body), resp, bodylen = snprintf(body, sizeof(body), resp,
action, "urn:schemas-upnp-org:service:ContentDirectory:1", action, "urn:schemas-upnp-org:service:ContentDirectory:1",
1, action); updateID, action);
BuildSendAndCloseSoapResp(h, body, bodylen); BuildSendAndCloseSoapResp(h, body, bodylen);
} }
@ -397,7 +397,7 @@ BrowseContentDirectory(struct upnphttp * h, const char * action)
"&lt;DIDL-Lite" "&lt;DIDL-Lite"
CONTENT_DIRECTORY_SCHEMAS; CONTENT_DIRECTORY_SCHEMAS;
static const char resp1[] = "&lt;/DIDL-Lite&gt;</Result>"; static const char resp1[] = "&lt;/DIDL-Lite&gt;</Result>";
static const char resp2[] = "<UpdateID>0</UpdateID></u:BrowseResponse>"; static const char resp2[] = "</u:BrowseResponse>";
char *resp = calloc(1, 1048576); char *resp = calloc(1, 1048576);
char str_buf[4096]; char str_buf[4096];
@ -466,7 +466,10 @@ BrowseContentDirectory(struct upnphttp * h, const char * action)
sqlite3_free(zErrMsg); sqlite3_free(zErrMsg);
} }
strcat(resp, resp1); strcat(resp, resp1);
sprintf(str_buf, "\n<NumberReturned>%u</NumberReturned>\n<TotalMatches>%u</TotalMatches>\n", args.returned, args.total); sprintf(str_buf, "\n<NumberReturned>%u</NumberReturned>\n"
"<TotalMatches>%u</TotalMatches>\n"
"<UpdateID>%u</UpdateID>",
args.returned, args.total, updateID);
strcat(resp, str_buf); strcat(resp, str_buf);
strcat(resp, resp2); strcat(resp, resp2);
BuildSendAndCloseSoapResp(h, resp, strlen(resp)); BuildSendAndCloseSoapResp(h, resp, strlen(resp));
@ -484,7 +487,7 @@ SearchContentDirectory(struct upnphttp * h, const char * action)
"&lt;DIDL-Lite" "&lt;DIDL-Lite"
CONTENT_DIRECTORY_SCHEMAS; CONTENT_DIRECTORY_SCHEMAS;
static const char resp1[] = "&lt;/DIDL-Lite&gt;</Result>"; static const char resp1[] = "&lt;/DIDL-Lite&gt;</Result>";
static const char resp2[] = "<UpdateID>0</UpdateID></u:SearchResponse>"; static const char resp2[] = "</u:SearchResponse>";
char *resp = calloc(1, 1048576); char *resp = calloc(1, 1048576);
char *zErrMsg = 0; char *zErrMsg = 0;
@ -581,7 +584,10 @@ SearchContentDirectory(struct upnphttp * h, const char * action)
} }
sqlite3_free(sql); sqlite3_free(sql);
strcat(resp, resp1); strcat(resp, resp1);
sprintf(str_buf, "\n<NumberReturned>%u</NumberReturned>\n<TotalMatches>%u</TotalMatches>\n", args.returned, args.total); sprintf(str_buf, "\n<NumberReturned>%u</NumberReturned>\n"
"<TotalMatches>%u</TotalMatches>\n"
"<UpdateID>%u</UpdateID>",
args.returned, args.total, updateID);
strcat(resp, str_buf); strcat(resp, str_buf);
strcat(resp, resp2); strcat(resp, resp2);
BuildSendAndCloseSoapResp(h, resp, strlen(resp)); BuildSendAndCloseSoapResp(h, resp, strlen(resp));