From ec75664b81f565627fe1f30650d67c5c7835ac8e Mon Sep 17 00:00:00 2001 From: chme Date: Mon, 23 Feb 2015 20:26:06 +0100 Subject: [PATCH 1/3] filescanner: set event-base for cmdenv --- src/filescanner.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/filescanner.c b/src/filescanner.c index f7e8a0a2..d4cb80b3 100644 --- a/src/filescanner.c +++ b/src/filescanner.c @@ -2138,7 +2138,7 @@ filescanner_init(void) } event_set(&cmdev, cmd_pipe[0], EV_READ, command_cb, NULL); - event_base_set(evbase_scan, &exitev); + event_base_set(evbase_scan, &cmdev); event_add(&cmdev, NULL); ret = pthread_create(&tid_scan, NULL, filescanner, NULL); From 6f7d9f5b44314d89702b4e245fa8f6211835397f Mon Sep 17 00:00:00 2001 From: chme Date: Mon, 23 Feb 2015 20:26:42 +0100 Subject: [PATCH 2/3] db: fix wrong number of elements for purge queries --- src/db.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/db.c b/src/db.c index d8d2a0af..a0bde563 100644 --- a/src/db.c +++ b/src/db.c @@ -815,7 +815,7 @@ db_purge_cruft(time_t ref) void db_purge_all(void) { - char *queries[6] = + char *queries[5] = { "DELETE FROM inotify;", "DELETE FROM playlistitems;", @@ -2104,7 +2104,7 @@ db_file_path_byid(int id) if (ret == SQLITE_DONE) DPRINTF(E_DBG, L_DB, "No results\n"); else - DPRINTF(E_LOG, L_DB, "Could not step: %s\n", sqlite3_errmsg(hdl)); + DPRINTF(E_LOG, L_DB, "Could not step: %s\n", sqlite3_errmsg(hdl)); sqlite3_finalize(stmt); sqlite3_free(query); @@ -2153,7 +2153,7 @@ db_file_id_byquery(char *query) if (ret == SQLITE_DONE) DPRINTF(E_DBG, L_DB, "No results\n"); else - DPRINTF(E_LOG, L_DB, "Could not step: %s\n", sqlite3_errmsg(hdl)); + DPRINTF(E_LOG, L_DB, "Could not step: %s\n", sqlite3_errmsg(hdl)); sqlite3_finalize(stmt); return 0; @@ -2326,7 +2326,7 @@ db_file_stamp_bypath(char *path, time_t *stamp, int *id) if (ret == SQLITE_DONE) DPRINTF(E_DBG, L_DB, "No results\n"); else - DPRINTF(E_LOG, L_DB, "Could not step: %s\n", sqlite3_errmsg(hdl)); + DPRINTF(E_LOG, L_DB, "Could not step: %s\n", sqlite3_errmsg(hdl)); sqlite3_finalize(stmt); sqlite3_free(query); @@ -2641,7 +2641,7 @@ db_file_update(struct media_file_info *mfi) query = sqlite3_mprintf(Q_TMPL, STR(mfi->path), STR(mfi->fname), mfi->title, mfi->artist, mfi->album, mfi->genre, - mfi->comment, mfi->type, mfi->composer, mfi->orchestra, mfi->conductor, mfi->grouping, + mfi->comment, mfi->type, mfi->composer, mfi->orchestra, mfi->conductor, mfi->grouping, mfi->url, mfi->bitrate, mfi->samplerate, mfi->song_length, mfi->file_size, mfi->year, mfi->track, mfi->total_tracks, mfi->disc, mfi->total_discs, mfi->bpm, mfi->compilation, mfi->artwork, mfi->rating, mfi->seek, mfi->data_kind, mfi->item_kind, @@ -2649,7 +2649,7 @@ db_file_update(struct media_file_info *mfi) (int64_t)mfi->db_timestamp, (int64_t)mfi->disabled, mfi->sample_count, mfi->codectype, mfi->index, mfi->has_video, mfi->bits_per_sample, mfi->album_artist, - mfi->media_kind, mfi->tv_series_name, mfi->tv_episode_num_str, + mfi->media_kind, mfi->tv_series_name, mfi->tv_episode_num_str, mfi->tv_network_name, mfi->tv_episode_sort, mfi->tv_season_num, mfi->album_artist, mfi->album_artist, mfi->album, mfi->title_sort, mfi->artist_sort, mfi->album_sort, @@ -5624,7 +5624,7 @@ db_upgrade_v15(void) " || QUOTE(composer_sort) || ', ' || QUOTE(album_artist_sort) || ');' FROM files;" return db_upgrade_files_table(Q_DUMP, U_V15_NEW_FILES_TABLE); - + #undef Q_DUMP } From 795926605db6a57f1b2f7bb301b5cf51bf867ce7 Mon Sep 17 00:00:00 2001 From: chme Date: Mon, 23 Feb 2015 20:49:53 +0100 Subject: [PATCH 3/3] db: add missing field "virtual_path" in struct db_playlist_info (fixes segfault when loading playlists) --- src/db.c | 2 +- src/db.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/db.c b/src/db.c index a0bde563..96d207d2 100644 --- a/src/db.c +++ b/src/db.c @@ -239,7 +239,7 @@ static const ssize_t dbpli_cols_map[] = dbpli_offsetof(path), dbpli_offsetof(index), dbpli_offsetof(special_id), - dbmfi_offsetof(virtual_path), + dbpli_offsetof(virtual_path), /* items is computed on the fly */ }; diff --git a/src/db.h b/src/db.h index 633c5bfd..e1370b91 100644 --- a/src/db.h +++ b/src/db.h @@ -194,6 +194,7 @@ struct db_playlist_info { char *path; char *index; char *special_id; + char *virtual_path; }; #define dbpli_offsetof(field) offsetof(struct db_playlist_info, field)