Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
angus6b23 committed Dec 30, 2023
2 parents 6bda62e + 1e1a060 commit 23bbbcf
Show file tree
Hide file tree
Showing 47 changed files with 1,220 additions and 593 deletions.
6 changes: 3 additions & 3 deletions electron-builder.json5
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
{
target: 'portable',
}
},
],
icon: 'public/icons/win/icon.ico',
// artifactName: '${productName}-Windows-${version}-Setup.${ext}',
Expand All @@ -32,8 +32,8 @@
deleteAppDataOnUninstall: true,
},
mac: {
target: ['mas'],
artifactName: '${productName}-Mac-${version}-Installer.${ext}',
target: ['mas'],
artifactName: '${productName}-Mac-${version}-Installer.${ext}',
},
linux: {
target: ['AppImage', 'flatpak', 'tar.gz'],
Expand Down
10 changes: 7 additions & 3 deletions electron/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,7 @@ ipcMain.on('delete-blob', (_, data) => {
const extension = data.extension.includes('mp4') ? 'm4a' : 'opus'
fs.promises
.rm(path.join(downloadPath, `${data.id}.${extension}`))
.catch((err) => {
console.log(err)
})
.catch()
.finally(sendDirSize)
})
ipcMain.handle('get-blob', async (_, id) => {
Expand All @@ -201,3 +199,9 @@ ipcMain.handle('get-blob', async (_, id) => {
}
}
})
ipcMain.handle('get-folder-path', () => {
return downloadPath
})
ipcMain.handle('get-folder-content', async () => {
return await fs.promises.readdir(downloadPath)
})
30 changes: 0 additions & 30 deletions forge.config.js

This file was deleted.

52 changes: 0 additions & 52 deletions index.html

This file was deleted.

30 changes: 15 additions & 15 deletions public/locales/en/common.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"Search-here": "Search here",
"Search": "Search",
"Now-Playing": "Now Playing",
"Search-Result": "Search Result",
"Setting": "Setting",
"Videos": "Videos",
"views": "views",
"Channel": "Channel",
"Playlists": "Playlists",
"Load-More": "Load More",
"Playlist": "Playlist",
"Search-Results": "Search Results",
"URL": "URL:",
"Global-UI": "Global UI",
"setting": "setting"
"Search-here": "Search here",
"Search": "Search",
"Now-Playing": "Now Playing",
"Search-Result": "Search Result",
"Setting": "Setting",
"Videos": "Videos",
"views": "views",
"Channel": "Channel",
"Playlists": "Playlists",
"Load-More": "Load More",
"Playlist": "Playlist",
"Search-Results": "Search Results",
"URL": "URL:",
"Global-UI": "Global UI",
"setting": "setting"
}
8 changes: 4 additions & 4 deletions public/locales/en/common_old.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"url": "url",
"details": {
"Relevant-Videos": "details.Relevant Videos"
}
"url": "url",
"details": {
"Relevant-Videos": "details.Relevant Videos"
}
}
4 changes: 2 additions & 2 deletions public/locales/en/now-playing.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"Nothing-is-playing": "Nothing is playing",
"Add-something-to-playlist-to-play": "Add something to playlist to play"
"Nothing-is-playing": "Nothing is playing",
"Add-something-to-playlist-to-play": "Add something to playlist to play"
}
37 changes: 20 additions & 17 deletions public/locales/en/playlist.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
{
"Save-to-drive": "Save to drive",
"Remove-from-playlist": "Remove from playlist",
"Retry": "Retry",
"Are-you-sure-to-clear-the-playlist": "Are you sure to clear the playlist",
"Clear-playlist": "Clear playlist",
"Please-input-name-of-the-new-playlist": "Please input name of the new playlist",
"Playlist-Added": "Playlist Added",
"This-is-the-last-playlist": "This is the last playlist",
"Are-you-sure-to-remove-the-playlist?": "Are you sure to remove the playlist?",
"Please-input-the-new-name-for-playlist": "Please input the new name for playlist",
"Name-cannot-be-empty": "Name cannot be empty",
"New-Playlist": "New Playlist",
"Clear-Error-items": "Clear Error items",
"Clear-played-items": "Clear played items",
"Shuffle-unplayed-items": "Shuffle unplayed items",
"Remove-playlist": "Remove playlist",
"Rename-playlist": "Rename playlist"
"Save-to-drive": "Save to drive",
"Remove-from-playlist": "Remove from playlist",
"Retry": "Retry",
"Please-input-name-of-the-new-playlist": "Please input name of the new playlist",
"Playlist-Added": "Playlist Added",
"This-is-the-last-playlist": "This is the last playlist",
"Are-you-sure-to-remove-the-playlist?": "Are you sure to remove the playlist?",
"Please-input-the-new-name-for-playlist": "Please input the new name for playlist",
"Name-cannot-be-empty": "Name cannot be empty",
"New-Playlist": "New Playlist",
"Remove-playlist": "Remove playlist",
"Rename-playlist": "Rename playlist",
"Randomize-items": "Randomize items",
"Shuffle-unplayed-items": "Shuffle unplayed items",
"Shuffle-all-items": "Shuffle all items",
"Are-you-sure-to-clear-the-playlist": "Are you sure to clear the playlist",
"Clear-playlist": "Clear playlist",
"Remove-Items": "Remove Items",
"Clear-Error-items": "Clear Error items",
"Clear-played-items": "Clear played items"
}
2 changes: 1 addition & 1 deletion public/locales/en/playlist_old.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"Download-to-drive": "Download to drive"
"Download-to-drive": "Download to drive"
}
26 changes: 13 additions & 13 deletions public/locales/en/search-result.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"Details": "Details",
"Replace-Playlist-Prompt": "This will clear the current playlist. Are you sure to proceed?",
"Replace-current-playlist": "Replace current playlist",
"Browse-playlist": "Browse playlist",
"Add-all-to-playlist": "Add all to playlist",
"Already-on-playlist": "Already on playlist",
"Add-to-playlist": "Add to playlist",
"Add-to-next-song": "Add to next song",
"Copy-Link": "Copy Link",
"Open-link": "Open link",
"No-search-results": "No search results",
"Search-something-on-the-search-bar": "Search something on the search bar",
"Search-Results": "Search Results"
"Details": "Details",
"Replace-Playlist-Prompt": "This will clear the current playlist. Are you sure to proceed?",
"Replace-current-playlist": "Replace current playlist",
"Browse-playlist": "Browse playlist",
"Add-all-to-playlist": "Add all to playlist",
"Already-on-playlist": "Already on playlist",
"Add-to-playlist": "Add to playlist",
"Add-to-next-song": "Add to next song",
"Copy-Link": "Copy Link",
"Open-link": "Open link",
"No-search-results": "No search results",
"Search-something-on-the-search-bar": "Search something on the search bar",
"Search-Results": "Search Results"
}
12 changes: 6 additions & 6 deletions public/locales/en/search-result_old.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"Duration": "Duration",
"Published-at": "Published at",
"Views": "Views",
"Likes": "Likes",
"Description": "Description",
"Relevant-Videos": "Relevant Videos"
"Duration": "Duration",
"Published-at": "Published at",
"Views": "Views",
"Likes": "Likes",
"Description": "Description",
"Relevant-Videos": "Relevant Videos"
}
40 changes: 21 additions & 19 deletions public/locales/en/setting.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
{
"Source": "Source",
"Youtube-Language": "Youtube Language",
"Youtube-Region": "Youtube Region",
"View-Invidious-Instances": "View Invidious Instances",
"View-Piped-Instances": "View Piped Instances",
"Reset-to-default": "Reset to default",
"Storage-size-must-be-a-positive-number": "Storage size must be a positive number",
"Store-audio-files-on-disk": "Store audio files on disk",
"Maximum-audio-files-storage": "Maximum audio files storage",
"Language": "Language",
"Theme": "Theme",
"Light": "Light",
"Dark": "Dark",
"Seek-Time": "Seek Time",
"Choose-Layout": "Choose Layout",
"Show-Timeline-in-wavesurfer": "Show Timeline in wavesurfer",
"Instance-Configuration": "Instance Configuration",
"UI-Preference": "UI Preference",
"Storage-Setting": "Storage Setting"
"Source": "Source",
"Youtube-Language": "Youtube Language",
"Youtube-Region": "Youtube Region",
"View-Invidious-Instances": "View Invidious Instances",
"View-Piped-Instances": "View Piped Instances",
"Reset-to-default": "Reset to default",
"Storage-size-must-be-a-positive-number": "Storage size must be a positive number",
"Store-audio-files-on-disk": "Store audio files on disk",
"Maximum-audio-files-storage": "Maximum audio files storage",
"Show-stored-files": "Show stored files",
"Manage-stored-files": "Manage stored files",
"Language": "Language",
"Theme": "Theme",
"Light": "Light",
"Dark": "Dark",
"Seek-Time": "Seek Time",
"Choose-Layout": "Choose Layout",
"Show-Timeline-in-wavesurfer": "Show Timeline in wavesurfer",
"Instance-Configuration": "Instance Configuration",
"UI-Preference": "UI Preference",
"Storage-Setting": "Storage Setting"
}
8 changes: 4 additions & 4 deletions public/locales/en/setting_old.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Youtube-Country": "Youtube Country",
"Enable-Blob-Storage": "Enable Blob Storage",
"Maximum-Blob-Storage": "Maximum Blob Storage",
"Blob-Size-must-be-a-positive-number": "Blob Size must be a positive number"
"Youtube-Country": "Youtube Country",
"Enable-Blob-Storage": "Enable Blob Storage",
"Maximum-Blob-Storage": "Maximum Blob Storage",
"Blob-Size-must-be-a-positive-number": "Blob Size must be a positive number"
}
22 changes: 22 additions & 0 deletions public/locales/en/storage.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"This-will-remove-all-files-in-the-download-folder-Are-you-sure-to-proceed?": "This will remove all files in the download folder Are you sure to proceed?",
"Removed-files-without-entries": "Removed files without entries",
"Removed-entries-without-files": "Removed entries without files",
"Removed-selected-files": "Removed selected files",
"Added-{{count}}-items-to-playlist_one": "Added {{count}} items to playlist",
"Added-{{count}}-items-to-playlist_other": "Added {{count}} items to playlist",
"Unknown": "Unknown",
"Storage-management": "Storage management",
"items-selected": "items selected",
"Add-entries-to-current-playlist": "Add entries to current playlist",
"Remove-selected-entries": "Remove selected entries",
"Audio-files": "Audio files",
"Remove-non-existent-entries": "Remove non existent entries",
"Remove-unhandled-entries": "Remove unhandled entries",
"Remove-all-files": "Remove all files",
"Title": "Title",
"Video-Id": "Video Id",
"Created-on": "Created on",
"Last-access": "Last access",
"File-exist": "File exist"
}
13 changes: 7 additions & 6 deletions public/locales/en/video-detail.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"Duration": "Duration",
"Published-at": "Published at",
"Views": "Views",
"Likes": "Likes",
"Description": "Description",
"Relevant-Videos": "Relevant Videos"
"Copied-Link": "Copied Link",
"Duration": "Duration",
"Published-at": "Published at",
"Views": "Views",
"Likes": "Likes",
"Description": "Description",
"Relevant-Videos": "Relevant Videos"
}
30 changes: 15 additions & 15 deletions public/locales/zh-TW/common.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"Search-here": "在此搜尋",
"Search": "搜尋",
"Now-Playing": "現正播放",
"Search-Result": "搜尋結果",
"Setting": "設定",
"Videos": "影片",
"views": "觀看次數",
"Channel": "頻道",
"Playlists": "播放清單",
"Load-More": "載入更多",
"Playlist": "播放清單",
"Search-Results": "",
"URL": "鏈結:",
"Global-UI": "介面",
"setting": "設定"
"Search-here": "在此搜尋",
"Search": "搜尋",
"Now-Playing": "現正播放",
"Search-Result": "搜尋結果",
"Setting": "設定",
"Videos": "影片",
"views": "觀看次數",
"Channel": "頻道",
"Playlists": "播放清單",
"Load-More": "載入更多",
"Playlist": "播放清單",
"Search-Results": "",
"URL": "鏈結:",
"Global-UI": "介面",
"setting": "設定"
}
4 changes: 2 additions & 2 deletions public/locales/zh-TW/now-playing.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"Nothing-is-playing": "尚未有播放項目",
"Add-something-to-playlist-to-play": "請在搜尋中添加播放項目"
"Nothing-is-playing": "尚未有播放項目",
"Add-something-to-playlist-to-play": "請在搜尋中添加播放項目"
}
Loading

0 comments on commit 23bbbcf

Please sign in to comment.