rework exists function for images

to support web-greeter

Author: FreekBes

client/data.ts

@@ -11,31 +11,29 @@ const PATH_USER_DEFAULT_IMAGE: string = '/usr/share/codam/web-greeter/user.png';
 
 export class GreeterImage {
 	private _path: string;
-	private _exists: boolean = false;
+	private _exists: boolean | null = null;
 
 	public constructor(path: string) {
 		this._path = path;
+	}
 
-		// Check if file exists
+	public async exists(): Promise<boolean> {
+		if (this._exists !== null) {
+			return this._exists;
+		}
 		const dir = this._path.split('/').slice(0, -1).join('/');
 		const self = this;
-		window.theme_utils?.dirlist(dir, false, (dirFiles: string[] | undefined) => {
-			self._exists = (dirFiles !== undefined && dirFiles.includes(self._path));
-			if (!self._exists) {
-				console.warn('Image file does not exist: ' + self._path);
-				return;
-			}
-			console.log(`Found image at "${self._path}"`);
+		return new Promise((resolve) => {
+			window.theme_utils?.dirlist(dir, false, (dirFiles: string[] | undefined) => {
+				self._exists = dirFiles !== undefined && dirFiles.includes(self._path);
+				resolve(self._exists);
+			});
 		});
 	}
 
 	public get path(): string {
 		return this._path;
 	}
-
-	public get exists(): boolean {
-		return this._exists;
-	}
 }
 
 

client/ui.ts

@@ -33,9 +33,10 @@ export class UI {
 		this.applyHiDpiScaling();
 
 		// Set up logo
-		if (data.logo.exists) {
-			this._logo.src = data.logo.path;
-		}
+		this._logo.src = data.logo.path;
+		this._logo.addEventListener('error', () => {
+			console.warn(`Logo image not found at ${data.logo.path}`);
+		});
 
 		// Check for active sessions
 		const activeSession = lightdm.users.find((user: LightDMUser) => user.logged_in);

client/uis/screens/lockscreen.ts

@@ -51,7 +51,7 @@ export class LockScreenUI extends UIScreen {
 		this._getAndSetLockedTimestamp();
 	}
 
-	protected _initForm(): void {
+	protected async _initForm(): Promise<void> {
 		const form = this._form as UILockScreenElements;
 
 		// Populate lock screen data
@@ -71,7 +71,7 @@ export class LockScreenUI extends UIScreen {
 				console.warn(`Failed to load avatar for user ${this._activeSession.username}`);
 				form.avatar.src = "assets/default-user.png"; // Load fallback image
 			});
-			if (window.data.userImage.exists) {
+			if (await window.data.userImage.exists) {
 				// Show the user's avatar from the /tmp folder
 				form.avatar.src = window.data.userImage.path;
 			}
@@ -80,7 +80,7 @@ export class LockScreenUI extends UIScreen {
 				// The greeter does not have access to the user's home folder...
 				form.avatar.src = this._activeSession.image;
 			}
-			else if (window.data.userDefaultImage.exists) {
+			else if (await window.data.userDefaultImage.exists) {
 				form.avatar.src = window.data.userDefaultImage.path;
 			}
 			form.displayName.innerText = this._activeSession.display_name ?? this._activeSession.username;

client/uis/wallpaper.ts

@@ -13,16 +13,16 @@ export class WallpaperUI {
 		this.displayWallpaper();
 	}
 
-	public displayWallpaper(): boolean {
+	public async displayWallpaper(): Promise<boolean> {
 		let wallpaper: GreeterImage = window.data.loginScreenWallpaper;
 		if (this._isLockScreen) {
 			this._blurFilter.style.display = 'block';
-			if (window.data.userLockScreenWallpaper.exists) {
+			if (await window.data.userLockScreenWallpaper.exists) {
 				wallpaper = window.data.userLockScreenWallpaper;
 			}
 		}
 
-		if (wallpaper.exists) {
+		if (await wallpaper.exists) {
 			// Set wallpaper (yes for some reason the file path just works without file://)
 			// Actually, file:// will even cause the image to not load.
 			this._element.style.backgroundImage = 'url("' + wallpaper.path + '")';