mirror of
https://github.com/arabianq/pipewire-soundpad.git
synced 2026-06-19 04:03:33 +00:00
Refactor to Cargo Workspace (#129)
* Refactor project into a Cargo workspace with distinct packages - Created a root `Cargo.toml` defining a workspace. - Moved `src/types` and `src/utils` into a new `pwsp-lib` crate for shared logic. - Split binaries into their own crates: `pwsp-daemon`, `pwsp-cli`, and `pwsp-gui`. - Shifted all dependencies into `[workspace.dependencies]` for centralized version management. - Updated import paths across all crates (e.g. from `pwsp::` to `pwsp_lib::`). - Updated build scripts, GitHub actions, Flatpak manifest, and AUR PKGBUILD to support the new workspace structure. - Ensured no core application logic was altered. Co-authored-by: arabianq <55220741+arabianq@users.noreply.github.com> * Fix cargo-deb build process in GitHub actions for workspace architecture Co-authored-by: arabianq <55220741+arabianq@users.noreply.github.com> * Fix cargo-deb asset discovery by using exact target/release paths Co-authored-by: arabianq <55220741+arabianq@users.noreply.github.com> * refactor deps in Cargo.toml files * fix incorrect assets path --------- Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
This commit is contained in:
Tarasov Aleksandr
committed by
GitHub
GitHub
parent
6c59137639
commit
0476329798
@@ -0,0 +1,69 @@
|
||||
[package]
|
||||
name = "pwsp-gui"
|
||||
version.workspace = true
|
||||
edition.workspace = true
|
||||
authors.workspace = true
|
||||
homepage.workspace = true
|
||||
repository.workspace = true
|
||||
license.workspace = true
|
||||
description.workspace = true
|
||||
|
||||
[dependencies]
|
||||
pwsp-lib.workspace = true
|
||||
|
||||
tokio.workspace = true
|
||||
|
||||
opener.workspace = true
|
||||
rfd.workspace = true
|
||||
itertools.workspace = true
|
||||
anyhow.workspace = true
|
||||
|
||||
serde.workspace = true
|
||||
serde_json.workspace = true
|
||||
|
||||
egui.workspace = true
|
||||
eframe.workspace = true
|
||||
egui_extras.workspace = true
|
||||
egui_material_icons.workspace = true
|
||||
egui_dnd.workspace = true
|
||||
|
||||
system-fonts.workspace = true
|
||||
rust-i18n.workspace = true
|
||||
sys-locale.workspace = true
|
||||
|
||||
reqwest.workspace = true
|
||||
percent-encoding.workspace = true
|
||||
|
||||
[package.metadata.deb]
|
||||
assets = [
|
||||
[
|
||||
"target/release/pwsp-daemon",
|
||||
"usr/bin/",
|
||||
"755",
|
||||
],
|
||||
[
|
||||
"target/release/pwsp-cli",
|
||||
"usr/bin/",
|
||||
"755",
|
||||
],
|
||||
[
|
||||
"target/release/pwsp-gui",
|
||||
"usr/bin/",
|
||||
"755",
|
||||
],
|
||||
[
|
||||
"assets/pwsp-gui.desktop",
|
||||
"usr/share/applications/pwsp.desktop",
|
||||
"644",
|
||||
],
|
||||
[
|
||||
"assets/icon.png",
|
||||
"usr/share/icons/hicolor/256x256/apps/pwsp.png",
|
||||
"644",
|
||||
],
|
||||
[
|
||||
"assets/pwsp-daemon.service",
|
||||
"usr/lib/systemd/user/pwsp-daemon.service",
|
||||
"644",
|
||||
],
|
||||
]
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 79 KiB |
@@ -0,0 +1,11 @@
|
||||
[Unit]
|
||||
Description=Pipewire Soundpad Daemon
|
||||
After=pipewire.service
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/pwsp-daemon
|
||||
Restart=no
|
||||
RuntimeDirectory=pwsp
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
@@ -0,0 +1,9 @@
|
||||
[Desktop Entry]
|
||||
Name=PWSP (Soundpad)
|
||||
Comment=Let's you play audio files through you microphone
|
||||
Exec=/usr/bin/pwsp-gui %u
|
||||
Icon=pwsp
|
||||
Terminal=false
|
||||
Type=Application
|
||||
Categories=Audio
|
||||
MimeType=x-scheme-handler/soundpad;
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 94 KiB |
@@ -0,0 +1,420 @@
|
||||
_version = 2
|
||||
|
||||
# ----------------
|
||||
# Main page
|
||||
# ----------------
|
||||
|
||||
[gui.play_file_button]
|
||||
en = "Play file"
|
||||
ru = "Выбрать файл"
|
||||
es = "Reproducir archivo"
|
||||
fr = "Lire le fichier"
|
||||
zh = "播放文件"
|
||||
ar = "تشغيل الملف"
|
||||
kz = "Файлды ойнату"
|
||||
he = "נגן קובץ"
|
||||
pt-BR = "Reproduzir arquivo"
|
||||
|
||||
[gui.choose_mic_select]
|
||||
en = "Select microphone"
|
||||
ru = "Выбрать микрофон"
|
||||
es = "Seleccionar micrófono"
|
||||
fr = "Sélectionner le microphone"
|
||||
zh = "选择麦克风"
|
||||
ar = "اختر الميكروفون"
|
||||
kz = "Микрофонды таңдау"
|
||||
he = "בחר מיקרופון"
|
||||
pt-BR = "Selecionar microfone"
|
||||
|
||||
[gui.search_placeholder]
|
||||
en = "Search files..."
|
||||
ru = "Поиск файлов..."
|
||||
es = "Buscar archivos..."
|
||||
fr = "Rechercher des fichiers..."
|
||||
zh = "搜索文件..."
|
||||
ar = "البحث عن ملفات..."
|
||||
kz = "Файлдарды іздеу..."
|
||||
he = "חפש קבצים..."
|
||||
pt-BR = "Buscar arquivos..."
|
||||
|
||||
[gui.context.dirs.open]
|
||||
en = "Open"
|
||||
ru = "Открыть"
|
||||
es = "Abrir"
|
||||
fr = "Ouvrir"
|
||||
zh = "打开"
|
||||
ar = "فتح"
|
||||
kz = "Ашу"
|
||||
he = "פתח"
|
||||
pt-BR = "Abrir"
|
||||
|
||||
[gui.context.dirs.open_in_fm]
|
||||
en = "Open in File Manager"
|
||||
ru = "Открыть в менеджере файлов"
|
||||
es = "Abrir en el gestor de archivos"
|
||||
fr = "Ouvrir dans le gestionnaire de fichiers"
|
||||
zh = "在文件管理器中打开"
|
||||
ar = "فتح في مدير الملفات"
|
||||
kz = "Файл менеджерінде ашу"
|
||||
he = "פתח במנהל הקבצים"
|
||||
pt-BR = "Abrir no gestor de arquivos"
|
||||
|
||||
[gui.context.dirs.remove]
|
||||
en = "Remove"
|
||||
ru = "Удалить"
|
||||
es = "Eliminar"
|
||||
fr = "Supprimer"
|
||||
zh = "移除"
|
||||
ar = "إزالة"
|
||||
kz = "Жою"
|
||||
he = "הסר"
|
||||
pt-BR = "Remover"
|
||||
|
||||
[gui.context.files.play_solo]
|
||||
en = "Play Solo"
|
||||
ru = "Играть"
|
||||
es = "Reproducir solo"
|
||||
fr = "Jouer en solo"
|
||||
zh = "单独播放"
|
||||
ar = "تشغيل منفرد"
|
||||
kz = "Жалғыз ойнату"
|
||||
he = "נגן סולו"
|
||||
pt-BR = "Reproduzir"
|
||||
|
||||
[gui.context.files.add_new]
|
||||
en = "Add New"
|
||||
ru = "Добавить"
|
||||
es = "Añadir nuevo"
|
||||
fr = "Ajouter un nouveau"
|
||||
zh = "添加新项"
|
||||
ar = "إضافة جديد"
|
||||
kz = "Жаңасын қосу"
|
||||
he = "הוסף חדש"
|
||||
pt-BR = "Adicionar"
|
||||
|
||||
[gui.context.files.replace_last]
|
||||
en = "Replace Last"
|
||||
ru = "Заменить Последний"
|
||||
es = "Reemplazar último"
|
||||
fr = "Remplacer le dernier"
|
||||
zh = "替换上一个"
|
||||
ar = "استبدال الأخير"
|
||||
kz = "Соңғысын ауыстыру"
|
||||
he = "החלף אחרון"
|
||||
pt-BR = "Substituir"
|
||||
|
||||
[gui.context.files.show_in_fm]
|
||||
en = "Show in File Manager"
|
||||
ru = "Открыть в менеджере файлов"
|
||||
es = "Mostrar en el gestor de archivos"
|
||||
fr = "Afficher dans le gestionnaire de fichiers"
|
||||
zh = "在文件管理器中显示"
|
||||
ar = "عرض في مدير الملفات"
|
||||
kz = "Файл менеджерінде көрсету"
|
||||
he = "הצג במנהל הקבצים"
|
||||
pt-BR = "Mostrar no gestor de arquivos"
|
||||
|
||||
[gui.context.files.asign_hotkey]
|
||||
en = "Assign Hotkey"
|
||||
ru = "Назначить Горячую Клавишу"
|
||||
es = "Asignar atajo"
|
||||
fr = "Assigner un raccourci"
|
||||
zh = "分配快捷键"
|
||||
ar = "تعيين مفتاح اختصار"
|
||||
kz = "Ыстық пернені тағайындау"
|
||||
he = "הקצה מקש קיצור"
|
||||
pt-BR = "Definir tecla de atalho"
|
||||
|
||||
# ----------------
|
||||
# Settings
|
||||
# ----------------
|
||||
|
||||
[gui.settings.header]
|
||||
en = "Settings"
|
||||
ru = "Настройки"
|
||||
es = "Ajustes"
|
||||
fr = "Paramètres"
|
||||
zh = "设置"
|
||||
ar = "الإعدادات"
|
||||
kz = "Баптаулар"
|
||||
he = "הגדרות"
|
||||
pt-BR = "Configurações"
|
||||
|
||||
[gui.settings.remember_volume]
|
||||
en = "Always remember volume"
|
||||
ru = "Всегда запоминать громкость"
|
||||
es = "Recordar siempre el volumen"
|
||||
fr = "Toujours se souvenir du volume"
|
||||
zh = "始终记住音量"
|
||||
ar = "تذكر مستوى الصوت دائمًا"
|
||||
kz = "Әрқашан дыбыс деңгейін есте сақтау"
|
||||
he = "זכור תמיד עוצמת קול"
|
||||
pt-BR = "Lembrar volume"
|
||||
|
||||
[gui.settings.remember_mic]
|
||||
en = "Always remember microphone"
|
||||
ru = "Всегда запоминать микрофон"
|
||||
es = "Recordar siempre el micrófono"
|
||||
fr = "Toujours se souvenir du microphone"
|
||||
zh = "始终记住麦克风"
|
||||
ar = "تذكر الميكروفون دائمًا"
|
||||
kz = "Әрқашан микрофонды есте сақтау"
|
||||
he = "זכור תמיד מיקרופון"
|
||||
pt-BR = "Lembrar microfone"
|
||||
|
||||
[gui.settings.remember_ui_scale]
|
||||
en = "Always remember UI scale factor"
|
||||
ru = "Всегда запоминать масштаб интерфейса"
|
||||
es = "Recordar siempre la escala de la interfaz"
|
||||
fr = "Toujours se souvenir de l'échelle de l'interface"
|
||||
zh = "始终记住界面缩放比例"
|
||||
ar = "تذكر عامل تكبير الواجهة دائمًا"
|
||||
kz = "Әрқашан интерфейс масштабын есте сақтау"
|
||||
he = "זכור תמיד קנה מידה של ממשק משתמש"
|
||||
pt-BR = "Lembrar fator de escala da interface"
|
||||
|
||||
[gui.settings.pause_on_window_close]
|
||||
en = "Pause audio playback when the window is closed"
|
||||
ru = "Останавливать воспроизведение при закрытии окна"
|
||||
es = "Pausar la reproducción de audio al cerrar la ventana"
|
||||
fr = "Mettre en pause la lecture audio à la fermeture de la fenêtre"
|
||||
zh = "关闭窗口时暂停音频播放"
|
||||
ar = "إيقاف الصوت مؤقتًا عند إغلاق النافذة"
|
||||
kz = "Терезе жабылған кезде дыбысты ойнатуды кідірту"
|
||||
he = "השהה השמעת שמע כאשר החלון נסגר"
|
||||
pt-BR = "Pausar reprodução de aúdio ao fechar a janela"
|
||||
|
||||
[gui.settings.version]
|
||||
en = "GUI version: %{version}"
|
||||
ru = "Версия GUI: %{version}"
|
||||
es = "Versión de la GUI: %{version}"
|
||||
fr = "Version de l'interface : %{version}"
|
||||
zh = "GUI 版本: %{version}"
|
||||
ar = "إصدار الواجهة: %{version}"
|
||||
kz = "GUI нұсқасы: %{version}"
|
||||
he = "גרסת ממשק משתמש: %{version}"
|
||||
pt-BR = "Versão da GUI: %{version}"
|
||||
|
||||
[gui.settings.theme.label]
|
||||
en = "Color Scheme"
|
||||
ru = "Цветовая схема"
|
||||
es = "Esquema de color"
|
||||
fr = "Schéma de couleurs"
|
||||
zh = "配色方案"
|
||||
ar = "نظام الألوان"
|
||||
kz = "Түс схемасы"
|
||||
he = "ערכת צבעים"
|
||||
pt-BR = "Esquema de cores"
|
||||
|
||||
[gui.settings.theme.system]
|
||||
en = "System"
|
||||
ru = "Системная"
|
||||
es = "Sistema"
|
||||
fr = "Système"
|
||||
zh = "系统"
|
||||
ar = "النظام"
|
||||
kz = "Жүйе"
|
||||
he = "מערכת"
|
||||
pt-BR = "Sistema"
|
||||
|
||||
[gui.settings.theme.light]
|
||||
en = "Light"
|
||||
ru = "Светлая"
|
||||
es = "Claro"
|
||||
fr = "Clair"
|
||||
zh = "浅色"
|
||||
ar = "فاتح"
|
||||
kz = "Жарық"
|
||||
he = "בהיר"
|
||||
pt-BR = "Claro"
|
||||
|
||||
[gui.settings.theme.dark]
|
||||
en = "Dark"
|
||||
ru = "Тёмная"
|
||||
es = "Oscuro"
|
||||
fr = "Sombre"
|
||||
zh = "暗色"
|
||||
ar = "داكن"
|
||||
kz = "Қараңғы"
|
||||
he = "כהה"
|
||||
pt-BR = "Escuro"
|
||||
|
||||
# ----------------
|
||||
# Hotkeys
|
||||
# ----------------
|
||||
|
||||
[gui.hotkeys.header]
|
||||
en = "Hotkeys"
|
||||
ru = "Горячие клавиши"
|
||||
es = "Atajos de teclado"
|
||||
fr = "Raccourcis clavier"
|
||||
zh = "快捷键"
|
||||
ar = "اختصارات لوحة المفاتيح"
|
||||
kz = "Ыстық пернелер"
|
||||
he = "מקשי קיצור"
|
||||
pt-BR = "Atalhos"
|
||||
|
||||
[gui.hotkeys.search_placeholder]
|
||||
en = "Search hotkeys..."
|
||||
ru = "Поиск горячих клавиш..."
|
||||
es = "Buscar atajos..."
|
||||
fr = "Rechercher des raccourcis..."
|
||||
zh = "搜索快捷键..."
|
||||
ar = "البحث عن الاختصارات..."
|
||||
kz = "Ыстық пернелерді іздеу..."
|
||||
he = "חפש מקשי קיצור..."
|
||||
pt-BR = "Buscar atalhos..."
|
||||
|
||||
[gui.hotkeys.add_command_select]
|
||||
en = "Add Command"
|
||||
ru = "Добавить команду"
|
||||
es = "Añadir comando"
|
||||
fr = "Ajouter une commande"
|
||||
zh = "添加命令"
|
||||
ar = "إضافة أمر"
|
||||
kz = "Команда қосу"
|
||||
he = "הוסף פקודה"
|
||||
pt-BR = "Adicionar comando"
|
||||
|
||||
[gui.hotkeys.toggle_pause_command]
|
||||
en = "Toggle Pause"
|
||||
ru = "Переключить паузу"
|
||||
es = "Alternar pausa"
|
||||
fr = "Basculer la pause"
|
||||
zh = "切换暂停"
|
||||
ar = "تبديل الإيقاف المؤقت"
|
||||
kz = "Кідіртуді ауыстыру"
|
||||
he = "הפעל/השהה"
|
||||
pt-BR = "Alternar reprodução"
|
||||
|
||||
[gui.hotkeys.stop_playback_command]
|
||||
en = "Stop Playback"
|
||||
ru = "Остановить воспроизведение"
|
||||
es = "Detener reproducción"
|
||||
fr = "Arrêter la lecture"
|
||||
zh = "停止播放"
|
||||
ar = "إيقاف التشغيل"
|
||||
kz = "Ойнатуды тоқтату"
|
||||
he = "עצור השמעה"
|
||||
pt-BR = "Parar reprodução"
|
||||
|
||||
[gui.hotkeys.pause_playback_command]
|
||||
en = "Pause Playback"
|
||||
ru = "Поставить воспроизведение на паузу"
|
||||
es = "Pausar reproducción"
|
||||
fr = "Mettre en pause la lecture"
|
||||
zh = "暂停播放"
|
||||
ar = "إيقاف التشغيل مؤقتاً"
|
||||
kz = "Ойнатуды кідірту"
|
||||
he = "השהה השמעה"
|
||||
pt-BR = "Pausar reprodução"
|
||||
|
||||
[gui.hotkeys.resume_playback_command]
|
||||
en = "Resume Playback"
|
||||
ru = "Продолжить воспроизведение"
|
||||
es = "Reanudar reproducción"
|
||||
fr = "Reprendre la lecture"
|
||||
zh = "恢复播放"
|
||||
ar = "استئناف التشغيل"
|
||||
kz = "Ойнатуды жалғастыру"
|
||||
he = "המשך השמעה"
|
||||
pt-BR = "Resumir reprodução"
|
||||
|
||||
[gui.hotkeys.toggle_loop_command]
|
||||
en = "Toggle Loop"
|
||||
ru = "Переключить зацикливание"
|
||||
es = "Alternar bucle"
|
||||
fr = "Basculer la boucle"
|
||||
zh = "切换循环"
|
||||
ar = "تبديل التكرار"
|
||||
kz = "Қайталауды ауыстыру"
|
||||
he = "הפעל/כבה לולאה"
|
||||
pt-BR = "Alternar loop"
|
||||
|
||||
[gui.hotkeys.column_slot]
|
||||
en = "Slot"
|
||||
ru = "Слот"
|
||||
es = "Ranura"
|
||||
fr = "Emplacement"
|
||||
zh = "插槽"
|
||||
ar = "الخانة"
|
||||
kz = "Ұяшық"
|
||||
he = "משבצת"
|
||||
pt-BR = "Slot"
|
||||
|
||||
[gui.hotkeys.column_sound]
|
||||
en = "Sound"
|
||||
ru = "Звук"
|
||||
es = "Sonido"
|
||||
fr = "Son"
|
||||
zh = "声音"
|
||||
ar = "الصوت"
|
||||
kz = "Дыбыс"
|
||||
he = "צליל"
|
||||
pt-BR = "Som"
|
||||
|
||||
[gui.hotkeys.column_key_chord]
|
||||
en = "Key Chord"
|
||||
ru = "Клавиша"
|
||||
es = "Combinación de teclas"
|
||||
fr = "Combinaison de touches"
|
||||
zh = "组合键"
|
||||
ar = "تركيبة المفاتيح"
|
||||
kz = "Пернелер тіркесімі"
|
||||
he = "צירוף מקשים"
|
||||
pt-BR = "Combinação de teclas"
|
||||
|
||||
[gui.hotkeys.column_actions]
|
||||
en = "Actions"
|
||||
ru = "Действия"
|
||||
es = "Acciones"
|
||||
fr = "Actions"
|
||||
zh = "操作"
|
||||
ar = "الإجراءات"
|
||||
kz = "Әрекеттер"
|
||||
he = "פעולות"
|
||||
pt-BR = "Ações"
|
||||
|
||||
[gui.hotkeys.no_hotkeys_configured]
|
||||
en = "No hotkeys configured"
|
||||
ru = "Горячие клавиши не настроены"
|
||||
es = "No hay atajos configurados"
|
||||
fr = "Aucun raccourci configuré"
|
||||
zh = "未配置快捷键"
|
||||
ar = "لا توجد اختصارات معينة"
|
||||
kz = "Ыстық пернелер бапталмаған"
|
||||
he = "לא הוגדרו מקשי קיצור"
|
||||
pt-BR = "Nenhum atalho configurado"
|
||||
|
||||
[gui.hotkeys.capture.header]
|
||||
en = "Press a key combination (e.g. Ctrl+Alt+1)"
|
||||
ru = "Нажмите сочетание клавиш (например, Ctrl+Alt+1)"
|
||||
es = "Presione una combinación de teclas (ej. Ctrl+Alt+1)"
|
||||
fr = "Appuyez sur une combinaison de touches (ex. Ctrl+Alt+1)"
|
||||
zh = "按下一个组合键 (例如 Ctrl+Alt+1)"
|
||||
ar = "اضغط على تركيبة مفاتيح (مثلاً Ctrl+Alt+1)"
|
||||
kz = "Пернелер тіркесімін басыңыз (мысалы, Ctrl+Alt+1)"
|
||||
he = "לחץ על צירוף מקשים (למשל Ctrl+Alt+1)"
|
||||
pt-BR = "Pressione uma combinação de tecla (ex: Ctrl+Alt+1)"
|
||||
|
||||
[gui.hotkeys.capture.for]
|
||||
en = "for"
|
||||
ru = "для"
|
||||
es = "para"
|
||||
fr = "pour"
|
||||
zh = "用于"
|
||||
ar = "لـ"
|
||||
kz = "үшін"
|
||||
he = "עבור"
|
||||
pt-BR = "para"
|
||||
|
||||
[gui.hotkeys.capture.cancel]
|
||||
en = "Press Escape to cancel"
|
||||
ru = "Нажмите Escape для отмены"
|
||||
es = "Presione Escape para cancelar"
|
||||
fr = "Appuyez sur Échap pour annuler"
|
||||
zh = "按 Escape 取消"
|
||||
ar = "اضغط Esc للإلغاء"
|
||||
kz = "Болдырмау үшін Escape пернесін басыңыз"
|
||||
he = "לחץ על Escape לביטול"
|
||||
pt-BR = "Pressione Esc para cancelar"
|
||||
@@ -0,0 +1,219 @@
|
||||
use crate::gui::SoundpadGui;
|
||||
use egui::{Context, Id, Key, Modifiers};
|
||||
use pwsp_lib::types::socket::Request;
|
||||
use pwsp_lib::utils::gui::make_request_async;
|
||||
|
||||
/// Convert an egui Key + Modifiers to a normalized chord string like "Ctrl+Shift+A".
|
||||
fn chord_from_event(modifiers: &Modifiers, key: &Key) -> Option<String> {
|
||||
let key_name = key.name();
|
||||
let is_valid = (key_name.len() == 1
|
||||
&& key_name
|
||||
.chars()
|
||||
.next()
|
||||
.is_some_and(|c| c.is_ascii_alphanumeric()))
|
||||
|| (key_name.starts_with('F')
|
||||
&& key_name.len() > 1
|
||||
&& key_name[1..].chars().all(|c| c.is_ascii_digit()));
|
||||
if !is_valid {
|
||||
return None;
|
||||
}
|
||||
|
||||
// Require at least one modifier for hotkey chords (ignoring command/Super due to Wayland/Niri bug)
|
||||
if !modifiers.ctrl && !modifiers.alt && !modifiers.shift {
|
||||
return None;
|
||||
}
|
||||
|
||||
let mut parts = vec![];
|
||||
if modifiers.ctrl {
|
||||
parts.push("Ctrl");
|
||||
}
|
||||
if modifiers.alt {
|
||||
parts.push("Alt");
|
||||
}
|
||||
if modifiers.shift {
|
||||
parts.push("Shift");
|
||||
}
|
||||
// We intentionally ignore modifiers.command (Super) here to bypass a Wayland/Niri bug
|
||||
// where the Super key modifier is constantly active.
|
||||
|
||||
parts.push(key_name);
|
||||
|
||||
Some(parts.join("+"))
|
||||
}
|
||||
|
||||
/// Parse a chord string back to (Modifiers, Key) for matching.
|
||||
pub fn parse_chord(chord: &str) -> Option<(Modifiers, Key)> {
|
||||
let parts: Vec<&str> = chord.split('+').collect();
|
||||
if parts.is_empty() {
|
||||
return None;
|
||||
}
|
||||
|
||||
let mut modifiers = Modifiers::NONE;
|
||||
for &part in &parts[..parts.len() - 1] {
|
||||
match part {
|
||||
"Ctrl" => modifiers.ctrl = true,
|
||||
"Alt" => modifiers.alt = true,
|
||||
"Shift" => modifiers.shift = true,
|
||||
"Super" => modifiers.command = true,
|
||||
_ => return None,
|
||||
}
|
||||
}
|
||||
|
||||
let key_name = parts[parts.len() - 1];
|
||||
let is_valid = (key_name.len() == 1
|
||||
&& key_name
|
||||
.chars()
|
||||
.next()
|
||||
.is_some_and(|c| c.is_ascii_alphanumeric()))
|
||||
|| (key_name.starts_with('F')
|
||||
&& key_name.len() > 1
|
||||
&& key_name[1..].chars().all(|c| c.is_ascii_digit()));
|
||||
|
||||
if !is_valid {
|
||||
return None;
|
||||
}
|
||||
|
||||
let key = Key::from_name(key_name)?;
|
||||
|
||||
Some((modifiers, key))
|
||||
}
|
||||
|
||||
impl SoundpadGui {
|
||||
fn key_pressed(&self, ctx: &Context, key: Key) -> bool {
|
||||
ctx.input(|i| i.key_pressed(key))
|
||||
}
|
||||
|
||||
fn modifiers(&self, ctx: &Context) -> Modifiers {
|
||||
ctx.input(|i| i.modifiers)
|
||||
}
|
||||
|
||||
fn get_focused(&self, ctx: &Context) -> Option<Id> {
|
||||
ctx.memory(|m| m.focused())
|
||||
}
|
||||
|
||||
pub fn handle_input(&mut self, ctx: &Context) {
|
||||
let _modifiers = self.modifiers(ctx);
|
||||
let search_focused = {
|
||||
if let Some(focused_id) = self.get_focused(ctx)
|
||||
&& let Some(search_id) = self.app_state.search_field_id
|
||||
&& focused_id.eq(&search_id)
|
||||
{
|
||||
true
|
||||
} else {
|
||||
false
|
||||
}
|
||||
};
|
||||
|
||||
// Handle hotkey capture mode: listen for a key chord to assign
|
||||
if self.app_state.hotkey_capture_active {
|
||||
if self.key_pressed(ctx, Key::Escape) {
|
||||
self.app_state.hotkey_capture_active = false;
|
||||
self.app_state.assigning_hotkey_slot = None;
|
||||
self.app_state.assigning_hotkey_for_file = None;
|
||||
return;
|
||||
}
|
||||
|
||||
// Try to capture a chord from any key press
|
||||
let captured = ctx.input(|i| {
|
||||
for event in &i.events {
|
||||
if let egui::Event::Key {
|
||||
key,
|
||||
pressed: true,
|
||||
modifiers: mods,
|
||||
..
|
||||
} = event
|
||||
&& let Some(chord) = chord_from_event(mods, key)
|
||||
{
|
||||
return Some(chord);
|
||||
}
|
||||
}
|
||||
None
|
||||
});
|
||||
|
||||
if let Some(chord) = captured {
|
||||
if let Some(slot) = self.app_state.assigning_hotkey_slot.take() {
|
||||
make_request_async(Request::set_hotkey_key(&slot, &chord));
|
||||
self.app_state
|
||||
.hotkey_config
|
||||
.set_key_chord(&slot, Some(chord));
|
||||
} else if let Some(file_path) = self.app_state.assigning_hotkey_for_file.take() {
|
||||
// Auto-create a slot from the file name
|
||||
let slot_name = file_path
|
||||
.file_stem()
|
||||
.unwrap_or_default()
|
||||
.to_string_lossy()
|
||||
.to_string();
|
||||
let action = Request::play(&file_path.to_string_lossy(), false);
|
||||
|
||||
make_request_async(Request::set_hotkey_action_and_key(
|
||||
&slot_name, &action, &chord,
|
||||
));
|
||||
|
||||
self.app_state
|
||||
.hotkey_config
|
||||
.set_slot(slot_name.clone(), action);
|
||||
self.app_state
|
||||
.hotkey_config
|
||||
.set_key_chord(&slot_name, Some(chord.clone()));
|
||||
}
|
||||
self.app_state.hotkey_capture_active = false;
|
||||
self.app_state.assigning_hotkey_slot = None;
|
||||
self.app_state.assigning_hotkey_for_file = None;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
// Open/close settings
|
||||
if !search_focused && self.key_pressed(ctx, Key::I) {
|
||||
self.app_state.show_settings = !self.app_state.show_settings;
|
||||
}
|
||||
|
||||
// Toggle hotkeys view
|
||||
if !search_focused && self.key_pressed(ctx, Key::H) {
|
||||
self.app_state.show_hotkeys = !self.app_state.show_hotkeys;
|
||||
}
|
||||
|
||||
if !self.app_state.show_settings && !self.app_state.show_hotkeys {
|
||||
// Pause / resume audio on space
|
||||
if !search_focused && self.key_pressed(ctx, Key::Space) {
|
||||
self.play_toggle();
|
||||
}
|
||||
|
||||
// Stop all audio tracks on backspace
|
||||
if !search_focused && self.key_pressed(ctx, Key::Backspace) {
|
||||
self.stop(None);
|
||||
}
|
||||
|
||||
// Focus search field
|
||||
if self.key_pressed(ctx, Key::Slash) {
|
||||
if search_focused {
|
||||
ctx.memory_mut(|m| {
|
||||
m.request_focus(Id::NULL);
|
||||
});
|
||||
} else {
|
||||
self.app_state.force_focus_search = true;
|
||||
}
|
||||
}
|
||||
|
||||
// Check for hotkey chord triggers
|
||||
let slots_to_play: Vec<String> = ctx.input(|i| {
|
||||
let mut result = vec![];
|
||||
for slot in &self.app_state.hotkey_config.slots {
|
||||
if let Some(chord) = &slot.key_chord
|
||||
&& let Some((mods, key)) = parse_chord(chord)
|
||||
&& i.modifiers == mods
|
||||
&& i.key_pressed(key)
|
||||
{
|
||||
result.push(slot.slot.clone());
|
||||
}
|
||||
}
|
||||
result
|
||||
});
|
||||
|
||||
for slot in slots_to_play {
|
||||
self.play_hotkey_slot(&slot);
|
||||
}
|
||||
}
|
||||
// });
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,296 @@
|
||||
mod input;
|
||||
mod update;
|
||||
mod views;
|
||||
|
||||
use anyhow::{Result, anyhow};
|
||||
use eframe::{HardwareAcceleration, NativeOptions, icon_data::from_png_bytes, run_native};
|
||||
use egui::{Context, FontData, FontDefinitions, FontFamily, FontTweak, Vec2, ViewportBuilder};
|
||||
use itertools::Itertools;
|
||||
use pwsp_lib::{
|
||||
types::{
|
||||
audio_player::PlayerState,
|
||||
config::GuiConfig,
|
||||
config::HotkeyConfig,
|
||||
gui::{AppState, AudioPlayerState},
|
||||
socket::Request,
|
||||
},
|
||||
utils::{
|
||||
daemon::get_daemon_config,
|
||||
gui::{get_gui_config, make_request_async, make_request_sync, start_app_state_thread},
|
||||
},
|
||||
};
|
||||
use rfd::FileDialog;
|
||||
use std::{
|
||||
cmp::Ordering,
|
||||
fs,
|
||||
path::{Path, PathBuf},
|
||||
sync::{Arc, Mutex},
|
||||
};
|
||||
use system_fonts::{FontStyle, FoundFontSource, find_for_locale};
|
||||
|
||||
const SUPPORTED_EXTENSIONS: [&str; 13] = [
|
||||
"mp3", "wav", "ogg", "flac", "mp4", "m4a", "aac", "mov", "mkv", "mka", "webm", "avi", "opus",
|
||||
];
|
||||
|
||||
struct SoundpadGui {
|
||||
pub app_state: AppState,
|
||||
pub config: GuiConfig,
|
||||
pub audio_player_state: AudioPlayerState,
|
||||
pub audio_player_state_shared: Arc<Mutex<AudioPlayerState>>,
|
||||
}
|
||||
|
||||
impl SoundpadGui {
|
||||
fn new(ctx: &Context) -> Self {
|
||||
let audio_player_state = Arc::new(Mutex::new(AudioPlayerState::default()));
|
||||
start_app_state_thread(audio_player_state.clone());
|
||||
|
||||
let config = get_gui_config();
|
||||
|
||||
ctx.set_zoom_factor(config.scale_factor);
|
||||
|
||||
let mut soundpad_gui = SoundpadGui {
|
||||
app_state: AppState::default(),
|
||||
config: config.clone(),
|
||||
audio_player_state: AudioPlayerState::default(),
|
||||
audio_player_state_shared: audio_player_state.clone(),
|
||||
};
|
||||
|
||||
soundpad_gui.app_state.dirs = config.dirs;
|
||||
soundpad_gui.app_state.hotkey_config = HotkeyConfig::load().unwrap_or_default();
|
||||
|
||||
soundpad_gui
|
||||
}
|
||||
|
||||
pub fn play_toggle(&mut self) {
|
||||
let (new_state, request) = {
|
||||
let guard = self
|
||||
.audio_player_state_shared
|
||||
.lock()
|
||||
.unwrap_or_else(|e| e.into_inner());
|
||||
match guard.state {
|
||||
PlayerState::Playing => (Some(PlayerState::Paused), Some(Request::pause(None))),
|
||||
PlayerState::Paused => (Some(PlayerState::Playing), Some(Request::resume(None))),
|
||||
PlayerState::Stopped => (None, None),
|
||||
}
|
||||
};
|
||||
|
||||
if let Some(req) = request {
|
||||
make_request_async(req);
|
||||
}
|
||||
|
||||
if let Some(state) = new_state {
|
||||
let mut guard = self
|
||||
.audio_player_state_shared
|
||||
.lock()
|
||||
.unwrap_or_else(|e| e.into_inner());
|
||||
guard.new_state = Some(state.clone());
|
||||
guard.state = state;
|
||||
}
|
||||
}
|
||||
|
||||
pub fn open_file(&mut self) {
|
||||
let file_dialog = FileDialog::new().add_filter("Audio File", &SUPPORTED_EXTENSIONS);
|
||||
if let Some(path) = file_dialog.pick_file() {
|
||||
self.play_file(&path, false);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn add_dirs(&mut self) {
|
||||
let file_dialog = FileDialog::new();
|
||||
if let Some(paths) = file_dialog.pick_folders() {
|
||||
for path in paths {
|
||||
self.app_state.dirs.push(path);
|
||||
}
|
||||
self.app_state.dirs = self.app_state.dirs.iter().unique().cloned().collect();
|
||||
self.config.dirs = self.app_state.dirs.clone();
|
||||
self.config.save_to_file().ok();
|
||||
}
|
||||
}
|
||||
|
||||
pub fn open_dir(&mut self, path: &PathBuf) {
|
||||
self.app_state.current_dir = Some(path.clone());
|
||||
match path.read_dir() {
|
||||
Ok(read_dir) => {
|
||||
self.app_state.listed_files = read_dir
|
||||
.filter_map(|res| res.ok())
|
||||
.map(|entry| entry.path())
|
||||
.collect();
|
||||
}
|
||||
Err(e) => {
|
||||
eprintln!("Failed to read directory {:?}: {}", path, e);
|
||||
self.app_state.listed_files.clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn play_file(&mut self, path: &Path, concurrent: bool) {
|
||||
make_request_async(Request::play(&path.to_string_lossy(), concurrent));
|
||||
}
|
||||
|
||||
pub fn set_input(&mut self, name: String) {
|
||||
make_request_async(Request::set_input(&name));
|
||||
|
||||
if self.config.save_input {
|
||||
let mut daemon_config = get_daemon_config();
|
||||
daemon_config.default_input_name = Some(name);
|
||||
daemon_config.save_to_file().ok();
|
||||
}
|
||||
}
|
||||
|
||||
pub fn toggle_loop(&mut self, id: Option<u32>) {
|
||||
make_request_async(Request::toggle_loop(id));
|
||||
}
|
||||
|
||||
pub fn pause(&mut self, id: Option<u32>) {
|
||||
make_request_async(Request::pause(id));
|
||||
}
|
||||
|
||||
pub fn resume(&mut self, id: Option<u32>) {
|
||||
make_request_async(Request::resume(id));
|
||||
}
|
||||
|
||||
pub fn stop(&mut self, id: Option<u32>) {
|
||||
make_request_async(Request::stop(id));
|
||||
}
|
||||
|
||||
pub fn play_hotkey_slot(&mut self, slot: &str) {
|
||||
make_request_async(Request::play_hotkey(slot));
|
||||
}
|
||||
|
||||
pub fn get_filtered_files(&self) -> Vec<PathBuf> {
|
||||
let mut files: Vec<PathBuf> = self.app_state.listed_files.iter().cloned().collect();
|
||||
files.sort_by(|a, b| {
|
||||
let a_is_dir = a.is_dir();
|
||||
let b_is_dir = b.is_dir();
|
||||
if a_is_dir && !b_is_dir {
|
||||
Ordering::Less
|
||||
} else if !a_is_dir && b_is_dir {
|
||||
Ordering::Greater
|
||||
} else {
|
||||
a.cmp(b)
|
||||
}
|
||||
});
|
||||
|
||||
let search_query = self.app_state.search_query.to_lowercase();
|
||||
let search_query = search_query.trim();
|
||||
|
||||
files
|
||||
.into_iter()
|
||||
.filter(|entry_path| {
|
||||
if entry_path.is_dir() {
|
||||
return true;
|
||||
}
|
||||
|
||||
if !SUPPORTED_EXTENSIONS.contains(
|
||||
&entry_path
|
||||
.extension()
|
||||
.unwrap_or_default()
|
||||
.to_str()
|
||||
.unwrap_or_default(),
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if !search_query.is_empty() {
|
||||
let file_name = entry_path
|
||||
.file_name()
|
||||
.unwrap_or_default()
|
||||
.to_string_lossy()
|
||||
.to_string();
|
||||
|
||||
if !file_name.to_lowercase().contains(search_query) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
true
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
|
||||
fn add_font(font_name: &str, font_bytes: &[u8], fonts: &mut FontDefinitions) -> Result<()> {
|
||||
let font_data = FontData::from_owned(font_bytes.to_vec()).tweak(FontTweak {
|
||||
scale: 1.0,
|
||||
hinting_override: Some(true),
|
||||
..Default::default()
|
||||
});
|
||||
|
||||
fonts
|
||||
.font_data
|
||||
.insert(font_name.to_owned(), font_data.into());
|
||||
|
||||
fonts
|
||||
.families
|
||||
.entry(FontFamily::Proportional)
|
||||
.or_default()
|
||||
.insert(0, font_name.to_owned());
|
||||
fonts
|
||||
.families
|
||||
.entry(FontFamily::Monospace)
|
||||
.or_default()
|
||||
.insert(0, font_name.to_owned());
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn load_system_fonts(fonts: &mut FontDefinitions) -> Result<()> {
|
||||
let (_, en_sans) = find_for_locale("en", FontStyle::Sans);
|
||||
let (_, en_serif) = find_for_locale("en", FontStyle::Serif);
|
||||
let (_, ja_sans) = find_for_locale("ja", FontStyle::Sans);
|
||||
let (_, ar_sans) = find_for_locale("ar", FontStyle::Sans);
|
||||
|
||||
let system_fonts = [en_sans, en_serif, ja_sans, ar_sans].concat();
|
||||
|
||||
for font in system_fonts.iter().rev() {
|
||||
let font_bytes = match &font.source {
|
||||
FoundFontSource::Path(path) => fs::read(path)?,
|
||||
FoundFontSource::Bytes(bytes) => bytes.to_vec(),
|
||||
};
|
||||
|
||||
add_font(&font.key, &font_bytes, fonts)?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn run() -> Result<()> {
|
||||
const ICON: &[u8] = include_bytes!("../../assets/icon.png");
|
||||
|
||||
let options = NativeOptions {
|
||||
vsync: true,
|
||||
centered: true,
|
||||
hardware_acceleration: HardwareAcceleration::Preferred,
|
||||
|
||||
viewport: ViewportBuilder::default()
|
||||
.with_app_id("ru.arabianq.pwsp")
|
||||
.with_inner_size(Vec2::new(1200.0, 800.0))
|
||||
.with_min_inner_size(Vec2::new(800.0, 600.0))
|
||||
.with_icon(from_png_bytes(ICON)?),
|
||||
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
match run_native(
|
||||
"Pipewire Soundpad",
|
||||
options,
|
||||
Box::new(|cc| {
|
||||
egui_material_icons::initialize(&cc.egui_ctx);
|
||||
|
||||
let mut fonts = FontDefinitions::default();
|
||||
load_system_fonts(&mut fonts).ok();
|
||||
cc.egui_ctx.set_fonts(fonts);
|
||||
|
||||
Ok(Box::new(SoundpadGui::new(&cc.egui_ctx)))
|
||||
}),
|
||||
) {
|
||||
Ok(_) => {
|
||||
let config = get_gui_config();
|
||||
if config.pause_on_exit {
|
||||
make_request_sync(Request::pause(None)).ok();
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
Err(e) => Err(anyhow!(e.to_string())),
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,151 @@
|
||||
use crate::gui::SoundpadGui;
|
||||
use eframe::{App, Frame as EFrame};
|
||||
use egui::{CentralPanel, Context, ThemePreference};
|
||||
use pwsp_lib::{
|
||||
types::{config::PreferredTheme, socket::Request},
|
||||
utils::{daemon::get_daemon_config, gui::make_request_async},
|
||||
};
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
impl App for SoundpadGui {
|
||||
fn logic(&mut self, ctx: &Context, _frame: &mut EFrame) {
|
||||
// Update theme
|
||||
let current_theme = match ctx.options(|r| r.theme_preference) {
|
||||
ThemePreference::System => PreferredTheme::System,
|
||||
ThemePreference::Light => PreferredTheme::Light,
|
||||
ThemePreference::Dark => PreferredTheme::Dark,
|
||||
};
|
||||
|
||||
if !self.config.preferred_theme.eq(¤t_theme) {
|
||||
ctx.options_mut(|w| {
|
||||
w.theme_preference = match self.config.preferred_theme {
|
||||
PreferredTheme::System => ThemePreference::System,
|
||||
PreferredTheme::Light => ThemePreference::Light,
|
||||
PreferredTheme::Dark => ThemePreference::Dark,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// Remove directories
|
||||
for path in self.app_state.dirs_to_remove.drain() {
|
||||
self.app_state.dirs.retain(|x| x != &path);
|
||||
if let Some(current_dir) = &self.app_state.current_dir
|
||||
&& current_dir == &path
|
||||
{
|
||||
self.app_state.current_dir = None;
|
||||
self.app_state.listed_files.clear();
|
||||
}
|
||||
}
|
||||
|
||||
// Save directories if changed
|
||||
if !self.config.dirs.eq(&self.app_state.dirs) {
|
||||
self.config.dirs = self.app_state.dirs.clone();
|
||||
self.config.save_to_file().ok();
|
||||
}
|
||||
|
||||
// Seek and volume requests
|
||||
let mut seek_requests = vec![];
|
||||
let mut volume_requests = vec![];
|
||||
|
||||
for (id, ui_state) in &mut self.app_state.track_ui_states {
|
||||
if ui_state.position_dragged {
|
||||
seek_requests.push((*id, ui_state.position_slider_value));
|
||||
}
|
||||
if ui_state.volume_dragged {
|
||||
volume_requests.push((*id, ui_state.volume_slider_value));
|
||||
ui_state.volume_dragged = false;
|
||||
}
|
||||
}
|
||||
|
||||
for (id, pos) in seek_requests {
|
||||
make_request_async(Request::seek(pos, Some(id)));
|
||||
if let Some(ui_state) = self.app_state.track_ui_states.get_mut(&id) {
|
||||
ui_state.position_dragged = false;
|
||||
ui_state.ignore_position_update_until =
|
||||
Some(Instant::now() + Duration::from_millis(300));
|
||||
}
|
||||
}
|
||||
|
||||
for (id, vol) in volume_requests {
|
||||
make_request_async(Request::set_volume(vol, Some(id)));
|
||||
if let Some(ui_state) = self.app_state.track_ui_states.get_mut(&id) {
|
||||
ui_state.volume_dragged = false;
|
||||
ui_state.ignore_volume_update_until =
|
||||
Some(Instant::now() + Duration::from_millis(300));
|
||||
}
|
||||
}
|
||||
|
||||
if self.app_state.volume_dragged {
|
||||
make_request_async(Request::set_volume(
|
||||
self.app_state.volume_slider_value,
|
||||
None,
|
||||
));
|
||||
|
||||
self.app_state.volume_dragged = false;
|
||||
self.app_state.ignore_volume_update_until =
|
||||
Some(Instant::now() + Duration::from_millis(300));
|
||||
|
||||
if self.config.save_volume {
|
||||
let mut daemon_config = get_daemon_config();
|
||||
daemon_config.default_volume = Some(self.app_state.volume_slider_value);
|
||||
daemon_config.save_to_file().ok();
|
||||
}
|
||||
}
|
||||
|
||||
// Sync audio player state
|
||||
{
|
||||
let mut guard = self
|
||||
.audio_player_state_shared
|
||||
.lock()
|
||||
.unwrap_or_else(|e| e.into_inner());
|
||||
if let Some(config) = guard.hotkey_config.take() {
|
||||
self.app_state.hotkey_config = config;
|
||||
}
|
||||
self.audio_player_state = guard.clone();
|
||||
}
|
||||
|
||||
// Handle scale factor changes
|
||||
let old_scale_factor = self.config.scale_factor;
|
||||
let new_scale_factor = ctx.zoom_factor().clamp(0.5, 2.0);
|
||||
|
||||
ctx.set_zoom_factor(new_scale_factor);
|
||||
self.config.scale_factor = new_scale_factor;
|
||||
|
||||
if new_scale_factor != old_scale_factor && self.config.save_scale_factor {
|
||||
self.config.save_to_file().ok();
|
||||
}
|
||||
|
||||
// Handle input
|
||||
self.handle_input(ctx);
|
||||
}
|
||||
|
||||
fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut EFrame) {
|
||||
// Draw UI
|
||||
CentralPanel::default().show_inside(ui, |ui| {
|
||||
if !self.audio_player_state.is_daemon_running {
|
||||
self.draw_waiting_for_daemon(ui);
|
||||
return;
|
||||
}
|
||||
|
||||
if self.app_state.hotkey_capture_active {
|
||||
self.draw_hotkey_capture(ui);
|
||||
return;
|
||||
}
|
||||
|
||||
if self.app_state.show_settings {
|
||||
self.draw_settings(ui);
|
||||
return;
|
||||
}
|
||||
|
||||
if self.app_state.show_hotkeys {
|
||||
self.draw_hotkeys(ui);
|
||||
return;
|
||||
}
|
||||
|
||||
self.draw(ui);
|
||||
});
|
||||
|
||||
// Request repaint
|
||||
ui.request_repaint_after_secs(1.0 / 60.0);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,432 @@
|
||||
use crate::gui::SoundpadGui;
|
||||
use egui::{
|
||||
Align, AtomExt, Button, CollapsingHeader, Color32, CursorIcon, Layout, RichText, ScrollArea,
|
||||
Sense, TextEdit, Ui, Vec2,
|
||||
};
|
||||
use egui_dnd::dnd;
|
||||
use egui_material_icons::icons::*;
|
||||
use pwsp_lib::types::{gui::AppState, gui::AudioPlayerState};
|
||||
use rust_i18n::t;
|
||||
use std::{cmp::Ordering, path::Path, path::PathBuf};
|
||||
|
||||
pub(crate) enum FileAction {
|
||||
Play(PathBuf, bool),
|
||||
StopAndPlay(u32, PathBuf, bool),
|
||||
AssignHotkey(PathBuf),
|
||||
}
|
||||
|
||||
impl SoundpadGui {
|
||||
pub fn draw_body(&mut self, ui: &mut Ui) {
|
||||
let left_panel_width = self
|
||||
.config
|
||||
.left_panel_width
|
||||
.max(100.0)
|
||||
.min(ui.available_width() - 100.0);
|
||||
let dirs_size = Vec2::new(left_panel_width, ui.available_height() - 40.0);
|
||||
|
||||
ui.horizontal(|ui| {
|
||||
self.draw_dirs(ui, dirs_size);
|
||||
|
||||
let (rect, response) = ui.allocate_at_least(
|
||||
Vec2::new(ui.spacing().item_spacing.x, ui.available_height()),
|
||||
Sense::click_and_drag(),
|
||||
);
|
||||
|
||||
if ui.is_rect_visible(rect) {
|
||||
let stroke = ui.visuals().widgets.noninteractive.bg_stroke;
|
||||
ui.painter().vline(rect.center().x, rect.y_range(), stroke);
|
||||
}
|
||||
|
||||
let vertical_separator_response =
|
||||
response.on_hover_and_drag_cursor(CursorIcon::ResizeHorizontal);
|
||||
|
||||
if vertical_separator_response.dragged() {
|
||||
self.config.left_panel_width += vertical_separator_response.drag_delta().x;
|
||||
self.config.left_panel_width = self.config.left_panel_width.clamp(100.0, 500.0);
|
||||
}
|
||||
|
||||
if vertical_separator_response.drag_stopped() {
|
||||
self.config.save_to_file().ok();
|
||||
}
|
||||
|
||||
let files_size = Vec2::new(ui.available_width(), ui.available_height() - 40.0);
|
||||
self.draw_files(ui, files_size);
|
||||
});
|
||||
}
|
||||
|
||||
fn draw_dirs(&mut self, ui: &mut Ui, area_size: Vec2) {
|
||||
ui.vertical(|ui| {
|
||||
ui.set_min_width(area_size.x);
|
||||
ui.set_min_height(area_size.y);
|
||||
|
||||
ScrollArea::vertical().id_salt(0).show(ui, |ui| {
|
||||
ui.set_min_width(area_size.x);
|
||||
|
||||
let mut dirs = std::mem::take(&mut self.app_state.dirs);
|
||||
let mut dir_to_open = None;
|
||||
|
||||
dnd(ui, "dnd_directories").show_vec(&mut dirs, |ui, item, handle, _state| {
|
||||
let path = item;
|
||||
ui.horizontal(|ui| {
|
||||
handle.ui(ui, |ui| {
|
||||
ui.label(ICON_DRAG_INDICATOR.codepoint);
|
||||
});
|
||||
let name = path
|
||||
.file_name()
|
||||
.map(|s| s.to_string_lossy().to_string())
|
||||
.unwrap_or_else(|| path.to_string_lossy().to_string());
|
||||
|
||||
let mut dir_button =
|
||||
Button::new(RichText::new(name.clone()).atom_max_width(area_size.x))
|
||||
.frame(false);
|
||||
|
||||
if let Some(current_dir) = &self.app_state.current_dir
|
||||
&& current_dir.eq(&*path)
|
||||
{
|
||||
dir_button = dir_button.selected(true);
|
||||
}
|
||||
|
||||
let dir_button_response = ui.add(dir_button);
|
||||
if dir_button_response.clicked() {
|
||||
dir_to_open = Some(path.clone());
|
||||
}
|
||||
|
||||
let delete_dir_button = Button::new(ICON_DELETE).frame(false);
|
||||
let delete_dir_button_response =
|
||||
ui.add_sized([18.0, 18.0], delete_dir_button);
|
||||
if delete_dir_button_response.clicked() {
|
||||
self.app_state.dirs_to_remove.insert(path.clone());
|
||||
}
|
||||
|
||||
// Context menu
|
||||
dir_button_response.context_menu(|ui| {
|
||||
if ui
|
||||
.button(format!(
|
||||
"{} {}",
|
||||
ICON_OPEN_IN_NEW.codepoint,
|
||||
t!("gui.context.dirs.open")
|
||||
))
|
||||
.clicked()
|
||||
{
|
||||
dir_to_open = Some(path.clone());
|
||||
}
|
||||
|
||||
if ui
|
||||
.button(format!(
|
||||
"{} {}",
|
||||
ICON_OPEN_IN_BROWSER.codepoint,
|
||||
t!("gui.context.dirs.open_in_fm")
|
||||
))
|
||||
.clicked()
|
||||
&& let Err(e) = opener::open(&path)
|
||||
{
|
||||
eprintln!("Failed to open file manager: {}", e);
|
||||
}
|
||||
|
||||
ui.separator();
|
||||
|
||||
if ui
|
||||
.button(format!(
|
||||
"{} {}",
|
||||
ICON_DELETE.codepoint,
|
||||
t!("gui.context.dirs.remove")
|
||||
))
|
||||
.clicked()
|
||||
{
|
||||
self.app_state.dirs_to_remove.insert(path.clone());
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
self.app_state.dirs = dirs;
|
||||
|
||||
if let Some(path) = dir_to_open {
|
||||
self.open_dir(&path);
|
||||
}
|
||||
|
||||
ui.horizontal(|ui| {
|
||||
let add_dirs_button = Button::new(ICON_ADD).frame(false);
|
||||
let add_dirs_button_response = ui.add_sized([18.0, 18.0], add_dirs_button);
|
||||
if add_dirs_button_response.clicked() {
|
||||
self.add_dirs();
|
||||
}
|
||||
});
|
||||
|
||||
ui.with_layout(Layout::bottom_up(Align::Min), |ui| {
|
||||
let play_file_button = Button::new(t!("gui.play_file_button"));
|
||||
let play_file_button_response = ui.add(play_file_button);
|
||||
if play_file_button_response.clicked() {
|
||||
self.open_file();
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
fn draw_files_search_field(&mut self, ui: &mut Ui) {
|
||||
ui.horizontal(|ui| {
|
||||
let search_field_response = ui.add_sized(
|
||||
[ui.available_width(), 22.0],
|
||||
TextEdit::singleline(&mut self.app_state.search_query)
|
||||
.hint_text(t!("gui.search_placeholder")),
|
||||
);
|
||||
|
||||
if self.app_state.force_focus_search {
|
||||
search_field_response.request_focus();
|
||||
self.app_state.force_focus_search = false;
|
||||
}
|
||||
|
||||
self.app_state.search_field_id = Some(search_field_response.id);
|
||||
});
|
||||
}
|
||||
|
||||
fn draw_files_list(&mut self, ui: &mut Ui, area_size: Vec2) {
|
||||
ScrollArea::vertical().id_salt(1).show(ui, |ui| {
|
||||
ui.set_min_width(area_size.x);
|
||||
ui.set_min_height(area_size.y);
|
||||
|
||||
ui.vertical(|ui| {
|
||||
let mut actions = Vec::new();
|
||||
let files = self.get_filtered_files();
|
||||
for entry_path in files {
|
||||
Self::draw_tree_node(
|
||||
ui,
|
||||
entry_path,
|
||||
&mut self.app_state,
|
||||
&self.audio_player_state,
|
||||
&mut actions,
|
||||
);
|
||||
}
|
||||
|
||||
for action in actions {
|
||||
match action {
|
||||
FileAction::Play(path, concurrent) => self.play_file(&path, concurrent),
|
||||
FileAction::StopAndPlay(id, path, concurrent) => {
|
||||
self.stop(Some(id));
|
||||
self.play_file(&path, concurrent);
|
||||
}
|
||||
FileAction::AssignHotkey(path) => {
|
||||
self.app_state.assigning_hotkey_for_file = Some(path);
|
||||
self.app_state.hotkey_capture_active = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
fn draw_files(&mut self, ui: &mut Ui, area_size: Vec2) {
|
||||
ui.vertical(|ui| {
|
||||
self.draw_files_search_field(ui);
|
||||
ui.separator();
|
||||
self.draw_files_list(ui, area_size);
|
||||
});
|
||||
}
|
||||
|
||||
fn draw_tree_node_dir(
|
||||
ui: &mut Ui,
|
||||
path: std::path::PathBuf,
|
||||
app_state: &mut AppState,
|
||||
audio_player_state: &AudioPlayerState,
|
||||
actions: &mut Vec<FileAction>,
|
||||
) {
|
||||
let dir_name = path
|
||||
.file_name()
|
||||
.unwrap_or_default()
|
||||
.to_string_lossy()
|
||||
.to_string();
|
||||
CollapsingHeader::new(dir_name)
|
||||
.id_salt(&path)
|
||||
.show(ui, |ui| {
|
||||
let children = if let Some(cached) = app_state.dir_cache.get(&path) {
|
||||
cached.clone()
|
||||
} else {
|
||||
let mut read = Vec::new();
|
||||
if let Ok(entries) = std::fs::read_dir(&path) {
|
||||
for entry in entries.filter_map(|e| e.ok()) {
|
||||
read.push(entry.path());
|
||||
}
|
||||
}
|
||||
read.sort_by(|a, b| {
|
||||
let a_is_dir = a.is_dir();
|
||||
let b_is_dir = b.is_dir();
|
||||
if a_is_dir && !b_is_dir {
|
||||
Ordering::Less
|
||||
} else if !a_is_dir && b_is_dir {
|
||||
Ordering::Greater
|
||||
} else {
|
||||
a.cmp(b)
|
||||
}
|
||||
});
|
||||
app_state.dir_cache.insert(path.clone(), read.clone());
|
||||
read
|
||||
};
|
||||
|
||||
let search_query = app_state.search_query.to_lowercase();
|
||||
let search_query = search_query.trim();
|
||||
|
||||
for child in children {
|
||||
if !child.is_dir() {
|
||||
if !crate::gui::SUPPORTED_EXTENSIONS.contains(
|
||||
&child
|
||||
.extension()
|
||||
.unwrap_or_default()
|
||||
.to_str()
|
||||
.unwrap_or_default(),
|
||||
) {
|
||||
continue;
|
||||
}
|
||||
if !search_query.is_empty() {
|
||||
let file_name = child
|
||||
.file_name()
|
||||
.unwrap_or_default()
|
||||
.to_string_lossy()
|
||||
.to_string();
|
||||
if !file_name.to_lowercase().contains(search_query) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
Self::draw_tree_node(ui, child, app_state, audio_player_state, actions);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
fn draw_tree_node_file(
|
||||
ui: &mut Ui,
|
||||
path: std::path::PathBuf,
|
||||
app_state: &mut AppState,
|
||||
audio_player_state: &AudioPlayerState,
|
||||
actions: &mut Vec<FileAction>,
|
||||
) {
|
||||
let file_name = path
|
||||
.file_name()
|
||||
.unwrap_or_default()
|
||||
.to_string_lossy()
|
||||
.to_string();
|
||||
|
||||
ui.horizontal(|ui| {
|
||||
// Hotkey badge
|
||||
let mut hotkey_badge = None;
|
||||
for slot in &app_state.hotkey_config.slots {
|
||||
if slot.action.name == "play"
|
||||
&& let Some(file_path_str) = slot.action.args.get("file_path")
|
||||
&& Path::new(file_path_str) == path
|
||||
{
|
||||
if let Some(chord) = &slot.key_chord {
|
||||
hotkey_badge = Some(format!("[{}]", chord));
|
||||
} else {
|
||||
hotkey_badge = Some(format!("[{}]", slot.slot));
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(badge) = &hotkey_badge {
|
||||
ui.label(
|
||||
RichText::new(badge)
|
||||
.small()
|
||||
.monospace()
|
||||
.color(Color32::from_rgb(100, 200, 100)),
|
||||
);
|
||||
}
|
||||
|
||||
let file_button_text = RichText::new(&file_name);
|
||||
|
||||
let file_button = Button::new(file_button_text).frame(false).truncate();
|
||||
let file_button_response = ui.add(file_button);
|
||||
if file_button_response.clicked() {
|
||||
ui.input(|i| {
|
||||
if i.modifiers.ctrl {
|
||||
actions.push(FileAction::Play(path.clone(), true));
|
||||
} else if i.modifiers.shift
|
||||
&& let Some(last_track) = audio_player_state.tracks.last()
|
||||
{
|
||||
actions.push(FileAction::StopAndPlay(last_track.id, path.clone(), true));
|
||||
} else {
|
||||
actions.push(FileAction::Play(path.clone(), false));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Context menu
|
||||
file_button_response.context_menu(|ui| {
|
||||
if ui
|
||||
.button(format!(
|
||||
"{} {}",
|
||||
ICON_BOLT.codepoint,
|
||||
t!("gui.context.files.play_solo")
|
||||
))
|
||||
.clicked()
|
||||
{
|
||||
actions.push(FileAction::Play(path.clone(), false));
|
||||
}
|
||||
|
||||
if ui
|
||||
.button(format!(
|
||||
"{} {}",
|
||||
ICON_ADD.codepoint,
|
||||
t!("gui.context.files.add_new")
|
||||
))
|
||||
.clicked()
|
||||
{
|
||||
actions.push(FileAction::Play(path.clone(), true));
|
||||
}
|
||||
|
||||
if ui
|
||||
.button(format!(
|
||||
"{} {}",
|
||||
ICON_SWAP_HORIZ.codepoint,
|
||||
t!("gui.context.files.replace_last")
|
||||
))
|
||||
.clicked()
|
||||
&& let Some(last_track) = audio_player_state.tracks.last()
|
||||
{
|
||||
actions.push(FileAction::StopAndPlay(last_track.id, path.clone(), true));
|
||||
}
|
||||
|
||||
ui.separator();
|
||||
|
||||
if ui
|
||||
.button(format!(
|
||||
"{} {}",
|
||||
ICON_OPEN_IN_BROWSER.codepoint,
|
||||
t!("gui.context.files.show_in_fm")
|
||||
))
|
||||
.clicked()
|
||||
&& let Err(e) = opener::reveal(&path)
|
||||
{
|
||||
eprintln!("Failed to open file manager: {}", e);
|
||||
}
|
||||
|
||||
ui.separator();
|
||||
|
||||
if ui
|
||||
.button(format!(
|
||||
"{} {}",
|
||||
ICON_KEYBOARD.codepoint,
|
||||
t!("gui.context.files.asign_hotkey")
|
||||
))
|
||||
.clicked()
|
||||
{
|
||||
actions.push(FileAction::AssignHotkey(path.clone()));
|
||||
ui.close();
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
fn draw_tree_node(
|
||||
ui: &mut Ui,
|
||||
path: std::path::PathBuf,
|
||||
app_state: &mut AppState,
|
||||
audio_player_state: &AudioPlayerState,
|
||||
actions: &mut Vec<FileAction>,
|
||||
) {
|
||||
if path.is_dir() {
|
||||
Self::draw_tree_node_dir(ui, path, app_state, audio_player_state, actions);
|
||||
} else {
|
||||
Self::draw_tree_node_file(ui, path, app_state, audio_player_state, actions);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,92 @@
|
||||
use crate::gui::SoundpadGui;
|
||||
use egui::{AtomExt, Button, ComboBox, Label, RichText, Slider, Ui, Vec2};
|
||||
use egui_material_icons::icons::*;
|
||||
use rust_i18n::t;
|
||||
use std::time::Instant;
|
||||
|
||||
impl SoundpadGui {
|
||||
pub fn draw_footer(&mut self, ui: &mut Ui) {
|
||||
ui.add_space(5.0);
|
||||
ui.horizontal(|ui| {
|
||||
self.draw_mic_selection(ui);
|
||||
self.draw_master_volume(ui);
|
||||
|
||||
ui.add_space(ui.available_width() - 18.0 * 2.0 - ui.spacing().item_spacing.x * 2.0);
|
||||
|
||||
self.draw_hotkeys_button(ui);
|
||||
self.draw_settings_button(ui);
|
||||
});
|
||||
}
|
||||
|
||||
fn draw_mic_selection(&mut self, ui: &mut Ui) {
|
||||
let mics = &self.audio_player_state.all_inputs_sorted;
|
||||
|
||||
let mut selected_input = self.audio_player_state.current_input.to_owned();
|
||||
let prev_input = selected_input.to_owned();
|
||||
ComboBox::from_label(t!("gui.choose_mic_select"))
|
||||
.height(30.0)
|
||||
.selected_text(
|
||||
self.audio_player_state
|
||||
.all_inputs
|
||||
.get(&selected_input)
|
||||
.unwrap_or(&String::new()),
|
||||
)
|
||||
.show_ui(ui, |ui| {
|
||||
for (name, nick) in mics {
|
||||
ui.selectable_value(&mut selected_input, name.clone(), nick);
|
||||
}
|
||||
});
|
||||
|
||||
if selected_input != prev_input {
|
||||
self.set_input(selected_input);
|
||||
}
|
||||
}
|
||||
|
||||
fn draw_master_volume(&mut self, ui: &mut Ui) {
|
||||
let volume_icon = Self::get_volume_icon(self.audio_player_state.volume);
|
||||
let volume_label = Label::new(RichText::new(volume_icon).size(18.0));
|
||||
ui.add_sized([18.0, 18.0], volume_label)
|
||||
.on_hover_text(format!(
|
||||
"Master Volume: {:.0}%",
|
||||
self.audio_player_state.volume * 100.0
|
||||
));
|
||||
|
||||
let should_update_volume = !self.app_state.volume_dragged
|
||||
&& self
|
||||
.app_state
|
||||
.ignore_volume_update_until
|
||||
.map(|t| Instant::now() > t)
|
||||
.unwrap_or(true);
|
||||
|
||||
if should_update_volume {
|
||||
self.app_state.volume_slider_value = self.audio_player_state.volume;
|
||||
}
|
||||
|
||||
let volume_slider = Slider::new(&mut self.app_state.volume_slider_value, 0.0..=1.0)
|
||||
.show_value(false)
|
||||
.step_by(0.01);
|
||||
let volume_slider_response = ui.add_sized([150.0, 18.0], volume_slider);
|
||||
if volume_slider_response.drag_stopped() {
|
||||
self.app_state.volume_dragged = true;
|
||||
}
|
||||
}
|
||||
|
||||
fn draw_hotkeys_button(&mut self, ui: &mut Ui) {
|
||||
let hotkeys_button =
|
||||
Button::new(ICON_KEYBOARD.atom_size(Vec2::new(18.0, 18.0))).frame(false);
|
||||
let hotkeys_button_response = ui.add_sized([18.0, 18.0], hotkeys_button);
|
||||
if hotkeys_button_response.clicked() {
|
||||
self.app_state.show_hotkeys = true;
|
||||
}
|
||||
hotkeys_button_response.on_hover_text("Hotkeys (H)");
|
||||
}
|
||||
|
||||
fn draw_settings_button(&mut self, ui: &mut Ui) {
|
||||
let settings_button =
|
||||
Button::new(ICON_SETTINGS.atom_size(Vec2::new(18.0, 18.0))).frame(false);
|
||||
let settings_button_response = ui.add_sized([18.0, 18.0], settings_button);
|
||||
if settings_button_response.clicked() {
|
||||
self.app_state.show_settings = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,195 @@
|
||||
use crate::gui::SoundpadGui;
|
||||
use egui::{Button, CollapsingHeader, FontFamily, Label, RichText, Slider, Ui};
|
||||
use egui_material_icons::icons::*;
|
||||
use pwsp_lib::types::{audio_player::TrackInfo, gui::AppState};
|
||||
use pwsp_lib::utils::gui::format_time_pair;
|
||||
use std::time::Instant;
|
||||
|
||||
pub(crate) enum TrackAction {
|
||||
Pause(u32),
|
||||
Resume(u32),
|
||||
ToggleLoop(u32),
|
||||
Stop(u32),
|
||||
}
|
||||
|
||||
impl SoundpadGui {
|
||||
pub fn draw_header(&mut self, ui: &mut Ui) {
|
||||
ui.vertical_centered_justified(|ui| {
|
||||
if self.audio_player_state.tracks.is_empty() {
|
||||
ui.label("No tracks playing");
|
||||
return;
|
||||
}
|
||||
|
||||
let mut action = None;
|
||||
|
||||
for track in &self.audio_player_state.tracks {
|
||||
CollapsingHeader::new(
|
||||
RichText::new(
|
||||
track
|
||||
.path
|
||||
.file_stem()
|
||||
.unwrap_or_default()
|
||||
.to_str()
|
||||
.unwrap_or_default(),
|
||||
)
|
||||
.family(FontFamily::Monospace),
|
||||
)
|
||||
.default_open(true)
|
||||
.show(ui, |ui| {
|
||||
if let Some(act) = Self::draw_track_control(ui, &mut self.app_state, track) {
|
||||
action = Some(act);
|
||||
}
|
||||
});
|
||||
ui.separator();
|
||||
}
|
||||
|
||||
if let Some(action) = action {
|
||||
match action {
|
||||
TrackAction::Pause(id) => self.pause(Some(id)),
|
||||
TrackAction::Resume(id) => self.resume(Some(id)),
|
||||
TrackAction::ToggleLoop(id) => self.toggle_loop(Some(id)),
|
||||
TrackAction::Stop(id) => self.stop(Some(id)),
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
fn draw_playback_controls(ui: &mut Ui, track: &TrackInfo) -> Option<TrackAction> {
|
||||
let mut action = None;
|
||||
|
||||
let play_button = Button::new(if track.paused {
|
||||
ICON_PLAY_ARROW
|
||||
} else {
|
||||
ICON_PAUSE
|
||||
})
|
||||
.corner_radius(15.0);
|
||||
|
||||
if ui.add_sized([30.0, 30.0], play_button).clicked() {
|
||||
action = Some(if track.paused {
|
||||
TrackAction::Resume(track.id)
|
||||
} else {
|
||||
TrackAction::Pause(track.id)
|
||||
});
|
||||
}
|
||||
|
||||
let loop_button = Button::new(
|
||||
RichText::new(if track.looped {
|
||||
ICON_REPEAT_ONE
|
||||
} else {
|
||||
ICON_REPEAT
|
||||
})
|
||||
.size(18.0),
|
||||
)
|
||||
.frame(false);
|
||||
|
||||
if ui.add_sized([15.0, 30.0], loop_button).clicked() {
|
||||
action = Some(TrackAction::ToggleLoop(track.id));
|
||||
}
|
||||
|
||||
action
|
||||
}
|
||||
|
||||
fn draw_position_control(
|
||||
ui: &mut Ui,
|
||||
ui_state: &mut pwsp_lib::types::gui::TrackUiState,
|
||||
track: &TrackInfo,
|
||||
default_slider_width: f32,
|
||||
) {
|
||||
let duration = track.duration.unwrap_or(1.0);
|
||||
let position_slider = Slider::new(&mut ui_state.position_slider_value, 0.0..=duration)
|
||||
.show_value(false)
|
||||
.step_by(0.01);
|
||||
|
||||
let position_slider_width = ui.available_width()
|
||||
- (30.0 * 3.0)
|
||||
- default_slider_width
|
||||
- (ui.spacing().item_spacing.x * 6.0);
|
||||
|
||||
ui.spacing_mut().slider_width = position_slider_width;
|
||||
if ui.add_sized([30.0, 30.0], position_slider).drag_stopped() {
|
||||
ui_state.position_dragged = true;
|
||||
}
|
||||
|
||||
let time_label =
|
||||
Label::new(RichText::new(format_time_pair(track.position, duration)).monospace());
|
||||
ui.add_sized([30.0, 30.0], time_label);
|
||||
}
|
||||
|
||||
fn draw_volume_control(
|
||||
ui: &mut Ui,
|
||||
ui_state: &mut pwsp_lib::types::gui::TrackUiState,
|
||||
track: &TrackInfo,
|
||||
default_slider_width: f32,
|
||||
) {
|
||||
let volume_icon = Self::get_volume_icon(track.volume);
|
||||
let volume_label = Label::new(RichText::new(volume_icon).size(18.0));
|
||||
ui.add_sized([30.0, 30.0], volume_label)
|
||||
.on_hover_text(format!("Volume: {:.0}%", track.volume * 100.0));
|
||||
|
||||
let volume_slider = Slider::new(&mut ui_state.volume_slider_value, 0.0..=1.0)
|
||||
.show_value(false)
|
||||
.step_by(0.01);
|
||||
|
||||
ui.spacing_mut().slider_width = default_slider_width - 30.0;
|
||||
ui.spacing_mut().item_spacing.x = 0.0;
|
||||
|
||||
if ui.add_sized([30.0, 30.0], volume_slider).drag_stopped() {
|
||||
ui_state.volume_dragged = true;
|
||||
}
|
||||
}
|
||||
|
||||
fn draw_stop_control(ui: &mut Ui, track: &TrackInfo) -> Option<TrackAction> {
|
||||
let stop_button = Button::new(ICON_CLOSE).frame(false);
|
||||
if ui.add_sized([30.0, 30.0], stop_button).clicked() {
|
||||
Some(TrackAction::Stop(track.id))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
fn draw_track_control(
|
||||
ui: &mut Ui,
|
||||
app_state: &mut AppState,
|
||||
track: &TrackInfo,
|
||||
) -> Option<TrackAction> {
|
||||
let ui_state = app_state.track_ui_states.entry(track.id).or_default();
|
||||
|
||||
let should_update_position = !ui_state.position_dragged
|
||||
&& ui_state
|
||||
.ignore_position_update_until
|
||||
.map(|t| Instant::now() > t)
|
||||
.unwrap_or(true);
|
||||
|
||||
if should_update_position {
|
||||
ui_state.position_slider_value = track.position;
|
||||
}
|
||||
|
||||
let should_update_volume = !ui_state.volume_dragged
|
||||
&& ui_state
|
||||
.ignore_volume_update_until
|
||||
.map(|t| Instant::now() > t)
|
||||
.unwrap_or(true);
|
||||
|
||||
if should_update_volume {
|
||||
ui_state.volume_slider_value = track.volume;
|
||||
}
|
||||
|
||||
let mut action = None;
|
||||
|
||||
ui.horizontal_top(|ui| {
|
||||
if let Some(act) = Self::draw_playback_controls(ui, track) {
|
||||
action = Some(act);
|
||||
}
|
||||
|
||||
let default_slider_width = ui.spacing().slider_width;
|
||||
Self::draw_position_control(ui, ui_state, track, default_slider_width);
|
||||
Self::draw_volume_control(ui, ui_state, track, default_slider_width);
|
||||
|
||||
if let Some(act) = Self::draw_stop_control(ui, track) {
|
||||
action = Some(act);
|
||||
}
|
||||
});
|
||||
|
||||
action
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
use crate::gui::SoundpadGui;
|
||||
use egui::{Color32, RichText, Ui};
|
||||
use rust_i18n::t;
|
||||
|
||||
impl SoundpadGui {
|
||||
pub fn draw_hotkey_capture(&mut self, ui: &mut Ui) {
|
||||
ui.vertical_centered(|ui| {
|
||||
ui.add_space(ui.available_height() / 3.0);
|
||||
ui.label(
|
||||
RichText::new(t!("gui.hotkeys.capture.header"))
|
||||
.size(18.0)
|
||||
.color(Color32::YELLOW)
|
||||
.monospace(),
|
||||
);
|
||||
ui.add_space(10.0);
|
||||
let target = if let Some(slot) = &self.app_state.assigning_hotkey_slot {
|
||||
format!("{} '{}'", t!("gui.hotkeys.capture.for"), slot)
|
||||
} else if let Some(path) = &self.app_state.assigning_hotkey_for_file {
|
||||
format!(
|
||||
"{} '{}'",
|
||||
t!("gui.hotkeys.capture.for"),
|
||||
path.file_name().unwrap_or_default().to_string_lossy()
|
||||
)
|
||||
} else {
|
||||
String::new()
|
||||
};
|
||||
ui.label(RichText::new(target).size(16.0));
|
||||
ui.add_space(10.0);
|
||||
ui.label(t!("gui.hotkeys.capture.cancel"));
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,304 @@
|
||||
use crate::gui::SoundpadGui;
|
||||
use egui::{Button, Color32, Label, RichText, TextEdit, Ui};
|
||||
use egui_extras::{Column, TableBuilder};
|
||||
use egui_material_icons::icons::*;
|
||||
use pwsp_lib::types::socket::Request;
|
||||
use pwsp_lib::utils::gui::make_request_async;
|
||||
use rust_i18n::t;
|
||||
use std::path::Path;
|
||||
|
||||
pub(crate) enum HotkeyAction {
|
||||
Remove(String),
|
||||
Capture(String),
|
||||
ClearChord(String),
|
||||
Play(String),
|
||||
}
|
||||
|
||||
impl SoundpadGui {
|
||||
pub fn draw_hotkeys(&mut self, ui: &mut Ui) {
|
||||
ui.vertical(|ui| {
|
||||
ui.spacing_mut().item_spacing.y = 5.0;
|
||||
|
||||
self.draw_hotkeys_header(ui);
|
||||
ui.separator();
|
||||
|
||||
self.draw_hotkeys_search(ui);
|
||||
ui.separator();
|
||||
ui.add_space(5.0);
|
||||
|
||||
let action = self.draw_hotkeys_table(ui);
|
||||
|
||||
if let Some(action) = action {
|
||||
self.handle_hotkey_action(action);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
fn draw_hotkeys_header(&mut self, ui: &mut Ui) {
|
||||
ui.horizontal(|ui| {
|
||||
let back_button = Button::new(ICON_ARROW_BACK).frame(false);
|
||||
if ui.add(back_button).clicked() {
|
||||
self.app_state.show_hotkeys = false;
|
||||
}
|
||||
|
||||
ui.vertical_centered(|ui| {
|
||||
ui.label(
|
||||
RichText::new(t!("gui.hotkeys.header"))
|
||||
.color(Color32::WHITE)
|
||||
.monospace(),
|
||||
);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
fn draw_hotkeys_search(&mut self, ui: &mut Ui) {
|
||||
ui.horizontal(|ui| {
|
||||
ui.menu_button(
|
||||
format!(
|
||||
"{} {}",
|
||||
ICON_ADD.codepoint,
|
||||
t!("gui.hotkeys.add_command_select")
|
||||
),
|
||||
|ui| {
|
||||
let mut selected_cmd = None;
|
||||
if ui.button(t!("gui.hotkeys.toggle_pause_command")).clicked() {
|
||||
selected_cmd = Some(("cmd_toggle_pause", Request::toggle_pause(None)));
|
||||
}
|
||||
if ui.button(t!("gui.hotkeys.stop_playback_command")).clicked() {
|
||||
selected_cmd = Some(("cmd_stop", Request::stop(None)));
|
||||
}
|
||||
if ui
|
||||
.button(t!("gui.hotkeys.pause_playback_command"))
|
||||
.clicked()
|
||||
{
|
||||
selected_cmd = Some(("cmd_pause", Request::pause(None)));
|
||||
}
|
||||
if ui
|
||||
.button(t!("gui.hotkeys.resume_playback_command"))
|
||||
.clicked()
|
||||
{
|
||||
selected_cmd = Some(("cmd_resume", Request::resume(None)));
|
||||
}
|
||||
if ui.button(t!("gui.hotkeys.toggle_loop_command")).clicked() {
|
||||
selected_cmd = Some(("cmd_toggle_loop", Request::toggle_loop(None)));
|
||||
}
|
||||
|
||||
if let Some((slot_name, req)) = selected_cmd {
|
||||
make_request_async(Request::set_hotkey_action(slot_name, &req));
|
||||
self.app_state
|
||||
.hotkey_config
|
||||
.set_slot(slot_name.to_string(), req);
|
||||
self.app_state.assigning_hotkey_slot = Some(slot_name.to_string());
|
||||
self.app_state.hotkey_capture_active = true;
|
||||
ui.close();
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
ui.add_space(10.0);
|
||||
|
||||
ui.add(
|
||||
TextEdit::singleline(&mut self.app_state.hotkey_search_query)
|
||||
.hint_text(t!("gui.hotkeys.search_placeholder"))
|
||||
.desired_width(f32::INFINITY),
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
fn draw_hotkeys_table(&mut self, ui: &mut Ui) -> Option<HotkeyAction> {
|
||||
let conflicts = self.app_state.hotkey_config.find_conflicts();
|
||||
let conflict_slots: std::collections::HashSet<&str> =
|
||||
conflicts.into_iter().flat_map(|(a, b)| [a, b]).collect();
|
||||
|
||||
let search = self.app_state.hotkey_search_query.to_lowercase();
|
||||
let mut action: Option<HotkeyAction> = None;
|
||||
|
||||
let slots: Vec<_> = self
|
||||
.app_state
|
||||
.hotkey_config
|
||||
.slots
|
||||
.iter()
|
||||
.filter(|s| {
|
||||
if search.is_empty() {
|
||||
return true;
|
||||
}
|
||||
s.slot.to_lowercase().contains(&search)
|
||||
|| format!("{:?}", s.action).to_lowercase().contains(&search)
|
||||
|| s.key_chord
|
||||
.as_deref()
|
||||
.unwrap_or("")
|
||||
.to_lowercase()
|
||||
.contains(&search)
|
||||
})
|
||||
.collect();
|
||||
|
||||
let available_width = ui.available_width();
|
||||
let col_width = (available_width / 4.0).max(80.0);
|
||||
|
||||
TableBuilder::new(ui)
|
||||
.striped(true)
|
||||
.column(Column::exact(col_width).clip(true)) // Slot
|
||||
.column(Column::exact(col_width).clip(true)) // Sound / Action name
|
||||
.column(Column::exact(col_width).clip(true)) // Key Chord
|
||||
.column(Column::exact(col_width).clip(true)) // Actions
|
||||
.header(30.0, |mut header| {
|
||||
header.col(|ui| {
|
||||
ui.label(
|
||||
RichText::new(t!("gui.hotkeys.column_slot"))
|
||||
.strong()
|
||||
.monospace(),
|
||||
);
|
||||
});
|
||||
header.col(|ui| {
|
||||
ui.label(
|
||||
RichText::new(t!("gui.hotkeys.column_sound"))
|
||||
.strong()
|
||||
.monospace(),
|
||||
);
|
||||
});
|
||||
header.col(|ui| {
|
||||
ui.label(
|
||||
RichText::new(t!("gui.hotkeys.column_key_chord"))
|
||||
.strong()
|
||||
.monospace(),
|
||||
);
|
||||
});
|
||||
header.col(|ui| {
|
||||
ui.label(
|
||||
RichText::new(t!("gui.hotkeys.column_actions"))
|
||||
.strong()
|
||||
.monospace(),
|
||||
);
|
||||
});
|
||||
})
|
||||
.body(|mut body| {
|
||||
if slots.is_empty() {
|
||||
body.row(30.0, |mut row| {
|
||||
row.col(|_| {});
|
||||
row.col(|ui| {
|
||||
ui.label(RichText::new(t!("gui.hotkeys.no_hotkeys_configured")));
|
||||
});
|
||||
row.col(|_| {});
|
||||
row.col(|_| {});
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
for slot in &slots {
|
||||
body.row(30.0, |mut row| {
|
||||
// Column 1: Slot
|
||||
row.col(|ui| {
|
||||
ui.horizontal(|ui| {
|
||||
if conflict_slots.contains(slot.slot.as_str()) {
|
||||
ui.label(
|
||||
RichText::new(ICON_WARNING.codepoint)
|
||||
.color(Color32::from_rgb(255, 165, 0)),
|
||||
)
|
||||
.on_hover_text("Key chord conflict");
|
||||
}
|
||||
ui.add(
|
||||
Label::new(RichText::new(&slot.slot).monospace()).truncate(),
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
// Column 2: Sound / Action name
|
||||
row.col(|ui| {
|
||||
let action_name = match slot.action.name.as_str() {
|
||||
"play" => {
|
||||
if let Some(file_path_str) = slot.action.args.get("file_path") {
|
||||
Path::new(file_path_str)
|
||||
.file_name()
|
||||
.unwrap_or_default()
|
||||
.to_string_lossy()
|
||||
.to_string()
|
||||
} else {
|
||||
"Play".to_string()
|
||||
}
|
||||
}
|
||||
"toggle_pause" => "Toggle Pause".to_string(),
|
||||
"pause" => "Pause Playback".to_string(),
|
||||
"resume" => "Resume Playback".to_string(),
|
||||
"stop" => "Stop Playback".to_string(),
|
||||
"toggle_loop" => "Toggle Loop".to_string(),
|
||||
other => other.to_string(),
|
||||
};
|
||||
ui.add(Label::new(RichText::new(action_name).monospace()).truncate());
|
||||
});
|
||||
|
||||
// Column 3: Key Chord
|
||||
row.col(|ui| {
|
||||
let chord_text = slot.key_chord.as_deref().unwrap_or("(none)");
|
||||
ui.add(
|
||||
Label::new(RichText::new(chord_text).monospace().color(
|
||||
if slot.key_chord.is_some() {
|
||||
Color32::from_rgb(100, 200, 100)
|
||||
} else {
|
||||
Color32::GRAY
|
||||
},
|
||||
))
|
||||
.truncate(),
|
||||
);
|
||||
});
|
||||
|
||||
// Column 4: Actions
|
||||
row.col(|ui| {
|
||||
ui.horizontal(|ui| {
|
||||
if ui
|
||||
.add(Button::new(ICON_DELETE).frame(false))
|
||||
.on_hover_text("Remove slot")
|
||||
.clicked()
|
||||
{
|
||||
action = Some(HotkeyAction::Remove(slot.slot.clone()));
|
||||
}
|
||||
if ui
|
||||
.add(Button::new(ICON_KEYBOARD).frame(false))
|
||||
.on_hover_text("Set key chord")
|
||||
.clicked()
|
||||
{
|
||||
action = Some(HotkeyAction::Capture(slot.slot.clone()));
|
||||
}
|
||||
if slot.key_chord.is_some()
|
||||
&& ui
|
||||
.add(Button::new(ICON_BACKSPACE).frame(false))
|
||||
.on_hover_text("Clear key chord")
|
||||
.clicked()
|
||||
{
|
||||
action = Some(HotkeyAction::ClearChord(slot.slot.clone()));
|
||||
}
|
||||
if ui
|
||||
.add(Button::new(ICON_PLAY_ARROW).frame(false))
|
||||
.on_hover_text("Play")
|
||||
.clicked()
|
||||
{
|
||||
action = Some(HotkeyAction::Play(slot.slot.clone()));
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
action
|
||||
}
|
||||
|
||||
fn handle_hotkey_action(&mut self, action: HotkeyAction) {
|
||||
match action {
|
||||
HotkeyAction::Remove(slot) => {
|
||||
make_request_async(Request::clear_hotkey(&slot));
|
||||
self.app_state.hotkey_config.remove_slot(&slot);
|
||||
}
|
||||
HotkeyAction::Capture(slot) => {
|
||||
self.app_state.assigning_hotkey_slot = Some(slot);
|
||||
self.app_state.hotkey_capture_active = true;
|
||||
}
|
||||
HotkeyAction::ClearChord(slot) => {
|
||||
make_request_async(Request::clear_hotkey_key(&slot));
|
||||
self.app_state.hotkey_config.set_key_chord(&slot, None);
|
||||
}
|
||||
HotkeyAction::Play(slot) => {
|
||||
self.play_hotkey_slot(&slot);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
use crate::gui::SoundpadGui;
|
||||
use egui::Ui;
|
||||
use egui_material_icons::icons::*;
|
||||
|
||||
mod body;
|
||||
mod footer;
|
||||
mod header;
|
||||
mod hotkey_capture;
|
||||
mod hotkeys;
|
||||
mod settings;
|
||||
mod waiting_for_daemon;
|
||||
|
||||
impl SoundpadGui {
|
||||
pub(crate) fn get_volume_icon(volume: f32) -> &'static str {
|
||||
if volume > 0.7 {
|
||||
ICON_VOLUME_UP.codepoint
|
||||
} else if volume <= 0.0 {
|
||||
ICON_VOLUME_OFF.codepoint
|
||||
} else if volume < 0.3 {
|
||||
ICON_VOLUME_MUTE.codepoint
|
||||
} else {
|
||||
ICON_VOLUME_DOWN.codepoint
|
||||
}
|
||||
}
|
||||
|
||||
pub fn draw(&mut self, ui: &mut Ui) {
|
||||
self.draw_header(ui);
|
||||
self.draw_body(ui);
|
||||
ui.separator();
|
||||
self.draw_footer(ui);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,99 @@
|
||||
use crate::gui::SoundpadGui;
|
||||
use egui::{Align, Button, Color32, ComboBox, Layout, RichText, Ui};
|
||||
use egui_material_icons::icons::ICON_ARROW_BACK;
|
||||
use pwsp_lib::types::config::PreferredTheme;
|
||||
use rust_i18n::t;
|
||||
|
||||
impl SoundpadGui {
|
||||
pub fn draw_settings(&mut self, ui: &mut Ui) {
|
||||
ui.vertical(|ui| {
|
||||
ui.spacing_mut().item_spacing.y = 5.0;
|
||||
// --------- Back Button and Title ----------
|
||||
ui.horizontal_top(|ui| {
|
||||
let back_button = Button::new(ICON_ARROW_BACK).frame(false);
|
||||
let back_button_response = ui.add(back_button);
|
||||
if back_button_response.clicked() {
|
||||
self.app_state.show_settings = false;
|
||||
}
|
||||
|
||||
ui.add_space(ui.available_width() / 2.0 - 40.0);
|
||||
|
||||
ui.label(
|
||||
RichText::new(t!("gui.settings.header"))
|
||||
.color(Color32::WHITE)
|
||||
.monospace(),
|
||||
);
|
||||
});
|
||||
// --------------------------------
|
||||
|
||||
ui.separator();
|
||||
ui.add_space(20.0);
|
||||
|
||||
// --------- Checkboxes ----------
|
||||
let save_volume_response = ui.checkbox(
|
||||
&mut self.config.save_volume,
|
||||
t!("gui.settings.remember_volume"),
|
||||
);
|
||||
let save_input_response =
|
||||
ui.checkbox(&mut self.config.save_input, t!("gui.settings.remember_mic"));
|
||||
let save_scale_response = ui.checkbox(
|
||||
&mut self.config.save_scale_factor,
|
||||
t!("gui.settings.remember_ui_scale"),
|
||||
);
|
||||
let pause_on_exit_response = ui.checkbox(
|
||||
&mut self.config.pause_on_exit,
|
||||
t!("gui.settings.pause_on_window_close"),
|
||||
);
|
||||
|
||||
if save_volume_response.changed()
|
||||
|| save_input_response.changed()
|
||||
|| save_scale_response.changed()
|
||||
|| pause_on_exit_response.changed()
|
||||
{
|
||||
self.config.save_to_file().ok();
|
||||
}
|
||||
// --------------------------------
|
||||
|
||||
ui.separator();
|
||||
|
||||
// ---------- Selectors -----------
|
||||
let mut selected_theme = self.config.preferred_theme.clone();
|
||||
ComboBox::from_label(t!("gui.settings.theme.label"))
|
||||
.selected_text(match self.config.preferred_theme {
|
||||
PreferredTheme::System => t!("gui.settings.theme.system"),
|
||||
PreferredTheme::Light => t!("gui.settings.theme.light"),
|
||||
PreferredTheme::Dark => t!("gui.settings.theme.dark"),
|
||||
})
|
||||
.show_ui(ui, |ui| {
|
||||
ui.selectable_value(
|
||||
&mut selected_theme,
|
||||
PreferredTheme::System,
|
||||
t!("gui.settings.theme.system"),
|
||||
);
|
||||
ui.selectable_value(
|
||||
&mut selected_theme,
|
||||
PreferredTheme::Light,
|
||||
t!("gui.settings.theme.light"),
|
||||
);
|
||||
ui.selectable_value(
|
||||
&mut selected_theme,
|
||||
PreferredTheme::Dark,
|
||||
t!("gui.settings.theme.dark"),
|
||||
);
|
||||
});
|
||||
|
||||
if selected_theme != self.config.preferred_theme {
|
||||
self.config.preferred_theme = selected_theme;
|
||||
self.config.save_to_file().ok();
|
||||
}
|
||||
// --------------------------------
|
||||
|
||||
ui.with_layout(Layout::bottom_up(Align::Min), |ui| {
|
||||
ui.label(t!(
|
||||
"gui.settings.version",
|
||||
version = env!("CARGO_PKG_VERSION")
|
||||
));
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
use crate::gui::SoundpadGui;
|
||||
use egui::{RichText, Ui};
|
||||
|
||||
impl SoundpadGui {
|
||||
pub fn draw_waiting_for_daemon(&mut self, ui: &mut Ui) {
|
||||
ui.centered_and_justified(|ui| {
|
||||
ui.label(
|
||||
RichText::new("Waiting for PWSP daemon to start...")
|
||||
.size(34.0)
|
||||
.monospace(),
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
mod gui;
|
||||
|
||||
use anyhow::{Context, Result};
|
||||
use pwsp_lib::utils::gui::ensure_pwsp_audio_dir;
|
||||
use rust_i18n::i18n;
|
||||
use std::{env, path::PathBuf};
|
||||
|
||||
i18n!("locales", fallback = "en");
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> Result<()> {
|
||||
let locale = sys_locale::get_locale().unwrap_or(String::from("en-US"));
|
||||
rust_i18n::set_locale(&locale);
|
||||
|
||||
let args = env::args().skip(1).collect::<Vec<String>>();
|
||||
|
||||
if let Some(uri) = args.first() {
|
||||
match download_audio_from_url(uri).await {
|
||||
Ok(path) => println!("Successfully downloaded to: {:?}", path),
|
||||
Err(e) => eprintln!("Error downloading file: {}", e),
|
||||
}
|
||||
} else {
|
||||
gui::run().await?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn download_audio_from_url(uri: &str) -> Result<PathBuf> {
|
||||
let prefix = "soundpad://sound/url/";
|
||||
|
||||
let target_url = uri
|
||||
.strip_prefix(prefix)
|
||||
.ok_or_else(|| anyhow::anyhow!("URI does not containt an expected prefix: {}", prefix))?;
|
||||
|
||||
let file_name_encoded = target_url
|
||||
.split('/')
|
||||
.next_back()
|
||||
.unwrap_or("downloaded_audio.mp3");
|
||||
|
||||
let file_name = percent_encoding::percent_decode_str(file_name_encoded)
|
||||
.decode_utf8()
|
||||
.unwrap_or_else(|_| file_name_encoded.into())
|
||||
.into_owned();
|
||||
|
||||
let save_path = ensure_pwsp_audio_dir().join(file_name);
|
||||
|
||||
let response = reqwest::get(target_url)
|
||||
.await?
|
||||
.error_for_status()
|
||||
.context("Failed to fetch file")?;
|
||||
|
||||
let bytes = response.bytes().await?;
|
||||
|
||||
tokio::fs::write(&save_path, bytes)
|
||||
.await
|
||||
.context("Failed to save file to disk")?;
|
||||
|
||||
Ok(save_path)
|
||||
}
|
||||
Reference in New Issue
Block a user