MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow editing of smart playlists

This commit is contained in:
Ron Pedde 2005-11-03 05:02:17 +00:00
parent 88ab086900
commit f127d8cb58
8 changed files with 815 additions and 721 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin-root/smart.js
View File

@ -53,7 +53,8 @@ function pl_update() {
var url = '/databases/1/containers/add?output=xml&org.mt-daapd.playlist-type=1&dmap.itemname=' + name + '&org.mt-daapd.smart-playlist-spec=' + spec; var url = '/databases/1/containers/add?output=xml&org.mt-daapd.playlist-type=1&dmap.itemname=' + name + '&org.mt-daapd.smart-playlist-spec=' + spec;
result = pl_exec(url,false); result = pl_exec(url,false);
} else { } else {
pl_errormsg("Can't yet update existing playlists.. sorry."); var url='/databases/1/containers/edit?output=xml&dmap.itemid=' + id + '&dmap.itemname=' + name + '&org.mt-daapd.smart-playlist-spec=' + spec;
result = pl_exec(url,false);
} }
init(); init();

21
src/db-generic.c
View File

@ -50,6 +50,7 @@ typedef struct tag_db_functions {
int(*dbs_add_playlist_item)(int, int); int(*dbs_add_playlist_item)(int, int);
int(*dbs_delete_playlist)(int); int(*dbs_delete_playlist)(int);
int(*dbs_delete_playlist_item)(int, int); int(*dbs_delete_playlist_item)(int, int);
int(*dbs_edit_playlist)(int, char*, char*);
int(*dbs_enum_start)(DBQUERYINFO *); int(*dbs_enum_start)(DBQUERYINFO *);
int(*dbs_enum_size)(DBQUERYINFO *, int *); int(*dbs_enum_size)(DBQUERYINFO *, int *);
int(*dbs_enum_fetch)(DBQUERYINFO *, unsigned char **); int(*dbs_enum_fetch)(DBQUERYINFO *, unsigned char **);
@ -79,6 +80,7 @@ DB_FUNCTIONS db_functions[] = {
db_sqlite_add_playlist_item, db_sqlite_add_playlist_item,
db_sqlite_delete_playlist, db_sqlite_delete_playlist,
db_sqlite_delete_playlist_item, db_sqlite_delete_playlist_item,
db_sqlite_edit_playlist,
db_sqlite_enum_start, db_sqlite_enum_start,
db_sqlite_enum_size, db_sqlite_enum_size,
db_sqlite_enum_fetch, db_sqlite_enum_fetch,
@ -203,6 +205,7 @@ DAAP_ITEMS taglist[] = {
{ 0x0C, "MAPI", "org.mt-daapd.addplaylistitem" }, { 0x0C, "MAPI", "org.mt-daapd.addplaylistitem" },
{ 0x0C, "MDPR", "org.mt-daapd.delplaylist" }, { 0x0C, "MDPR", "org.mt-daapd.delplaylist" },
{ 0x0C, "MDPI", "org.mt-daapd.delplaylistitem" }, { 0x0C, "MDPI", "org.mt-daapd.delplaylistitem" },
{ 0x0C, "MEPR", "org.mt-daapd.editplaylist" },
{ 0x00, NULL, NULL } { 0x00, NULL, NULL }
}; };
@ -550,6 +553,24 @@ int db_delete_playlist_item(int playlistid, int songid) {
return retval; return retval;
} }
/**
* edit a playlist
*
* @param id playlist id to edit
* @param name new name of playlist
* @param clause new where clause
*/
int db_edit_playlist(int id, char *name, char *clause) {
int retval;
db_writelock();
retval = db_current->dbs_edit_playlist(id, name, clause);
db_unlock();
return retval;
}
/** /**
* start a db enumeration, based info in the DBQUERYINFO struct * start a db enumeration, based info in the DBQUERYINFO struct
* *

1
src/db-generic.h
View File

@ -158,6 +158,7 @@ extern int db_scanning(void);
extern int db_add_playlist(char *name, int type, char *clause, char *path, int index, int *playlistid); extern int db_add_playlist(char *name, int type, char *clause, char *path, int index, int *playlistid);
extern int db_add_playlist_item(int playlistid, int songid); extern int db_add_playlist_item(int playlistid, int songid);
extern int db_edit_playlist(int id, char *name, char *clause);
extern int db_delete_playlist(int playlistid); extern int db_delete_playlist(int playlistid);
extern int db_delete_playlist_item(int playlistid, int songid); extern int db_delete_playlist_item(int playlistid, int songid);

20
src/dbs-sqlite.c
View File

@ -304,6 +304,8 @@ int db_sqlite_deinit(void) {
* start a background scan * start a background scan
*/ */
int db_sqlite_start_scan(void) { int db_sqlite_start_scan(void) {
DPRINTF(E_DBG,L_DB,"Starting db scan\n");
if(db_sqlite_reload) { if(db_sqlite_reload) {
db_sqlite_exec(E_FATAL,"PRAGMA synchronous = OFF"); db_sqlite_exec(E_FATAL,"PRAGMA synchronous = OFF");
db_sqlite_exec(E_FATAL,"BEGIN TRANSACTION"); db_sqlite_exec(E_FATAL,"BEGIN TRANSACTION");
@ -427,6 +429,24 @@ int db_sqlite_delete_playlist_item(int playlistid, int songid) {
return result; return result;
} }
/**
* edit a playlist. The only things worth changing are the name
* and the "where" clause.
*
* @param id id of the playlist to alter
* @param name new name of the playlist
* @param where new where clause
*/
int db_sqlite_edit_playlist(int id, char *name, char *clause) {
int result;
result = db_sqlite_exec(E_LOG,"update playlists set title='%q',query='%q' where id=%d",
name, clause, id);
return result;
}
/** /**
* add a playlist * add a playlist

1
src/dbs-sqlite.h
View File

@ -42,6 +42,7 @@ extern void db_sqlite_dispose_item(MP3FILE *pmp3);
extern void db_sqlite_dispose_playlist(M3UFILE *pm3u); extern void db_sqlite_dispose_playlist(M3UFILE *pm3u);
extern int db_sqlite_add_playlist(char *name, int type, char *clause, char *path, int index, int *playlistid); extern int db_sqlite_add_playlist(char *name, int type, char *clause, char *path, int index, int *playlistid);
extern int db_sqlite_add_playlist_item(int playlistid, int songid); extern int db_sqlite_add_playlist_item(int playlistid, int songid);
extern int db_sqlite_edit_playlist(int id, char *name, char *clause);
extern int db_sqlite_delete_playlist(int playlistid); extern int db_sqlite_delete_playlist(int playlistid);
extern int db_sqlite_delete_playlist_item(int playlistid, int songid); extern int db_sqlite_delete_playlist_item(int playlistid, int songid);

1098
src/dispatch.c
View File

File diff suppressed because it is too large Load Diff

2
src/main.c
View File

@ -493,7 +493,7 @@ int main(int argc, char *argv[]) {
} }
if(!skip_initial) { if(!skip_initial) {
DPRINTF(E_LOG,L_MAIN|L_SCAN,"Starting mp3 scan\n"); DPRINTF(E_LOG,L_MAIN|L_SCAN,"Starting mp3 scan of %s\n",config.mp3dir);
if(scan_init(config.mp3dir)) { if(scan_init(config.mp3dir)) {
DPRINTF(E_FATAL,L_MAIN|L_SCAN,"Error scanning MP3 files: %s\n",strerror(errno)); DPRINTF(E_FATAL,L_MAIN|L_SCAN,"Error scanning MP3 files: %s\n",strerror(errno));
} }

390
src/mp3-scanner.c
View File

@ -60,7 +60,7 @@
*/ */
typedef struct { typedef struct {
char *suffix; char *suffix;
int (*scanner)(char* file, MP3FILE* pmp3); int (*scanner)(char* file, MP3FILE* pmp3);
char *type; /* daap.songformat */ char *type; /* daap.songformat */
char *codectype; /* song.codectype */ char *codectype; /* song.codectype */
char *description; /* daap.songdescription */ char *description; /* daap.songdescription */
@ -172,8 +172,8 @@ void scan_add_playlistlist(char *path) {
plist=(PLAYLISTLIST*)malloc(sizeof(PLAYLISTLIST)); plist=(PLAYLISTLIST*)malloc(sizeof(PLAYLISTLIST));
if(!plist) { if(!plist) {
DPRINTF(E_FATAL,L_SCAN,"Malloc error\n"); DPRINTF(E_FATAL,L_SCAN,"Malloc error\n");
return; return;
} }
plist->path=strdup(path); plist->path=strdup(path);
@ -190,24 +190,24 @@ void scan_process_playlistlist(void) {
char *ext; char *ext;
while(scan_playlistlist.next) { while(scan_playlistlist.next) {
pnext=scan_playlistlist.next; pnext=scan_playlistlist.next;
ext=pnext->path; ext=pnext->path;
if(strrchr(pnext->path,'.')) { if(strrchr(pnext->path,'.')) {
ext = strrchr(pnext->path,'.'); ext = strrchr(pnext->path,'.');
} }
if(strcasecmp(ext,".xml") == 0) { if(strcasecmp(ext,".xml") == 0) {
scan_xml_playlist(pnext->path); scan_xml_playlist(pnext->path);
} else if(strcasecmp(ext,".m3u") == 0) { } else if(strcasecmp(ext,".m3u") == 0) {
scan_static_playlist(pnext->path); scan_static_playlist(pnext->path);
} else { } else {
DPRINTF(E_LOG,L_SCAN,"Unknown playlist type: %s\n",ext); DPRINTF(E_LOG,L_SCAN,"Unknown playlist type: %s\n",ext);
} }
free(pnext->path); free(pnext->path);
scan_playlistlist.next=pnext->next; scan_playlistlist.next=pnext->next;
free(pnext); free(pnext);
} }
} }
@ -227,8 +227,12 @@ void scan_process_playlistlist(void) {
int scan_init(char *path) { int scan_init(char *path) {
int err=0; int err=0;
if(db_start_scan()) DPRINTF(E_DBG,L_SCAN,"Starting scan_init\n");
return -1;
if(db_start_scan()) {
DPRINTF(E_DBG,L_SCAN,"Error in db_start_scan()\n");
return -1;
}
DPRINTF(E_DBG,L_SCAN,"Scanning for MP3s in %s\n",path); DPRINTF(E_DBG,L_SCAN,"Scanning for MP3s in %s\n",path);
@ -236,12 +240,12 @@ int scan_init(char *path) {
err=scan_path(path); err=scan_path(path);
if(db_end_song_scan()) if(db_end_song_scan())
return -1; return -1;
scan_process_playlistlist(); scan_process_playlistlist();
if(db_end_scan()) if(db_end_scan())
return -1; return -1;
return err; return err;
} }
@ -256,12 +260,12 @@ int scan_is_compdir(char *path) {
int current=0; int current=0;
if(!config.complist) if(!config.complist)
return 0; return 0;
while(config.complist[current]) { while(config.complist[current]) {
if(strcasestr(path,config.complist[current])) if(strcasestr(path,config.complist[current]))
return 1; return 1;
current++; current++;
} }
return 0; return 0;
@ -287,72 +291,72 @@ int scan_path(char *path) {
int is_compdir; int is_compdir;
if((current_dir=opendir(path)) == NULL) { if((current_dir=opendir(path)) == NULL) {
DPRINTF(E_WARN,L_SCAN,"opendir: %s\n",strerror(errno)); DPRINTF(E_WARN,L_SCAN,"opendir: %s\n",strerror(errno));
return -1; return -1;
} }
is_compdir=scan_is_compdir(path); is_compdir=scan_is_compdir(path);
while(1) { while(1) {
if(config.stop) { if(config.stop) {
DPRINTF(E_WARN,L_SCAN,"Stop req. Aborting scan of %s.\n",path); DPRINTF(E_WARN,L_SCAN,"Stop req. Aborting scan of %s.\n",path);
closedir(current_dir); closedir(current_dir);
return 0; return 0;
} }
pde=(struct dirent *)&de; pde=(struct dirent *)&de;
err=readdir_r(current_dir,(struct dirent *)de,&pde); err=readdir_r(current_dir,(struct dirent *)de,&pde);
if(err == -1) { if(err == -1) {
DPRINTF(E_DBG,L_SCAN,"Error on readdir_r: %s\n",strerror(errno)); DPRINTF(E_DBG,L_SCAN,"Error on readdir_r: %s\n",strerror(errno));
err=errno; err=errno;
closedir(current_dir); closedir(current_dir);
errno=err; errno=err;
return -1; return -1;
} }
if(!pde) if(!pde)
break; break;
if(pde->d_name[0] == '.') /* skip hidden and directories */ if(pde->d_name[0] == '.') /* skip hidden and directories */
continue; continue;
snprintf(relative_path,PATH_MAX,"%s/%s",path,pde->d_name); snprintf(relative_path,PATH_MAX,"%s/%s",path,pde->d_name);
mp3_path[0] = '\x0'; mp3_path[0] = '\x0';
realpath(relative_path,mp3_path); realpath(relative_path,mp3_path);
DPRINTF(E_DBG,L_SCAN,"Found %s\n",relative_path); DPRINTF(E_DBG,L_SCAN,"Found %s\n",relative_path);
if(stat(mp3_path,&sb)) { if(stat(mp3_path,&sb)) {
DPRINTF(E_WARN,L_SCAN,"Error statting: %s\n",strerror(errno)); DPRINTF(E_WARN,L_SCAN,"Error statting: %s\n",strerror(errno));
} else { } else {
if(sb.st_mode & S_IFDIR) { /* dir -- recurse */ if(sb.st_mode & S_IFDIR) { /* dir -- recurse */
DPRINTF(E_DBG,L_SCAN,"Found dir %s... recursing\n",pde->d_name); DPRINTF(E_DBG,L_SCAN,"Found dir %s... recursing\n",pde->d_name);
scan_path(mp3_path); scan_path(mp3_path);
} else { } else {
/* process the file */ /* process the file */
if(strlen(pde->d_name) > 4) { if(strlen(pde->d_name) > 4) {
if((strcasecmp(".m3u",(char*)&pde->d_name[strlen(pde->d_name) - 4]) == 0) && if((strcasecmp(".m3u",(char*)&pde->d_name[strlen(pde->d_name) - 4]) == 0) &&
config.process_m3u){ config.process_m3u){
/* we found an m3u file */ /* we found an m3u file */
scan_add_playlistlist(mp3_path); scan_add_playlistlist(mp3_path);
} else if((strcasecmp(".xml",(char*)&pde->d_name[strlen(pde->d_name) - 4]) == 0)) { } else if((strcasecmp(".xml",(char*)&pde->d_name[strlen(pde->d_name) - 4]) == 0)) {
scan_add_playlistlist(mp3_path); scan_add_playlistlist(mp3_path);
} else if (((ext = strrchr(pde->d_name, '.')) != NULL) && } else if (((ext = strrchr(pde->d_name, '.')) != NULL) &&
(strcasestr(config.extensions, ext))) { (strcasestr(config.extensions, ext))) {
/* 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;
pmp3=db_fetch_path(mp3_path,0); pmp3=db_fetch_path(mp3_path,0);
if((!pmp3) || (pmp3->db_timestamp < modified_time) || if((!pmp3) || (pmp3->db_timestamp < modified_time) ||
(pmp3->force_update)) { (pmp3->force_update)) {
scan_music_file(path,pde,&sb,is_compdir); scan_music_file(path,pde,&sb,is_compdir);
} else { } else {
DPRINTF(E_DBG,L_SCAN,"Skipping file... not modified\n"); DPRINTF(E_DBG,L_SCAN,"Skipping file... not modified\n");
} }
db_dispose_item(pmp3); db_dispose_item(pmp3);
} }
} }
} }
} }
} }
closedir(current_dir); closedir(current_dir);
@ -379,79 +383,79 @@ int scan_static_playlist(char *path) {
DPRINTF(E_WARN,L_SCAN|L_PL,"Processing static playlist: %s\n",path); DPRINTF(E_WARN,L_SCAN|L_PL,"Processing static playlist: %s\n",path);
if(stat(path,&sb)) { if(stat(path,&sb)) {
DPRINTF(E_WARN,L_SCAN,"Error statting %s: %s\n",path,strerror(errno)); DPRINTF(E_WARN,L_SCAN,"Error statting %s: %s\n",path,strerror(errno));
return FALSE; return FALSE;
} }
if((current=strrchr(path,'/')) == NULL) { if((current=strrchr(path,'/')) == NULL) {
current = path; current = path;
} else { } else {
current++; current++;
} }
/* temporarily use base_path for m3u name */ /* temporarily use base_path for m3u name */
strcpy(base_path,current); strcpy(base_path,current);
if((current=strrchr(base_path,'.'))) { if((current=strrchr(base_path,'.'))) {
*current='\x0'; *current='\x0';
} }
pm3u = db_fetch_playlist(path,0); pm3u = db_fetch_playlist(path,0);
if(pm3u && (pm3u->db_timestamp > sb.st_mtime)) { if(pm3u && (pm3u->db_timestamp > sb.st_mtime)) {
/* already up-to-date */ /* already up-to-date */
DPRINTF(E_DBG,L_SCAN,"Playlist already up-to-date\n"); DPRINTF(E_DBG,L_SCAN,"Playlist already up-to-date\n");
db_dispose_playlist(pm3u); db_dispose_playlist(pm3u);
return TRUE; return TRUE;
} }
if(pm3u) if(pm3u)
db_delete_playlist(pm3u->id); db_delete_playlist(pm3u->id);
fd=open(path,O_RDONLY); fd=open(path,O_RDONLY);
if(fd != -1) { if(fd != -1) {
if(db_add_playlist(base_path,PL_STATICFILE,NULL,path,0,&playlistid) != DB_E_SUCCESS) { if(db_add_playlist(base_path,PL_STATICFILE,NULL,path,0,&playlistid) != DB_E_SUCCESS) {
DPRINTF(E_LOG,L_SCAN,"Error adding m3u playlist %s\n",path); DPRINTF(E_LOG,L_SCAN,"Error adding m3u playlist %s\n",path);
db_dispose_playlist(pm3u); db_dispose_playlist(pm3u);
return FALSE; return FALSE;
} }
/* now get the *real* base_path */ /* now get the *real* base_path */
strcpy(base_path,path); strcpy(base_path,path);
if((current=strrchr(base_path,'/'))) { if((current=strrchr(base_path,'/'))) {
*(current+1) = '\x0'; *(current+1) = '\x0';
} /* else something is fubar */ } /* else something is fubar */
DPRINTF(E_INF,L_SCAN|L_PL,"Added playlist as id %d\n",playlistid); DPRINTF(E_INF,L_SCAN|L_PL,"Added playlist as id %d\n",playlistid);
memset(linebuffer,0x00,sizeof(linebuffer)); memset(linebuffer,0x00,sizeof(linebuffer));
while(readline(fd,linebuffer,sizeof(linebuffer)) > 0) { while(readline(fd,linebuffer,sizeof(linebuffer)) > 0) {
while((linebuffer[strlen(linebuffer)-1] == '\n') || while((linebuffer[strlen(linebuffer)-1] == '\n') ||
(linebuffer[strlen(linebuffer)-1] == '\r')) (linebuffer[strlen(linebuffer)-1] == '\r'))
linebuffer[strlen(linebuffer)-1] = '\0'; linebuffer[strlen(linebuffer)-1] = '\0';
if((linebuffer[0] == ';') || (linebuffer[0] == '#')) if((linebuffer[0] == ';') || (linebuffer[0] == '#'))
continue; continue;
// FIXME - should chomp trailing comments // FIXME - should chomp trailing comments
// otherwise, assume it is a path // otherwise, assume it is a path
if(linebuffer[0] == '/') { if(linebuffer[0] == '/') {
strcpy(file_path,linebuffer); strcpy(file_path,linebuffer);
} else { } else {
snprintf(file_path,sizeof(file_path),"%s%s",base_path,linebuffer); snprintf(file_path,sizeof(file_path),"%s%s",base_path,linebuffer);
} }
realpath(file_path,real_path); realpath(file_path,real_path);
DPRINTF(E_DBG,L_SCAN|L_PL,"Checking %s\n",real_path); DPRINTF(E_DBG,L_SCAN|L_PL,"Checking %s\n",real_path);
// might be valid, might not... // might be valid, might not...
if((pmp3=db_fetch_path(real_path,0))) { if((pmp3=db_fetch_path(real_path,0))) {
db_add_playlist_item(playlistid,pmp3->id); db_add_playlist_item(playlistid,pmp3->id);
db_dispose_item(pmp3); db_dispose_item(pmp3);
} else { } else {
DPRINTF(E_WARN,L_SCAN|L_PL,"Playlist entry %s bad: %s\n", DPRINTF(E_WARN,L_SCAN|L_PL,"Playlist entry %s bad: %s\n",
path,strerror(errno)); path,strerror(errno));
} }
} }
close(fd); close(fd);
} }
db_dispose_playlist(pm3u); db_dispose_playlist(pm3u);
@ -466,7 +470,7 @@ int scan_static_playlist(char *path) {
* scan a particular file as a music file * scan a particular file as a music file
*/ */
void scan_music_file(char *path, struct dirent *pde, void scan_music_file(char *path, struct dirent *pde,
struct stat *psb, int is_compdir) { struct stat *psb, int is_compdir) {
MP3FILE mp3file; MP3FILE mp3file;
char mp3_path[PATH_MAX]; char mp3_path[PATH_MAX];
char *current=NULL; char *current=NULL;
@ -483,60 +487,60 @@ void scan_music_file(char *path, struct dirent *pde,
mp3file.path=strdup(mp3_path); mp3file.path=strdup(mp3_path);
mp3file.fname=strdup(pde->d_name); mp3file.fname=strdup(pde->d_name);
if(strlen(pde->d_name) > 4) { if(strlen(pde->d_name) > 4) {
type = strrchr(pde->d_name, '.') + 1; type = strrchr(pde->d_name, '.') + 1;
if(type) { if(type) {
/* see if there is "official" format and info for it */ /* see if there is "official" format and info for it */
ptaghandler=scan_gethandler(type); ptaghandler=scan_gethandler(type);
if(ptaghandler) { if(ptaghandler) {
/* yup, use the official format */ /* yup, use the official format */
mp3file.type=strdup(ptaghandler->type); mp3file.type=strdup(ptaghandler->type);
if(ptaghandler->description) if(ptaghandler->description)
mp3file.description=strdup(ptaghandler->description); mp3file.description=strdup(ptaghandler->description);
if(ptaghandler->codectype) if(ptaghandler->codectype)
mp3file.codectype=strdup(ptaghandler->codectype); mp3file.codectype=strdup(ptaghandler->codectype);
DPRINTF(E_DBG,L_SCAN,"Codec type: %s\n",mp3file.codectype); DPRINTF(E_DBG,L_SCAN,"Codec type: %s\n",mp3file.codectype);
} else { } else {
/* just dummy up songformat, codectype and description */ /* just dummy up songformat, codectype and description */
mp3file.type=strdup(type); mp3file.type=strdup(type);
/* upper-case types cause some problems */ /* upper-case types cause some problems */
current=mp3file.type; current=mp3file.type;
while(*current) { while(*current) {
*current=tolower(*current); *current=tolower(*current);
current++; current++;
} }
sprintf(fdescr,"%s audio file",mp3file.type); sprintf(fdescr,"%s audio file",mp3file.type);
mp3file.description = strdup(fdescr); mp3file.description = strdup(fdescr);
/* we'll just dodge the codectype */ /* we'll just dodge the codectype */
} }
} }
} }
/* Do the tag lookup here */ /* Do the tag lookup here */
if(scan_get_info(mp3file.path,&mp3file)) { if(scan_get_info(mp3file.path,&mp3file)) {
make_composite_tags(&mp3file); make_composite_tags(&mp3file);
/* fill in the time_added. I'm not sure of the logic in this. /* fill in the time_added. I'm not sure of the logic in this.
My thinking is to use time created, but what is that? Best My thinking is to use time created, but what is that? Best
guess would be earliest of st_mtime and st_ctime... guess would be earliest of st_mtime and st_ctime...
*/ */
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=psb->st_mtime; mp3file.time_modified=psb->st_mtime;
DPRINTF(E_DBG,L_SCAN," Date Added: %d\n",mp3file.time_added); DPRINTF(E_DBG,L_SCAN," Date Added: %d\n",mp3file.time_added);
DPRINTF(E_DBG,L_SCAN," Codec: %s\n",mp3file.codectype); DPRINTF(E_DBG,L_SCAN," Codec: %s\n",mp3file.codectype);
if(is_compdir) if(is_compdir)
mp3file.compilation = 1; mp3file.compilation = 1;
db_add(&mp3file); db_add(&mp3file);
} else { } else {
DPRINTF(E_WARN,L_SCAN,"Skipping %s - scan failed\n",mp3file.path); DPRINTF(E_WARN,L_SCAN,"Skipping %s - scan failed\n",mp3file.path);
} }
scan_freetags(&mp3file); scan_freetags(&mp3file);
@ -549,10 +553,10 @@ TAGHANDLER *scan_gethandler(char *type) {
TAGHANDLER *phdl = taghandlers; TAGHANDLER *phdl = taghandlers;
while((phdl->suffix) && (strcasecmp(phdl->suffix,type))) while((phdl->suffix) && (strcasecmp(phdl->suffix,type)))
phdl++; phdl++;
if(phdl->suffix) if(phdl->suffix)
return phdl; return phdl;
return NULL; return NULL;
} }
@ -597,12 +601,12 @@ int scan_get_info(char *file, MP3FILE *pmp3) {
/* dispatch to appropriate tag handler */ /* dispatch to appropriate tag handler */
hdl = scan_gethandler(pmp3->type); hdl = scan_gethandler(pmp3->type);
if(hdl && hdl->scanner) if(hdl && hdl->scanner)
return hdl->scanner(file,pmp3); return hdl->scanner(file,pmp3);
/* a file we don't know anything about... ogg or aiff maybe */ /* a file we don't know anything about... ogg or aiff maybe */
if(!(infile=fopen(file,"rb"))) { if(!(infile=fopen(file,"rb"))) {
DPRINTF(E_WARN,L_SCAN,"Could not open %s for reading\n",file); DPRINTF(E_WARN,L_SCAN,"Could not open %s for reading\n",file);
return FALSE; return FALSE;
} }
/* we can at least get this */ /* we can at least get this */
@ -631,34 +635,34 @@ void make_composite_tags(MP3FILE *song) {
len=0; len=0;
if(!song->artist && (song->orchestra || song->conductor)) { if(!song->artist && (song->orchestra || song->conductor)) {
if(song->orchestra) if(song->orchestra)
len += strlen(song->orchestra); len += strlen(song->orchestra);
if(song->conductor) if(song->conductor)
len += strlen(song->conductor); len += strlen(song->conductor);
len += 3; len += 3;
song->artist=(char*)calloc(len, 1); song->artist=(char*)calloc(len, 1);
if(song->artist) { if(song->artist) {
if(song->orchestra) if(song->orchestra)
strcat(song->artist,song->orchestra); strcat(song->artist,song->orchestra);
if(song->orchestra && song->conductor) if(song->orchestra && song->conductor)
strcat(song->artist," - "); strcat(song->artist," - ");
if(song->conductor) if(song->conductor)
strcat(song->artist,song->conductor); strcat(song->artist,song->conductor);
} }
} }
if(song->url) { if(song->url) {
song->data_kind=1; song->data_kind=1;
} else { } else {
song->data_kind=0; song->data_kind=0;
} }
if(!song->title) if(!song->title)
song->title = strdup(song->fname); song->title = strdup(song->fname);
song->item_kind = 2; /* music, I think. */ song->item_kind = 2; /* music, I think. */
} }