Skip to content
This repository was archived by the owner on Apr 27, 2026. It is now read-only.

Commit e0cc2c5

Browse files
committed
fix: MR review lint errors
1 parent 6d22e7d commit e0cc2c5

4 files changed

Lines changed: 23 additions & 48 deletions

File tree

src/components/bar/modules/media/index.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,13 @@ const { ignore } = options.menus.media;
2727

2828
const isVis = Variable(!show_active_only.get());
2929

30-
Variable.derive([bind(show_active_only), bind(mprisService, 'players'), bind(ignore)], (showActive, players, ignoredApps) => {
31-
const filteredPlayers = filterPlayers(players, ignoredApps);
32-
isVis.set(!showActive || filteredPlayers?.length > 0);
33-
});
30+
Variable.derive(
31+
[bind(show_active_only), bind(mprisService, 'players'), bind(ignore)],
32+
(showActive, players, ignoredApps) => {
33+
const filteredPlayers = filterPlayers(players, ignoredApps);
34+
isVis.set(!showActive || filteredPlayers?.length > 0);
35+
},
36+
);
3437

3538
const Media = (): BarBoxChild => {
3639
const allPlayers = mprisService.get_players();

src/components/menus/media/components/controls/helpers.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,9 @@ export const getNextPlayer = (): void => {
9393
const allPlayers = mprisService.get_players();
9494
const filteredPlayers = filterPlayers(allPlayers, ignore.get());
9595

96-
const currentPlayerIndex = filteredPlayers
97-
.findIndex((player) => player.busName === currentPlayer.busName);
96+
const currentPlayerIndex = filteredPlayers.findIndex(
97+
(player) => player.busName === currentPlayer.busName,
98+
);
9899
const totalPlayers = filteredPlayers.length;
99100

100101
if (totalPlayers === 1) {
@@ -123,15 +124,14 @@ export const getPreviousPlayer = (): void => {
123124
const allPlayers = mprisService.get_players();
124125
const filteredPlayers = filterPlayers(allPlayers, ignore.get());
125126

126-
const currentPlayerIndex = filteredPlayers
127-
.findIndex((player) => player.busName === currentPlayer.busName);
127+
const currentPlayerIndex = filteredPlayers.findIndex(
128+
(player) => player.busName === currentPlayer.busName,
129+
);
128130
const totalPlayers = filteredPlayers.length;
129131

130132
if (totalPlayers === 1) {
131133
return activePlayer.set(filteredPlayers[0]);
132134
}
133135

134-
return activePlayer.set(
135-
filteredPlayers[(currentPlayerIndex - 1 + totalPlayers) % totalPlayers],
136-
);
136+
return activePlayer.set(filteredPlayers[(currentPlayerIndex - 1 + totalPlayers) % totalPlayers]);
137137
};

src/lib/shared/media/index.ts

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,6 @@ import AstalMpris from 'gi://AstalMpris?version=0.1';
22

33
const normalizeName = (name: string): string => name.toLowerCase().replace(/\s+/g, '_');
44

5-
/**
6-
* Gets the desktop entry name from an MPRIS player.
7-
*
8-
* The desktop entry typically contains the actual application name,
9-
* which is more reliable than the bus name for Electron apps.
10-
*
11-
* @param player The MPRIS player.
12-
*
13-
* @returns The desktop entry name or empty string.
14-
*/
15-
const getDesktopEntry = (player: AstalMpris.Player): string => {
16-
try {
17-
return player.entry || '';
18-
} catch {
19-
return '';
20-
}
21-
};
22-
23-
245
/**
256
* Checks if a media player should be ignored based on the filter list.
267
*
@@ -32,10 +13,7 @@ const getDesktopEntry = (player: AstalMpris.Player): string => {
3213
*
3314
* @returns True if the player should be ignored, false otherwise.
3415
*/
35-
export const isPlayerIgnored = (
36-
player: AstalMpris.Player | null | undefined,
37-
filter: string[],
38-
): boolean => {
16+
export const isPlayerIgnored = (player: AstalMpris.Player | null | undefined, filter: string[]): boolean => {
3917
if (!player) {
4018
return false;
4119
}
@@ -44,7 +22,7 @@ export const isPlayerIgnored = (
4422

4523
const identity = player.identity || '';
4624
const normalizedIdentity = normalizeName(identity);
47-
25+
4826
return playerFilters.has(normalizedIdentity);
4927
};
5028

@@ -58,10 +36,7 @@ export const isPlayerIgnored = (
5836
*
5937
* @returns Filtered array of players.
6038
*/
61-
export const filterPlayers = (
62-
players: AstalMpris.Player[],
63-
filter: string[],
64-
): AstalMpris.Player[] => {
39+
export const filterPlayers = (players: AstalMpris.Player[], filter: string[]): AstalMpris.Player[] => {
6540
const filteredPlayers = players.filter((player: AstalMpris.Player) => {
6641
return !isPlayerIgnored(player, filter);
6742
});

src/services/media/index.ts

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ export class MediaPlayerService {
6363

6464
const preferred = preferredPlayer.get();
6565
if (preferred) {
66-
const preferredPlayerMatch = filteredPlayers.find(
67-
player => player.identity?.toLowerCase().includes(preferred.toLowerCase())
66+
const preferredPlayerMatch = filteredPlayers.find((player) =>
67+
player.identity?.toLowerCase().includes(preferred.toLowerCase()),
6868
);
6969
if (preferredPlayerMatch) {
7070
this.activePlayer.set(preferredPlayerMatch);
@@ -112,7 +112,8 @@ export class MediaPlayerService {
112112
}
113113

114114
const preferred = preferredPlayer.get();
115-
const isPreferred = preferred && addedPlayer.identity?.toLowerCase().includes(preferred.toLowerCase());
115+
const isPreferred =
116+
preferred && addedPlayer.identity?.toLowerCase().includes(preferred.toLowerCase());
116117

117118
if (this.activePlayer.get() === undefined || isPreferred) {
118119
this.activePlayer.set(addedPlayer);
@@ -132,16 +133,12 @@ export class MediaPlayerService {
132133
const allPlayers = this._mprisService.get_players();
133134
const filteredPlayers = filterPlayers(allPlayers, ignore.get());
134135

135-
if (
136-
filteredPlayers.length === 1 &&
137-
closedPlayer.busName === filteredPlayers[0]?.busName
138-
) {
136+
if (filteredPlayers.length === 1 && closedPlayer.busName === filteredPlayers[0]?.busName) {
139137
return this.activePlayer.set(undefined);
140138
}
141139

142140
if (closedPlayer.busName === this.activePlayer.get()?.busName) {
143-
const nextPlayer = filteredPlayers
144-
.find((player) => player.busName !== closedPlayer.busName);
141+
const nextPlayer = filteredPlayers.find((player) => player.busName !== closedPlayer.busName);
145142
this.activePlayer.set(nextPlayer);
146143
}
147144
}

0 commit comments

Comments
 (0)