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

* Rework the sql_exec function to use format arguments, to simplfy the code.

Browse Source 
* Don't set the DB version until after the scan completes.  This way, if only a partial scan has been done, a full scan will be initiated the next time minidlna is started.
This commit is contained in:
Justin Maggard
2009-11-04 01:38:14 +00:00
parent 6738b8a722
commit c8fe23d838
7 changed files with 152 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
albumart.c
View File

@ -106,7 +106,6 @@ update_if_album_art(const char * path)
char * dir;
char * match = NULL;
char * file = NULL;
char * sql;
int ncmp = 0;
struct album_art_name_s * album_art_name;
DIR * dh;
@ -161,10 +160,8 @@ update_if_album_art(const char * path)
DPRINTF(E_DEBUG, L_METADATA, "New file %s looks like cover art for %s\n", path, dp->d_name);
asprintf(&file, "%s/%s", dir, dp->d_name);
art_id = find_album_art(file, NULL, 0);
sql = sqlite3_mprintf("UPDATE DETAILS set ALBUM_ART = %lld where PATH = '%q'", art_id, file);
if( sql_exec(db, sql) != SQLITE_OK )
if( sql_exec(db, "UPDATE DETAILS set ALBUM_ART = %lld where PATH = '%q'", art_id, file) != SQLITE_OK )
DPRINTF(E_WARN, L_METADATA, "Error setting %s as cover art for %s\n", match, dp->d_name);
sqlite3_free(sql);
free(file);
}
}
@ -359,9 +356,7 @@ find_album_art(const char * path, const char * image_data, int image_size)
}
else
{
sqlite3_free(sql);
sql = sqlite3_mprintf("INSERT into ALBUM_ART (PATH) VALUES ('%q')", album_art);
if( sql_exec(db, sql) == SQLITE_OK )
if( sql_exec(db, "INSERT into ALBUM_ART (PATH) VALUES ('%q')", album_art) == SQLITE_OK )
ret = sqlite3_last_insert_rowid(db);
}
sqlite3_free_table(result);