Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
c4d023ed43 | |||
9b86af282e | |||
2e17e0ae75 | |||
edef5cc6dc | |||
2dad0de4f1 | |||
14a65eb5bb |
22
CHANGELOG.md
22
CHANGELOG.md
@ -1,3 +1,25 @@
|
|||||||
|
## 0.19.1
|
||||||
|
|
||||||
|
- Fixed the update button enabling the package
|
||||||
|
- Fixed deep URLs with rainycolor.org
|
||||||
|
|
||||||
|
## 0.19.0
|
||||||
|
|
||||||
|
- Added diagnostic exports
|
||||||
|
|
||||||
|
## 0.18.3
|
||||||
|
|
||||||
|
- Updated Rainycolor's domain・真
|
||||||
|
|
||||||
|
## 0.18.2
|
||||||
|
|
||||||
|
- Updated Rainycolor's domain
|
||||||
|
|
||||||
|
## 0.18.1
|
||||||
|
|
||||||
|
- Keys can now be unbinded with Esc
|
||||||
|
- Fixed CHUNITHM IR behavior on actual keyboards
|
||||||
|
|
||||||
## 0.18.0
|
## 0.18.0
|
||||||
|
|
||||||
- Added new grouping options to the package list
|
- Added new grouping options to the package list
|
||||||
|
@ -9,7 +9,7 @@ This is a program that seeks to streamline game data configuration, currently su
|
|||||||
|
|
||||||
STARTLINER is four things:
|
STARTLINER is four things:
|
||||||
|
|
||||||
- a mod installer and updater, powered by [Rainycolor Watercolor](https://rainy.patafour.zip),
|
- a mod installer and updater, powered by [Rainycolor Watercolor](https://rainycolor.org),
|
||||||
- a configuration GUI for segatools,
|
- a configuration GUI for segatools,
|
||||||
- a glorified `start.bat` clicker, with automatic monitor setup and rollback,
|
- a glorified `start.bat` clicker, with automatic monitor setup and rollback,
|
||||||
- [an abstraction allowing data configuration without touching the game directory](https://gitea.tendokyu.moe/akanyan/STARTLINER/wiki/Architecture-details).
|
- [an abstraction allowing data configuration without touching the game directory](https://gitea.tendokyu.moe/akanyan/STARTLINER/wiki/Architecture-details).
|
||||||
|
@ -125,12 +125,13 @@ pub async fn kill() -> Result<(), String> {
|
|||||||
pub async fn install_package(
|
pub async fn install_package(
|
||||||
state: State<'_, tokio::sync::Mutex<AppData>>,
|
state: State<'_, tokio::sync::Mutex<AppData>>,
|
||||||
key: PkgKey,
|
key: PkgKey,
|
||||||
force: bool
|
force: bool,
|
||||||
|
enable: bool
|
||||||
) -> Result<InstallResult, String> {
|
) -> Result<InstallResult, String> {
|
||||||
log::debug!("invoke: install_package({})", key);
|
log::debug!("invoke: install_package({})", key);
|
||||||
|
|
||||||
let mut appd = state.lock().await;
|
let mut appd = state.lock().await;
|
||||||
appd.pkgs.install_package(&key, force, true)
|
appd.pkgs.install_package(&key, force, true, enable)
|
||||||
.await
|
.await
|
||||||
.map_err(|e| e.to_string())
|
.map_err(|e| e.to_string())
|
||||||
}
|
}
|
||||||
@ -480,13 +481,18 @@ pub async fn create_shortcut(_app: AppHandle, profile_meta: ProfileMeta) -> Resu
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn export_profile(state: State<'_, Mutex<AppData>>, export_keychip: bool, files: Vec<String>) -> Result<(), String> {
|
pub async fn export_profile(
|
||||||
|
state: State<'_, Mutex<AppData>>,
|
||||||
|
is_diagnostic: bool,
|
||||||
|
export_keychip: bool,
|
||||||
|
files: Vec<String>
|
||||||
|
) -> Result<(), String> {
|
||||||
log::debug!("invoke: export_profile({:?}, {:?} files)", export_keychip, files.len());
|
log::debug!("invoke: export_profile({:?}, {:?} files)", export_keychip, files.len());
|
||||||
|
|
||||||
let appd = state.lock().await;
|
let appd = state.lock().await;
|
||||||
match &appd.profile {
|
match &appd.profile {
|
||||||
Some(p) => {
|
Some(p) => {
|
||||||
p.export(export_keychip, files)
|
p.export(export_keychip, files, is_diagnostic)
|
||||||
.map_err(|e| e.to_string())?;
|
.map_err(|e| e.to_string())?;
|
||||||
}
|
}
|
||||||
None => {
|
None => {
|
||||||
|
@ -17,6 +17,12 @@ pub struct DownloadTick {
|
|||||||
ratio: f32,
|
ratio: f32,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize, Clone, Debug)]
|
||||||
|
pub struct DownloadEndPayload {
|
||||||
|
pub key: PkgKey,
|
||||||
|
pub enable: bool
|
||||||
|
}
|
||||||
|
|
||||||
impl DownloadHandler {
|
impl DownloadHandler {
|
||||||
pub fn new(app: AppHandle) -> DownloadHandler {
|
pub fn new(app: AppHandle) -> DownloadHandler {
|
||||||
DownloadHandler {
|
DownloadHandler {
|
||||||
@ -25,7 +31,7 @@ impl DownloadHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn download_zip(&mut self, zip_path: &PathBuf, pkg: &Package) -> Result<()> {
|
pub fn download_zip(&mut self, zip_path: &PathBuf, pkg: &Package, enable: bool) -> Result<()> {
|
||||||
let rmt = pkg.rmt.as_ref()
|
let rmt = pkg.rmt.as_ref()
|
||||||
.ok_or_else(|| anyhow!("Attempted to download a package without remote data"))?
|
.ok_or_else(|| anyhow!("Attempted to download a package without remote data"))?
|
||||||
.clone();
|
.clone();
|
||||||
@ -34,12 +40,18 @@ impl DownloadHandler {
|
|||||||
} else {
|
} else {
|
||||||
// TODO clear cache button should clear this
|
// TODO clear cache button should clear this
|
||||||
self.paths.insert(zip_path.clone());
|
self.paths.insert(zip_path.clone());
|
||||||
tauri::async_runtime::spawn(Self::download_zip_proc(self.app.clone(), zip_path.clone(), pkg.key(), rmt));
|
tauri::async_runtime::spawn(Self::download_zip_proc(self.app.clone(), zip_path.clone(), pkg.key(), rmt, enable));
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn download_zip_proc(app: AppHandle, zip_path: PathBuf, pkg_key: PkgKey, rmt: Remote) -> Result<()> {
|
async fn download_zip_proc(
|
||||||
|
app: AppHandle,
|
||||||
|
zip_path: PathBuf,
|
||||||
|
pkg_key: PkgKey,
|
||||||
|
rmt: Remote,
|
||||||
|
enable: bool
|
||||||
|
) -> Result<()> {
|
||||||
use futures::StreamExt;
|
use futures::StreamExt;
|
||||||
use tokio::io::AsyncWriteExt;
|
use tokio::io::AsyncWriteExt;
|
||||||
|
|
||||||
@ -66,7 +78,10 @@ impl DownloadHandler {
|
|||||||
|
|
||||||
log::debug!("downloaded to {:?}", zip_path);
|
log::debug!("downloaded to {:?}", zip_path);
|
||||||
|
|
||||||
app.emit("download-end", pkg_key)?;
|
app.emit("download-end", DownloadEndPayload {
|
||||||
|
key: pkg_key,
|
||||||
|
enable
|
||||||
|
})?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
@ -102,16 +102,23 @@ pub async fn run(_args: Vec<String>) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
app.listen("download-end", closure!(clone apph, |ev| {
|
app.listen("download-end", closure!(clone apph, |ev| {
|
||||||
let raw = ev.payload();
|
let payload = serde_json::from_str::<download_handler::DownloadEndPayload>(ev.payload());
|
||||||
log::debug!("download-end triggered: {}", raw);
|
match payload {
|
||||||
let key = PkgKey(raw[1..raw.len()-1].to_owned());
|
Ok(payload) => {
|
||||||
let apph = apph.clone();
|
log::debug!("download-end triggered: {:?}", payload);
|
||||||
tauri::async_runtime::spawn(async move {
|
let key = payload.key;
|
||||||
let mutex = apph.state::<Mutex<AppData>>();
|
let apph = apph.clone();
|
||||||
let mut appd = mutex.lock().await;
|
tauri::async_runtime::spawn(async move {
|
||||||
let res = appd.pkgs.install_package(&key, true, false).await;
|
let mutex = apph.state::<Mutex<AppData>>();
|
||||||
log::debug!("download-end install {:?}", res);
|
let mut appd = mutex.lock().await;
|
||||||
});
|
let res = appd.pkgs.install_package(&key, true, false, payload.enable).await;
|
||||||
|
log::debug!("download-end install {:?}", res);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
Err(err) => {
|
||||||
|
log::error!("invalid download payload: {err}");
|
||||||
|
}
|
||||||
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
app.listen("launch-end", closure!(clone apph, |_| {
|
app.listen("launch-end", closure!(clone apph, |_| {
|
||||||
@ -134,11 +141,13 @@ pub async fn run(_args: Vec<String>) {
|
|||||||
tauri::async_runtime::spawn(async move {
|
tauri::async_runtime::spawn(async move {
|
||||||
let mutex = apph.state::<Mutex<AppData>>();
|
let mutex = apph.state::<Mutex<AppData>>();
|
||||||
let mut appd = mutex.lock().await;
|
let mut appd = mutex.lock().await;
|
||||||
let res = appd.toggle_package(payload.pkg.clone(), ToggleAction::EnableSelf);
|
if payload.enable == true {
|
||||||
log::debug!(
|
let res = appd.toggle_package(payload.pkg.clone(), ToggleAction::EnableSelf);
|
||||||
"install-end-prelude toggle {:?}",
|
log::debug!(
|
||||||
res
|
"install-end-prelude toggle {:?}",
|
||||||
);
|
res
|
||||||
|
);
|
||||||
|
}
|
||||||
use tauri::Emitter;
|
use tauri::Emitter;
|
||||||
let res = apph.emit("install-end", payload);
|
let res = apph.emit("install-end", payload);
|
||||||
log::debug!("install-end {:?}", res);
|
log::debug!("install-end {:?}", res);
|
||||||
@ -261,7 +270,7 @@ fn deep_link(app: AppHandle, args: Vec<String>) {
|
|||||||
log::info!("deep link: {}", url);
|
log::info!("deep link: {}", url);
|
||||||
|
|
||||||
let regex = regex::Regex::new(
|
let regex = regex::Regex::new(
|
||||||
r"rainycolor://v1/install/rainy\.patafour\.zip/([^/]+)/([^/]+)/[0-9]+\.[0-9]+\.[0-9]+/"
|
r"rainycolor://v1/install/www\.rainycolor\.org/([^/]+)/([^/]+)/[0-9]+\.[0-9]+\.[0-9]+/"
|
||||||
).expect("Invalid regex");
|
).expect("Invalid regex");
|
||||||
|
|
||||||
if let Some(caps) = regex.captures(url) {
|
if let Some(caps) = regex.captures(url) {
|
||||||
@ -273,11 +282,13 @@ fn deep_link(app: AppHandle, args: Vec<String>) {
|
|||||||
let mut appd = mutex.lock().await;
|
let mut appd = mutex.lock().await;
|
||||||
if appd.pkgs.is_offline() {
|
if appd.pkgs.is_offline() {
|
||||||
log::warn!("Deep link installation failed: offline");
|
log::warn!("Deep link installation failed: offline");
|
||||||
} else if let Err(e) = appd.pkgs.install_package(&key, true, true).await {
|
} else if let Err(e) = appd.pkgs.install_package(&key, true, true, true).await {
|
||||||
log::warn!("Deep link installation failed: {}", e.to_string());
|
log::warn!("Deep link installation failed: {}", e.to_string());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
log::error!("No caps");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -117,12 +117,16 @@ impl Keyboard {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Keyboard::Chunithm(kb) => {
|
Keyboard::Chunithm(kb) => {
|
||||||
|
let mut enabled_ir = false;
|
||||||
if kb.enabled {
|
if kb.enabled {
|
||||||
for (i, cell) in kb.cell.iter().enumerate() {
|
for (i, cell) in kb.cell.iter().enumerate() {
|
||||||
ini.with_section(Some("slider")).set(format!("cell{}", i + 1), cell.to_string());
|
ini.with_section(Some("slider")).set(format!("cell{}", i + 1), cell.to_string());
|
||||||
}
|
}
|
||||||
for (i, ir) in kb.ir.iter().enumerate() {
|
for (i, ir) in kb.ir.iter().enumerate() {
|
||||||
ini.with_section(Some("ir")).set(format!("ir{}", i + 1), ir.to_string());
|
ini.with_section(Some("ir")).set(format!("ir{}", i + 1), (*ir).to_string());
|
||||||
|
if i > 0 && *ir != 0 {
|
||||||
|
enabled_ir = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
ini.with_section(Some("io3"))
|
ini.with_section(Some("io3"))
|
||||||
.set("test", kb.test.to_string())
|
.set("test", kb.test.to_string())
|
||||||
@ -140,8 +144,13 @@ impl Keyboard {
|
|||||||
.set("service", "0")
|
.set("service", "0")
|
||||||
.set("coin", "0");
|
.set("coin", "0");
|
||||||
}
|
}
|
||||||
ini.with_section(Some("io3"))
|
if enabled_ir {
|
||||||
.set("ir", "0");
|
ini.with_section(Some("io3"))
|
||||||
|
.set("ir", "0");
|
||||||
|
} else {
|
||||||
|
ini.with_section(Some("io3"))
|
||||||
|
.set("ir", kb.ir[0].to_string());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -29,6 +29,10 @@ impl PatchFileVec {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn find_patches(&self, target: impl AsRef<Path>) -> Result<Vec<Patch>> {
|
pub fn find_patches(&self, target: impl AsRef<Path>) -> Result<Vec<Patch>> {
|
||||||
|
if !target.as_ref().exists() {
|
||||||
|
log::warn!("invalid target path: {:?}", target.as_ref());
|
||||||
|
anyhow::bail!("Unable to open {:?}. Make sure the game path is correct.", target.as_ref());
|
||||||
|
}
|
||||||
let checksum = try_digest(target.as_ref())?;
|
let checksum = try_digest(target.as_ref())?;
|
||||||
|
|
||||||
let mut res_patches = Vec::new();
|
let mut res_patches = Vec::new();
|
||||||
|
@ -109,7 +109,7 @@ impl Package {
|
|||||||
loc: None,
|
loc: None,
|
||||||
rmt: Some(Remote {
|
rmt: Some(Remote {
|
||||||
package_url: p.package_url,
|
package_url: p.package_url,
|
||||||
download_url: v.download_url,
|
download_url: v.download_url.replace("https://rainy.patafour.zip/", "https://www.rainycolor.org/"),
|
||||||
icon: v.icon,
|
icon: v.icon,
|
||||||
deprecated: p.is_deprecated,
|
deprecated: p.is_deprecated,
|
||||||
nsfw: p.has_nsfw_content,
|
nsfw: p.has_nsfw_content,
|
||||||
|
@ -23,7 +23,8 @@ pub struct PackageStore {
|
|||||||
|
|
||||||
#[derive(Clone, Serialize, Deserialize, Debug)]
|
#[derive(Clone, Serialize, Deserialize, Debug)]
|
||||||
pub struct Payload {
|
pub struct Payload {
|
||||||
pub pkg: PkgKey
|
pub pkg: PkgKey,
|
||||||
|
pub enable: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Serialize, Deserialize, Debug)]
|
#[derive(Clone, Copy, Serialize, Deserialize, Debug)]
|
||||||
@ -132,7 +133,7 @@ impl PackageStore {
|
|||||||
prelude::*,
|
prelude::*,
|
||||||
};
|
};
|
||||||
|
|
||||||
let response = reqwest::get(format!("https://rainy.patafour.zip/c/{game}/api/v1/package/")).await?;
|
let response = reqwest::get(format!("https://www.rainycolor.org/c/{game}/api/v1/package/")).await?;
|
||||||
|
|
||||||
let reader = response
|
let reader = response
|
||||||
.bytes_stream()
|
.bytes_stream()
|
||||||
@ -180,7 +181,13 @@ impl PackageStore {
|
|||||||
self.offline = false;
|
self.offline = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn install_package(&mut self, key: &PkgKey, force: bool, install_deps: bool) -> Result<InstallResult> {
|
pub async fn install_package(
|
||||||
|
&mut self,
|
||||||
|
key: &PkgKey,
|
||||||
|
force: bool,
|
||||||
|
install_deps: bool,
|
||||||
|
enable: bool
|
||||||
|
) -> Result<InstallResult> {
|
||||||
log::info!("installation request: {}/{}/{}", key, force, install_deps);
|
log::info!("installation request: {}/{}/{}", key, force, install_deps);
|
||||||
|
|
||||||
let pkg = self.store.get(key)
|
let pkg = self.store.get(key)
|
||||||
@ -193,7 +200,8 @@ impl PackageStore {
|
|||||||
}
|
}
|
||||||
|
|
||||||
self.app.emit("install-start", Payload {
|
self.app.emit("install-start", Payload {
|
||||||
pkg: key.to_owned()
|
pkg: key.to_owned(),
|
||||||
|
enable
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
let rmt = pkg.rmt.as_ref()
|
let rmt = pkg.rmt.as_ref()
|
||||||
@ -203,7 +211,7 @@ impl PackageStore {
|
|||||||
let mut set = HashSet::new();
|
let mut set = HashSet::new();
|
||||||
self.resolve_deps(rmt.clone(), &mut set)?;
|
self.resolve_deps(rmt.clone(), &mut set)?;
|
||||||
for dep in set {
|
for dep in set {
|
||||||
Box::pin(self.install_package(&dep, false, false)).await?;
|
Box::pin(self.install_package(&dep, false, false, enable)).await?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -214,7 +222,7 @@ impl PackageStore {
|
|||||||
let part_path = zip_path.join(".part");
|
let part_path = zip_path.join(".part");
|
||||||
|
|
||||||
if !zip_path.exists() && !part_path.exists() {
|
if !zip_path.exists() && !part_path.exists() {
|
||||||
self.dlh.download_zip(&zip_path, &pkg)?;
|
self.dlh.download_zip(&zip_path, &pkg, enable)?;
|
||||||
log::debug!("deferring {}", key);
|
log::debug!("deferring {}", key);
|
||||||
return Ok(InstallResult::Deferred);
|
return Ok(InstallResult::Deferred);
|
||||||
}
|
}
|
||||||
@ -230,7 +238,8 @@ impl PackageStore {
|
|||||||
self.reload_package(key.to_owned()).await;
|
self.reload_package(key.to_owned()).await;
|
||||||
|
|
||||||
self.app.emit("install-end-prelude", Payload {
|
self.app.emit("install-end-prelude", Payload {
|
||||||
pkg: key.to_owned()
|
pkg: key.to_owned(),
|
||||||
|
enable
|
||||||
})?;
|
})?;
|
||||||
|
|
||||||
log::info!("installed {}", key);
|
log::info!("installed {}", key);
|
||||||
@ -252,7 +261,8 @@ impl PackageStore {
|
|||||||
|
|
||||||
if rv.is_ok() {
|
if rv.is_ok() {
|
||||||
self.app.emit("install-end-prelude", Payload {
|
self.app.emit("install-end-prelude", Payload {
|
||||||
pkg: key.to_owned()
|
pkg: key.to_owned(),
|
||||||
|
enable: false
|
||||||
})?;
|
})?;
|
||||||
log::info!("deleted {}", key);
|
log::info!("deleted {}", key);
|
||||||
}
|
}
|
||||||
|
@ -36,7 +36,7 @@ impl Profile {
|
|||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
pub fn export(&self, export_keychip: bool, extra_files: Vec<String>) -> anyhow::Result<()> {
|
pub fn export(&self, export_keychip: bool, extra_files: Vec<String>, is_diagnostic: bool) -> anyhow::Result<()> {
|
||||||
let mut prf = self.clone();
|
let mut prf = self.clone();
|
||||||
|
|
||||||
let dir = util::config_dir().join("exports");
|
let dir = util::config_dir().join("exports");
|
||||||
@ -45,7 +45,7 @@ impl Profile {
|
|||||||
std::fs::create_dir(&dir)?;
|
std::fs::create_dir(&dir)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
let path = dir.join(format!("{}-{}-template.zip", &self.meta.game, &self.meta.name));
|
let path = dir.join(format!("{}-{}-{}.zip", &self.meta.game, &self.meta.name, if is_diagnostic { "diagnostic" } else { "template" } ));
|
||||||
|
|
||||||
{
|
{
|
||||||
let sgt = &mut prf.data.sgt;
|
let sgt = &mut prf.data.sgt;
|
||||||
@ -66,7 +66,7 @@ impl Profile {
|
|||||||
if network.local_path.is_absolute() {
|
if network.local_path.is_absolute() {
|
||||||
network.local_path = PathBuf::new();
|
network.local_path = PathBuf::new();
|
||||||
}
|
}
|
||||||
if !export_keychip {
|
if !export_keychip || is_diagnostic {
|
||||||
network.keychip = String::new();
|
network.keychip = String::new();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -83,6 +83,29 @@ impl Profile {
|
|||||||
zip.write_all(&std::fs::read(self.config_dir().join(file))?)?;
|
zip.write_all(&std::fs::read(self.config_dir().join(file))?)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if is_diagnostic {
|
||||||
|
let name = "mu3.exe.log";
|
||||||
|
let path = self.data_dir().join(name);
|
||||||
|
if path.exists() {
|
||||||
|
zip.start_file(name, options)?;
|
||||||
|
zip.write_all(&std::fs::read(path)?)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
let name = "chusanApp.exe.log";
|
||||||
|
let path = self.data_dir().join(name);
|
||||||
|
if path.exists() {
|
||||||
|
zip.start_file(name, options)?;
|
||||||
|
zip.write_all(&std::fs::read(path)?)?;
|
||||||
|
}
|
||||||
|
|
||||||
|
let name = "amdaemon.exe.log";
|
||||||
|
let path = self.data_dir().join(name);
|
||||||
|
if path.exists() {
|
||||||
|
zip.start_file(name, options)?;
|
||||||
|
zip.write_all(&std::fs::read(path)?)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
zip.finish()?;
|
zip.finish()?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://schema.tauri.app/config/2",
|
"$schema": "https://schema.tauri.app/config/2",
|
||||||
"productName": "STARTLINER",
|
"productName": "STARTLINER",
|
||||||
"version": "0.18.0",
|
"version": "0.19.1",
|
||||||
"identifier": "zip.patafour.startliner",
|
"identifier": "zip.patafour.startliner",
|
||||||
"build": {
|
"build": {
|
||||||
"beforeDevCommand": "bun run dev",
|
"beforeDevCommand": "bun run dev",
|
||||||
|
@ -295,7 +295,7 @@ listen<DownloadingStatus>('download-progress', (event) => {
|
|||||||
pkg.hasAvailableUpdates
|
pkg.hasAvailableUpdates
|
||||||
"
|
"
|
||||||
icon="pi pi-download"
|
icon="pi pi-download"
|
||||||
label="UPDATE ALL"
|
:label="t('updateAll')"
|
||||||
size="small"
|
size="small"
|
||||||
class="mr-4 m-2.5"
|
class="mr-4 m-2.5"
|
||||||
@click="pkg.updateAll()"
|
@click="pkg.updateAll()"
|
||||||
|
@ -53,6 +53,6 @@ const remove = async () => {
|
|||||||
class="self-center ml-4"
|
class="self-center ml-4"
|
||||||
style="width: 2rem; height: 2rem"
|
style="width: 2rem; height: 2rem"
|
||||||
:loading="pkg?.js.downloading"
|
:loading="pkg?.js.downloading"
|
||||||
v-on:click="async () => await pkgs.install(pkg)"
|
v-on:click="async () => await pkgs.install(pkg, true)"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
@ -4,6 +4,9 @@ import InputText from 'primevue/inputtext';
|
|||||||
import { fromKeycode, toKeycode } from '../keyboard';
|
import { fromKeycode, toKeycode } from '../keyboard';
|
||||||
import { usePrfStore } from '../stores';
|
import { usePrfStore } from '../stores';
|
||||||
import { OngekiButtons } from '../types';
|
import { OngekiButtons } from '../types';
|
||||||
|
import { useI18n } from 'vue-i18n';
|
||||||
|
|
||||||
|
const { t } = useI18n();
|
||||||
|
|
||||||
const prf = usePrfStore();
|
const prf = usePrfStore();
|
||||||
|
|
||||||
@ -61,6 +64,10 @@ const handleKey = (
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (event.code === 'Escape') {
|
||||||
|
keycode = 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (index !== undefined) {
|
if (index !== undefined) {
|
||||||
data[button][index] = keycode;
|
data[button][index] = keycode;
|
||||||
} else {
|
} else {
|
||||||
@ -160,13 +167,24 @@ const fontSize = computed(() => {
|
|||||||
<InputText
|
<InputText
|
||||||
:style="{
|
:style="{
|
||||||
width: small ? '2.8rem' : '5rem',
|
width: small ? '2.8rem' : '5rem',
|
||||||
height: small ? '2.8rem' : tall ? '10rem' : '5rem',
|
height:
|
||||||
|
small && tall
|
||||||
|
? '5rem'
|
||||||
|
: small
|
||||||
|
? '2.8rem'
|
||||||
|
: tall
|
||||||
|
? '10rem'
|
||||||
|
: '5rem',
|
||||||
fontSize,
|
fontSize,
|
||||||
backgroundColor: color,
|
backgroundColor: color,
|
||||||
}"
|
}"
|
||||||
unstyled
|
unstyled
|
||||||
class="text-center buttoninputtext"
|
class="text-center buttoninputtext"
|
||||||
v-tooltip="tooltip ? `${tooltip}: ${modelValue}` : undefined"
|
v-tooltip="
|
||||||
|
tooltip
|
||||||
|
? `${tooltip}: ${modelValue} ${tooltip.startsWith('ir') ? `\n${t('cfg.keyboard.irTooltip')}` : ''}`
|
||||||
|
: undefined
|
||||||
|
"
|
||||||
@contextmenu.prevent="() => {}"
|
@contextmenu.prevent="() => {}"
|
||||||
@keydown="(ev: KeyboardEvent) => handleKey(button, ev, index)"
|
@keydown="(ev: KeyboardEvent) => handleKey(button, ev, index)"
|
||||||
@mousedown="
|
@mousedown="
|
||||||
|
@ -29,23 +29,34 @@ const files = new Set<string>();
|
|||||||
).includes('chunithm');
|
).includes('chunithm');
|
||||||
})();
|
})();
|
||||||
|
|
||||||
|
const fileList = {
|
||||||
|
ongeki: ['aime.txt', 'inohara.cfg', 'mu3.ini', 'segatools-base.ini'],
|
||||||
|
chunithm: ['aime.txt', 'saekawa.toml', 'segatools-base.ini'],
|
||||||
|
};
|
||||||
|
|
||||||
|
const diagnosticList = {
|
||||||
|
ongeki: ['mu3.ini', 'segatools-base.ini'],
|
||||||
|
chunithm: ['segatools-base.ini'],
|
||||||
|
};
|
||||||
|
|
||||||
|
const diagnostic = ref(false);
|
||||||
|
|
||||||
const exportTemplate = async () => {
|
const exportTemplate = async () => {
|
||||||
const fl = [...files.values()];
|
const fl = [...files.values()];
|
||||||
exportVisible.value = false;
|
exportVisible.value = false;
|
||||||
await invoke('export_profile', {
|
await invoke('export_profile', {
|
||||||
exportKeychip: exportKeychip.value,
|
exportKeychip: exportKeychip.value,
|
||||||
files: fl,
|
isDiagnostic: diagnostic.value,
|
||||||
|
files:
|
||||||
|
diagnostic.value === true
|
||||||
|
? diagnosticList[prf.current!.meta.game]
|
||||||
|
: fl,
|
||||||
});
|
});
|
||||||
await invoke('open_file', {
|
await invoke('open_file', {
|
||||||
path: await path.join(await general.configDir, 'exports'),
|
path: await path.join(await general.configDir, 'exports'),
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
const fileList = {
|
|
||||||
ongeki: ['aime.txt', 'inohara.cfg', 'mu3.ini', 'segatools-base.ini'],
|
|
||||||
chunithm: ['aime.txt', 'saekawa.toml', 'segatools-base.ini'],
|
|
||||||
};
|
|
||||||
|
|
||||||
const fileListCurrent: Ref<string[]> = ref([]);
|
const fileListCurrent: Ref<string[]> = ref([]);
|
||||||
|
|
||||||
const recalcFileList = async () => {
|
const recalcFileList = async () => {
|
||||||
@ -91,16 +102,36 @@ const importPick = async () => {
|
|||||||
:visible="exportVisible"
|
:visible="exportVisible"
|
||||||
:closable="false /*this shit doesn't work */"
|
:closable="false /*this shit doesn't work */"
|
||||||
:header="`${t('profile.export')} ${prf.current?.meta.name}`"
|
:header="`${t('profile.export')} ${prf.current?.meta.name}`"
|
||||||
:style="{ width: '300px', scale: client.scaleValue }"
|
:style="{ width: '330px', scale: client.scaleValue }"
|
||||||
>
|
>
|
||||||
<div class="flex flex-col gap-4">
|
<div class="flex flex-col gap-4">
|
||||||
|
<div class="flex flex-col items-center">
|
||||||
|
<SelectButton
|
||||||
|
v-model="diagnostic"
|
||||||
|
:options="[
|
||||||
|
{
|
||||||
|
title: t('profile.standardExport'),
|
||||||
|
value: false,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: t('profile.diagnostic'),
|
||||||
|
value: true,
|
||||||
|
},
|
||||||
|
]"
|
||||||
|
:allow-empty="false"
|
||||||
|
option-label="title"
|
||||||
|
option-value="value"
|
||||||
|
>
|
||||||
|
</SelectButton>
|
||||||
|
</div>
|
||||||
<div class="flex flex-row">
|
<div class="flex flex-row">
|
||||||
<div class="grow">{{ t('profile.export') }} keychip</div>
|
<div class="grow">{{ t('profile.export') }} keychip</div>
|
||||||
<ToggleSwitch v-model="exportKeychip" />
|
<ToggleSwitch :disabled="diagnostic" v-model="exportKeychip" />
|
||||||
</div>
|
</div>
|
||||||
<div class="flex flex-row" v-for="f in fileListCurrent">
|
<div class="flex flex-row" v-for="f in fileListCurrent">
|
||||||
<div class="grow">{{ t('profile.export') }} {{ f }}</div>
|
<div class="grow">{{ t('profile.export') }} {{ f }}</div>
|
||||||
<ToggleSwitch
|
<ToggleSwitch
|
||||||
|
:disabled="diagnostic"
|
||||||
:model-value="true"
|
:model-value="true"
|
||||||
@update:model-value="
|
@update:model-value="
|
||||||
(v) => {
|
(v) => {
|
||||||
|
@ -17,6 +17,7 @@ const install = async () => {
|
|||||||
await invoke('install_package', {
|
await invoke('install_package', {
|
||||||
key: pkgKey(props.pkg),
|
key: pkgKey(props.pkg),
|
||||||
force: true,
|
force: true,
|
||||||
|
enable: false,
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (props.pkg !== undefined) {
|
if (props.pkg !== undefined) {
|
||||||
|
@ -95,7 +95,7 @@ const prf = usePrfStore();
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-if="prf.current?.meta.game === 'chunithm'">
|
<div v-if="prf.current?.meta.game === 'chunithm'">
|
||||||
<div class="absolute left-1/2 top-1/5">
|
<div class="absolute left-9/17 top-1/12">
|
||||||
<div
|
<div
|
||||||
class="flex flex-row flex-nowrap gap-2 self-center w-full"
|
class="flex flex-row flex-nowrap gap-2 self-center w-full"
|
||||||
>
|
>
|
||||||
@ -108,6 +108,7 @@ const prf = usePrfStore();
|
|||||||
button="ir"
|
button="ir"
|
||||||
:index="idx - 1"
|
:index="idx - 1"
|
||||||
:tooltip="`ir${idx}`"
|
:tooltip="`ir${idx}`"
|
||||||
|
tall
|
||||||
small
|
small
|
||||||
color="rgba(0, 255, 0, 0.2)"
|
color="rgba(0, 255, 0, 0.2)"
|
||||||
/>
|
/>
|
||||||
|
@ -9,6 +9,7 @@ export default {
|
|||||||
skip: 'Skip',
|
skip: 'Skip',
|
||||||
close: 'Close',
|
close: 'Close',
|
||||||
by: 'by {namespace}',
|
by: 'by {namespace}',
|
||||||
|
updateAll: 'UPDATE ALL',
|
||||||
start: {
|
start: {
|
||||||
failed: 'Start check failed',
|
failed: 'Start check failed',
|
||||||
accept: 'Run anyway',
|
accept: 'Run anyway',
|
||||||
@ -44,8 +45,10 @@ export default {
|
|||||||
reallyDelete: 'Are you sure you want to delete {profile}?',
|
reallyDelete: 'Are you sure you want to delete {profile}?',
|
||||||
template: 'STARTLINER template',
|
template: 'STARTLINER template',
|
||||||
importTemplate: 'Import template',
|
importTemplate: 'Import template',
|
||||||
exportTemplate: 'Export template',
|
exportTemplate: 'Export profile',
|
||||||
export: 'Export',
|
export: 'Export',
|
||||||
|
standardExport: 'Template',
|
||||||
|
diagnostic: 'Diagnostic',
|
||||||
},
|
},
|
||||||
creator: {
|
creator: {
|
||||||
header: 'Package creator',
|
header: 'Package creator',
|
||||||
@ -189,6 +192,8 @@ export default {
|
|||||||
'Only applicable if the IO module is set to segatools built-in (keyboard) or a compatible third-party module (like mu3io.NET)',
|
'Only applicable if the IO module is set to segatools built-in (keyboard) or a compatible third-party module (like mu3io.NET)',
|
||||||
leverMode: 'Lever mode',
|
leverMode: 'Lever mode',
|
||||||
mouse: 'Mouse',
|
mouse: 'Mouse',
|
||||||
|
irTooltip:
|
||||||
|
'When playing on an actual keyboard, only bind ir1; leave the rest unbound',
|
||||||
},
|
},
|
||||||
wine: {
|
wine: {
|
||||||
prefix: 'Wine prefix',
|
prefix: 'Wine prefix',
|
||||||
|
@ -9,6 +9,7 @@ export default {
|
|||||||
skip: 'Pomiń',
|
skip: 'Pomiń',
|
||||||
close: 'Zamknij',
|
close: 'Zamknij',
|
||||||
by: 'od {namespace}',
|
by: 'od {namespace}',
|
||||||
|
updateAll: 'ZAKTUALIZUJ WSZYSTKO',
|
||||||
start: {
|
start: {
|
||||||
failed: 'Uruchomienie nie powiodło się',
|
failed: 'Uruchomienie nie powiodło się',
|
||||||
accept: 'Uruchom mimo to',
|
accept: 'Uruchom mimo to',
|
||||||
@ -44,8 +45,10 @@ export default {
|
|||||||
reallyDelete: 'Czy na pewno chcesz usunąć {profile}?',
|
reallyDelete: 'Czy na pewno chcesz usunąć {profile}?',
|
||||||
template: 'Szablon',
|
template: 'Szablon',
|
||||||
importTemplate: 'Importuj szablon',
|
importTemplate: 'Importuj szablon',
|
||||||
exportTemplate: 'Eksportuj szablon',
|
exportTemplate: 'Eksportuj profil',
|
||||||
export: 'Eksportuj',
|
export: 'Eksportuj',
|
||||||
|
standardExport: 'Szablon',
|
||||||
|
diagnostic: 'Diagnostyka',
|
||||||
},
|
},
|
||||||
creator: {
|
creator: {
|
||||||
header: 'Kreator pakietów',
|
header: 'Kreator pakietów',
|
||||||
@ -229,6 +232,8 @@ export default {
|
|||||||
'Dotyczy tylko wtedy, gdy moduł IO jest ustawiony na wbudowaną emulację lub zgodny moduł (np. mu3io.NET)',
|
'Dotyczy tylko wtedy, gdy moduł IO jest ustawiony na wbudowaną emulację lub zgodny moduł (np. mu3io.NET)',
|
||||||
leverMode: 'Tryb wajchy',
|
leverMode: 'Tryb wajchy',
|
||||||
mouse: 'Mysz',
|
mouse: 'Mysz',
|
||||||
|
irTooltip:
|
||||||
|
'Jeśli grasz na klawiaturze, ustaw tylko ir1; pozostałe zostaw wyłączone',
|
||||||
},
|
},
|
||||||
wine: {
|
wine: {
|
||||||
prefix: 'Wine prefix',
|
prefix: 'Wine prefix',
|
||||||
|
@ -189,7 +189,7 @@ export const usePkgStore = defineStore('pkg', {
|
|||||||
await this.reloadAll();
|
await this.reloadAll();
|
||||||
},
|
},
|
||||||
|
|
||||||
async install(pkg: Package | undefined) {
|
async install(pkg: Package | undefined, enable: boolean) {
|
||||||
if (pkg === undefined) {
|
if (pkg === undefined) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -198,6 +198,7 @@ export const usePkgStore = defineStore('pkg', {
|
|||||||
await invoke('install_package', {
|
await invoke('install_package', {
|
||||||
key: pkgKey(pkg),
|
key: pkgKey(pkg),
|
||||||
force: true,
|
force: true,
|
||||||
|
enable,
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
if (pkg !== undefined) {
|
if (pkg !== undefined) {
|
||||||
@ -211,6 +212,7 @@ export const usePkgStore = defineStore('pkg', {
|
|||||||
await invoke('install_package', {
|
await invoke('install_package', {
|
||||||
key,
|
key,
|
||||||
force: true,
|
force: true,
|
||||||
|
enable: false,
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err);
|
console.error(err);
|
||||||
@ -221,7 +223,7 @@ export const usePkgStore = defineStore('pkg', {
|
|||||||
const list = [];
|
const list = [];
|
||||||
for (const pkg of this.allLocal) {
|
for (const pkg of this.allLocal) {
|
||||||
if (pkg.rmt && pkg.rmt.version > pkg.loc!.version) {
|
if (pkg.rmt && pkg.rmt.version > pkg.loc!.version) {
|
||||||
list.push(this.install(pkg));
|
list.push(this.install(pkg, false));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
await Promise.all(list);
|
await Promise.all(list);
|
||||||
|
Reference in New Issue
Block a user