Changes needed to get the kiosk to run on the rpi.

[kiosk.git] / local_photos_mirror_renderer.py

diff --git a/local_photos_mirror_renderer.py b/local_photos_mirror_renderer.py
index b27a7918feba389de82897941806bda83ee6ac99..287bdd697ecdfad96c93e47aa12619463cee54f9 100644 (file)
--- a/local_photos_mirror_renderer.py
+++ b/local_photos_mirror_renderer.py
@@ -5,7 +5,6 @@ import random
 import re
 from typing import Dict, Set
 
 import re
 from typing import Dict, Set
 

-import constants

 import file_writer
 import renderer
 
 import file_writer
 import renderer
 


@@ -13,7 +12,7 @@ import renderer
 class local_photos_mirror_renderer(renderer.debuggable_abstaining_renderer):
     """A renderer that uses a local mirror of Google photos"""
 
 class local_photos_mirror_renderer(renderer.debuggable_abstaining_renderer):
     """A renderer that uses a local mirror of Google photos"""
 

-    ALBUM_ROOT_DIR = "/var/www/kiosk/pages/images/gphotos/albums"
+    album_root_directory = "/var/www/kiosk/pages/images/gphotos/albums"

 
     album_whitelist = frozenset(
         [
 
     album_whitelist = frozenset(
         [


@@ -87,7 +86,7 @@ class local_photos_mirror_renderer(renderer.debuggable_abstaining_renderer):
         """Walk the filesystem looking for photos in whitelisted albums and
         keep their paths in memory.
         """
         """Walk the filesystem looking for photos in whitelisted albums and
         keep their paths in memory.
         """

-        for root, subdirs, files in os.walk(self.ALBUM_ROOT_DIR):
+        for root, subdirs, files in os.walk(self.album_root_directory):

             last_dir = root.rsplit("/", 1)[1]
             if self.album_is_in_whitelist(last_dir):
                 for filename in files:
             last_dir = root.rsplit("/", 1)[1]
             if self.album_is_in_whitelist(last_dir):
                 for filename in files:


@@ -95,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(
                     if extension in self.extension_whitelist:
                         photo_path = os.path.join(root, filename)
                         photo_url = photo_path.replace(

-                            "/var/www/", f"http://{constants.hostname}/", 1
+                            "/var/www/", "http://kiosk.house/", 1

                         )
                         self.candidate_photos.add(photo_url)
         return True
                         )
                         self.candidate_photos.add(photo_url)
         return True