0.3.3

.github/workflows/release.yml

@@ -50,12 +50,37 @@ jobs:
       - name: Generate icons
         run: npm run gen-icons
 
+      - name: Import Apple Developer Certificate
+        env:
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        run: |
+          echo $APPLE_CERTIFICATE | base64 --decode > certificate.p12
+          security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
+          security default-keychain -s build.keychain
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
+          security set-keychain-settings -t 3600 -u build.keychain
+          security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
+          security find-identity -v -p codesigning build.keychain
+
+      - name: Verify Certificate
+        run: |
+          CERT_INFO=$(security find-identity -v -p codesigning build.keychain | grep "Apple Development")
+          CERT_ID=$(echo "$CERT_INFO" | awk -F'"' '{print $2}')
+          echo "CERT_ID=$CERT_ID" >> $GITHUB_ENV
+          echo "Certificate imported."
+
       - name: Build & publish (Tauri)
         uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
           TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          APPLE_SIGNING_IDENTITY: ${{ env.CERT_ID }}
         with:
           tagName: v__VERSION__
           releaseName: DTM v__VERSION__

README.md

@@ -1 +1,19 @@
-# DTM
+# DTM
+
+## Building
+
+To build the app on Mac, you will need to have [Node/NPM](https://nodejs.org/en/download), and [Rust](https://www.rust-lang.org/tools/install) installed, as well as the Xcode command line tools (`xcode-select --install`)
+
+```bash
+npm install
+npm run gen:icons
+
+# Build the app for current architecture
+npm run build:mac
+
+# Build for Mac Universal
+npm run build:universal
+
+# Run in dev mode
+npm run dev
+```

package.json

@@ -2,7 +2,7 @@
   "name": "dtm",
   "author": "kcjerrell",
   "private": true,
-  "version": "0.3.2",
+  "version": "0.3.3",
   "type": "module",
   "scripts": {
     "dev": "tauri dev",

src-tauri/.cargo/config.toml

@@ -0,0 +1,2 @@
+[env]
+RUST_TEST_THREADS = "1"

src-tauri/Cargo.toml

@@ -3,7 +3,7 @@ members = ["migration", "entity", ".", "fpzip-sys", "macros"]
 
 [package]
 name = "dtm"
-version = "0.3.2"
+version = "0.3.3"
 description = "A little app for reading Draw Things Metadata"
 authors = ["kcjerrell"]
 edition = "2021"
@@ -58,7 +58,6 @@ futures = "0.3.28"
 tokio = { version = "1.48.0", features = ["full"] }
 mime = "0.3.17"
 once_cell = "1.21.3"
-moka = { version = "0.12.11", features = ["future"] }
 bytes = "1.10.1"
 byteorder = "1.5.0"
 half = "2"
@@ -79,6 +78,10 @@ sevenz-rust = "0.6.1"
 sha2 = "0.10.9"
 futures-util = "0.3.31"
 regex = "1.12.2"
+walkdir = "2.5.0"
+async-trait = "0.1.89"
+notify-debouncer-mini = { version = "0.7.0", features = ["macos_fsevent"] }
+dashmap = "6.1.0"
 
 # macOS-only
 [target."cfg(target_os = \"macos\")".dependencies]
@@ -91,3 +94,6 @@ tauri-plugin-nspopover = { git = "https://github.com/freethinkel/tauri-nspopover
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 tauri-plugin-updater = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
 tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+
+[dev-dependencies]
+tempfile = "3.25.0"

src-tauri/capabilities/default.json

@@ -31,28 +31,46 @@
     "fs:allow-home-read-recursive",
     "fs:allow-watch",
     "fs:allow-unwatch",
+    {
+      "identifier": "fs:allow-watch",
+      "allow": [
+        "$HOME/**",
+        "/Volumes/**"
+      ]
+    },
     {
       "identifier": "fs:allow-exists",
       "allow": [
-        "$HOME/Library/Containers/com.liuliu.draw-things/Data/*"
+        "$HOME/**",
+        "/Volumes/**"
       ]
     },
     {
       "identifier": "fs:allow-read-dir",
       "allow": [
-        "$HOME/Library/Containers/com.liuliu.draw-things/Data/Documents/*"
+        "$HOME/**",
+        "/Volumes/**"
       ]
     },
     {
       "identifier": "fs:allow-read-file",
       "allow": [
-        "$HOME/Library/Containers/com.liuliu.draw-things/Data/Documents/*"
+        "$HOME/**",
+        "/Volumes/**"
       ]
     },
     {
       "identifier": "fs:allow-read",
       "allow": [
-        "$HOME/Library/Containers/com.liuliu.draw-things/Data/Documents/*"
+        "$HOME/**",
+        "/Volumes/**"
+      ]
+    },
+    {
+      "identifier": "fs:allow-stat",
+      "allow": [
+        "$HOME/**",
+        "/Volumes/**"
       ]
     },
     "http:default",

src-tauri/entity/Cargo.toml

@@ -10,6 +10,6 @@ path = "src/mod.rs"
 
 [dependencies]
 sea-orm = { version = "2.0.0-rc" }
-serde = "1.0.228"
+serde = { version = "1.0", features = ["derive"] }
 chrono = { version = "0.4", features = ["serde"] }
 num_enum = "0.7.5"

src-tauri/entity/src/projects.rs

@@ -4,18 +4,25 @@ use sea_orm::entity::prelude::*;
 use serde::Serialize;
 
 #[sea_orm::model]
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Serialize)]
 #[sea_orm(table_name = "projects")]
 pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i64,
     pub fingerprint: String,
-    #[sea_orm(unique)]
     pub path: String,
+    pub watchfolder_id: i64,
     pub filesize: Option<i64>,
     pub modified: Option<i64>,
-    pub missing_on: Option<i64>,
     pub excluded: bool,
+    #[sea_orm(
+        belongs_to,
+        from = "watchfolder_id",
+        to = "id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    pub watchfolder: HasOne<super::watch_folders::Entity>,
     #[sea_orm(has_many)]
     pub images: HasMany<super::images::Entity>,
 }

src-tauri/entity/src/watch_folders.rs

@@ -4,14 +4,18 @@ use sea_orm::entity::prelude::*;
 use serde::Serialize;
 
 #[sea_orm::model]
-#[derive(Clone, Debug, PartialEq, Eq, DeriveEntityModel, Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Serialize)]
 #[sea_orm(table_name = "watch_folders")]
 pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i64,
     pub path: String,
+    pub bookmark: String,
     pub recursive: Option<bool>,
-    pub last_updated: Option<i64>,
+    pub is_missing: bool,
+    pub is_locked: bool,
+    #[sea_orm(has_many)]
+    pub projects: HasMany<super::projects::Entity>,
 }
 
 impl ActiveModelBehavior for ActiveModel {}