diff --git a/.github/workflows/artcraft-linux-publish.yml b/.github/workflows/artcraft-linux-publish.yml
index f448cf569f..f72a6b7448 100644
--- a/.github/workflows/artcraft-linux-publish.yml
+++ b/.github/workflows/artcraft-linux-publish.yml
@@ -13,7 +13,11 @@ jobs:
runs-on: ubuntu-22.04
timeout-minutes: 10
steps:
- - uses: actions/checkout@v4
+ - name: Harden runner
+ uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
+ with:
+ egress-policy: audit
+ - uses: actions/checkout@v7
- uses: storytold/craft-common-actions/actions/install-apt-packages@main
with:
packages: rpm jq binutils zsync
@@ -34,7 +38,11 @@ jobs:
TAURI_FRONTEND_PATH: ${{ github.workspace }}/frontend
TAURI_APP_PATH: ${{ github.workspace }}/crates/desktop/artcraft
steps:
- - uses: actions/checkout@v4
+ - name: Harden runner
+ uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
+ with:
+ egress-policy: audit
+ - uses: actions/checkout@v7
- uses: storytold/craft-common-actions/actions/install-apt-packages@main
with:
packages: libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libssl-dev libclang-dev libasound2-dev libxdo-dev libdbus-1-dev build-essential clang file jq perl cmake nasm rpm zsync gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-libav
@@ -63,16 +71,16 @@ jobs:
PKG_CONFIG_LIBDIR_riscv64gc_unknown_linux_gnu=/usr/lib/riscv64-linux-gnu/pkgconfig:/usr/share/pkgconfig
ENV
echo "CMAKE_TOOLCHAIN_FILE_riscv64gc_unknown_linux_gnu=$GITHUB_WORKSPACE/packaging/linux/riscv64.cmake" >> "$GITHUB_ENV"
- - uses: actions/setup-node@v4
+ - uses: actions/setup-node@v7
with:
node-version: '22'
cache: npm
cache-dependency-path: frontend/package-lock.json
- - uses: dtolnay/rust-toolchain@683b588c487a69d01f6c6ddf40f036ff682cc2c8 # v1
+ - uses: step-security/dtolnay-rust-toolchain@8dd607977d06adf4ed49b190381e74c17a9dd25f # v1.0.0
with:
toolchain: stable
targets: ${{ matrix.target }}
- - uses: Swatinem/rust-cache@d1527c8f67ef9af357290475d4af4b0fab8f12e0 # v2.9.3
+ - uses: step-security/rust-cache@8871c8ba063416da7c32246932ea6ae08700453e # v2.9.2
with:
key: tauri-linux-${{ matrix.arch }}
cache-on-failure: true
@@ -80,7 +88,7 @@ jobs:
working-directory: frontend
- run: ./node_modules/.bin/nx run artcraft:build
working-directory: frontend
- - uses: tauri-apps/tauri-action@fce9c6108b31ea247710505d3aaaa893ee6768d4 # v0
+ - uses: step-security/tauri-action@dc662d498edbd35ec8ed564b45d44e955444d1bc # v1.0.0
with:
projectPath: crates/desktop/artcraft
args: --target ${{ matrix.target }} --bundles ${{ matrix.bundles }} --config ${{ github.workspace }}/packaging/linux/tauri.conf.json
@@ -89,7 +97,7 @@ jobs:
ARCH: ${{ matrix.arch }}
TARGET: ${{ matrix.target }}
run: packaging/linux/package.sh "$ARCH" "$TARGET"
- - uses: actions/upload-artifact@v4
+ - uses: actions/upload-artifact@v7
with:
name: release-linux-${{ matrix.arch }}
path: dist/release/*
@@ -102,8 +110,12 @@ jobs:
matrix:
arch: [x86_64, aarch64]
steps:
- - uses: actions/checkout@v4
- - uses: actions/download-artifact@v4
+ - name: Harden runner
+ uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
+ with:
+ egress-policy: audit
+ - uses: actions/checkout@v7
+ - uses: actions/download-artifact@v8
with:
name: release-linux-${{ matrix.arch }}
path: dist/linux
@@ -126,7 +138,7 @@ jobs:
for package in dist/release/*.pkg.tar.zst; do
tar --zstd -xOf "$package" .PKGINFO | grep -Fx 'depend = webkit2gtk-4.1'
done
- - uses: actions/upload-artifact@v4
+ - uses: actions/upload-artifact@v7
with:
name: release-arch-${{ matrix.arch }}
path: dist/release/*.pkg.tar.zst
@@ -145,8 +157,12 @@ jobs:
- {arch: x86_64, runner: ubuntu-24.04}
- {arch: aarch64, runner: ubuntu-24.04-arm}
steps:
- - uses: actions/checkout@v4
- - uses: actions/download-artifact@v4
+ - name: Harden runner
+ uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
+ with:
+ egress-policy: audit
+ - uses: actions/checkout@v7
+ - uses: actions/download-artifact@v8
with:
name: release-linux-${{ matrix.arch }}
path: dist/linux
@@ -161,8 +177,10 @@ jobs:
- name: Build Flatpak and publish OCI
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+ DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+ DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
run: packaging/linux/flatpak.sh
- - uses: actions/upload-artifact@v4
+ - uses: actions/upload-artifact@v7
with:
name: release-flatpak-${{ matrix.arch }}
path: |
@@ -175,7 +193,11 @@ jobs:
permissions:
contents: write
steps:
- - uses: actions/checkout@v4
+ - name: Harden runner
+ uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
+ with:
+ egress-policy: audit
+ - uses: actions/checkout@v7
- name: Read version
id: version
run: echo "value=$(jq -r .version crates/desktop/artcraft/tauri.conf.json)" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/artcraft-macos-publish.yml b/.github/workflows/artcraft-macos-publish.yml
index d40cda5e61..07d2d8af04 100644
--- a/.github/workflows/artcraft-macos-publish.yml
+++ b/.github/workflows/artcraft-macos-publish.yml
@@ -10,6 +10,13 @@ on:
# This workflow creates Universal macOS builds with signing certificate support.
# On each push to the release branches it will create or update a GitHub release, build your app, and upload the artifacts to the release.
+# One release build per branch at a time. A run in progress is never cancelled, because it may
+# already have created or uploaded to the draft release. If more pushes arrive while one runs,
+# GitHub keeps only the newest as pending, so the next build is of the latest commit.
+concurrency:
+ group: macos-release-${{ github.ref }}
+ cancel-in-progress: false
+
jobs:
publish-artcraft:
permissions:
@@ -28,17 +35,24 @@ jobs:
# args: ''
runs-on: ${{ matrix.platform }}
+ # Successful builds took 10-22 min (2026-04 to 2026-11).
+ timeout-minutes: 60
steps:
- - uses: actions/checkout@v4
+ - name: Harden runner
+ uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
+ with:
+ egress-policy: audit
+ - uses: actions/checkout@v7
- name: setup node
- uses: actions/setup-node@v4
+ uses: actions/setup-node@v7
with:
node-version: lts/*
- name: install Rust stable
- uses: dtolnay/rust-toolchain@stable
+ uses: step-security/dtolnay-rust-toolchain@8dd607977d06adf4ed49b190381e74c17a9dd25f # v1.0.0
with:
+ toolchain: stable
targets: ${{ matrix.platform == 'macos-latest-xlarge' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
- name: install dependencies (ubuntu only)
@@ -63,7 +77,7 @@ jobs:
npm cache clean --force
echo "Installing all workspace dependencies..."
- npm ci
+ npm ci --ignore-scripts
echo "=== Version Information ==="
echo "Node version:"
@@ -196,9 +210,8 @@ jobs:
# Increase Node.js memory limit for the build
export NODE_OPTIONS="--max-old-space-size=8192"
- # Use npx to ensure we use the local nx version
- echo "Building with npx nx..."
- npx nx run artcraft:build
+ echo "Building with nx..."
+ ./node_modules/.bin/nx run artcraft:build
echo "Checking build output..."
# shellcheck disable=SC2012
@@ -217,7 +230,7 @@ jobs:
- name: build and publish
- uses: tauri-apps/tauri-action@v0
+ uses: step-security/tauri-action@dc662d498edbd35ec8ed564b45d44e955444d1bc # v1.0.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
APPLE_ID: ${{ secrets.APPLE_ID }}
diff --git a/.github/workflows/artcraft-windows-publish.yml b/.github/workflows/artcraft-windows-publish.yml
index fa5847e49c..56384ccdc9 100644
--- a/.github/workflows/artcraft-windows-publish.yml
+++ b/.github/workflows/artcraft-windows-publish.yml
@@ -10,6 +10,13 @@ on:
# This workflow creates Windows builds.
# On each push to the release branches it will create or update a GitHub release, build your app, and upload the artifacts to the release.
+# One release build per branch at a time. A run in progress is never cancelled, because it may
+# already have created or uploaded to the draft release. If more pushes arrive while one runs,
+# GitHub keeps only the newest as pending, so the next build is of the latest commit.
+concurrency:
+ group: windows-release-${{ github.ref }}
+ cancel-in-progress: false
+
jobs:
publish-artcraft-windows:
permissions:
@@ -23,11 +30,19 @@ jobs:
args: ''
runs-on: ${{ matrix.platform }}
+ # Successful builds took 17-36 min (2026-04 to 2026-11); one hung run used the full 6-hour default.
+ timeout-minutes: 90
steps:
- - uses: actions/checkout@v4
+ - name: Harden runner
+ uses: step-security/harden-runner@1d88384fd173af6ecb012dfd0264a306b711241a # v2.22.4
+ with:
+ egress-policy: audit
+ - uses: actions/checkout@v7
- name: install Rust stable
- uses: dtolnay/rust-toolchain@stable
+ uses: step-security/dtolnay-rust-toolchain@8dd607977d06adf4ed49b190381e74c17a9dd25f # v1.0.0
+ with:
+ toolchain: stable
- name: install wreq dependencies
run: |
@@ -39,7 +54,7 @@ jobs:
shell: cmd
- name: setup node
- uses: actions/setup-node@v4
+ uses: actions/setup-node@v7
with:
node-version: lts/*
@@ -52,7 +67,7 @@ jobs:
npm cache clean --force
echo "Installing all workspace dependencies..."
- npm ci
+ npm ci --ignore-scripts
echo "=== Version Information ==="
echo "Node version:"
@@ -92,7 +107,7 @@ jobs:
$config | ConvertTo-Json -Depth 10 | Set-Content tauri.conf.json
- name: build and publish
- uses: tauri-apps/tauri-action@v0
+ uses: step-security/tauri-action@dc662d498edbd35ec8ed564b45d44e955444d1bc # v1.0.0
env:
# NB(bt): This is needed by wreq. Hopefully it doesn't kill Tauri
RUSTFLAGS: "-C target-feature=+crt-static"
diff --git a/Cargo.lock b/Cargo.lock
index 7ccf01b298..69dc9a660c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -304,7 +304,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
dependencies = [
"anstyle",
"once_cell_polyfill",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
]
[[package]]
@@ -383,6 +383,7 @@ dependencies = [
"chrono",
"cookie_store 0.0.1",
"cookie_store_wrapper",
+ "craft-update",
"directories",
"dirs",
"discord-rich-presence",
@@ -838,6 +839,12 @@ version = "0.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+[[package]]
+name = "base64"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
+
[[package]]
name = "base64ct"
version = "1.6.0"
@@ -1424,9 +1431,9 @@ dependencies = [
[[package]]
name = "chrono"
-version = "0.4.44"
+version = "0.4.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0"
+checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
dependencies = [
"iana-time-zone",
"js-sys",
@@ -1768,6 +1775,31 @@ dependencies = [
"libc",
]
+[[package]]
+name = "craft-update"
+version = "0.1.0"
+source = "git+https://github.com/storytold/craft-libs?rev=2a24c10817173d26d0ea4689acbbade36f91b5dc#2a24c10817173d26d0ea4689acbbade36f91b5dc"
+dependencies = [
+ "chrono",
+ "dunce",
+ "flate2",
+ "getrandom 0.3.1",
+ "log",
+ "plist",
+ "rustix 1.1.5",
+ "semver",
+ "serde",
+ "serde_json",
+ "sha2 0.10.8",
+ "tar",
+ "tempfile",
+ "ureq",
+ "verifysign",
+ "winreg 0.55.0",
+ "winsafe",
+ "zip",
+]
+
[[package]]
name = "crc"
version = "3.0.1"
@@ -1785,9 +1817,9 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
[[package]]
name = "crc32fast"
-version = "1.4.2"
+version = "1.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "2b929dd2a135771f40afabd1073f85eed59c800b7c61901e5c254270497dad64"
dependencies = [
"cfg-if",
]
@@ -2092,7 +2124,7 @@ dependencies = [
"libc",
"option-ext",
"redox_users",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
]
[[package]]
@@ -2464,7 +2496,7 @@ dependencies = [
"rustc_version",
"toml 0.8.23",
"vswhom",
- "winreg",
+ "winreg 0.52.0",
]
[[package]]
@@ -2654,7 +2686,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
dependencies = [
"libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
]
[[package]]
@@ -2818,6 +2850,16 @@ dependencies = [
"walkdir",
]
+[[package]]
+name = "filetime"
+version = "0.2.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759"
+dependencies = [
+ "cfg-if",
+ "libc",
+]
+
[[package]]
name = "find-msvc-tools"
version = "0.1.9"
@@ -4724,7 +4766,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
dependencies = [
"cfg-if",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
]
[[package]]
@@ -5073,7 +5115,7 @@ dependencies = [
"png 0.18.1",
"serde",
"thiserror 2.0.18",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
]
[[package]]
@@ -7119,7 +7161,7 @@ dependencies = [
"errno",
"libc",
"linux-raw-sys 0.12.1",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
]
[[package]]
@@ -7139,6 +7181,7 @@ version = "0.23.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b"
dependencies = [
+ "log",
"once_cell",
"ring",
"rustls-pki-types",
@@ -7189,6 +7232,33 @@ dependencies = [
"zeroize",
]
+[[package]]
+name = "rustls-platform-verifier"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1167586491e2b18b8bfbb293e8180ec17c201c4f076d7cb3070ca964e7598f98"
+dependencies = [
+ "core-foundation 0.10.1",
+ "core-foundation-sys",
+ "jni 0.22.4",
+ "log",
+ "once_cell",
+ "rustls 0.23.36",
+ "rustls-native-certs",
+ "rustls-platform-verifier-android",
+ "rustls-webpki 0.103.9",
+ "security-framework 3.7.0",
+ "security-framework-sys",
+ "webpki-root-certs",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "rustls-platform-verifier-android"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f"
+
[[package]]
name = "rustls-webpki"
version = "0.101.7"
@@ -8022,6 +8092,7 @@ dependencies = [
"sqlx",
"tempfile",
"tokens",
+ "tokio",
]
[[package]]
@@ -8649,6 +8720,16 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+[[package]]
+name = "tar"
+version = "0.4.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840"
+dependencies = [
+ "filetime",
+ "libc",
+]
+
[[package]]
name = "target-lexicon"
version = "0.12.14"
@@ -9033,7 +9114,7 @@ dependencies = [
"getrandom 0.4.1",
"once_cell",
"rustix 1.1.5",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
]
[[package]]
@@ -9543,7 +9624,7 @@ dependencies = [
"png 0.18.1",
"serde",
"thiserror 2.0.18",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
]
[[package]]
@@ -9607,6 +9688,12 @@ dependencies = [
"syn 2.0.117",
]
+[[package]]
+name = "typed-path"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54ec2755506471f54baf5e4bb5499d8e510cc1caf271270e778a736bd2d7336c"
+
[[package]]
name = "typeid"
version = "1.0.2"
@@ -9636,7 +9723,7 @@ checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
dependencies = [
"memoffset",
"tempfile",
- "windows-sys 0.61.2",
+ "windows-sys 0.60.2",
]
[[package]]
@@ -9788,6 +9875,35 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+[[package]]
+name = "ureq"
+version = "3.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a7ac20be9b7726e0bbdbf974c059676d9acb1cd414961f570a4e8231cacd7fc"
+dependencies = [
+ "base64 0.23.1",
+ "flate2",
+ "log",
+ "percent-encoding",
+ "rustls 0.23.36",
+ "rustls-pki-types",
+ "rustls-platform-verifier",
+ "ureq-proto",
+ "utf8-zero",
+]
+
+[[package]]
+name = "ureq-proto"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "841583fc36089d7d59419568ae157f43a5a03a2e5a81ba87c77d1596ef46e922"
+dependencies = [
+ "base64 0.23.1",
+ "http",
+ "httparse",
+ "log",
+]
+
[[package]]
name = "url"
version = "2.5.8"
@@ -9877,6 +9993,12 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3"
+[[package]]
+name = "utf8-zero"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e"
+
[[package]]
name = "utf8_iter"
version = "1.0.4"
@@ -9992,6 +10114,16 @@ dependencies = [
"vello_common",
]
+[[package]]
+name = "verifysign"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6efd25aadc22c756a9012267fae0b130278d335d6ceb512ec02ce82029b5ca9"
+dependencies = [
+ "core-foundation 0.10.1",
+ "windows-sys 0.61.2",
+]
+
[[package]]
name = "version-compare"
version = "0.2.0"
@@ -11327,6 +11459,22 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "winreg"
+version = "0.55.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "winsafe"
+version = "0.0.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ef0ffc427f045c0cc9ebffd6f4f91153dcd2a1547b5c3c29ee3f541e16e95c6"
+
[[package]]
name = "wit-bindgen"
version = "0.51.0"
@@ -11889,6 +12037,19 @@ dependencies = [
"syn 2.0.117",
]
+[[package]]
+name = "zip"
+version = "9.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711e8c9646791c49b7eb799a19c4ae70a9b8372ddc6a1fa4778defd1e2aa5d5e"
+dependencies = [
+ "crc32fast",
+ "flate2",
+ "indexmap 2.13.0",
+ "memchr",
+ "typed-path",
+]
+
[[package]]
name = "zmij"
version = "1.0.21"
diff --git a/README.md b/README.md
index e7095a5377..da446e4916 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
+
The IDE for artists.
diff --git a/crates/api_clients/artcraft/artcraft_client/Cargo.toml b/crates/api_clients/artcraft/artcraft_client/Cargo.toml
index 6987761299..4fa416b0aa 100644
--- a/crates/api_clients/artcraft/artcraft_client/Cargo.toml
+++ b/crates/api_clients/artcraft/artcraft_client/Cargo.toml
@@ -33,6 +33,7 @@ chrono.workspace = true
cookie.workspace = true
log.workspace = true
reqwest = { workspace = true, features = ["multipart", "gzip"] }
+tokio = { workspace = true, features = ["fs"] }
url.workspace = true
# Serialization
diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs
index 9d0b0e1d59..964ec52c4a 100644
--- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs
+++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs
@@ -60,7 +60,7 @@ pub async fn legacy_upload_media_file_from_file>(
.build()
.map_err(|err| StorytellerError::Client(ClientError::from(err)))?;
- let file_bytes = std::fs::read(args.path.as_ref())
+ let file_bytes = tokio::fs::read(args.path.as_ref()).await
.map_err(|err| StorytellerError::Client(ClientError::from(err)))?;
let file_name = args.path.as_ref().file_name()
.and_then(|n| n.to_str()).unwrap_or("file").to_string();
diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs
index 70105963e9..39c9a6358f 100644
--- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs
+++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs
@@ -69,7 +69,7 @@ pub async fn upload_image_media_file_from_file_with_idempotency_token>(
let client = storyteller_client_builder(api_host)
.build()?;
- let file_bytes = std::fs::read(path.as_ref())?;
+ let file_bytes = tokio::fs::read(path.as_ref()).await?;
let file_name = path.as_ref().file_name()
.and_then(|n| n.to_str()).unwrap_or("file").to_string();
let mut form = Form::new()
diff --git a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs
index 332a5464aa..d0864b126a 100644
--- a/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs
+++ b/crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs
@@ -61,7 +61,7 @@ pub async fn upload_video_media_file_from_file>(
let client = storyteller_client_builder(args.api_host)
.build()?;
- let file_bytes = std::fs::read(args.path.as_ref())?;
+ let file_bytes = tokio::fs::read(args.path.as_ref()).await?;
let file_name = args.path.as_ref().file_name()
.and_then(|n| n.to_str()).unwrap_or("file").to_string();
let mut form = Form::new()
diff --git a/crates/api_clients/artcraft/artcraft_client/src/recipes/download_media_file.rs b/crates/api_clients/artcraft/artcraft_client/src/recipes/download_media_file.rs
index a4eb3903b6..8c42250b13 100644
--- a/crates/api_clients/artcraft/artcraft_client/src/recipes/download_media_file.rs
+++ b/crates/api_clients/artcraft/artcraft_client/src/recipes/download_media_file.rs
@@ -1,5 +1,3 @@
-use std::fs;
-use std::io::Write;
use std::path::{Path, PathBuf};
use log::{info, warn};
@@ -68,13 +66,7 @@ pub async fn download_media_file>(
let bytes = download_bytes(cdn_url).await?;
// 4. Write to disk.
- let mut file = fs::File::create(&output_path)
- .map_err(|err| StorytellerError::Client(ClientError::IoError(err)))?;
-
- file.write_all(&bytes)
- .map_err(|err| StorytellerError::Client(ClientError::IoError(err)))?;
-
- file.flush()
+ tokio::fs::write(&output_path, &bytes).await
.map_err(|err| StorytellerError::Client(ClientError::IoError(err)))?;
info!("Downloaded {} bytes to {:?}", bytes.len(), output_path);
diff --git a/crates/api_clients/artcraft/artcraft_router/Cargo.toml b/crates/api_clients/artcraft/artcraft_router/Cargo.toml
index 3fd929faee..8edabf415c 100644
--- a/crates/api_clients/artcraft/artcraft_router/Cargo.toml
+++ b/crates/api_clients/artcraft/artcraft_router/Cargo.toml
@@ -31,7 +31,7 @@ reqwest.workspace = true
serde.workspace = true
wreq.workspace = true
serde_derive.workspace = true
-tokio.workspace = true
+tokio = { workspace = true, features = ["fs"] }
uuid.workspace = true
[dev-dependencies]
diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/upload.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/upload.rs
index ae878a16a3..1900d0465b 100644
--- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/upload.rs
+++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/kinovi/upload.rs
@@ -24,7 +24,7 @@ pub(crate) async fn upload_to_kinovi_web(
.unwrap_or_else(|| "jpg".to_string());
let file_bytes = match maybe_local_path {
- Some(local_path) => match std::fs::read(local_path) {
+ Some(local_path) => match tokio::fs::read(local_path).await {
Ok(bytes) => {
info!("Reusing predownloaded file for kinovi upload: {}", source_url);
bytes
diff --git a/crates/api_clients/midjourney_client/src/credentials/credential_manager.rs b/crates/api_clients/midjourney_client/src/credentials/credential_manager.rs
index 2909961236..fb9472a468 100644
--- a/crates/api_clients/midjourney_client/src/credentials/credential_manager.rs
+++ b/crates/api_clients/midjourney_client/src/credentials/credential_manager.rs
@@ -93,7 +93,7 @@ impl MidjourneyCredentialManager {
let _guard = self.mutation.lock().await;
// Remove every format, so a later startup cannot migrate a logged-out account.
for path in self.legacy_paths.iter().chain([&self.credential_path]) {
- match std::fs::remove_file(path) {
+ match tokio::fs::remove_file(path).await {
Ok(()) => {},
Err(err) if err.kind() == std::io::ErrorKind::NotFound => {},
Err(err) => return Err(err.into()),
diff --git a/crates/api_clients/openai_sora_client/src/requests/common/task_id.rs b/crates/api_clients/openai_sora_client/src/requests/common/task_id.rs
index 131d933fe9..b1894ef8b2 100644
--- a/crates/api_clients/openai_sora_client/src/requests/common/task_id.rs
+++ b/crates/api_clients/openai_sora_client/src/requests/common/task_id.rs
@@ -21,10 +21,6 @@ impl TaskId {
pub fn as_str(&self) -> &str {
&self.0
}
-
- pub fn to_string(&self) -> String {
- self.0.to_string()
- }
}
impl Display for TaskId {
diff --git a/crates/api_clients/openai_sora_client/src/requests/deprecated/job_status/sora_job_status.rs b/crates/api_clients/openai_sora_client/src/requests/deprecated/job_status/sora_job_status.rs
index fce3287c0c..5338d98de0 100644
--- a/crates/api_clients/openai_sora_client/src/requests/deprecated/job_status/sora_job_status.rs
+++ b/crates/api_clients/openai_sora_client/src/requests/deprecated/job_status/sora_job_status.rs
@@ -11,7 +11,7 @@ use errors::AnyhowResult;
use log::{debug, error, warn};
use serde_derive::{Deserialize, Serialize};
use std::fmt::{Debug, Display};
-use std::{fs::File, io::Write, path::Path};
+use std::path::Path;
use url::Url;
use wreq::Client;
@@ -271,9 +271,7 @@ pub async fn get_image_gen_status(status_request: &StatusRequest, credentials: &
pub async fn save_generations_to_dir(generations: &[Generation], dir: &str) -> AnyhowResult<()> {
let dir = Path::new(dir);
- if !dir.exists() {
- std::fs::create_dir_all(dir)?;
- }
+ tokio::fs::create_dir_all(dir).await?;
for generation in generations {
let response = wreq::get(generation.url.clone()).send().await?;
let image_bytes = response.bytes().await?;
@@ -282,15 +280,13 @@ pub async fn save_generations_to_dir(generations: &[Generation], dir: &str) -> A
let ext = url.path().split(".").last().unwrap_or("png");
let path = Path::new(dir).join(format!("{}.{}", generation.id, ext));
- let mut file = File::create(path)?;
- file.write_all(&image_bytes)?;
+ tokio::fs::write(path, &image_bytes).await?;
let thumbnail_url = generation.encodings.thumbnail.path.clone();
let thumbnail_response = wreq::get(thumbnail_url).send().await?;
let thumbnail_bytes = thumbnail_response.bytes().await?;
let thumbnail_path = Path::new(dir).join(format!("{}_thumbnail.{}", generation.id, ext));
- let mut thumbnail_file = File::create(thumbnail_path)?;
- thumbnail_file.write_all(&thumbnail_bytes)?;
+ tokio::fs::write(thumbnail_path, &thumbnail_bytes).await?;
}
Ok(())
diff --git a/crates/api_clients/worldlabs_consumer_client/src/api/requests/google_refresh_token/google_refresh_token.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/google_refresh_token/google_refresh_token.rs
index 7db5e6b9b1..259a45d38c 100644
--- a/crates/api_clients/worldlabs_consumer_client/src/api/requests/google_refresh_token/google_refresh_token.rs
+++ b/crates/api_clients/worldlabs_consumer_client/src/api/requests/google_refresh_token/google_refresh_token.rs
@@ -141,8 +141,8 @@ mod tests {
async fn test_requests() -> AnyhowResult<()> {
setup_test_logging(LevelFilter::Debug);
- let refresh_token = "AMf-vByUgA0J9S93vULECe-sD50cbR85AFVYF60gKAmLFF1MBYwXlKRJCsv7z3oSpLtP0ApyOU5fAl52qHWM2U0yKgEu5gQ5UCUDt5SEG4UBRHWvHEmLLcu-Zl04Fq4ljocSEO3qJzuX1wyshmptZxlDPRkjdLYgyn-Kp03woI2yRPKLuQF5hQtABHabsNUh9Zhs129sgxuUlOuw4zsFI4L8UdE3bEuF3k6Mic7KlE3440YwyQ8Qtmk9zHtXIx2ob56N-1WTGSqwMUuQ1mX4OOvLve9bw2zDW3UzchomTWkh732886RPrP-DNRkPbO3FejUEMxuYQFWYX3EEeIEdfNGXFNGPL1dNniSXlSaKadpX699Ishjviv-x9o-pPQa3zoAj3NzWLyd8mn5rDBh9qAO_iDETaeo01Sjhb4mGYfAWZ-g4S6nW778";
- let refresh_token = WorldLabsRefreshToken::new(refresh_token.to_string());
+ let refresh_token = std::env::var("WORLDLABS_REFRESH_TOKEN")?;
+ let refresh_token = WorldLabsRefreshToken::new(refresh_token);
let result = google_refresh_token(GoogleRefreshTokenArgs {
refresh_token: &refresh_token,
diff --git a/crates/desktop/artcraft/Cargo.toml b/crates/desktop/artcraft/Cargo.toml
index 51ff6bcd94..74eefe4928 100644
--- a/crates/desktop/artcraft/Cargo.toml
+++ b/crates/desktop/artcraft/Cargo.toml
@@ -22,6 +22,7 @@ crate-type = ["staticlib", "cdylib", "rlib"]
tauri-build = { version = "2.6.2", features = [] }
[dependencies]
+craft-update = { git = "https://github.com/storytold/craft-libs", rev = "2a24c10817173d26d0ea4689acbbade36f91b5dc" }
toml.workspace = true
browser_emulation.workspace = true
cookie_store_wrapper = { workspace = true, features = ["wreq"] }
diff --git a/crates/desktop/artcraft/src/core/commands/mod.rs b/crates/desktop/artcraft/src/core/commands/mod.rs
index 4baa4c0584..460227085a 100644
--- a/crates/desktop/artcraft/src/core/commands/mod.rs
+++ b/crates/desktop/artcraft/src/core/commands/mod.rs
@@ -12,4 +12,5 @@ pub mod platform_info_command;
pub mod providers;
pub mod response;
pub mod task_queue;
-pub mod deprecated;
\ No newline at end of file
+pub mod deprecated;
+pub mod updates;
diff --git a/crates/desktop/artcraft/src/core/commands/updates/check_for_updates_command.rs b/crates/desktop/artcraft/src/core/commands/updates/check_for_updates_command.rs
new file mode 100644
index 0000000000..54791e3e57
--- /dev/null
+++ b/crates/desktop/artcraft/src/core/commands/updates/check_for_updates_command.rs
@@ -0,0 +1,8 @@
+use crate::updates::{UpdateInfo, Updates};
+use std::sync::Arc;
+use tauri::{AppHandle, State};
+
+#[tauri::command]
+pub async fn check_for_updates_command(app: AppHandle, updates: State<'_, Arc>) -> Result {
+ updates.inner().run("The update check stopped unexpectedly", move |state| state.check(&app)).await
+}
diff --git a/crates/desktop/artcraft/src/core/commands/updates/install_update_command.rs b/crates/desktop/artcraft/src/core/commands/updates/install_update_command.rs
new file mode 100644
index 0000000000..4346ad6769
--- /dev/null
+++ b/crates/desktop/artcraft/src/core/commands/updates/install_update_command.rs
@@ -0,0 +1,9 @@
+use crate::updates::{require_confirmation, Updates};
+use std::sync::Arc;
+use tauri::{AppHandle, State};
+
+#[tauri::command]
+pub async fn install_update_command(app: AppHandle, updates: State<'_, Arc>, confirmed: bool) -> Result<(), String> {
+ require_confirmation(confirmed)?;
+ updates.inner().run("The update installer stopped unexpectedly", move |state| state.install(&app)).await
+}
diff --git a/crates/desktop/artcraft/src/core/commands/updates/mod.rs b/crates/desktop/artcraft/src/core/commands/updates/mod.rs
new file mode 100644
index 0000000000..d11e8510a5
--- /dev/null
+++ b/crates/desktop/artcraft/src/core/commands/updates/mod.rs
@@ -0,0 +1,2 @@
+pub mod check_for_updates_command;
+pub mod install_update_command;
diff --git a/crates/desktop/artcraft/src/core/threads/third_party_task_polling_thread/handlers/fal/handle_fal_complete.rs b/crates/desktop/artcraft/src/core/threads/third_party_task_polling_thread/handlers/fal/handle_fal_complete.rs
index 620d19aec0..7a04cb89dd 100644
--- a/crates/desktop/artcraft/src/core/threads/third_party_task_polling_thread/handlers/fal/handle_fal_complete.rs
+++ b/crates/desktop/artcraft/src/core/threads/third_party_task_polling_thread/handlers/fal/handle_fal_complete.rs
@@ -31,8 +31,6 @@ use sqlite_tasks::queries::task::Task;
use sqlite_tasks::queries::update_successful_task_status_with_metadata::{
update_successful_task_status_with_metadata, UpdateSuccessfulTaskArgs,
};
-use std::fs::File;
-use std::io::Write;
use std::path::PathBuf;
use std::time::Duration;
use tauri::AppHandle;
@@ -255,8 +253,7 @@ async fn download_file(
let filename = format!("fal_{}_{}.{}", generate_random_uuid(), index, extension);
let download_path = tempdir.join(filename);
- let mut file = File::create(&download_path)?;
- file.write_all(&bytes)?;
+ tokio::fs::write(&download_path, bytes).await?;
Ok(download_path)
}
diff --git a/crates/desktop/artcraft/src/core/utils/auto_download.rs b/crates/desktop/artcraft/src/core/utils/auto_download.rs
index 3b4e2f3e31..a2e52d525a 100644
--- a/crates/desktop/artcraft/src/core/utils/auto_download.rs
+++ b/crates/desktop/artcraft/src/core/utils/auto_download.rs
@@ -94,7 +94,7 @@ async fn download_generated_results(
}
ensure!(!urls.is_empty(), "Completed task has no downloadable results");
let path = checkpoint_path(root, task);
- let mut checkpoint: AutoDownloadCheckpoint = match std::fs::read(&path) {
+ let mut checkpoint: AutoDownloadCheckpoint = match tokio::fs::read(&path).await {
Ok(bytes) => serde_json::from_slice(&bytes)?,
Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
AutoDownloadCheckpoint { download_time: Local::now(), saved: BTreeMap::new() }
diff --git a/crates/desktop/artcraft/src/core/utils/simple_http_download.rs b/crates/desktop/artcraft/src/core/utils/simple_http_download.rs
index 966b71950c..769c9f0535 100644
--- a/crates/desktop/artcraft/src/core/utils/simple_http_download.rs
+++ b/crates/desktop/artcraft/src/core/utils/simple_http_download.rs
@@ -1,8 +1,6 @@
use errors::AnyhowResult;
use reqwest::Client;
use reqwest::Url;
-use std::fs::OpenOptions;
-use std::io::Write;
use std::path::Path;
const USER_AGENT: &str = "storyteller-client/1.0";
@@ -22,13 +20,7 @@ pub async fn simple_http_download>(url: &Url, download_path: P) -
//let response : Response = reqwest::get(url).await?;
let bytes = response.bytes().await?;
- let mut file = OpenOptions::new()
- .create(true) // To create a new file
- .write(true)
- .truncate(true)
- .open(download_path)?;
-
- file.write_all(&bytes)?;
+ tokio::fs::write(download_path, bytes).await?;
Ok(())
}
diff --git a/crates/desktop/artcraft/src/lib.rs b/crates/desktop/artcraft/src/lib.rs
index 643c671371..64a3f98f22 100644
--- a/crates/desktop/artcraft/src/lib.rs
+++ b/crates/desktop/artcraft/src/lib.rs
@@ -6,6 +6,11 @@ use crate::core::commands::generate::generate_mesh_command::generate_mesh_comman
pub mod core;
pub mod services;
pub mod version;
+pub mod updates;
+
+use std::sync::Arc;
+use crate::core::commands::updates::check_for_updates_command::check_for_updates_command;
+use crate::core::commands::updates::install_update_command::install_update_command;
use tauri::Manager;
@@ -155,11 +160,20 @@ pub fn run() {
println!("Initializing backend runtime...");
let builder = tauri::Builder::default()
+ .manage(Arc::new(updates::Updates::default()))
+ .on_window_event(|window, event| {
+ if window.try_state::>().is_some_and(|updates| updates.prevents_exit()) {
+ if let tauri::WindowEvent::CloseRequested { api, .. } = event {
+ api.prevent_close();
+ }
+ }
+ })
.plugin(tauri_plugin_dialog::init())
.plugin(tauri_plugin_http::init())
.plugin(tauri_plugin_opener::init())
.plugin(tauri_plugin_upload::init())
.setup(move |app| {
+ updates::show_previous_outcome(app.handle());
// TODO(bt): This is broken on windows
// log_environment_details();
@@ -225,6 +239,8 @@ pub fn run() {
// TODO: Break this out into another module, because RustRover/IntelliJ lags with these macros.
// My first attempt at naively doing this didn't work because the macros can't find their codegen'd targets.
let builder = builder.invoke_handler(tauri::generate_handler![
+ check_for_updates_command,
+ install_update_command,
check_sora_session_command,
download_directory_reveal_command,
download_media_file_command,
@@ -290,6 +306,14 @@ pub fn run() {
worldlabs_receive_bearer_command,
]);
- builder.run(tauri::generate_context!("tauri.conf.json"))
- .expect("error while running tauri application");
+ let app = builder.build(tauri::generate_context!("tauri.conf.json"))
+ .expect("error while building tauri application");
+ app.run(|handle, event| {
+ let updates = handle.state::>();
+ match event {
+ tauri::RunEvent::ExitRequested { api, .. } if updates.prevents_exit() => api.prevent_exit(),
+ tauri::RunEvent::Exit => updates.finish(),
+ _ => {}
+ }
+ });
}
diff --git a/crates/desktop/artcraft/src/main.rs b/crates/desktop/artcraft/src/main.rs
index 50008bc51b..6b27bc958e 100644
--- a/crates/desktop/artcraft/src/main.rs
+++ b/crates/desktop/artcraft/src/main.rs
@@ -2,5 +2,10 @@
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
fn main() {
+ if let Some(result) = artcraft_app_lib::updates::finish_helper() {
+ let failed = result.is_err();
+ if let Err(error) = result { log::error!("Update failed: {error}"); }
+ std::process::exit(i32::from(failed));
+ }
artcraft_app_lib::run();
}
diff --git a/crates/desktop/artcraft/src/services/midjourney/threads/upload_midjourney_batch.rs b/crates/desktop/artcraft/src/services/midjourney/threads/upload_midjourney_batch.rs
index 8b0448e12a..9010ae09f3 100644
--- a/crates/desktop/artcraft/src/services/midjourney/threads/upload_midjourney_batch.rs
+++ b/crates/desktop/artcraft/src/services/midjourney/threads/upload_midjourney_batch.rs
@@ -119,7 +119,7 @@ pub(super) async fn upload_midjourney_batch(maybe_app_handle: Option<&AppHandle>
}
}
- if let Err(err) = std::fs::remove_file(MidjourneyUploadCheckpoint::path(app_data_root, local_task)) {
+ if let Err(err) = tokio::fs::remove_file(MidjourneyUploadCheckpoint::path(app_data_root, local_task)).await {
log::warn!("Could not remove completed Midjourney upload checkpoint: {}", err);
}
Ok(())
diff --git a/crates/desktop/artcraft/src/services/midjourney/utils/download_midjourney_image.rs b/crates/desktop/artcraft/src/services/midjourney/utils/download_midjourney_image.rs
index fb63021c15..c07ecd6963 100644
--- a/crates/desktop/artcraft/src/services/midjourney/utils/download_midjourney_image.rs
+++ b/crates/desktop/artcraft/src/services/midjourney/utils/download_midjourney_image.rs
@@ -2,8 +2,6 @@ use crate::core::state::data_dir::app_data_root::AppDataRoot;
use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
use errors::AnyhowResult;
use midjourney_client::utils::get_image_url::get_image_url;
-use std::fs::File;
-use std::io::Write;
use std::path::PathBuf;
use url::Url;
use midjourney_client::utils::image_downloader_client::ImageDownloaderClient;
@@ -28,8 +26,7 @@ pub async fn download_midjourney_image(
let download_filename = format!("{}_{}.{}", job_id, index, ext);
let download_path = tempdir.join(download_filename);
- let mut file = File::create(&download_path)?;
- file.write_all(&image_bytes)?;
+ tokio::fs::write(&download_path, &image_bytes).await?;
Ok(download_path)
}
diff --git a/crates/desktop/artcraft/src/services/sora/state/initialize_sora_jwt_bearer_token.rs b/crates/desktop/artcraft/src/services/sora/state/initialize_sora_jwt_bearer_token.rs
index 5705cb165f..62b4c3983e 100644
--- a/crates/desktop/artcraft/src/services/sora/state/initialize_sora_jwt_bearer_token.rs
+++ b/crates/desktop/artcraft/src/services/sora/state/initialize_sora_jwt_bearer_token.rs
@@ -14,7 +14,7 @@ pub async fn initialize_sora_jwt_bearer_token(app_data_root: &AppDataRoot) -> An
return Ok(()); // Bearer token already exists.
}
- let cookie = std::fs::read_to_string(app_data_root.get_sora_cookie_file_path())?
+ let cookie = tokio::fs::read_to_string(app_data_root.get_sora_cookie_file_path()).await?
.trim()
.to_string();
@@ -22,7 +22,7 @@ pub async fn initialize_sora_jwt_bearer_token(app_data_root: &AppDataRoot) -> An
let bearer = generate_bearer_jwt_with_cookie(&cookie).await?;
- std::fs::write(app_data_root.get_sora_bearer_token_file_path(), bearer)?;
+ tokio::fs::write(app_data_root.get_sora_bearer_token_file_path(), bearer).await?;
Ok(())
}
diff --git a/crates/desktop/artcraft/src/services/sora/state/read_sora_credentials_from_disk_with_upgrade.rs b/crates/desktop/artcraft/src/services/sora/state/read_sora_credentials_from_disk_with_upgrade.rs
index 7538a1a067..eae939280f 100644
--- a/crates/desktop/artcraft/src/services/sora/state/read_sora_credentials_from_disk_with_upgrade.rs
+++ b/crates/desktop/artcraft/src/services/sora/state/read_sora_credentials_from_disk_with_upgrade.rs
@@ -8,8 +8,7 @@ use openai_sora_client::creds::sora_jwt_bearer_token::SoraJwtBearerToken;
use openai_sora_client::creds::sora_sentinel::SoraSentinel;
use openai_sora_client::creds::sora_sentinel_token::SoraSentinelToken;
use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
-use std::fs::{read_to_string, OpenOptions};
-use std::io::Write;
+use tokio::fs::{read_to_string, write};
pub async fn read_sora_credentials_from_disk_with_upgrade(app_data_root: &AppDataRoot) -> AnyhowResult {
let cookie_file = app_data_root.get_sora_cookie_file_path();
@@ -21,7 +20,7 @@ pub async fn read_sora_credentials_from_disk_with_upgrade(app_data_root: &AppDat
return Err(anyhow!("Cookie file does not exist: {:?}", cookie_file));
}
- let value = read_to_string(cookie_file)?
+ let value = read_to_string(cookie_file).await?
.trim()
.to_string();
@@ -32,14 +31,14 @@ pub async fn read_sora_credentials_from_disk_with_upgrade(app_data_root: &AppDat
let mut sentinel_token = None;
if bearer_file.exists() {
- let value = read_to_string(&bearer_file)?
+ let value = read_to_string(&bearer_file).await?
.trim()
.to_string();
bearer = Some(SoraJwtBearerToken::new(value)?);
}
if legacy_sentinel_file.exists() {
- let value = read_to_string(&legacy_sentinel_file)?
+ let value = read_to_string(&legacy_sentinel_file).await?
.trim()
.to_string();
@@ -47,7 +46,7 @@ pub async fn read_sora_credentials_from_disk_with_upgrade(app_data_root: &AppDat
}
if sentinel_token_file.exists() {
- let value = read_to_string(&sentinel_token_file)?
+ let value = read_to_string(&sentinel_token_file).await?
.trim()
.to_string();
@@ -73,14 +72,7 @@ pub async fn read_sora_credentials_from_disk_with_upgrade(app_data_root: &AppDat
info!("Persisting bearer token value...");
let value = bearer.token_str();
- let mut file = OpenOptions::new()
- .create(true)
- .write(true)
- .truncate(true)
- .open(&bearer_file)?;
-
- file.write_all(value.as_bytes())?;
- file.flush()?;
+ write(&bearer_file, value.as_bytes()).await?;
}
}
@@ -89,14 +81,7 @@ pub async fn read_sora_credentials_from_disk_with_upgrade(app_data_root: &AppDat
info!("Persisting sentinel value...");
let value = sentinel.get_sentinel();
- let mut file = OpenOptions::new()
- .create(true)
- .write(true)
- .truncate(true)
- .open(&legacy_sentinel_file)?;
-
- file.write_all(value.as_bytes())?;
- file.flush()?;
+ write(&legacy_sentinel_file, value.as_bytes()).await?;
}
}
@@ -105,14 +90,7 @@ pub async fn read_sora_credentials_from_disk_with_upgrade(app_data_root: &AppDat
info!("Persisting sentinel token...");
let value = sentinel_token.to_persistent_storage_json()?;
- let mut file = OpenOptions::new()
- .create(true)
- .write(true)
- .truncate(true)
- .open(&sentinel_token_file)?;
-
- file.write_all(value.as_bytes())?;
- file.flush()?;
+ write(&sentinel_token_file, value.as_bytes()).await?;
}
}
diff --git a/crates/desktop/artcraft/src/services/sora/state/sora_credential_manager.rs b/crates/desktop/artcraft/src/services/sora/state/sora_credential_manager.rs
index e10ddcf3f6..451e2ba1dd 100644
--- a/crates/desktop/artcraft/src/services/sora/state/sora_credential_manager.rs
+++ b/crates/desktop/artcraft/src/services/sora/state/sora_credential_manager.rs
@@ -162,14 +162,7 @@ impl SoraCredentialManager {
self.holder.set_credentials(&creds)?;
- let mut file = OpenOptions::new()
- .create(true)
- .write(true)
- .truncate(true)
- .open(self.app_data_root.get_sora_legacy_sentinel_file_path())?;
-
- file.write_all(sentinel.as_bytes())?;
- file.flush()?;
+ tokio::fs::write(self.app_data_root.get_sora_legacy_sentinel_file_path(), sentinel.as_bytes()).await?;
Ok(creds)
}
diff --git a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs
index b3bf451457..932c07afe5 100644
--- a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs
+++ b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling/helpers/handle_successful_generations.rs
@@ -33,8 +33,6 @@ use sqlite_tasks::queries::task::Task;
use sqlite_tasks::queries::update_successful_task_status_with_metadata::{update_successful_task_status_with_metadata, UpdateSuccessfulTaskArgs};
use sqlite_tasks::queries::update_task_status::{update_task_status, UpdateTaskArgs};
use std::collections::{HashMap, HashSet};
-use std::fs::File;
-use std::io::Write;
use std::path::PathBuf;
use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
use artcraft_client::endpoints::media_files::get_media_file::get_media_file;
@@ -213,8 +211,7 @@ async fn download_generation_item(
info!("Writing to path: {:?}", download_path);
- let mut file = File::create(&download_path)?;
- file.write_all(&image_bytes)?;
+ tokio::fs::write(&download_path, image_bytes).await?;
Ok(download_path)
}
diff --git a/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs b/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs
index 1b52c9f615..9ddacd8b03 100644
--- a/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs
+++ b/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs
@@ -39,8 +39,6 @@ use sqlite_tasks::queries::task::Task;
use sqlite_tasks::queries::update_successful_task_status_with_metadata::{update_successful_task_status_with_metadata, UpdateSuccessfulTaskArgs};
use sqlite_tasks::queries::update_task_status::{update_task_status, UpdateTaskArgs};
use std::collections::{HashMap, HashSet};
-use std::fs::File;
-use std::io::Write;
use std::path::PathBuf;
use std::time::Duration;
use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
@@ -378,8 +376,7 @@ async fn download_spz(
info!("Writing to path: {:?}", download_path);
- let mut file = File::create(&download_path)?;
- file.write_all(&image_bytes)?;
+ tokio::fs::write(&download_path, image_bytes).await?;
Ok(download_path)
}
diff --git a/crates/desktop/artcraft/src/updates.rs b/crates/desktop/artcraft/src/updates.rs
new file mode 100644
index 0000000000..515c66728a
--- /dev/null
+++ b/crates/desktop/artcraft/src/updates.rs
@@ -0,0 +1,567 @@
+//! Manual update checks and verified installation shared with the native Craft apps.
+use craft_update::pins::{Choice, Pins};
+use craft_update::self_update::Install;
+use craft_update::{self_update, pick_asset, App, Http, Os, PackageKind, Paths, Platform, Release, Stop};
+use enums::tauri::tasks::task_status::TaskStatus;
+use serde_derive::Serialize;
+use sqlite_tasks::queries::list_tasks_for_frontend::list_tasks_for_frontend;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::{Arc, Mutex};
+use tauri::{AppHandle, Manager};
+use tauri_plugin_dialog::DialogExt;
+use crate::core::state::task_database::TaskDatabase;
+use crate::version::ARTCRAFT_VERSION;
+
+const APP: App = App { bundle_id_override: Some("ai.artcraft.app"), ..App::new("artcraft", "ArtCraft", "Create images and video", "storytold/artcraft") };
+
+#[derive(Default)]
+pub struct Updates {
+ busy: AtomicBool,
+ installing: AtomicBool,
+ maybe_release: Mutex