Merge pull request #1149 from ittner/improvements-for-podcast-search-rule

Improvements for podcast search rule

Author: lwindolf

doc/html/searching_en.html

@@ -143,12 +143,24 @@ <h4>Permanent Searches with Search Folders</h4>
 	<tr><td style="background:#bfb">
 	<b>Podcast included</b>
 	</td><td>
-	<b>Adds</b> all items that contain an enclosure to the search folder.
+	<b>Adds</b> all items that contain a podcast to the search folder. For this rule, podcast is assumed to be any enclosure for an audio file.
 	</td></tr>
 	<!-- ----------------------------------------- -->
 	<tr><td style="background:#fbb">
 	<b>Podcast not included</b>
 	</td><td>
+	<b>Removes</b> all items that do not contain a podcast (i.e. an enclosure for an audio file) from the search folder.
+	</td></tr>
+	<!-- ----------------------------------------- -->
+	<tr><td style="background:#bfb">
+	<b>Enclosure included</b>
+	</td><td>
+	<b>Adds</b> all items that contain an enclosure (for any file type) to the search folder.
+	</td></tr>
+	<!-- ----------------------------------------- -->
+	<tr><td style="background:#fbb">
+	<b>Enclosure not included</b>
+	</td><td>
 	<b>Removes</b> all items that do not contain an enclosure from the search folder.
 	</td></tr>
 	</table>

src/rule.c

@@ -149,41 +149,26 @@ rule_check_item_has_enc (rulePtr rule, itemPtr item)
 	return item->hasEnclosure;
 }
 
-static void
-rule_check_item_has_podcast_metadata_cb ( const gchar *key, const gchar *value,
-	guint index, gpointer user_data )
-{
-	gboolean *found = (gboolean *) user_data;
-	if (*found) {
-		return;	/* Already found, nothing else to do. */
-	}
-	if (g_strcmp0(key, "enclosure") != 0) {
-		return;
-	}
-	enclosurePtr encl = enclosure_from_string (value);
-	if (encl != NULL) {
-		if (encl->mime && g_str_has_prefix (encl->mime, "audio/")) {
-			*found = TRUE;
-		}
-		enclosure_free (encl);
-	}
-}
-
 static gboolean
 rule_check_item_has_podcast (rulePtr rule, itemPtr item)
 {
-	if (!item->hasEnclosure) {
-		return FALSE;	/* Optimization. */
-	}
-
+	GSList *iter = metadata_list_get_values (item->metadata, "enclosure");
 	gboolean found = FALSE;
-	metadata_list_foreach(item->metadata,
-		rule_check_item_has_podcast_metadata_cb,
-		&found);
+	enclosurePtr encl;
+
+	while (iter && !found) {
+		enclosurePtr encl = enclosure_from_string ((gchar *)iter->data);
+		if (encl != NULL) {
+			if (encl->mime && g_str_has_prefix (encl->mime, "audio/")) {
+				found = TRUE;
+			}
+			enclosure_free (encl);
+		}
+		iter = g_slist_next (iter);
+	}
 	return found;
 }
 
-
 static gboolean
 rule_check_item_category (rulePtr rule, itemPtr item)
 {