More DAAP cache adjustments

src/daap_cache.c

@@ -37,7 +37,24 @@
 #include "db.h"
 #include "daap_cache.h"
 
-#define Q_C1 "/databases/1/containers/1/items?meta=dmap.itemname,dmap.itemid,daap.songartist,daap.songalbumartist,daap.songalbum,com.apple.itunes.cloud-id,dmap.containeritemid,com.apple.itunes.has-video,com.apple.itunes.itms-songid,com.apple.itunes.extended-media-kind,dmap.downloadstatus,daap.songdisabled&type=music&sort=name&include-sort-headers=1&query=('com.apple.itunes.extended-media-kind:1','com.apple.itunes.extended-media-kind:32')"
+/* The DAAP cache will only cache raw daap replies for these queries.
+ * Remove session_id and revision-number from the query, if you add a new one
+ */
+static const char *daapcache_queries[] =
+  {
+    // Remote 4.2, Playlist 1 - Library
+    "/databases/1/containers/1/items?meta=dmap.itemname,dmap.itemid,daap.songartist,daap.songalbumartist,daap.songalbum,com.apple.itunes.cloud-id,dmap.containeritemid,com.apple.itunes.has-video,com.apple.itunes.itms-songid,com.apple.itunes.extended-media-kind,dmap.downloadstatus,daap.songdisabled&type=music&sort=name&include-sort-headers=1&query=('com.apple.itunes.extended-media-kind:1','com.apple.itunes.extended-media-kind:32')",
+    // Remote 4.2, Albums
+    "/databases/1/groups?meta=dmap.itemname,dmap.itemid,dmap.persistentid,daap.songartist,com.apple.itunes.cloud-id,daap.songartistid,daap.songalbumid,dmap.persistentid,daap.songtime,daap.songdatereleased,dmap.downloadstatus&type=music&group-type=albums&sort=album&include-sort-headers=0&query=('daap.songalbum!:'%2B('com.apple.itunes.extended-media-kind:1','com.apple.itunes.extended-media-kind:32'))",
+    // Remote 4.2, Artists
+    "/databases/1/groups?meta=dmap.itemname,dmap.itemid,dmap.persistentid,daap.songartist,daap.groupalbumcount,daap.songartistid&type=music&group-type=artists&sort=album&include-sort-headers=1&query=('daap.songartist!:'%2B('com.apple.itunes.extended-media-kind:1','com.apple.itunes.extended-media-kind:32'))",
+    // iTunes 11.3, DB song list
+    "/databases/1/items?delta=0&type=music&meta=all",
+    // iTunes 11.3, Playlist 1 - Library
+    "/databases/1/containers/1/items?delta=0&type=music&meta=dmap.itemkind,dmap.itemid,dmap.containeritemid",
+    // iTunes 11.3, Playlist 2 - Music
+    "/databases/1/containers/2/items?delta=0&type=music&meta=dmap.itemkind,dmap.itemid,dmap.containeritemid",
+  };
 
 struct daapcache_command;
 
@@ -297,19 +314,52 @@ daapcache_query_get(struct daapcache_command *cmd)
 {
 #define Q_TMPL "SELECT reply FROM cache WHERE query = ?;"
   sqlite3_stmt *stmt;
+  char *query;
+  char *buf;
+  char *ptr;
   int datlen;
   int ret;
 
   cmd->arg.evbuf = NULL;
 
+  // Remove session-id and revision-number from the query
+  buf = strdup(cmd->arg.query);
+
+  query = (char *)malloc(strlen(buf) + 1);
+  query[0] = '\0';
+
+  ptr = strtok(buf, "&");
+  while (ptr)
+    {
+      if ( (strncmp(ptr, "session-id=", strlen("session-id=")) == 0) ||
+           (strncmp(ptr, "revision-number=", strlen("revision-number=")) == 0) )
+	{
+	  ptr = strtok (NULL, "&");
+	  continue;
+	}
+
+      if (ptr != buf)
+	strcat(query, "&");
+
+      strcat(query, ptr);
+
+      ptr = strtok(NULL, "&");
+    }
+
+  free(buf);
+
+  DPRINTF(E_DBG, L_DCACHE, "Query after removing session-id and revision-number: %s\n", query);
+
+  // Look in the DB
   ret = sqlite3_prepare_v2(g_db_hdl, Q_TMPL, -1, &stmt, 0);
   if (ret != SQLITE_OK)
     {
       DPRINTF(E_LOG, L_DCACHE, "Error preparing query for cache update: %s\n", sqlite3_errmsg(g_db_hdl));
+      free(query);
       return -1;
     }
 
-  sqlite3_bind_text(stmt, 1, cmd->arg.query, -1, SQLITE_STATIC);
+  sqlite3_bind_text(stmt, 1, query, -1, SQLITE_STATIC);
 
   ret = sqlite3_step(stmt);
   if (ret != SQLITE_ROW)  
@@ -341,16 +391,19 @@ daapcache_query_get(struct daapcache_command *cmd)
   if (ret != SQLITE_OK)
     DPRINTF(E_LOG, L_DCACHE, "Error finalizing query for getting cache: %s\n", sqlite3_errmsg(g_db_hdl));
 
+  free(query);
+
   return 0;
 
  error:
   sqlite3_finalize(stmt);
+  free(query);
   return -1;  
 #undef Q_TMPL
 }
 
