From d86618ff5208cce50528914722b1cf6ebd62ed75 Mon Sep 17 00:00:00 2001
From: PandaDEV <70103896+0PandaDEV@users.noreply.github.com>
Date: Sun, 4 Aug 2024 12:25:37 +0200
Subject: [PATCH] fixed migration system

---
 assets/styles/components/library.scss |   2 +-
 components/Titlebar.vue               |  10 +-
 src-tauri/Cargo.lock                  |   2 +
 src-tauri/Cargo.toml                  |   1 +
 src-tauri/src/db/migration.rs         | 168 +++++++++++++++++++++++---
 src-tauri/src/main.rs                 | 104 +++++-----------
 src-tauri/tauri.conf.json             |   5 +
 7 files changed, 195 insertions(+), 97 deletions(-)

diff --git a/assets/styles/components/library.scss b/assets/styles/components/library.scss
index 717d8dd..cb60904 100644
--- a/assets/styles/components/library.scss
+++ b/assets/styles/components/library.scss
@@ -106,4 +106,4 @@
     width: 32px;
     height: 32px;
   }
-}
\ No newline at end of file
+}
diff --git a/components/Titlebar.vue b/components/Titlebar.vue
index 8829650..6f2c03e 100644
--- a/components/Titlebar.vue
+++ b/components/Titlebar.vue
@@ -1,11 +1,11 @@
 <script setup>
