MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-03 03:10:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

make initial scan faster

Browse Source
This commit is contained in:
Ron Pedde 2006-08-14 01:24:24 +00:00
parent f3fecf593e
commit 6891f3a169
5 changed files with 136 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/db-generic.h
View File

@ -181,7 +181,6 @@ extern MP3FILE *db_fetch_item(char **pe, int id);
extern MP3FILE *db_fetch_path(char **pe, char *path, int index); extern MP3FILE *db_fetch_path(char **pe, char *path, int index);
extern M3UFILE *db_fetch_playlist(char **pe, char *path, int index); extern M3UFILE *db_fetch_playlist(char **pe, char *path, int index);
/* metatag parsing */ /* metatag parsing */
extern MetaField_t db_encode_meta(char *meta); extern MetaField_t db_encode_meta(char *meta);
extern int db_wantsmeta(MetaField_t meta, MetaFieldName_t fieldNo); extern int db_wantsmeta(MetaField_t meta, MetaFieldName_t fieldNo);

9
src/db-sql-sqlite2.c
View File

@ -354,8 +354,8 @@ int db_sqlite2_event(int event_type) {
case DB_SQL_EVENT_SONGSCANSTART: case DB_SQL_EVENT_SONGSCANSTART:
if(db_sqlite2_reload) { if(db_sqlite2_reload) {
db_sqlite2_exec(NULL,E_FATAL,"pragma synchronous = off");
db_sqlite2_exec(NULL,E_FATAL,"begin transaction"); db_sqlite2_exec(NULL,E_FATAL,"begin transaction");
db_sqlite2_exec(NULL,E_FATAL,"pragma synchronous = off");
} else { } else {
db_sqlite2_exec(NULL,E_DBG,"drop table updated"); db_sqlite2_exec(NULL,E_DBG,"drop table updated");
db_sqlite2_exec(NULL,E_FATAL,"create temp table updated (id int)"); db_sqlite2_exec(NULL,E_FATAL,"create temp table updated (id int)");
@ -366,6 +366,7 @@ int db_sqlite2_event(int event_type) {
case DB_SQL_EVENT_SONGSCANEND: case DB_SQL_EVENT_SONGSCANEND:
if(db_sqlite2_reload) { if(db_sqlite2_reload) {
db_sqlite2_exec(NULL,E_FATAL,"pragma synchronous=normal");
db_sqlite2_exec(NULL,E_FATAL,"commit transaction"); db_sqlite2_exec(NULL,E_FATAL,"commit transaction");
db_sqlite2_exec(NULL,E_FATAL,"create index idx_path on songs(path,idx)"); db_sqlite2_exec(NULL,E_FATAL,"create index idx_path on songs(path,idx)");
db_sqlite2_exec(NULL,E_DBG,"delete from config where term='rescan'"); db_sqlite2_exec(NULL,E_DBG,"delete from config where term='rescan'");
@ -373,14 +374,16 @@ int db_sqlite2_event(int event_type) {
break; break;
case DB_SQL_EVENT_PLSCANSTART: case DB_SQL_EVENT_PLSCANSTART:
if(db_sqlite2_reload) if(db_sqlite2_reload) {
db_sqlite2_exec(NULL,E_FATAL,"begin transaction"); db_sqlite2_exec(NULL,E_FATAL,"begin transaction");
db_sqlite2_exec(NULL,E_FATAL,"pragma synchronous = off");
}
break; break;
case DB_SQL_EVENT_PLSCANEND: case DB_SQL_EVENT_PLSCANEND:
if(db_sqlite2_reload) { if(db_sqlite2_reload) {
db_sqlite2_exec(NULL,E_FATAL,"end transaction");
db_sqlite2_exec(NULL,E_FATAL,"pragma synchronous=normal"); db_sqlite2_exec(NULL,E_FATAL,"pragma synchronous=normal");
db_sqlite2_exec(NULL,E_FATAL,"end transaction");
db_sqlite2_exec(NULL,E_FATAL,"create index idx_songid on playlistitems(songid)"); db_sqlite2_exec(NULL,E_FATAL,"create index idx_songid on playlistitems(songid)");
db_sqlite2_exec(NULL,E_FATAL,"create index idx_playlistid on playlistitems(playlistid,songid)"); db_sqlite2_exec(NULL,E_FATAL,"create index idx_playlistid on playlistitems(playlistid,songid)");

9
src/db-sql-sqlite3.c
View File

@ -386,8 +386,8 @@ int db_sqlite3_event(int event_type) {
case DB_SQL_EVENT_SONGSCANSTART: case DB_SQL_EVENT_SONGSCANSTART:
if(db_sqlite3_reload) { if(db_sqlite3_reload) {
db_sqlite3_exec(NULL,E_FATAL,"pragma synchronous = off");
db_sqlite3_exec(NULL,E_FATAL,"begin transaction"); db_sqlite3_exec(NULL,E_FATAL,"begin transaction");
db_sqlite3_exec(NULL,E_FATAL,"pragma synchronous = off");
} else { } else {
db_sqlite3_exec(NULL,E_DBG,"drop table updated"); db_sqlite3_exec(NULL,E_DBG,"drop table updated");
db_sqlite3_exec(NULL,E_FATAL,"create temp table updated (id int)"); db_sqlite3_exec(NULL,E_FATAL,"create temp table updated (id int)");
@ -398,6 +398,7 @@ int db_sqlite3_event(int event_type) {
case DB_SQL_EVENT_SONGSCANEND: case DB_SQL_EVENT_SONGSCANEND:
if(db_sqlite3_reload) { if(db_sqlite3_reload) {
db_sqlite3_exec(NULL,E_FATAL,"pragma synchronous = normal");
db_sqlite3_exec(NULL,E_FATAL,"commit transaction"); db_sqlite3_exec(NULL,E_FATAL,"commit transaction");
db_sqlite3_exec(NULL,E_FATAL,"create index idx_path on songs(path,idx)"); db_sqlite3_exec(NULL,E_FATAL,"create index idx_path on songs(path,idx)");
db_sqlite3_exec(NULL,E_DBG,"delete from config where term='rescan'"); db_sqlite3_exec(NULL,E_DBG,"delete from config where term='rescan'");
@ -405,14 +406,16 @@ int db_sqlite3_event(int event_type) {
break; break;
case DB_SQL_EVENT_PLSCANSTART: case DB_SQL_EVENT_PLSCANSTART:
if(db_sqlite3_reload) if(db_sqlite3_reload) {
db_sqlite3_exec(NULL,E_FATAL,"begin transaction"); db_sqlite3_exec(NULL,E_FATAL,"begin transaction");
db_sqlite3_exec(NULL,E_FATAL,"pragma synchronous = off");
}
break; break;
case DB_SQL_EVENT_PLSCANEND: case DB_SQL_EVENT_PLSCANEND:
if(db_sqlite3_reload) { if(db_sqlite3_reload) {
db_sqlite3_exec(NULL,E_FATAL,"end transaction");
db_sqlite3_exec(NULL,E_FATAL,"pragma synchronous=normal"); db_sqlite3_exec(NULL,E_FATAL,"pragma synchronous=normal");
db_sqlite3_exec(NULL,E_FATAL,"end transaction");
db_sqlite3_exec(NULL,E_FATAL,"create index idx_songid on playlistitems(songid)"); db_sqlite3_exec(NULL,E_FATAL,"create index idx_songid on playlistitems(songid)");
db_sqlite3_exec(NULL,E_FATAL,"create index idx_playlistid on playlistitems(playlistid,songid)"); db_sqlite3_exec(NULL,E_FATAL,"create index idx_playlistid on playlistitems(playlistid,songid)");

234
src/db-sql.c
View File

@ -25,6 +25,7 @@
#define _XOPEN_SOURCE 500 #define _XOPEN_SOURCE 500
#include <ctype.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <limits.h> #include <limits.h>
@ -65,6 +66,7 @@ void db_sql_build_mp3file(char **valarray, MP3FILE *pmp3);
int db_sql_update(char **pe, MP3FILE *pmp3, int *id); int db_sql_update(char **pe, MP3FILE *pmp3, int *id);
int db_sql_update_playlists(char **pe); int db_sql_update_playlists(char **pe);
int db_sql_parse_smart(char **pe, char **clause, char *phrase); int db_sql_parse_smart(char **pe, char **clause, char *phrase);
char *_db_proper_path(char *path);
#define STR(a) (a) ? (a) : "" #define STR(a) (a) ? (a) : ""
#define ISSTR(a) ((a) && strlen((a))) #define ISSTR(a) ((a) && strlen((a)))
@ -126,6 +128,27 @@ int db_sql_open_sqlite3(char **pe, char *parameters) {
} }
#endif #endif
char *_db_proper_path(char *path) {
char *new_path;
char *path_ptr;
new_path = strdup(path);
if(!new_path) {
DPRINTF(E_FATAL,L_DB,"malloc: _db_proper_path\n");
}
if(conf_get_int("scanning","case_sensitive",0) == 0) {
path_ptr = new_path;
while(*path_ptr) {
*path_ptr = toupper(*path_ptr);
path_ptr++;
}
}
return new_path;
}
/** /**
* escape a sql string, returning it the supplied buffer. * escape a sql string, returning it the supplied buffer.
* note that this uses the sqlite escape format -- use %q for quoted * note that this uses the sqlite escape format -- use %q for quoted
@ -736,6 +759,7 @@ int db_sql_add(char **pe, MP3FILE *pmp3, int *id) {
int count; int count;
int insertid; int insertid;
char *query; char *query;
char *path;
DPRINTF(E_SPAM,L_DB,"Entering db_sql_add\n"); DPRINTF(E_SPAM,L_DB,"Entering db_sql_add\n");
@ -747,20 +771,18 @@ int db_sql_add(char **pe, MP3FILE *pmp3, int *id) {
pmp3->db_timestamp = (int)time(NULL); pmp3->db_timestamp = (int)time(NULL);
if(conf_get_int("scanning","case_sensitive",0)) { path = _db_proper_path(pmp3->path);
query = "select count(*) from songs where path='%q' and idx=%d";
} else {
query = "select count(*) from songs where upper(path)=upper('%q') and"
" idx=%d";
}
/* Always an add if in song scan on full reload */ /* Always an add if in song scan on full reload */
if((!db_sql_reload)||(!db_sql_in_scan)) { if((!db_sql_reload)||(!db_sql_in_scan)) {
err=db_sql_fetch_int(NULL,&count,query,pmp3->path,pmp3->index); query = "select count(*) from songs where path='%q' and idx=%d";
err=db_sql_fetch_int(NULL,&count,query,path,pmp3->index);
if((err == DB_E_SUCCESS) && (count == 1)) { /* we should update */ if((err == DB_E_SUCCESS) && (count == 1)) { /* we should update */
free(path);
return db_sql_update(pe,pmp3,id); return db_sql_update(pe,pmp3,id);
} else if((err != DB_E_SUCCESS) && (err != DB_E_NOROWS)) { } else if((err != DB_E_SUCCESS) && (err != DB_E_NOROWS)) {
free(path);
DPRINTF(E_LOG,L_DB,"Error: %s\n",pe); DPRINTF(E_LOG,L_DB,"Error: %s\n",pe);
return err; return err;
} }
@ -771,86 +793,87 @@ int db_sql_add(char **pe, MP3FILE *pmp3, int *id) {
pmp3->time_played=0; pmp3->time_played=0;
err=db_sql_exec_fn(pe,E_DBG,"INSERT INTO songs VALUES " err=db_sql_exec_fn(pe,E_DBG,"INSERT INTO songs VALUES "
"(NULL," // id "(NULL," // id
"'%q'," // path "'%q'," // path
"'%q'," // fname "'%q'," // fname
"'%q'," // title "'%q'," // title
"'%q'," // artist "'%q'," // artist
"'%q'," // album "'%q'," // album
"'%q'," // genre "'%q'," // genre
"'%q'," // comment "'%q'," // comment
"'%q'," // type "'%q'," // type
"'%q'," // composer "'%q'," // composer
"'%q'," // orchestra "'%q'," // orchestra
"'%q'," // conductor "'%q'," // conductor
"'%q'," // grouping "'%q'," // grouping
"'%q'," // url "'%q'," // url
"%d," // bitrate "%d," // bitrate
"%d," // samplerate "%d," // samplerate
"%d," // song_length "%d," // song_length
"%d," // file_size "%d," // file_size
"%d," // year "%d," // year
"%d," // track "%d," // track
"%d," // total_tracks "%d," // total_tracks
"%d," // disc "%d," // disc
"%d," // total_discs "%d," // total_discs
"%d," // bpm "%d," // bpm
"%d," // compilation "%d," // compilation
"%d," // rating "%d," // rating
"0," // play_count "0," // play_count
"%d," // data_kind "%d," // data_kind
"%d," // item_kind "%d," // item_kind
"'%q'," // description "'%q'," // description
"%d," // time_added "%d," // time_added
"%d," // time_modified "%d," // time_modified
"%d," // time_played "%d," // time_played
"%d," // db_timestamp "%d," // db_timestamp
"%d," // disabled "%d," // disabled
"%d," // sample_count "%d," // sample_count
"0," // force_update "0," // force_update
"'%q'," // codectype "'%q'," // codectype
"%d," // index "%d," // index
"%d," // has_video "%d," // has_video
"%d)", // contentrating "%d)", // contentrating
STR(pmp3->path), path,
STR(pmp3->fname), STR(pmp3->fname),
STR(pmp3->title), STR(pmp3->title),
STR(pmp3->artist), STR(pmp3->artist),
STR(pmp3->album), STR(pmp3->album),
STR(pmp3->genre), STR(pmp3->genre),
STR(pmp3->comment), STR(pmp3->comment),
STR(pmp3->type), STR(pmp3->type),
STR(pmp3->composer), STR(pmp3->composer),
STR(pmp3->orchestra), STR(pmp3->orchestra),
STR(pmp3->conductor), STR(pmp3->conductor),
STR(pmp3->grouping), STR(pmp3->grouping),
STR(pmp3->url), STR(pmp3->url),
pmp3->bitrate, pmp3->bitrate,
pmp3->samplerate, pmp3->samplerate,
pmp3->song_length, pmp3->song_length,
pmp3->file_size, pmp3->file_size,
pmp3->year, pmp3->year,
pmp3->track, pmp3->track,
pmp3->total_tracks, pmp3->total_tracks,
pmp3->disc, pmp3->disc,
pmp3->total_discs, pmp3->total_discs,
pmp3->bpm, pmp3->bpm,
pmp3->compilation, pmp3->compilation,
pmp3->rating, pmp3->rating,
pmp3->data_kind, pmp3->data_kind,
pmp3->item_kind, pmp3->item_kind,
STR(pmp3->description), STR(pmp3->description),
pmp3->time_added, pmp3->time_added,
pmp3->time_modified, pmp3->time_modified,
pmp3->time_played, pmp3->time_played,
pmp3->db_timestamp, pmp3->db_timestamp,
pmp3->disabled, pmp3->disabled,
pmp3->sample_count, pmp3->sample_count,
STR(pmp3->codectype), STR(pmp3->codectype),
pmp3->index, pmp3->index,
pmp3->has_video, pmp3->has_video,
pmp3->contentrating); pmp3->contentrating);
free(path);
if(err != DB_E_SUCCESS) if(err != DB_E_SUCCESS)
DPRINTF(E_FATAL,L_DB,"Error inserting file %s in database\n",pmp3->fname); DPRINTF(E_FATAL,L_DB,"Error inserting file %s in database\n",pmp3->fname);
@ -878,6 +901,7 @@ int db_sql_add(char **pe, MP3FILE *pmp3, int *id) {
int db_sql_update(char **pe, MP3FILE *pmp3, int *id) { int db_sql_update(char **pe, MP3FILE *pmp3, int *id) {
int err; int err;
char query[1024]; char query[1024];
char *path;
if(!pmp3->time_modified) if(!pmp3->time_modified)
pmp3->time_modified = (int)time(NULL); pmp3->time_modified = (int)time(NULL);
@ -913,13 +937,9 @@ int db_sql_update(char **pe, MP3FILE *pmp3, int *id) {
"rating=%d," // rating "rating=%d," // rating
"sample_count=%d," // sample_count "sample_count=%d," // sample_count
"codectype='%q'" // codec "codectype='%q'" // codec
); " WHERE path='%q' and idx=%d");
if(conf_get_int("scanning","case_sensitive",0)) { path = _db_proper_path(pmp3->path);
strcat(query," WHERE path='%q' and idx=%d");
} else {
strcat(query," WHERE upper(path)=upper('%q') and idx=%d");
}
err = db_sql_exec_fn(pe,E_LOG,query, err = db_sql_exec_fn(pe,E_LOG,query,
STR(pmp3->title), STR(pmp3->title),
@ -950,44 +970,36 @@ int db_sql_update(char **pe, MP3FILE *pmp3, int *id) {
pmp3->rating, pmp3->rating,
pmp3->sample_count, pmp3->sample_count,
STR(pmp3->codectype), STR(pmp3->codectype),
pmp3->path, path,
pmp3->index); pmp3->index);
if(err != DB_E_SUCCESS) if(err != DB_E_SUCCESS)
DPRINTF(E_FATAL,L_DB,"Error updating file: %s\n",pmp3->fname); DPRINTF(E_FATAL,L_DB,"Error updating file: %s\n",pmp3->fname);
if(id) { /* we need the insert/update id */ if(id) { /* we need the insert/update id */
if(conf_get_int("scanning","case_sensitive",0)) { strcpy(query,"select id from songs where path='%q' and idx=%d");
strcpy(query,"select id from songs where path='%q' and idx=%d");
} else {
strcpy(query,"select id from songs where upper(path)=upper('%q') "
"and idx=%d");
}
err=db_sql_fetch_int(pe,id,query,pmp3->path,pmp3->index); err=db_sql_fetch_int(pe,id,query,path,pmp3->index);
if(err != DB_E_SUCCESS) if(err != DB_E_SUCCESS) {
free(path);
return err; return err;
}
} }
if((db_sql_in_scan || db_sql_in_playlist_scan) && (!db_sql_reload)) { if((db_sql_in_scan || db_sql_in_playlist_scan) && (!db_sql_reload)) {
if(id) { if(id) {
db_sql_exec_fn(NULL,E_FATAL,"insert into updated (id) values (%d)",*id); db_sql_exec_fn(NULL,E_FATAL,"insert into updated (id) values (%d)",*id);
} else { } else {
if(conf_get_int("scanning","case_sensitive",0)) { strcpy(query,"insert into updated (id) select id from "
strcpy(query,"insert into updated (id) select id from " "songs where path='%q' and idx=%d");
"songs where path='%q' and idx=%d"); db_sql_exec_fn(NULL,E_FATAL,query,path,pmp3->index);
} else {
strcpy(query,"insert into updated (id) select id from "
"songs where upper(path)=upper('%q') and idx=%d");
}
db_sql_exec_fn(NULL,E_FATAL,query,pmp3->path,pmp3->index);
} }
} }
if((!db_sql_in_scan) && (!db_sql_in_playlist_scan)) if((!db_sql_in_scan) && (!db_sql_in_playlist_scan))
db_sql_update_playlists(NULL); db_sql_update_playlists(NULL);
free(path);
return 0; return 0;
} }
@ -1903,7 +1915,7 @@ MP3FILE *db_sql_fetch_path(char **pe, char *path, int index) {
if(conf_get_int("scanning","case_sensitive",0)) { if(conf_get_int("scanning","case_sensitive",0)) {
query="select * from songs where path='%q' and idx=%d"; query="select * from songs where path='%q' and idx=%d";
} else { } else {
query="select * from songs where upper(path)=upper('%q') and idx=%d"; query="select * from songs where path=upper('%q') and idx=%d";
} }
err=db_sql_fetch_row(pe,&row,query,path,index); err=db_sql_fetch_row(pe,&row,query,path,index);

2
src/mp3-scanner.c
View File

@ -203,7 +203,7 @@ void scan_process_playlistlist(void) {
char *ext; char *ext;
char *file; char *file;
DPRINTF(E_DBG,L_SCAN,"Starting playlist loop\n"); DPRINTF(E_LOG,L_SCAN,"Starting playlist scan\n");
while(scan_playlistlist.next) { while(scan_playlistlist.next) {
pnext=scan_playlistlist.next; pnext=scan_playlistlist.next;