Fix #296: Remove World Sunlight Map as a source

varietywalls · Feb 11, 2020 · d6b51f8 · jlu5 · Feb 12, 2020 · d6b51f8
1 parent fe868f2
commit d6b51f8
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 121 deletions.
diff --git a/data/ui/changes.txt b/data/ui/changes.txt
@@ -1,10 +1,11 @@
-0.8.0 - 0.8.2
+0.8.0 - 0.8.3
     Image sources are now plugins
     Add support for sequential albums
     Add support for multiple simultaneously running Variety profiles (--profile command option)
     Add a Privacy Notice dialog
     Add support for configurable Unsplash sources
     Add two new sources (ChromeOS Wallpapers and Google Earth View Wallpapers)
+    Remove World Sunlight Map source
     Added Urban Dictionary and UNIX fortune program as quote sources
     Download linked to wallpaper changing, not configured as a separate interval
     Add a dedicated --set/--set-wallpaper option

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+variety (0.8.3) bionic; urgency=medium
+
+  * Remove World Sunlight Map source
+
+ -- Peter Levi <peterlevi@peterlevi.com>  Wed, 12 Feb 2020 01:12:00 +0200
+
 variety (0.8.2) bionic; urgency=medium
 
   * Bugfixes

diff --git a/tests/TestEarthDownloader.py b/tests/TestEarthDownloader.py
diff --git a/tests/TestJumble.py b/tests/TestJumble.py
@@ -38,6 +38,6 @@ class TestJumble(unittest.TestCase):
     def test_load(self):
         p = Jumble(["variety/plugins/builtin"])
         p.load()
-        self.assertEqual(14, len(p.get_plugins()))
-        self.assertEqual(14, len(p.get_plugins(IPlugin)))
+        self.assertEqual(15, len(p.get_plugins()))
+        self.assertEqual(15, len(p.get_plugins(IPlugin)))
         self.assertEqual(1, len(p.get_plugins(name="Goodreads")))
diff --git a/variety/Texts.py b/variety/Texts.py
@@ -40,10 +40,6 @@
     ),
     "desktoppr": ("Random wallpapers from Desktoppr.co", _("Random wallpapers from Desktoppr.co")),
     "apod": ("NASA's Astronomy Picture of the Day", _("NASA's Astronomy Picture of the Day")),
-    "earth": (
-        "World Sunlight Map - live wallpaper from Die.net",
-        _("World Sunlight Map - live wallpaper from Die.net"),
-    ),
     "bing": ("Bing Photo of the Day", _("Bing Photo of the Day")),
     "unsplash": (
         "High-resolution photos from Unsplash.com",

diff --git a/variety/VarietyWindow.py b/variety/VarietyWindow.py
@@ -2239,6 +2239,13 @@ def perform_upgrade(self):
                     options.quotes_disabled_sources.append("Urban Dictionary")
                 options.write()
 
+            if Util.compare_versions(last_version, "0.8.3") < 0:
+                logger.info(lambda: "Performing upgrade to 0.8.3")
+                options = Options()
+                options.read()
+                options.sources = [source for source in options.sources if source[1] != "earth"]
+                options.write()
+
             # Perform on every upgrade to an newer version:
             if Util.compare_versions(last_version, current_version) < 0:
                 self.write_current_version()

diff --git a/variety/plugins/builtin/downloaders/EarthDownloader.py b/variety/plugins/builtin/downloaders/EarthDownloader.py
diff --git a/variety_lib/varietyconfig.py b/variety_lib/varietyconfig.py
@@ -23,7 +23,7 @@
     # for easy development / running from source.
     __variety_data_directory__ = "../data"
 __license__ = "GPL-3"
-__version__ = "0.8.2"
+__version__ = "0.8.3"
 
 import os