MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-15 16:53:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

[filescanner] Protect URL items in playlists from purge after scan

Browse Source
This commit is contained in:
ejurgensen 2017-10-02 23:02:50 +02:00
parent 65b4c579f3
commit 45bd2d6cc8
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/library/filescanner.c
View File

@ -941,11 +941,7 @@ bulk_scan(int flags)
} }
if (!(flags & F_SCAN_FAST) && playlists) if (!(flags & F_SCAN_FAST) && playlists)
{ process_deferred_playlists();
db_transaction_begin();
process_deferred_playlists();
db_transaction_end();
}
if (library_is_exiting()) if (library_is_exiting())
return; return;

23
src/library/filescanner_playlist.c
View File

@ -80,11 +80,6 @@ process_url(const char *path, time_t mtime, int extinf, struct media_file_info *
*filename = strdup(path); *filename = strdup(path);
// Playlist hasn't changed since last probe of this item, so we wont't probe again
ret = db_file_ping_bypath(path, mtime);
if ((mtime != 0) && (ret != 0))
return 0;
if (extinf) if (extinf)
DPRINTF(E_INFO, L_SCAN, "Playlist has EXTINF metadata, artist is '%s', title is '%s'\n", mfi->artist, mfi->title); DPRINTF(E_INFO, L_SCAN, "Playlist has EXTINF metadata, artist is '%s', title is '%s'\n", mfi->artist, mfi->title);
@ -196,8 +191,6 @@ scan_playlist(char *file, time_t mtime, int dir_id)
char virtual_path[PATH_MAX]; char virtual_path[PATH_MAX];
char *plitem_path; char *plitem_path;
DPRINTF(E_LOG, L_SCAN, "Processing static playlist: '%s'\n", file);
ptr = strrchr(file, '.'); ptr = strrchr(file, '.');
if (!ptr) if (!ptr)
return; return;
@ -219,19 +212,23 @@ scan_playlist(char *file, time_t mtime, int dir_id)
if (mtime && (pli->db_timestamp >= mtime)) if (mtime && (pli->db_timestamp >= mtime))
{ {
DPRINTF(E_LOG, L_SCAN, "Playlist not modified since last processing, skipping\n"); DPRINTF(E_LOG, L_SCAN, "Playlist '%s' is not modified, no processing required\n", file);
// Protect this playlist's radio stations from purge after scan
db_pl_ping_items_bymatch("http://", pli->id);
free_pli(pli, 0); free_pli(pli, 0);
return; return;
} }
DPRINTF(E_INFO, L_SCAN, "Updating playlist\n"); DPRINTF(E_LOG, L_SCAN, "Playlist '%s' is modified, processing\n", file);
pl_id = pli->id; pl_id = pli->id;
db_pl_clear_items(pl_id); db_pl_clear_items(pl_id);
} }
else else
{ {
DPRINTF(E_LOG, L_SCAN, "Playlist '%s' is new, processing\n", file);
CHECK_NULL(L_SCAN, pli = calloc(1, sizeof(struct playlist_info))); CHECK_NULL(L_SCAN, pli = calloc(1, sizeof(struct playlist_info)));
pli->type = PL_PLAIN; pli->type = PL_PLAIN;
@ -273,6 +270,8 @@ scan_playlist(char *file, time_t mtime, int dir_id)
return; return;
} }
db_transaction_begin();
extinf = 0; extinf = 0;
memset(&mfi, 0, sizeof(struct media_file_info)); memset(&mfi, 0, sizeof(struct media_file_info));
counter = 0; counter = 0;
@ -323,7 +322,7 @@ scan_playlist(char *file, time_t mtime, int dir_id)
counter++; counter++;
if (counter % 200 == 0) if (counter % 200 == 0)
{ {
DPRINTF(E_LOG, L_SCAN, "Added %d items to playlist ...\n", counter); DPRINTF(E_LOG, L_SCAN, "Added %d items to playlist...\n", counter);
db_transaction_end(); db_transaction_end();
db_transaction_begin(); db_transaction_begin();
} }
@ -337,6 +336,8 @@ scan_playlist(char *file, time_t mtime, int dir_id)
free(plitem_path); free(plitem_path);
} }
db_transaction_end();
/* We had some extinf that we never got to use, free it now */ /* We had some extinf that we never got to use, free it now */
if (extinf) if (extinf)
free_mfi(&mfi, 1); free_mfi(&mfi, 1);
@ -344,7 +345,7 @@ scan_playlist(char *file, time_t mtime, int dir_id)
if (!feof(fp)) if (!feof(fp))
DPRINTF(E_LOG, L_SCAN, "Error reading playlist '%s' (only added %d tracks): %s\n", file, counter, strerror(errno)); DPRINTF(E_LOG, L_SCAN, "Error reading playlist '%s' (only added %d tracks): %s\n", file, counter, strerror(errno));
else else
DPRINTF(E_LOG, L_SCAN, "Done processing playlist, added %d items\n", counter); DPRINTF(E_LOG, L_SCAN, "Done processing playlist, added/modified %d items\n", counter);
fclose(fp); fclose(fp);
} }