MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-24 06:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

add scanning/follow_symlinks option to close ticket #194

Browse Source
This commit is contained in:
Ron Pedde 2006-10-24 05:17:36 +00:00
parent b87d2443b7
commit 0fa620d4a7
6 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin-root/config.xml
View File

@ -182,6 +182,17 @@
<option value="1">Yes</option>
</options>
</item>
<item id="scanning:follow_symlinks">
<name>Follow Symlinks</name>
<short_description>
Should symlinks be followed when scanning directories?
</short_description>
<type default_value="1">select</type>
<options>
<option value="0">No</option>
<option value="1">Yes</option>
</options>
</item>
</section>
<section name="Database">
<item id="general:db_type" advanced="true" restart="true">

1
src/conf.c
View File

@ -135,6 +135,7 @@ static CONF_ELEMENTS conf_elements[] = {
{ 0, 0, CONF_T_INT,"scanning","ignore_dotfiles" },
{ 0, 0, CONF_T_INT,"scanning","concat_compilations" },
{ 0, 0, CONF_T_INT,"scanning","case_sensitive" },
{ 0, 0, CONF_T_INT,"scanning","follow_symlinks" },
{ 0, 0, CONF_T_INT,"scan","correct_order" },
{ 0, 0, CONF_T_INT, NULL, NULL }
};

16
src/mp3-scanner.c
View File

@ -69,6 +69,12 @@ typedef struct {
#define MAYBEFREE(a) { if((a)) free((a)); };
#ifndef S_ISDIR
# define S_ISDIR(a) (((a) & S_IFMT) == S_IFDIR)
#endif
#ifndef S_ISLNK
# define S_ISLNK(a) (((a) & S_IFMT) == S_IFLNK)
#endif
/*
@ -327,7 +333,9 @@ int scan_path(char *path) {
struct stat sb;
char *extensions;
int is_compdir;
int follow_symlinks = 0;
follow_symlinks = conf_get_int("scanning","follow_symlinks",0);
extensions = conf_alloc_string("general","extensions",".mp3,.m4a,.m4p");
if((current_dir=opendir(path)) == NULL) {
@ -365,13 +373,19 @@ int scan_path(char *path) {
continue;
snprintf(relative_path,PATH_MAX,"%s/%s",path,pde->d_name);
if(!os_lstat(relative_path,&sb)) {
if(S_ISLNK(sb.st_mode) && !follow_symlinks)
continue;
}
mp3_path[0] = '\x0';
realpath(relative_path,mp3_path);
DPRINTF(E_DBG,L_SCAN,"Found %s\n",relative_path);
if(os_stat(mp3_path,&sb)) {
DPRINTF(E_INF,L_SCAN,"Error statting %s: %s\n",mp3_path,strerror(errno));
} else {
if(sb.st_mode & S_IFDIR) { /* dir -- recurse */
if(S_ISDIR(sb.st_mode)) { /* follow dir */
if(conf_get_int("scanning","ignore_appledouble",1) &&
((strcasecmp(pde->d_name,".AppleDouble") == 0) ||
(strcasecmp(pde->d_name,".AppleDesktop") == 0))) {

4
src/os-unix.c
View File

@ -500,3 +500,7 @@ char *os_apppath(char *parm) {
int os_stat(const char *path, struct stat *sb) {
return stat(path, sb);
}
int os_lstat(const char *path, struct stat *sb) {
return lstat(path, sb);
}

4
src/os-win32-u.c
View File

@ -146,6 +146,10 @@ char *os_realpath(const char *pathname, char *resolved_path) {
return &resolved_path[0];
}
int os_lstat(const char *path, struct _stat *sb) {
return os_stat(path,sb);
}
int os_stat(const char *path, struct _stat *sb) {
WCHAR utf16_path[PATH_MAX+1];

1
src/os.h
View File

@ -40,6 +40,7 @@ extern int os_unload(void *handle);
/* misc */
extern int os_stat(const char *path, struct stat *sb);
extern int os_lstat(const char *path, struct stat *sb);
extern int os_islocaladdr(char *hostaddr);
extern char *os_apppath(char *parm);