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

* Add support for limiting a media dir to multiple media types.

Browse Source
This commit is contained in:
Justin Maggard
2012-10-03 07:26:00 +00:00
parent fdcdd9ded8
commit 584258c1f8
8 changed files with 172 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
minidlna.c
View File

@ -496,12 +496,13 @@ init(int argc, char * * argv)
const char * optionsfile = "/etc/minidlna.conf";
char mac_str[13];
char *string, *word;
enum media_types type;
char *path;
char buf[PATH_MAX];
char ip_addr[INET_ADDRSTRLEN + 3] = {'\0'};
char log_str[75] = "general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn";
char *log_level = NULL;
struct media_dir_s *media_dir;
media_types types;
uid_t uid = -1;
/* first check if "-f" option is used */
@ -598,30 +599,39 @@ init(int argc, char * * argv)
strncpyt(friendly_name, ary_options[i].value, FRIENDLYNAME_MAX_LEN);
break;
case UPNPMEDIADIR:
type = ALL_MEDIA;
types = ALL_MEDIA;
path = ary_options[i].value;
if( *path && (path[1] == ',') && (access(path, F_OK) != 0) )
word = strchr(path, ',');
if( word && (access(path, F_OK) != 0) )
{
switch( *path )
types = 0;
while( *path )
{
case 'A':
case 'a':
type = AUDIO_ONLY;
break;
case 'V':
case 'v':
type = VIDEO_ONLY;
break;
case 'P':
case 'p':
type = IMAGES_ONLY;
break;
default:
DPRINTF(E_FATAL, L_GENERAL, "Media directory entry not understood [%s]\n",
ary_options[i].value);
break;
if( *path == 'A' || *path == 'a' )
{
types |= TYPE_AUDIO;
}
else if( *path == 'V' || *path == 'v' )
{
types |= TYPE_VIDEO;
}
else if( *path == 'P' || *path == 'p' )
{
types |= TYPE_IMAGES;
}
else if( *path == ',' )
{
path++;
break;
}
else
{
DPRINTF(E_FATAL, L_GENERAL, "Media directory entry not understood [%s]\n",
ary_options[i].value);
break;
}
path++;
}
path += 2;
}
path = realpath(path, buf);
if( !path || access(path, F_OK) != 0 )
@ -630,19 +640,19 @@ init(int argc, char * * argv)
ary_options[i].value, strerror(errno));
break;
}
struct media_dir_s * this_dir = calloc(1, sizeof(struct media_dir_s));
this_dir->path = strdup(path);
this_dir->type = type;
media_dir = calloc(1, sizeof(struct media_dir_s));
media_dir->path = strdup(path);
media_dir->types = types;
if( !media_dirs )
{
media_dirs = this_dir;
media_dirs = media_dir;
}
else
{
struct media_dir_s * all_dirs = media_dirs;
while( all_dirs->next )
all_dirs = all_dirs->next;
all_dirs->next = this_dir;
all_dirs->next = media_dir;
}
break;
case UPNPALBUMART_NAMES: