Skip to content

Commit

Permalink
fix: fix #30
Browse files Browse the repository at this point in the history
  • Loading branch information
JellyBrick committed Oct 4, 2023
1 parent f7a0908 commit 78d8160
Showing 4 changed files with 11 additions and 5 deletions.
4 changes: 2 additions & 2 deletions plugins/notifications/utils.ts
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ import config from './config';

import { cache } from '../../providers/decorators';
import { SongInfo } from '../../providers/song-info';
import { getMediaIconLocation } from '../utils';
import { getAssetsDirectoryLocation } from '../utils';

const icon = 'assets/youtube-music.png';
const userData = app.getPath('userData');
@@ -89,7 +89,7 @@ export const saveTempIcon = () => {
continue;
}

const iconPath = path.resolve(getMediaIconLocation(), `${kind}.png`);
const iconPath = path.resolve(path.resolve(getAssetsDirectoryLocation(), 'media-icons-black'), `${kind}.png`);
fs.mkdirSync(path.dirname(destinationPath), { recursive: true });
fs.copyFile(iconPath, destinationPath, () => {});
}
4 changes: 3 additions & 1 deletion plugins/utils.ts
Original file line number Diff line number Diff line change
@@ -8,10 +8,12 @@ import is from 'electron-is';
import { ValueOf } from '../utils/type-utils';
import defaultConfig from '../config/defaults';

export const getAssetsDirectoryLocation = () => path.resolve(__dirname, 'assets');

export const getMediaIconLocation = () =>
app.isPackaged
? path.resolve(app.getPath('userData'), 'icons')
: path.resolve(__dirname, 'assets', 'media-icons-black');
: path.resolve(getAssetsDirectoryLocation(), 'media-icons-black');

// Creates a DOM element from an HTML string
export const ElementFromHtml = (html: string): HTMLElement => {
4 changes: 3 additions & 1 deletion providers/prompt-options.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import path from 'node:path';

const iconPath = path.join(__dirname, '..', 'assets', 'youtube-music-tray.png');
import { getAssetsDirectoryLocation } from '../plugins/utils';

const iconPath = path.join(getAssetsDirectoryLocation(), 'youtube-music-tray.png');

const promptOptions = {
customStylesheet: 'dark',
4 changes: 3 additions & 1 deletion tray.ts
Original file line number Diff line number Diff line change
@@ -6,6 +6,8 @@ import { restart } from './providers/app-controls';
import config from './config';
import getSongControls from './providers/song-controls';

import { getAssetsDirectoryLocation } from './plugins/utils';

import type { MenuTemplate } from './menu';

// Prevent tray being garbage collected
@@ -39,7 +41,7 @@ export const setUpTray = (app: Electron.App, win: Electron.BrowserWindow) => {
}

const { playPause, next, previous } = getSongControls(win);
const iconPath = path.join(__dirname, 'assets', 'youtube-music-tray.png');
const iconPath = path.join(getAssetsDirectoryLocation(), 'youtube-music-tray.png');

const trayIcon = nativeImage.createFromPath(iconPath).resize({
width: 16,

0 comments on commit 78d8160

Please sign in to comment.