mirror of
https://github.com/UNITRONIX/BetterDesk.git
synced 2026-09-10 01:27:11 +00:00
UNITRONIX
b14a8cf162
Add a full automated build pipeline, interactive build scripts, documentation and development utilities. - Add GitHub Actions workflow (.github/workflows/build.yml) to build BetterDesk (hbbs/hbbr) for Linux x64, Linux ARM64 and Windows x64, upload artifacts, optionally create a release and update repository binaries. - Add interactive build scripts for Windows and Unix (build-betterdesk.ps1, build-betterdesk.sh) supporting download, patch application, cross-build and checksum generation. - Add build and status docs (docs/BUILD_GUIDE.md, docs/STATUS_TRACKING_v3.md) and update project README/instructions (.github/copilot-instructions.md) with new items and updated timestamp. - Add development utilities under dev_modules/ (multiple database/patch/test helpers) and move test_generator.py into dev_modules/test_generator.py. - Update .gitignore to exclude archive/ folder. - Modify hbbs-patch-v2 sources (database.rs, http_api.rs, main.rs, peer.rs and add rendezvous_server.rs) and remove legacy fixed files; update web UI backend and static files (web/app.py, web/static/*, web/templates/index.html). These changes set up CI/CD for multi-platform builds, provide local build tooling, expand docs for v3 status tracking and ID-change features, and add developer test/patch utilities.
110 lines
3.7 KiB
Python
110 lines
3.7 KiB
Python
#!/usr/bin/env python3
|
|
"""Fix database.rs imports and change_id function"""
|
|
|
|
with open("database.rs", "r") as f:
|
|
content = f.read()
|
|
|
|
# Fix import
|
|
old_import = '''use sqlx::Row;\\nuse sqlx::{'''
|
|
new_import = '''use sqlx::{
|
|
Row,'''
|
|
|
|
content = content.replace(old_import, new_import)
|
|
|
|
# Also fix the get call and closure
|
|
old_code = ''' let prev: Option<String> = r.get("previous_ids");
|
|
prev.and_then(|s| serde_json::from_str(&s).ok()).unwrap_or_default()'''
|
|
|
|
new_code = ''' let prev: Option<String> = r.get("previous_ids");
|
|
prev.and_then(|s| serde_json::from_str(&s).ok()).unwrap_or_default()'''
|
|
|
|
# Just rewrite the function properly
|
|
old_func = ''' /// Change device ID in database
|
|
pub async fn change_id(&self, old_id: &str, new_id: &str) -> ResultType<()> {
|
|
let old = old_id.to_string();
|
|
let new = new_id.to_string();
|
|
let url = self.url.clone();
|
|
|
|
let mut opt = SqliteConnectOptions::from_str(&url).unwrap();
|
|
opt.log_statements(log::LevelFilter::Debug);
|
|
let mut conn = SqliteConnection::connect_with(&opt).await?;
|
|
|
|
// Get current previous_ids
|
|
let row = sqlx::query("SELECT previous_ids FROM peer WHERE id = ?")
|
|
.bind(&old)
|
|
.fetch_optional(&mut conn)
|
|
.await?;
|
|
|
|
let mut prev_ids: Vec<String> = if let Some(r) = row {
|
|
let prev: Option<String> = r.get("previous_ids");
|
|
prev.and_then(|s| serde_json::from_str(&s).ok()).unwrap_or_default()
|
|
} else {
|
|
Vec::new()
|
|
};
|
|
|
|
// Add old_id to history
|
|
if !prev_ids.contains(&old) {
|
|
prev_ids.push(old.clone());
|
|
}
|
|
|
|
let prev_json = serde_json::to_string(&prev_ids).unwrap_or("[]".to_string());
|
|
|
|
// Update ID
|
|
sqlx::query("UPDATE peer SET id = ?, previous_ids = ?, id_changed_at = datetime('now') WHERE id = ?")
|
|
.bind(&new)
|
|
.bind(&prev_json)
|
|
.bind(&old)
|
|
.execute(&mut conn)
|
|
.await?;
|
|
|
|
log::info!("Database: Changed ID {} -> {}", old, new);
|
|
Ok(())
|
|
}'''
|
|
|
|
new_func = ''' /// Change device ID in database
|
|
pub async fn change_id(&self, old_id: &str, new_id: &str) -> ResultType<()> {
|
|
let old = old_id.to_string();
|
|
let new = new_id.to_string();
|
|
let url = self.url.clone();
|
|
|
|
let mut opt = SqliteConnectOptions::from_str(&url).unwrap();
|
|
opt.log_statements(log::LevelFilter::Debug);
|
|
let mut conn = SqliteConnection::connect_with(&opt).await?;
|
|
|
|
// Get current previous_ids
|
|
let row: Option<(Option<String>,)> = sqlx::query_as("SELECT previous_ids FROM peer WHERE id = ?")
|
|
.bind(&old)
|
|
.fetch_optional(&mut conn)
|
|
.await?;
|
|
|
|
let mut prev_ids: Vec<String> = match row {
|
|
Some((Some(s),)) => serde_json::from_str(&s).unwrap_or_default(),
|
|
_ => Vec::new()
|
|
};
|
|
|
|
// Add old_id to history
|
|
if !prev_ids.contains(&old) {
|
|
prev_ids.push(old.clone());
|
|
}
|
|
|
|
let prev_json = serde_json::to_string(&prev_ids).unwrap_or("[]".to_string());
|
|
|
|
// Update ID
|
|
sqlx::query("UPDATE peer SET id = ?, previous_ids = ?, id_changed_at = datetime('now') WHERE id = ?")
|
|
.bind(&new)
|
|
.bind(&prev_json)
|
|
.bind(&old)
|
|
.execute(&mut conn)
|
|
.await?;
|
|
|
|
log::info!("Database: Changed ID {} -> {}", old, new);
|
|
Ok(())
|
|
}'''
|
|
|
|
content = content.replace(old_func, new_func)
|
|
|
|
with open("database.rs", "w") as f:
|
|
f.write(content)
|
|
|
|
print("Fixed database.rs")
|