-/* Here we actually update the cache by asking to httpd_daap for responses
+/* Here we actually update the cache by asking httpd_daap for responses
- * to known queries
+ * to the queries set for caching
  */
 static void
 daapcache_update_cb(int fd, short what, void *arg)
@@ -359,6 +412,7 @@ daapcache_update_cb(int fd, short what, void *arg)
   char *errmsg;
   char *query;
   int ret;
+  int i;
 
   DPRINTF(E_INFO, L_DCACHE, "Timeout reached, time to update DAAP cache\n");
 
@@ -370,20 +424,24 @@ daapcache_update_cb(int fd, short what, void *arg)
       return;
     }
 
-  query = strdup(Q_C1);
+  for (i = 0; i < (sizeof(daapcache_queries) / sizeof(daapcache_queries[0])); i++)
-
-  evbuf = daap_reply_build(query);
-  if (!evbuf)
     {
-      DPRINTF(E_LOG, L_DCACHE, "Error building DAAP reply for cache\n");
+      query = strdup(daapcache_queries[i]);
-      return;
+
+      evbuf = daap_reply_build(query);
+      if (!evbuf)
+	{
+	  DPRINTF(E_LOG, L_DCACHE, "Error building DAAP reply for query: %s\n", query);
+	  free(query);
+	  continue;
+	}
+
+      daapcache_query_add(query, evbuf);
+
+      free(query);
+      evbuffer_free(evbuf);
     }
 
-  daapcache_query_add(query, evbuf);
-
-  free(query);
-  evbuffer_free(evbuf);
-
   DPRINTF(E_INFO, L_DCACHE, "DAAP cache updated\n");
 }
 

src/db.c

@@ -2523,6 +2523,8 @@ db_file_delete_bypath(char *path)
   query = sqlite3_mprintf(Q_TMPL, path);
 
   db_query_run(query, 1);
+
+  daapcache_trigger();
 #undef Q_TMPL
 }
 
@@ -2540,6 +2542,8 @@ db_file_disable_bypath(char *path, char *strip, uint32_t cookie)
   query = sqlite3_mprintf(Q_TMPL, striplen, disabled, path);
 
   db_query_run(query, 1);
+
+  daapcache_trigger();
 #undef Q_TMPL
 }
 
@@ -2557,6 +2561,8 @@ db_file_disable_bymatch(char *path, char *strip, uint32_t cookie)
   query = sqlite3_mprintf(Q_TMPL, striplen, disabled, path);
 
   db_query_run(query, 1);
+
+  daapcache_trigger();
 #undef Q_TMPL
 }
 
@@ -2571,6 +2577,8 @@ db_file_enable_bycookie(uint32_t cookie, char *path)
 
   ret = db_query_run(query, 1);
 
+  daapcache_trigger();
+
   return ((ret < 0) ? -1 : sqlite3_changes(hdl));
 #undef Q_TMPL
 }

src/httpd_daap.c

@@ -1262,7 +1262,8 @@ daap_reply_songlist_generic(struct evhttp_request *req, struct evbuffer *evbuf,
 
   memset(&qp, 0, sizeof(struct query_params));
   get_query_params(query, &sort_headers, &qp);
-  if (playlist == -1)
+
+  if (req && (playlist == -1))
     user_agent_filter(s->user_agent, &qp);
 
   sctx = NULL;
@@ -1722,13 +1723,15 @@ daap_reply_groups(struct evhttp_request *req, struct evbuffer *evbuf, char **uri
   char *tag;
 
   s = daap_session_find(req, query, evbuf);
-  if (!s)
+  if (!s && req)
     return -1;
 
   memset(&qp, 0, sizeof(struct query_params));
 
   get_query_params(query, &sort_headers, &qp);
-  user_agent_filter(s->user_agent, &qp);
+
+  if (req)
+    user_agent_filter(s->user_agent, &qp);
 
   param = evhttp_find_header(query, "group-type");
   if (strcmp(param, "artists") == 0)
@@ -1978,7 +1981,8 @@ daap_reply_groups(struct evhttp_request *req, struct evbuffer *evbuf, char **uri
 	}
     }
 
-  httpd_send_reply(req, HTTP_OK, "OK", evbuf);
+  if (req)
+    httpd_send_reply(req, HTTP_OK, "OK", evbuf);
 
   return 0;
 
@@ -2664,10 +2668,6 @@ daap_request(struct evhttp_request *req)
   evhttp_add_header(headers, "Content-Type", "application/x-dmap-tagged");
 
   // Try the cache
-  ptr = strstr(full_uri, "&session-id");
-  if (ptr)
-    *ptr = '\0';
-
   evbuf = daapcache_get(full_uri);
   if (evbuf)
     {
@@ -2680,9 +2680,6 @@ daap_request(struct evhttp_request *req)
       return;
     }
 
-  if (ptr)
-    *ptr = '&';
-
   // No cache, so prepare handler arguments and send to the handler
   evbuf = evbuffer_new();
   if (!evbuf)