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

Fix iTunes xml scanning

Browse Source
This commit is contained in:
Ron Pedde 2006-06-30 05:17:06 +00:00
parent 57d75bc35c
commit 5873ce9bd7
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -461,7 +461,7 @@ char *db_sqlite2_initial1 =
" subterm VARCHAR(255) DEFAULT NULL,\n" " subterm VARCHAR(255) DEFAULT NULL,\n"
" value VARCHAR(1024) NOT NULL\n" " value VARCHAR(1024) NOT NULL\n"
");\n" ");\n"
"insert into config values ('version','','9');\n"; "insert into config values ('version','10');\n";
char *db_sqlite2_initial2 = char *db_sqlite2_initial2 =
"create table playlists (\n" "create table playlists (\n"

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

@ -506,7 +506,7 @@ char *db_sqlite3_initial1 =
" subterm VARCHAR(255) DEFAULT NULL,\n" " subterm VARCHAR(255) DEFAULT NULL,\n"
" value VARCHAR(1024) NOT NULL\n" " value VARCHAR(1024) NOT NULL\n"
");\n" ");\n"
"insert into config values ('version','','9');\n"; "insert into config values ('version','','10');\n";
char *db_sqlite3_initial2 = char *db_sqlite3_initial2 =
"create table playlists (\n" "create table playlists (\n"

8
src/mp3-scanner.c
View File

@ -200,6 +200,7 @@ void scan_add_playlistlist(char *path) {
void scan_process_playlistlist(void) { void scan_process_playlistlist(void) {
PLAYLISTLIST *pnext; PLAYLISTLIST *pnext;
char *ext; char *ext;
char *file;
DPRINTF(E_DBG,L_SCAN,"Starting playlist loop\n"); DPRINTF(E_DBG,L_SCAN,"Starting playlist loop\n");
@ -212,7 +213,12 @@ void scan_process_playlistlist(void) {
ext = strrchr(pnext->path,'.'); ext = strrchr(pnext->path,'.');
} }
if(strcasecmp(pnext->path,"iTunes Music Library.xml") == 0) { file=pnext->path;
if(strrchr(pnext->path,PATHSEP)) {
file = strrchr(pnext->path,PATHSEP) + 1;
}
if(strcasecmp(file,"iTunes Music Library.xml") == 0) {
if(conf_get_int("scanning","process_xml",1)) { if(conf_get_int("scanning","process_xml",1)) {
DPRINTF(E_LOG,L_SCAN,"Scanning %s\n",pnext->path); DPRINTF(E_LOG,L_SCAN,"Scanning %s\n",pnext->path);
scan_xml_playlist(pnext->path); scan_xml_playlist(pnext->path);