From 7742bc9361260f51e30fce79f4c44eb2e4ac6203 Mon Sep 17 00:00:00 2001
From: uku <hi@uku.moe>
Date: Mon, 19 May 2025 22:06:13 +0200
Subject: [PATCH] fix: use my own tokio

---
 Cargo.lock     |  1 +
 Cargo.toml     |  1 +
 src/ffmpeg.rs  | 12 +++++-------
 src/zipline.rs |  3 ++-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e9ccbeb..f70b89c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2406,6 +2406,7 @@ dependencies = [
  "rfd",
  "serde",
  "serde_json",
+ "tokio",
  "tokio-util",
  "toml",
  "tracing",
diff --git a/Cargo.toml b/Cargo.toml
index 8d7287a..b648ad0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,6 +13,7 @@ reqwest = { version = "0.12.15", default-features = false, features = ["http2",
 rfd = { version = "0.15.3", default-features = false, features = ["tokio", "xdg-portal"] }
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
+tokio = { version = "1.45.0", features = ["fs", "io-util", "process"] }
 tokio-util = { version = "0.7.15", features = ["io"] }
 toml = "0.8.22"
 tracing = "0.1.41"
diff --git a/src/ffmpeg.rs b/src/ffmpeg.rs
index 65f12c9..329b0e7 100644
--- a/src/ffmpeg.rs
+++ b/src/ffmpeg.rs
@@ -5,13 +5,11 @@ use std::{
 
 use color_eyre::eyre::{ContextCompat, Result, bail};
 use futures::channel::oneshot;
-use relm4::{
-    Sender,
-    tokio::{
-        self,
-        io::{AsyncBufReadExt, BufReader},
-        process::Command,
-    },
+use relm4::Sender;
+use tokio::{
+    self,
+    io::{AsyncBufReadExt, BufReader},
+    process::Command,
 };
 
 use crate::ProgressMessage;
diff --git a/src/zipline.rs b/src/zipline.rs
index fab96c9..a99d0a2 100644
--- a/src/zipline.rs
+++ b/src/zipline.rs
@@ -2,12 +2,13 @@ use std::{path::Path, sync::LazyLock};
 
 use color_eyre::eyre::{Result, bail};
 use futures::StreamExt;
-use relm4::{Sender, tokio::fs::File};
+use relm4::Sender;
 use reqwest::{
     Body, Client, StatusCode,
     header::AUTHORIZATION,
     multipart::{Form, Part},
 };
+use tokio::fs::File;
 use tokio_util::io::ReaderStream;
 
 use crate::{Config, ProgressMessage};