mastermindzh/tidal-hifi
1
0
Fork 0
mirror of https://github.com/Mastermindzh/tidal-hifi.git synced 2024-11-22 13:32:42 +01:00
Code Issues Projects Releases Wiki Activity

fixed errors with user theme files loading

Browse Source
This commit is contained in:
Rick van Lieshout 2023-08-07 20:04:06 +02:00
parent 4b81378423
commit 5ea3972053
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [next] ## [next]
- Fixed bug with theme files from user directory trying to load: "an error occurred reading the theme file"
- Fixed: config flags not being set correctly - Fixed: config flags not being set correctly
- [DEV]: - [DEV]:
- Logger is now static and will automatically call either ipcRenderer or ipcMain - Logger is now static and will automatically call either ipcRenderer or ipcMain

5
src/pages/settings/theming.ts
View File

@ -1,4 +1,5 @@
import fs from "fs"; import fs from "fs";
import { Logger } from "../../features/logger";
const cssFilter = (file: string) => file.endsWith(".css"); const cssFilter = (file: string) => file.endsWith(".css");
const sort = (a: string, b: string) => a.toLowerCase().localeCompare(b.toLowerCase()); const sort = (a: string, b: string) => a.toLowerCase().localeCompare(b.toLowerCase());
@ -36,7 +37,7 @@ export const getThemeListFromDirectory = (directory: string): string[] => {
makeUserThemesDirectory(directory); makeUserThemesDirectory(directory);
return fs.readdirSync(directory).filter(cssFilter).sort(sort); return fs.readdirSync(directory).filter(cssFilter).sort(sort);
} catch (err) { } catch (err) {
console.error(err); Logger.log(`Failed to get files from ${directory}`, err);
return []; return [];
} }
}; };
@ -49,6 +50,6 @@ export const makeUserThemesDirectory = (directory: string) => {
try { try {
fs.mkdirSync(directory, { recursive: true }); fs.mkdirSync(directory, { recursive: true });
} catch (err) { } catch (err) {
console.error(err); Logger.log(`Failed to make user theme directory: ${directory}`, err);
} }
}; };

9
src/preload.ts
View File

@ -17,6 +17,7 @@ import { settingsStore } from "./scripts/settings";
import { setTitle } from "./scripts/window-functions"; import { setTitle } from "./scripts/window-functions";
import { StoreData } from "./features/listenbrainz/models/storeData"; import { StoreData } from "./features/listenbrainz/models/storeData";
import { MediaStatus } from "./models/mediaStatus"; import { MediaStatus } from "./models/mediaStatus";
import { Logger } from "./features/logger";
const notificationPath = `${app.getPath("userData")}/notification.jpg`; const notificationPath = `${app.getPath("userData")}/notification.jpg`;
const appName = "Tidal Hifi"; const appName = "Tidal Hifi";
@ -157,12 +158,14 @@ const elements = {
function addCustomCss() { function addCustomCss() {
window.addEventListener("DOMContentLoaded", () => { window.addEventListener("DOMContentLoaded", () => {
const selectedTheme = settingsStore.get(settings.theme); const selectedTheme = settingsStore.get<string, string>(settings.theme);
if (selectedTheme !== "none") { if (selectedTheme !== "none") {
const themeFile = `${process.resourcesPath}/${selectedTheme}`; const userThemePath = `${app.getPath("userData")}/themes/${selectedTheme}`;
const resourcesThemePath = `${process.resourcesPath}/${selectedTheme}`;
const themeFile = fs.existsSync(userThemePath) ? userThemePath : resourcesThemePath;
fs.readFile(themeFile, "utf-8", (err, data) => { fs.readFile(themeFile, "utf-8", (err, data) => {
if (err) { if (err) {
alert("An error ocurred reading the theme file."); Logger.alert("An error ocurred reading the theme file.", err, alert);
return; return;
} }