X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=local_photos_mirror_renderer.py;h=287bdd697ecdfad96c93e47aa12619463cee54f9;hb=18913d6fecc43aeecfd5b617030e9cd3e840ef08;hp=da3b9e75c3abbc2f2e81b6a63c6226045436fba0;hpb=c06bfef53f70551e7920bc4facce27f47b89e2ba;p=kiosk.git

diff --git a/local_photos_mirror_renderer.py b/local_photos_mirror_renderer.py
index da3b9e7..287bdd6 100644
--- a/local_photos_mirror_renderer.py
+++ b/local_photos_mirror_renderer.py
@@ -3,7 +3,7 @@
 import os
 import random
 import re
-from typing import List, Dict
+from typing import Dict, Set
 
 import file_writer
 import renderer
@@ -12,7 +12,7 @@ import renderer
 class local_photos_mirror_renderer(renderer.debuggable_abstaining_renderer):
     """A renderer that uses a local mirror of Google photos"""
 
-    album_root_directory = "/usr/local/export/www/gphotos/albums"
+    album_root_directory = "/var/www/kiosk/pages/images/gphotos/albums"
 
     album_whitelist = frozenset(
         [
@@ -63,7 +63,7 @@ class local_photos_mirror_renderer(renderer.debuggable_abstaining_renderer):
 
     def __init__(self, name_to_timeout_dict: Dict[str, int]) -> None:
         super(local_photos_mirror_renderer, self).__init__(name_to_timeout_dict, False)
-        self.candidate_photos = set()
+        self.candidate_photos: Set[str] = set()
 
     def debug_prefix(self) -> str:
         return "local_photos_mirror"
@@ -74,11 +74,11 @@ class local_photos_mirror_renderer(renderer.debuggable_abstaining_renderer):
         elif key == "Choose Photo":
             return self.choose_photo()
         else:
-            raise error("Unexpected operation")
+            raise Exception("Unexpected operation")
 
     def album_is_in_whitelist(self, name: str) -> bool:
         for wlalbum in self.album_whitelist:
-            if re.search("\d+ %s" % wlalbum, name) != None:
+            if re.search("\d+ %s" % wlalbum, name) is not None:
                 return True
         return False
 
@@ -94,7 +94,7 @@ class local_photos_mirror_renderer(renderer.debuggable_abstaining_renderer):
                     if extension in self.extension_whitelist:
                         photo_path = os.path.join(root, filename)
                         photo_url = photo_path.replace(
-                            "/usr/local/export/www/", "http://10.0.0.18/", 1
+                            "/var/www/", "http://kiosk.house/", 1
                         )
                         self.candidate_photos.add(photo_url)
         return True