projects
/
kiosk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes.
[kiosk.git]
/
local_photos_mirror_renderer.py
diff --git
a/local_photos_mirror_renderer.py
b/local_photos_mirror_renderer.py
index 55927af124788e617fe43271fd80c04185907dd0..b6499a17bd39a13ad0e011db94cb963bfb6269d9 100644
(file)
--- a/
local_photos_mirror_renderer.py
+++ b/
local_photos_mirror_renderer.py
@@
-3,16
+3,16
@@
import os
import random
import re
import os
import random
import re
-from typing import
List, Dic
t
+from typing import
Dict, Se
t
import file_writer
import renderer
import file_writer
import renderer
-class local_photos_mirror_renderer(renderer.
debuggable_
abstaining_renderer):
+class local_photos_mirror_renderer(renderer.abstaining_renderer):
"""A renderer that uses a local mirror of Google photos"""
"""A renderer that uses a local mirror of Google photos"""
- album_root_directory = "/
usr/local/export/www
/gphotos/albums"
+ album_root_directory = "/
var/www/html/kiosk/images
/gphotos/albums"
album_whitelist = frozenset(
[
album_whitelist = frozenset(
[
@@
-36,9
+36,11
@@
class local_photos_mirror_renderer(renderer.debuggable_abstaining_renderer):
"Newer Alex Photos",
"Ohme Gardens",
"Olympic Sculpture Park",
"Newer Alex Photos",
"Ohme Gardens",
"Olympic Sculpture Park",
+ "Portland, ME 2021",
"Prague and Munich 2019",
"Random",
"Scott and Lynn",
"Prague and Munich 2019",
"Random",
"Scott and Lynn",
+ "Sculpture Place",
"SFO 2014",
"Skiing with Alex",
"Sonoma",
"SFO 2014",
"Skiing with Alex",
"Sonoma",
@@
-47,6
+49,7
@@
class local_photos_mirror_renderer(renderer.debuggable_abstaining_renderer):
"Trip to East Coast '16",
"Tuscany 2008",
"Yosemite 2010",
"Trip to East Coast '16",
"Tuscany 2008",
"Yosemite 2010",
+ "WA Roadtrip, 2021",
"Zoo",
]
)
"Zoo",
]
)
@@
-62,8
+65,8
@@
class local_photos_mirror_renderer(renderer.debuggable_abstaining_renderer):
)
def __init__(self, name_to_timeout_dict: Dict[str, int]) -> None:
)
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()
+ super(
).__init__(name_to_timeout_dict
)
+ self.candidate_photos
: Set[str]
= set()
def debug_prefix(self) -> str:
return "local_photos_mirror"
def debug_prefix(self) -> str:
return "local_photos_mirror"
@@
-74,7
+77,7
@@
class local_photos_mirror_renderer(renderer.debuggable_abstaining_renderer):
elif key == "Choose Photo":
return self.choose_photo()
else:
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:
def album_is_in_whitelist(self, name: str) -> bool:
for wlalbum in self.album_whitelist:
@@
-94,7
+97,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(
- "/
usr/local/export/www/", "http://10.0.0.18
/", 1
+ "/
var/www/html", "http://kiosk.house
/", 1
)
self.candidate_photos.add(photo_url)
return True
)
self.candidate_photos.add(photo_url)
return True