-import { getCurrent } from "@tauri-apps/api/window";
+import { getCurrentWindow } from "@tauri-apps/api/window";
 import { platform } from '@tauri-apps/plugin-os';
 
 const isMaximized = ref(false);
 
 onMounted(async () => {
-  const currentWindow = await getCurrent();
+  const currentWindow = await getCurrentWindow();
   isMaximized.value = await currentWindow.isMaximized();
 
   if (await platform() == 'macos') {
@@ -24,14 +24,14 @@ onMounted(async () => {
   <div class="titlebar">
     <div class="drag-region" data-tauri-drag-region></div>
     <div class="window-controls" id="window-controls">
-      <button class="button minimize" @click="async () => getCurrent().minimize()">
+      <button class="button minimize" @click="async () => getCurrentWindow().minimize()">
         <img src="/minimize.svg" alt="minimize">
       </button>
-      <button class="button maximize" @click="async () => getCurrent().toggleMaximize()">
+      <button class="button maximize" @click="async () => getCurrentWindow().toggleMaximize()">
         <img v-if="!isMaximized" src="/maximize.svg" alt="maximize">
         <img v-else src="/restore.svg" alt="restore">
       </button>
-      <button class="button close" @click="() => getCurrent().close()">
+      <button class="button close" @click="() => getCurrentWindow().close()">
         <img src="/close.svg" alt="close">
       </button>
     </div>
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 0240406..ec17fb2 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -3996,6 +3996,7 @@ dependencies = [
  "indexmap 2.3.0",
  "log",
  "memchr",
+ "native-tls",
  "once_cell",
  "paste",
  "percent-encoding",
@@ -5310,6 +5311,7 @@ dependencies = [
  "reqwest",
  "serde",
  "serde_json",
+ "sqlx",
  "tauri",
  "tauri-build",
  "tauri-plugin-dialog",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index afd7336..bba31eb 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -19,6 +19,7 @@ tauri-plugin-updater = "2.0.0-rc.0"
 tauri-plugin-global-shortcut = "2.0.0-rc.0"
 tauri-plugin-sql = {version = "2.0.0-rc.0", features = ["sqlite"] }
 tauri-plugin-prevent-default = "0.3"
+sqlx = { version = "0.8", features = ["runtime-tokio", "tls-native-tls", "sqlite"] }
 serde_json = "1.0"
 serde = "1.0"
 lazy_static = "1.4"
diff --git a/src-tauri/src/db/migration.rs b/src-tauri/src/db/migration.rs
index 3572c3d..75ea55f 100644
--- a/src-tauri/src/db/migration.rs
+++ b/src-tauri/src/db/migration.rs
@@ -1,7 +1,53 @@
+use crate::utils::commands;
+use regex::Regex;
 use serde_json::Value;
+use sqlx::sqlite::SqlitePoolOptions;
 use std::fs;
-use regex::Regex;
-use crate::utils::commands;
+use std::path::PathBuf;
+use tauri_plugin_sql::{Migration, MigrationKind};
+
+pub async fn insert_data(app_data_dir: PathBuf) -> Result<(), Box<dyn std::error::Error>> {
+    std::fs::create_dir_all(&app_data_dir)?;
+
+    let db_path = app_data_dir.join("data.db");
+    let db_url = format!("sqlite:{}", db_path.to_str().unwrap());
+
+    let pool = SqlitePoolOptions::new()
+        .max_connections(5)
+        .connect(&db_url)
+        .await?;
+
+    let count: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM songs")
+        .fetch_one(&pool)
+        .await?;
+
+    if count.0 > 0 {
+        return Ok(());
+    }
+
+    let songs_sql = generate_songs_insert_sql();
+    for statement in songs_sql.split(';') {
+        if !statement.trim().is_empty() {
+            sqlx::query(statement).execute(&pool).await?;
+        }
+    }
+
+    let playlists_sql = generate_playlists_insert_sql();
+    for statement in playlists_sql.split(';') {
+        if !statement.trim().is_empty() {
+            sqlx::query(statement).execute(&pool).await?;
+        }
+    }
+
+    let settings_sql = generate_settings_insert_sql();
+    for statement in settings_sql.split(';') {
+        if !statement.trim().is_empty() {
+            sqlx::query(statement).execute(&pool).await?;
+        }
+    }
+
+    Ok(())
+}
 
 pub fn generate_songs_insert_sql() -> String {
     let path = commands::get_music_path().join("songs.json");
@@ -14,13 +60,31 @@ pub fn generate_songs_insert_sql() -> String {
     let mut inserts = Vec::new();
     if let Some(songs) = json["songs"].as_object() {
         for (id, song) in songs {
-            let title = song["title"].as_str().unwrap_or_default().replace("'", "''");
-            let artist = song["artist"].as_str().unwrap_or_default().replace("'", "''");
+            let title = song["title"]
+                .as_str()
+                .unwrap_or_default()
+                .replace("'", "''");
+            let artist = song["artist"]
+                .as_str()
+                .unwrap_or_default()
+                .replace("'", "''");
             let length = song["length"].as_i64().unwrap_or_default();
-            let cover = song["cover"].as_str().unwrap_or_default().replace("'", "''");
-            let cover = Regex::new(r"^https?://[^/]+").unwrap().replace(&cover, "").to_string();
-            let date_added = song["date_added"].as_str().unwrap_or_default().replace("'", "''");
-            let last_played = song["lastPlayed"].as_str().unwrap_or_default().replace("'", "''");
+            let cover = song["cover"]
+                .as_str()
+                .unwrap_or_default()
+                .replace("'", "''");
+            let cover = Regex::new(r"^https?://[^/]+")
+                .unwrap()
+                .replace(&cover, "")
+                .to_string();
+            let date_added = song["date_added"]
+                .as_str()
+                .unwrap_or_default()
+                .replace("'", "''");
+            let last_played = song["lastPlayed"]
+                .as_str()
+                .unwrap_or_default()
+                .replace("'", "''");
 
             inserts.push(format!(
                 "INSERT INTO songs (id, title, artist, length, cover, date_added, last_played) VALUES ('{}', '{}', '{}', {}, '{}', '{}', '{}');",
@@ -43,11 +107,27 @@ pub fn generate_playlists_insert_sql() -> String {
     let mut inserts = Vec::new();
     if let Some(playlists) = json["playlists"].as_object() {
         for (id, playlist) in playlists {
-            let name = playlist["name"].as_str().unwrap_or_default().replace("'", "''");
-            let date = playlist["date"].as_str().unwrap_or_default().replace("'", "''");
-            let cover = playlist["cover"].as_str().unwrap_or_default().replace("'", "''");
-            let song_ids = playlist["songs"].as_array()
-                .map(|songs| songs.iter().filter_map(|s| s.as_str()).collect::<Vec<_>>().join(","))
+            let name = playlist["name"]
+                .as_str()
+                .unwrap_or_default()
+                .replace("'", "''");
+            let date = playlist["date"]
+                .as_str()
+                .unwrap_or_default()
+                .replace("'", "''");
+            let cover = playlist["cover"]
+                .as_str()
+                .unwrap_or_default()
+                .replace("'", "''");
+            let song_ids = playlist["songs"]
+                .as_array()
+                .map(|songs| {
+                    songs
+                        .iter()
+                        .filter_map(|s| s.as_str())
+                        .collect::<Vec<_>>()
+                        .join(",")
+                })
                 .unwrap_or_default();
 
             inserts.push(format!(
@@ -71,7 +151,9 @@ fn load_settings_json() -> Option<Value> {
 
 pub fn generate_settings_insert_sql() -> String {
     if let Some(json) = load_settings_json() {
-        let player_settings = json["playerSettings"].as_object().expect("Expected 'playerSettings' to be an object");
+        let player_settings = json["playerSettings"]
+            .as_object()
+            .expect("Expected 'playerSettings' to be an object");
 
         let mut inserts = Vec::new();
         let mut eq_settings = serde_json::Map::new();
@@ -85,7 +167,7 @@ pub fn generate_settings_insert_sql() -> String {
                 }
             } else {
                 let value_str = match value {
-                    Value::String(s) => s.replace("'", "''"), 
+                    Value::String(s) => s.replace("'", "''"),
                     _ => value.to_string().replace("'", "''"),
                 };
                 inserts.push(format!(
@@ -96,7 +178,9 @@ pub fn generate_settings_insert_sql() -> String {
         }
 
         if !eq_settings.is_empty() {
-            let eq_json = serde_json::to_string(&eq_settings).unwrap().replace("'", "''");
+            let eq_json = serde_json::to_string(&eq_settings)
+                .unwrap()
+                .replace("'", "''");
             inserts.push(format!(
                 "INSERT INTO settings (key, value) VALUES ('eq', '{}');",
                 eq_json
@@ -108,3 +192,55 @@ pub fn generate_settings_insert_sql() -> String {
         String::new()
     }
 }
+pub fn load_migrations() -> Vec<Migration> {
+    let migration_v1 = r#"
+    CREATE TABLE IF NOT EXISTS songs (
+        id TEXT PRIMARY KEY,
+        title TEXT,
+        artist TEXT,
+        length INTEGER,
+        cover TEXT,
+        date_added TEXT,
+        last_played TEXT
+    );
+    CREATE TABLE IF NOT EXISTS playlists (
+        id TEXT PRIMARY KEY,
+        name TEXT,
+        date TEXT,
+        cover TEXT,
+        songs TEXT
+    );
+    "#;
+    let migration_v2 = r#"
+    CREATE TABLE IF NOT EXISTS settings (
+        key TEXT PRIMARY KEY,
+        value TEXT
+    );
+    "#;
+
+    let migration_v3 = r#"
+    INSERT INTO settings (key, value) VALUES ('apiURL', 'https://pipedapi.wireway.ch');
+    INSERT INTO settings (key, value) VALUES ('volume', '50');
+    "#;
+
+    vec![
+        Migration {
+            version: 1,
+            description: "create_songs_and_playlists_tables",
+            sql: migration_v1,
+            kind: MigrationKind::Up,
+        },
+        Migration {
+            version: 2,
+            description: "create_settings_table",
+            sql: migration_v2,
+            kind: MigrationKind::Up,
+        },
+        Migration {
+            version: 3,
+            description: "insert_default_apiURL",
+            sql: migration_v3,
+            kind: MigrationKind::Up,
+        },
+    ]
+}
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 0d716dc..6d8a4ec 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -3,89 +3,50 @@
     windows_subsystem = "windows"
 )]
 
-mod utils;
 mod db;
+mod utils;
 
-use tauri_plugin_sql::{Migration, MigrationKind};
 use tauri_plugin_prevent_default::Flags;
+use tauri::Manager;
 
 fn main() {
     let _ = utils::discord_rpc::connect_rpc();
 
-    let migration_v1 = r#"
-    CREATE TABLE IF NOT EXISTS songs (
-        id TEXT PRIMARY KEY,
-        title TEXT,
-        artist TEXT,
-        length INTEGER,
-        cover TEXT,
-        date_added TEXT,
-        last_played TEXT
-    );
-    CREATE TABLE IF NOT EXISTS playlists (
-        id TEXT PRIMARY KEY,
-        name TEXT,
-        date TEXT,
-        cover TEXT,
-        songs TEXT
-    );
-    "#;
-
-    let migration_v2 = r#"
-    CREATE TABLE IF NOT EXISTS settings (
-        key TEXT PRIMARY KEY,
-        value TEXT
-    );
-    "#;
-
-    let migration_v3 = r#"
-    INSERT INTO settings (key, value) VALUES ('apiURL', 'https://pipedapi.wireway.ch');
-    INSERT INTO settings (key, value) VALUES ('volume', '50');
-    "#;
-
-    let migration_v1_data = format!(
-        "{}\n{}",
-        db::migration::generate_songs_insert_sql(),
-        db::migration::generate_playlists_insert_sql()
-    );
-
-    let migration_v2_data = db::migration::generate_settings_insert_sql();
-
-    let migrations = vec![
-        Migration {
-            version: 1,
-            description: "create_songs_and_playlists_tables",
-            sql: Box::leak(format!("{}\n{}", migration_v1, migration_v1_data).into_boxed_str()),
-            kind: MigrationKind::Up,
-        },
-        Migration {
-            version: 2,
-            description: "create_settings_table",
-            sql: Box::leak(format!("{}\n{}", migration_v2, migration_v2_data).into_boxed_str()),
-            kind: MigrationKind::Up,
-        },
-        Migration {
-            version: 3,
-            description: "insert_default_apiURL",
-            sql: migration_v3,
-            kind: MigrationKind::Up,
-        },
-    ];
-
     tauri::Builder::default()
         .plugin(tauri_plugin_fs::init())
         .plugin(tauri_plugin_os::init())
         .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_updater::Builder::new().build())
-        .plugin(tauri_plugin_prevent_default::Builder::new()
-  .with_flags(Flags::all().difference(Flags::CONTEXT_MENU))
-  .build())
-        .plugin(tauri_plugin_global_shortcut::Builder::new().build())
+        .plugin(
+            tauri_plugin_prevent_default::Builder::new()
+                .with_flags(Flags::all().difference(Flags::CONTEXT_MENU))
+                .build(),
+        )
         .plugin(
             tauri_plugin_sql::Builder::default()
-                .add_migrations("sqlite:data.db", migrations)
+                .add_migrations("sqlite:data.db", db::migration::load_migrations())
                 .build(),
         )
+        .plugin(tauri_plugin_global_shortcut::Builder::new().build())
+        .setup(|app| {
+            let app_handle = app.handle();
+
+            
+            let config_path = utils::commands::get_config_path();
+            tauri::async_runtime::spawn(async move {
+                if let Err(e) = db::migration::insert_data(config_path).await {
+                    eprintln!("Error inserting data: {:?}", e);
+                }
+            });
+
+            
+            let update_handle = app_handle.clone();
+            tauri::async_runtime::spawn(async move {
+                utils::updater::check_for_updates(update_handle).await;
+            });
+
+            Ok(())
+        })
         .invoke_handler(tauri::generate_handler![
             utils::discord_rpc::update_activity,
             utils::discord_rpc::clear_activity,
@@ -93,13 +54,6 @@ fn main() {
             utils::commands::ping_urls,
             utils::commands::get_music_path
         ])
-        .setup(|app| {
-            tauri::async_runtime::block_on(async {
-                let _ = utils::updater::check_for_updates(app.handle().clone()).await;
-            });
-
-            Ok(())
-        })
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
-}
+}
\ No newline at end of file
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index a65a4e3..e3e6eed 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -47,6 +47,11 @@
       "endpoints": [
         "https://updater.vleer.app"
       ]
+    },
+    "sql": {
+      "preload": [
+        "sqlite:data.db"
+      ]
     }
   },
   "$schema": "../node_modules/@tauri-apps/cli/schema.json"