From 1672b6704053641f673d7e4031da1c1b80cb14fd Mon Sep 17 00:00:00 2001
From: chme <christian.meffert@googlemail.com>
Date: Sun, 1 Jan 2017 11:05:18 +0100
Subject: [PATCH] [library/filescanner] Move purging of old content to library;
 Remove ping for spotify files in filescanner (not needed, either they get
 updated through the init-scan or purged)

---
 src/filescanner.c | 16 ----------------
 src/library.c     | 32 +++++++++++++++++++++++++-------
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/src/filescanner.c b/src/filescanner.c
index 2b526c50..267c1126 100644
--- a/src/filescanner.c
+++ b/src/filescanner.c
@@ -827,23 +827,7 @@ bulk_scan(int flags)
     }
   else
     {
-      /* Protect spotify from the imminent purge if rescanning */
-      db_transaction_begin();
-      db_file_ping_bymatch("spotify:", 0);
-      db_pl_ping_bymatch("spotify:", 0);
-      db_transaction_end();
-
-      DPRINTF(E_DBG, L_SCAN, "Purging old database content\n");
-      db_purge_cruft(start);
-      db_groups_cleanup();
-      db_queue_cleanup();
-
-      cache_artwork_purge_cruft(start);
-
       DPRINTF(E_LOG, L_SCAN, "Bulk library scan completed in %.f sec\n", difftime(end, start));
-
-      DPRINTF(E_DBG, L_SCAN, "Running post library scan jobs\n");
-      db_hook_post_scan();
     }
 }
 
diff --git a/src/library.c b/src/library.c
index b3ab3592..bb9b060f 100644
--- a/src/library.c
+++ b/src/library.c
@@ -37,6 +37,7 @@
 #include <uninorm.h>
 #include <unistr.h>
 
+#include "cache.h"
 #include "commands.h"
 #include "conffile.h"
 #include "db.h"
@@ -87,7 +88,7 @@ sort_tag_create(char **sort_tag, char *src_tag)
 
   if (*sort_tag)
     {
-      DPRINTF(E_DBG, L_SCAN, "Existing sort tag will be normalized: %s\n", *sort_tag);
+      DPRINTF(E_DBG, L_LIB, "Existing sort tag will be normalized: %s\n", *sort_tag);
       o_ptr = u8_normalize(UNINORM_NFD, (uint8_t *)*sort_tag, strlen(*sort_tag) + 1, NULL, &len);
       free(*sort_tag);
       *sort_tag = (char *)o_ptr;
@@ -362,7 +363,7 @@ library_process_media(const char *path, time_t mtime, off_t size, enum data_kind
       mfi = (struct media_file_info*)malloc(sizeof(struct media_file_info));
       if (!mfi)
 	{
-	  DPRINTF(E_LOG, L_SCAN, "Out of memory for mfi\n");
+	  DPRINTF(E_LOG, L_LIB, "Out of memory for mfi\n");
 	  return;
 	}
 
@@ -377,14 +378,14 @@ library_process_media(const char *path, time_t mtime, off_t size, enum data_kind
   mfi->fname = strdup(filename);
   if (!mfi->fname)
     {
-      DPRINTF(E_LOG, L_SCAN, "Out of memory for fname\n");
+      DPRINTF(E_LOG, L_LIB, "Out of memory for fname\n");
       goto out;
     }
 
   mfi->path = strdup(path);
   if (!mfi->path)
     {
-      DPRINTF(E_LOG, L_SCAN, "Out of memory for path\n");
+      DPRINTF(E_LOG, L_LIB, "Out of memory for path\n");
       goto out;
     }
 
@@ -407,7 +408,7 @@ library_process_media(const char *path, time_t mtime, off_t size, enum data_kind
       ret = scan_metadata_ffmpeg(path, mfi);
       if (ret < 0)
 	{
-	  DPRINTF(E_LOG, L_SCAN, "Playlist URL '%s' is unavailable for probe/metadata, assuming MP3 encoding\n", path);
+	  DPRINTF(E_LOG, L_LIB, "Playlist URL '%s' is unavailable for probe/metadata, assuming MP3 encoding\n", path);
 	  mfi->type = strdup("mp3");
 	  mfi->codectype = strdup("mpeg");
 	  mfi->description = strdup("MPEG audio file");
@@ -429,13 +430,13 @@ library_process_media(const char *path, time_t mtime, off_t size, enum data_kind
     }
   else
     {
-      DPRINTF(E_LOG, L_SCAN, "Unknown scan type for '%s', this error should not occur\n", path);
+      DPRINTF(E_LOG, L_LIB, "Unknown scan type for '%s', this error should not occur\n", path);
       ret = -1;
     }
 
   if (ret < 0)
     {
-      DPRINTF(E_INFO, L_SCAN, "Could not extract metadata for '%s'\n", path);
+      DPRINTF(E_INFO, L_LIB, "Could not extract metadata for '%s'\n", path);
       goto out;
     }
 
@@ -544,6 +545,18 @@ library_add_playlist_info(const char *path, const char *title, const char *virtu
   return plid;
 }
 
+static void
+purge_cruft(time_t start)
+{
+  DPRINTF(E_DBG, L_LIB, "Purging old library content\n");
+  db_purge_cruft(start);
+  db_groups_cleanup();
+  db_queue_cleanup();
+
+  DPRINTF(E_DBG, L_LIB, "Purging old artwork content\n");
+  cache_artwork_purge_cruft(start);
+}
+
 static enum command_state
 rescan(void *arg, int *ret)
 {
@@ -633,6 +646,11 @@ initscan()
 	sources[i]->initscan();
     }
 
+  purge_cruft(starttime);
+
+  DPRINTF(E_DBG, L_LIB, "Running post library scan jobs\n");
+  db_hook_post_scan();
+
   endtime = time(NULL);
   DPRINTF(E_LOG, L_LIB, "Library init scan completed in %.f sec\n", difftime(endtime, starttime));