From 9ce49b7ef00fda8e18659e0c736ea6cfc0ce1180 Mon Sep 17 00:00:00 2001
From: Adrian Sampson <adrian@radbox.org>
Date: Sat, 29 Aug 2015 12:52:57 -0700
Subject: [PATCH] fetchart: Do not emable Wikipedia by default

Because DBpedia seems to be down (it's responding very slowly with errors),
this seems like a good defensive action. It narrows the default sources to
those that resolve quickly, with only a couple of HTTP requests. We can
re-enable this again in the future if things seem to stabilize over at
DBpedia.
---
 beetsplug/fetchart.py     | 3 +--
 docs/changelog.rst        | 6 ++++--
 docs/plugins/fetchart.rst | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/beetsplug/fetchart.py b/beetsplug/fetchart.py
index 6014c10ef..b87c83212 100644
--- a/beetsplug/fetchart.py
+++ b/beetsplug/fetchart.py
@@ -403,8 +403,7 @@ class FetchArtPlugin(plugins.BeetsPlugin, RequestMixin):
             'remote_priority': False,
             'cautious': False,
             'cover_names': ['cover', 'front', 'art', 'album', 'folder'],
-            'sources': ['coverart', 'itunes', 'amazon', 'albumart',
-                        'wikipedia'],
+            'sources': ['coverart', 'itunes', 'amazon', 'albumart'],
         })
 
         # Holds paths to downloaded images between fetching them and
diff --git a/docs/changelog.rst b/docs/changelog.rst
index fa0a15c22..da139ec54 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -21,8 +21,10 @@ Fixes:
   art, for example with the ``clearart`` command from the
   :doc:`/plugins/embedart`. Thanks to :user:`nathdwek`. :bug:`1565`
 * :doc:`/plugins/fetchart`: The Google Images source is disabled by default
-  (as it was before beets 1.3.9). To enable it, add ``google`` to your
-  ``sources`` configuration option.
+  (as it was before beets 1.3.9), as is the Wikipedia source (which was
+  causing lots of unnecessary delays due to DBpedia downtime). To re-enable
+  these sources, add ``wikipedia google`` to your ``sources`` configuration
+  option.
 
 
 1.3.14 (August 2, 2015)
diff --git a/docs/plugins/fetchart.rst b/docs/plugins/fetchart.rst
index b25196c03..21d58fed4 100644
--- a/docs/plugins/fetchart.rst
+++ b/docs/plugins/fetchart.rst
@@ -49,8 +49,9 @@ file. The available options are:
   found in the filesystem.
 - **sources**: List of sources to search for images. An asterisk `*` expands
   to all available sources.
-  Default: ``coverart itunes albumart amazon wikipedia``, i.e., everything but
-  ``google``.
+  Default: ``coverart itunes amazon albumart``, i.e., everything but
+  ``wikipedia`` and ``google``. Enable those two sources for more matches at
+  the cost of some speed.
 
 Note: ``minwidth`` and ``enforce_ratio`` options require either `ImageMagick`_
 or `PIL`_.