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

* Don't try reading info from a new file if that new file has no size.

Browse Source
This commit is contained in:
Justin Maggard 2009-06-17 19:25:12 +00:00
parent 944729cf12
commit 7071e79f3f
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
inotify.c
View File

@ -7,6 +7,7 @@
#include <libgen.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/time.h>
#include <sys/resource.h>
#ifdef HAVE_INOTIFY_H
@ -588,9 +589,10 @@ start_inotify()
{
int fd;
char buffer[BUF_LEN];
char path_buf[PATH_MAX];
int length, i = 0;
char * esc_name = NULL;
char * path_buf = NULL;
struct stat st;
fd = inotify_init();
@ -626,7 +628,7 @@ start_inotify()
continue;
}
esc_name = modifyString(strdup(event->name), "&", "&amp;amp;", 0);
asprintf(&path_buf, "%s/%s", get_path_from_wd(event->wd), event->name);
sprintf(path_buf, "%s/%s", get_path_from_wd(event->wd), event->name);
if ( (event->mask & IN_CREATE && event->mask & IN_ISDIR) ||
(event->mask & IN_MOVED_TO && event->mask & IN_ISDIR) )
{
@ -635,8 +637,11 @@ start_inotify()
}
else if ( event->mask & IN_CLOSE_WRITE || event->mask & IN_MOVED_TO )
{
DPRINTF(E_DEBUG, L_INOTIFY, "The file %s was %s.\n", path_buf, (event->mask & IN_MOVED_TO ? "moved here" : "changed"));
inotify_insert_file(esc_name, path_buf);
if( stat(path_buf, &st) == 0 && st.st_size > 0 )
{
DPRINTF(E_DEBUG, L_INOTIFY, "The file %s was %s.\n", path_buf, (event->mask & IN_MOVED_TO ? "moved here" : "changed"));
inotify_insert_file(esc_name, path_buf);
}
}
else if ( event->mask & IN_DELETE || event->mask & IN_MOVED_FROM )
{
@ -652,7 +657,6 @@ start_inotify()
}
}
free(esc_name);
free(path_buf);
}
i += EVENT_SIZE + event->len;
}

2
minidlna.conf
View File

@ -27,7 +27,7 @@ enable_tivo=no
# default presentation url is http address on port 80
#presentation_url=http://www.mylan/index.php
# notify interval in seconds. default is 30 seconds.
# notify interval in seconds. default is 895 seconds.
notify_interval=900
# serial and model number the daemon will report to clients