preparser: pass meta request options to Preparse

[vlc] / src / playlist / preparser.c

diff --git a/src/playlist/preparser.c b/src/playlist/preparser.c
index 505cece94279a28ae87f33b7fbc87d477d378c1d..96171e3a83fdd0c18177d9ff321eaacb3c4bea46 100644 (file)
--- a/src/playlist/preparser.c
+++ b/src/playlist/preparser.c
@@ -26,17 +26,22 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
 
-#include "art.h"
 #include "fetcher.h"
 #include "preparser.h"
-#include "../input/input_interface.h"
-
+#include "input/input_interface.h"
 
 /*****************************************************************************
  * Structures/definitions
  *****************************************************************************/
+typedef struct preparser_entry_t preparser_entry_t;
+
+struct preparser_entry_t
+{
+    input_item_t    *p_item;
+    input_item_meta_request_option_t i_options;
+};
+
 struct playlist_preparser_t
 {
     vlc_object_t        *object;
@@ -45,10 +50,8 @@ struct playlist_preparser_t
     vlc_mutex_t     lock;
     vlc_cond_t      wait;
     bool            b_live;
-    input_item_t  **pp_waiting;
+    preparser_entry_t  **pp_waiting;
     int             i_waiting;
-
-    int             i_art_policy;
 };
 
 static void *Thread( void * );
@@ -70,20 +73,26 @@ playlist_preparser_t *playlist_preparser_New( vlc_object_t *parent )
     vlc_mutex_init( &p_preparser->lock );
     vlc_cond_init( &p_preparser->wait );
     p_preparser->b_live = false;
-    p_preparser->i_art_policy = var_InheritInteger( parent, "album-art" );
     p_preparser->i_waiting = 0;
     p_preparser->pp_waiting = NULL;
 
     return p_preparser;
 }
 
-void playlist_preparser_Push( playlist_preparser_t *p_preparser, input_item_t *p_item )
+void playlist_preparser_Push( playlist_preparser_t *p_preparser, input_item_t *p_item,
+                              input_item_meta_request_option_t i_options )
 {
-    vlc_gc_incref( p_item );
+    preparser_entry_t *p_entry = malloc( sizeof(preparser_entry_t) );
+
+    if ( !p_entry )
+        return;
+    p_entry->p_item = p_item;
+    p_entry->i_options = i_options;
+    vlc_gc_incref( p_entry->p_item );
 
     vlc_mutex_lock( &p_preparser->lock );
     INSERT_ELEM( p_preparser->pp_waiting, p_preparser->i_waiting,
-                 p_preparser->i_waiting, p_item );
+                 p_preparser->i_waiting, p_entry );
     if( !p_preparser->b_live )
     {
         if( vlc_clone_detach( NULL, Thread, p_preparser,
@@ -96,10 +105,10 @@ void playlist_preparser_Push( playlist_preparser_t *p_preparser, input_item_t *p
 }
 
 void playlist_preparser_fetcher_Push( playlist_preparser_t *p_preparser,
-                                      input_item_t *p_item )
+             input_item_t *p_item, input_item_meta_request_option_t i_options )
 {
     if( p_preparser->p_fetcher != NULL )
-        playlist_fetcher_Push( p_preparser->p_fetcher, p_item );
+        playlist_fetcher_Push( p_preparser->p_fetcher, p_item, i_options );
 }
 
 void playlist_preparser_Delete( playlist_preparser_t *p_preparser )
@@ -108,7 +117,9 @@ void playlist_preparser_Delete( playlist_preparser_t *p_preparser )
     /* Remove pending item to speed up preparser thread exit */
     while( p_preparser->i_waiting > 0 )
     {
-        vlc_gc_decref( p_preparser->pp_waiting[0] );
+        preparser_entry_t *p_entry = p_preparser->pp_waiting[0];
+        vlc_gc_decref( p_entry->p_item );
+        free( p_entry );
         REMOVE_ELEM( p_preparser->pp_waiting, p_preparser->i_waiting, 0 );
     }
 
@@ -131,13 +142,27 @@ void playlist_preparser_Delete( playlist_preparser_t *p_preparser )
 /**
  * This function preparses an item when needed.
  */
-static void Preparse( vlc_object_t *obj, input_item_t *p_item )
+static void Preparse( vlc_object_t *obj, input_item_t *p_item,
+                      input_item_meta_request_option_t i_options )
 {
     vlc_mutex_lock( &p_item->lock );
     int i_type = p_item->i_type;
     vlc_mutex_unlock( &p_item->lock );
 
-    if( i_type != ITEM_TYPE_FILE )
+    bool b_preparse = false;
+    switch (i_type) {
+    case ITEM_TYPE_FILE:
+    case ITEM_TYPE_DIRECTORY:
+    case ITEM_TYPE_PLAYLIST:
+    case ITEM_TYPE_NODE:
+        b_preparse = true;
+        break;
+    case ITEM_TYPE_NET:
+        if (i_options & META_REQUEST_OPTION_SCOPE_NETWORK)
+            b_preparse = true;
+        break;
+    }
+    if( !b_preparse )
     {
         input_item_SetPreparsed( p_item, true );
         return;
@@ -174,10 +199,8 @@ static void Art( playlist_preparser_t *p_preparser, input_item_t *p_item )
         const char *psz_arturl = vlc_meta_Get( p_item->p_meta, vlc_meta_ArtworkURL );
         const char *psz_name = vlc_meta_Get( p_item->p_meta, vlc_meta_Title );
 
-        if( p_preparser->i_art_policy == ALBUM_ART_ALL &&
-                ( !psz_arturl ||
-                  ( strncmp( psz_arturl, "file://", 7 ) &&
-                    strncmp( psz_arturl, "attachment://", 13 ) ) ) )
+        if( !psz_arturl || ( strncmp( psz_arturl, "file://", 7 ) &&
+                             strncmp( psz_arturl, "attachment://", 13 ) ) )
         {
             msg_Dbg( obj, "meta ok for %s, need to fetch art",
                      psz_name ? psz_name : "(null)" );
@@ -193,7 +216,7 @@ static void Art( playlist_preparser_t *p_preparser, input_item_t *p_item )
     vlc_mutex_unlock( &p_item->lock );
 
     if( b_fetch && p_fetcher )
-        playlist_fetcher_Push( p_fetcher, p_item );
+        playlist_fetcher_Push( p_fetcher, p_item, 0 );
 }
 
 /**
@@ -207,12 +230,16 @@ static void *Thread( void *data )
     for( ;; )
     {
         input_item_t *p_current;
+        input_item_meta_request_option_t i_options;
 
         /* */
         vlc_mutex_lock( &p_preparser->lock );
         if( p_preparser->i_waiting > 0 )
         {
-            p_current = p_preparser->pp_waiting[0];
+            preparser_entry_t *p_entry = p_preparser->pp_waiting[0];
+            p_current = p_entry->p_item;
+            i_options = p_entry->i_options;
+            free( p_entry );
             REMOVE_ELEM( p_preparser->pp_waiting, p_preparser->i_waiting, 0 );
         }
         else
@@ -226,7 +253,7 @@ static void *Thread( void *data )
         if( !p_current )
             break;
 
-        Preparse( obj, p_current );
+        Preparse( obj, p_current, i_options );
 
         Art( p_preparser, p_current );
         vlc_gc_decref(p_current);