api: More changes.

pywal/__main__.py

@@ -16,10 +16,10 @@ import sys
 
 from .settings import __version__, __cache_dir__
 from . import colors
+from . import export
 from . import image
 from . import reload
 from . import sequences
-from . import template
 from . import util
 from . import wallpaper
 
@@ -99,7 +99,7 @@ def process_args(args):
         if not args.n:
             wallpaper.change(colors_plain["wallpaper"])
 
-        template.export_all(colors_plain)
+        export.every(colors_plain)
         reload.env()
 
     if args.o:

pywal/image.py

@@ -7,15 +7,13 @@ import random
 
 from .settings import __cache_dir__
 from . import util
+from . import wallpaper
 
 
 def get_random_image(img_dir, cache_dir):
     """Pick a random image file from a directory."""
-    current_wall = cache_dir / "wal"
-
-    if current_wall.is_file():
-        current_wall = util.read_file(current_wall)
-        current_wall = os.path.basename(current_wall[0])
+    current_wall = wallpaper.get()
+    current_wall = os.path.basename(current_wall[0])
 
     file_types = (".png", ".jpg", ".jpeg", ".jpe", ".gif")
     images = [img for img in os.scandir(img_dir)

pywal/wallpaper.py

@@ -3,7 +3,8 @@ import os
 import shutil
 import subprocess
 
-from pywal import util
+from .settings import __cache_dir__
+from . import util
 
 
 def get_desktop_env():
@@ -94,3 +95,11 @@ def change(img):
         set_wm_wallpaper(img)
 
     print("wallpaper: Set the new wallpaper")
+
+
+def get(cache_dir=__cache_dir__):
+    """Get the current wallpaper."""
+    current_wall = cache_dir / "wal"
+
+    if current_wall.is_file():
+        return util.read_file(current_wall)[0]