MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-02-03 09:56:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix date_added, modified problems. Also, fix db_exists

Browse Source
This commit is contained in:
Ron Pedde 2004-09-19 05:18:49 +00:00
parent 2861761d36
commit 9559452124
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/db-gdbm.c
View File

@ -768,7 +768,7 @@ int db_add(MP3FILE *pmp3) {
ppacked=(MP3PACKED *)pnew->dptr; ppacked=(MP3PACKED *)pnew->dptr;
if(!ppacked->time_added) if(!ppacked->time_added)
ppacked->time_added=(int)time(NULL); ppacked->time_added=(int)time(NULL);
ppacked->time_modified=ppacked->time_added; ppacked->time_modified=(int)time(NULL);
ppacked->time_played=0; /* do we want to keep track of this? */ ppacked->time_played=0; /* do we want to keep track of this? */
if(gdbm_store(db_songs,dkey,*pnew,GDBM_REPLACE)) { if(gdbm_store(db_songs,dkey,*pnew,GDBM_REPLACE)) {
@ -1192,10 +1192,18 @@ int db_exists(int id) {
int *node; int *node;
int err; int err;
MP3FILE *pmp3; MP3FILE *pmp3;
datum key,content;
/* this is wrong and expensive */ DPRINTF(ERR_DEBUG,"Checking if node %d in db\n");
key.dptr=(char*)&id;
key.dsize=sizeof(int);
pmp3=db_find(id); content=gdbm_fetch(db_songs,key);
MEMNOTIFY(content.dptr);
if(!content.dptr) {
DPRINTF(ERR_DEBUG,"Nope! Not in DB\n");
return 0;
}
if(db_update_mode) { if(db_update_mode) {
/* knock it off the maybe list */ /* knock it off the maybe list */
@ -1206,7 +1214,9 @@ int db_exists(int id) {
} }
} }
return pmp3 ? 1 : 0; free(content.dptr);
DPRINTF(ERR_DEBUG,"Yup, in database\n");
return 1;
} }

3
src/mp3-scanner.c
View File

@ -376,6 +376,8 @@ int scan_path(char *path) {
/* only scan if it's been changed, or empty db */ /* only scan if it's been changed, or empty db */
modified_time=sb.st_mtime; modified_time=sb.st_mtime;
DPRINTF(ERR_DEBUG,"FS Modified time: %d\n",modified_time);
DPRINTF(ERR_DEBUG,"DB Modified time: %d\n",db_last_modified(sb.st_ino));
if((scan_mode_foreground) || if((scan_mode_foreground) ||
!db_exists(sb.st_ino) || !db_exists(sb.st_ino) ||
db_last_modified(sb.st_ino) < modified_time) { db_last_modified(sb.st_ino) < modified_time) {
@ -490,6 +492,7 @@ void scan_music_file(char *path, struct dirent *pde, struct stat *psb) {
mp3file.time_added=psb->st_mtime; mp3file.time_added=psb->st_mtime;
if(psb->st_ctime < mp3file.time_added) if(psb->st_ctime < mp3file.time_added)
mp3file.time_added=psb->st_ctime; mp3file.time_added=psb->st_ctime;
mp3file.time_modified=time(NULL);
DPRINTF(ERR_DEBUG," Date Added: %d\n",mp3file.time_added); DPRINTF(ERR_DEBUG," Date Added: %d\n",mp3file.time_added);