Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions install/inkypi
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
export APPNAME="inkypi"
export PROGRAM_PATH=/usr/local/inkypi
export VENV_PATH="$PROGRAM_PATH/venv_inkypi"
export PYTHONUNBUFFERED="1"

export PROJECT_DIR="$PROGRAM_PATH"
export SRC_DIR="$PROGRAM_PATH/src"
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/image_album/image_album.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def __init__(self, base_url: str, key: str, image_loader):

def get_album_id(self, album: str) -> str:
logger.debug(f"Fetching albums from {self.base_url}")
r = self.session.get(f"{self.base_url}/api/albums", headers=self.headers)
r = self.session.get(f"{self.base_url}/api/albums", headers=self.headers, timeout=30)
r.raise_for_status()
albums = r.json()

Expand All @@ -42,7 +42,7 @@ def get_assets(self, album_id: str) -> list[dict]:
"size": 1000,
"page": page
}
r2 = self.session.post(f"{self.base_url}/api/search/metadata", json=body, headers=self.headers)
r2 = self.session.post(f"{self.base_url}/api/search/metadata", json=body, headers=self.headers, timeout=30)
r2.raise_for_status()
assets_data = r2.json()

Expand Down
4 changes: 1 addition & 3 deletions src/plugins/image_folder/image_folder.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,8 @@ def generate_image(self, settings, device_config):
logger.debug(f"Scaling to fit dimensions: {dimensions[0]}x{dimensions[1]}")
img = ImageOps.fit(img, dimensions, method=Image.LANCZOS)

logger.info("=== Image Folder Plugin: Image generation complete ===")
return img
except Exception as e:
logger.error(f"Error loading image from {image_url}: {e}")
raise RuntimeError("Failed to load image, please check logs.")

logger.info("=== Image Folder Plugin: Image generation complete ===")
return img
5 changes: 2 additions & 3 deletions src/utils/image_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ def resize_image(image, desired_size, image_settings=[]):

keep_width = "keep-width" in image_settings

x_offset, y_offset = 0,0
new_width, new_height = img_width,img_height
x_offset, y_offset = 0, 0
new_width, new_height = img_width, img_height
# Step 1: Determine crop dimensions
desired_ratio = desired_width / desired_height
if img_ratio > desired_ratio:
# Image is wider than desired aspect ratio
new_width = int(img_height * desired_ratio)
Expand Down
Loading