Skip to content

Commit 5ed0922

Browse files
committed
Fix SongDownloader file extension, should fix #193
1 parent 7c9a367 commit 5ed0922

5 files changed

Lines changed: 9 additions & 450 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"concurrently": "^9.2.1",
2727
"electron": "^39.2.1",
2828
"http-server": "^14.1.1",
29-
"luna": "github:inrixia/TidaLuna#fcf8047",
29+
"luna": "github:inrixia/TidaLuna#072f06d",
3030
"oby": "^15.1.2",
3131
"rimraf": "^6.1.0",
3232
"tsx": "^4.20.6",

plugins/SongDownloader/src/Settings.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ export const Settings = () => {
3636
onChange={(e) => setDownloadQuality((settings.downloadQuality = e.target.value))}
3737
>
3838
{Object.values(Quality.lookups.audioQuality).map((quality) => {
39-
if (typeof quality !== "string") return <LunaSelectItem key={quality.name} value={quality.audioQuality} children={quality.name} />;
39+
if (typeof quality !== "string" && quality.audioQuality !== Quality.MQA.audioQuality)
40+
return <LunaSelectItem key={quality.name} value={quality.audioQuality} children={quality.name} />;
4041
})}
4142
</LunaSelectSetting>
4243
<LunaSwitchSetting

plugins/SongDownloader/src/helpers.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { MediaItem } from "@luna/lib";
1+
import { MediaItem, type redux } from "@luna/lib";
22
import { showOpenDialog, showSaveDialog } from "@luna/lib.native";
33
import { settings } from "./Settings";
44

@@ -15,8 +15,8 @@ export const getDownloadPath = async (defaultPath: string) => {
1515
});
1616
if (!canceled) return filePath;
1717
};
18-
export const getFileName = async (mediaItem: MediaItem) => {
19-
let fileName = `${settings.pathFormat}.${await mediaItem.fileExtension()}`;
18+
export const getFileName = async (mediaItem: MediaItem, audioQuality?: redux.AudioQuality) => {
19+
let fileName = `${settings.pathFormat}.${await mediaItem.fileExtension(audioQuality)}`;
2020
const { tags } = await mediaItem.flacTags();
2121
for (const tag of MediaItem.availableTags) {
2222
let tagValue = tags[tag];

plugins/SongDownloader/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ContextMenu.onMediaItem(unloads, async ({ mediaCollection, contextMenu }) => {
3636
await mediaItem.flacTags();
3737

3838
downloadButton.text = `Fetching filename...`;
39-
const fileName = await getFileName(mediaItem);
39+
const fileName = await getFileName(mediaItem, settings.downloadQuality);
4040

4141
downloadButton.text = `Fetching download path...`;
4242
const path = downloadFolder !== undefined ? join(downloadFolder, fileName) : await getDownloadPath(fileName);

0 commit comments

Comments
 (0)