fetcher: don't download network metadata if the user doesn't want to

The option is defined as "Allow metadata network access". If it's false (default but query during the first run) that means the
user doesn't want to check metadata from the network.
So we should not start a network job when there's a possibility to do it.

This is a regression from ea88b8d68e252445bcc305fd7a3dd45ef3ce0126.
Before that we only used FETCHER_SCOPE_LOCAL if the option wasn't set.

(cherry picked from commit 1a85d6793948c88afe35692d8c17a82089a58f33)

Gbp-Pq: Name 0079-fetcher-don-t-download-network-metadata-if-the-user-.patch

diff --git a/src/playlist/fetcher.c b/src/playlist/fetcher.c
index 44c13a55cafb821a99e6e93749ba2a11317eda17..f11b4201b515396ff9c222b9c10f4f88dd11c58d 100644 (file)
--- a/src/playlist/fetcher.c
+++ b/src/playlist/fetcher.c
@@ -294,7 +294,7 @@ static void SearchLocal( playlist_fetcher_t* fetcher, struct fetcher_request* re
     if( SearchByScope( fetcher, req, FETCHER_SCOPE_LOCAL ) == VLC_SUCCESS )
         return; /* done */
 
-    if( var_InheritBool( fetcher->owner, "metadata-network-access" ) ||
+    if( var_InheritBool( fetcher->owner, "metadata-network-access" ) &&
         req->options & META_REQUEST_OPTION_SCOPE_NETWORK )
     {
         if( background_worker_Push( fetcher->network, req, NULL, 0 ) )