Media metadata extraction & Thumbnailer rework

.cspell/project_words.txt

@@ -14,6 +14,7 @@ davidmytton
 deel
 elon
 encryptor
+Exif
 Flac
 graps
 haden

.github/actions/setup-rust/action.yaml

@@ -17,10 +17,9 @@ runs:
  steps:
  - name: Install Rust
  id: toolchain
- uses: dtolnay/rust-toolchain@stable
+ uses: IronCoreLabs/rust-toolchain@v1
  with:
  target: ${{ inputs.target }}
- toolchain: '1.75'
  components: clippy, rustfmt
 
  - name: Cache Rust Dependencies

.vscode/launch.json

@@ -12,8 +12,7 @@
  "args": [
  "build",
  "--manifest-path=./apps/desktop/src-tauri/Cargo.toml",
- "--no-default-features",
- "--features=ai-models"
+ "--no-default-features"
  ],
  "problemMatcher": "$rustc"
  },

.vscode/tasks.json

@@ -56,8 +56,7 @@
  "command": "run",
  "args": [
  "--manifest-path=./apps/desktop/src-tauri/Cargo.toml",
- "--no-default-features",
- "--features=ai-models"
+ "--no-default-features"
  ],
  "env": {
  "RUST_BACKTRACE": "short"

CONTRIBUTING.md

@@ -89,7 +89,7 @@ To run the landing page:
 
 If you encounter any issues, ensure that you are using the following versions of Rust, Node and Pnpm:
 
-- Rust version: **1.75**
+- Rust version: **1.77**
 - Node version: **18.18**
 - Pnpm version: **9.0.6**
 

Cargo.toml

@@ -22,25 +22,20 @@ repository = "https://github.com/spacedriveapp/spacedrive"
 [workspace.dependencies]
 # First party dependencies
 prisma-client-rust = { git = "https://github.com/spacedriveapp/prisma-client-rust", rev = "528ab1cd02c25a1b183c0a8bc44e28954fdd0bfd", features = [
- "specta",
- "sqlite-create-many",
  "migrations",
+ "specta",
  "sqlite",
+ "sqlite-create-many",
 ], default-features = false }
 prisma-client-rust-cli = { git = "https://github.com/spacedriveapp/prisma-client-rust", rev = "528ab1cd02c25a1b183c0a8bc44e28954fdd0bfd", features = [
- "specta",
- "sqlite-create-many",
  "migrations",
+ "specta",
  "sqlite",
+ "sqlite-create-many",
 ], default-features = false }
 prisma-client-rust-sdk = { git = "https://github.com/spacedriveapp/prisma-client-rust", rev = "528ab1cd02c25a1b183c0a8bc44e28954fdd0bfd", features = [
  "sqlite",
 ], default-features = false }
-
-tracing = "0.1.40"
-tracing-subscriber = "0.3.18"
-tracing-appender = "0.2.3"
-
 rspc = { version = "0.1.4" }
 specta = { version = "=2.0.0-rc.11" }
 tauri-specta = { version = "=2.0.0-rc.8" }
@@ -54,7 +49,7 @@ async-trait = "0.1.77"
 axum = "=0.6.20"
 base64 = "0.21.5"
 blake3 = "1.5.0"
-chrono = "0.4.31"
+chrono = "0.4.38"
 clap = "4.4.7"
 futures = "0.3.30"
 futures-concurrency = "7.4.3"
@@ -64,6 +59,7 @@ http = "0.2.9"
 image = "0.24.7"
 itertools = "0.12.0"
 lending-stream = "1.0.0"
+libc = "0.2"
 normpath = "1.1.1"
 once_cell = "1.18.0"
 pin-project-lite = "0.2.13"
@@ -83,13 +79,14 @@ thiserror = "1.0.50"
 tokio = "1.36.0"
 tokio-stream = "0.1.14"
 tokio-util = "0.7.10"
+tracing = "0.1.40"
+tracing-subscriber = "0.3.18"
+tracing-appender = "0.2.3"
+tracing-test = "^0.2.4"
 uhlc = "=0.5.2"
 uuid = "1.5.0"
 webp = "0.2.6"
 
-[workspace.dev-dependencies]
-tracing-test = { version = "^0.2.4" }
-
 [patch.crates-io]
 # Proper IOS Support
 if-watch = { git = "https://github.com/oscartbeaumont/if-watch.git", rev = "a92c17d3f85c1c6fb0afeeaf6c2b24d0b147e8c3" }

apps/desktop/crates/linux/Cargo.toml

@@ -7,7 +7,7 @@ edition = { workspace = true }
 
 [dependencies]
 tokio = { workspace = true, features = ["fs"] }
-libc = "0.2"
+libc =  { workspace = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 # WARNING: gtk should follow the same version used by tauri

apps/desktop/crates/linux/src/app_info.rs

@@ -2,31 +2,14 @@ use std::path::Path;
 
 use gtk::{
  gio::{
- content_type_guess,
- prelude::AppInfoExt,
- prelude::{AppLaunchContextExt, FileExt},
- AppInfo, AppLaunchContext, DesktopAppInfo, File as GioFile, ResourceError,
+ content_type_guess, prelude::AppInfoExt, prelude::FileExt, AppInfo, AppLaunchContext,
+ DesktopAppInfo, File as GioFile, ResourceError,
  },
  glib::error::Error as GlibError,
- prelude::IsA,
 };
 use tokio::fs::File;
 use tokio::io::AsyncReadExt;
 
-use crate::env::remove_prefix_from_pathlist;
-
-fn remove_prefix_from_env_in_ctx(
- ctx: &impl IsA<AppLaunchContext>,
- env_name: &str,
- prefix: &impl AsRef<Path>,
-) {
- if let Some(value) = remove_prefix_from_pathlist(env_name, prefix) {
- ctx.setenv(env_name, value);
- } else {
- ctx.unsetenv(env_name);
- }
-}
-
 thread_local! {
  static LAUNCH_CTX: AppLaunchContext = {
  // TODO: Display supports requires GDK, which can only run on the main thread

apps/desktop/crates/linux/src/env.rs

@@ -1,29 +1,13 @@
 use std::{
  collections::HashSet,
  env,
- ffi::{CStr, OsStr, OsString},
+ ffi::{CStr, OsStr},
  mem,
  os::unix::ffi::OsStrExt,
- path::{Path, PathBuf},
+ path::PathBuf,
  ptr,
 };
 
-fn version(version_str: &str) -> i32 {
- let mut version_parts: Vec<i32> = version_str
- .split('.')
- .take(4) // Take up to 4 components
- .map(|part| part.parse().unwrap_or(0))
- .collect();
-
- // Pad with zeros if needed
- version_parts.resize_with(4, Default::default);
-
- (version_parts[0] * 1_000_000_000)
- + (version_parts[1] * 1_000_000)
- + (version_parts[2] * 1_000)
- + version_parts[3]
-}
-
 pub fn get_current_user_home() -> Option<PathBuf> {
  use libc::{getpwuid_r, getuid, passwd, ERANGE};
 
@@ -193,23 +177,6 @@ pub fn normalize_environment() {
  .expect("PATH must be successfully normalized");
 }
 
-pub(crate) fn remove_prefix_from_pathlist(
- env_name: &str,
- prefix: &impl AsRef<Path>,
-) -> Option<OsString> {
- env::var_os(env_name).and_then(|value| {
- let mut dirs = env::split_paths(&value)
- .filter(|dir| !(dir.as_os_str().is_empty() || dir.starts_with(prefix)))
- .peekable();
-
- if dirs.peek().is_none() {
- None
- } else {
- Some(env::join_paths(dirs).expect("Should not fail because we are only filtering a pathlist retrieved from the environmnet"))
- }
- })
-}
-
 // Check if snap by looking if SNAP is set and not empty and that the SNAP directory exists
 pub fn is_snap() -> bool {
  if let Some(snap) = std::env::var_os("SNAP") {

apps/desktop/crates/windows/Cargo.toml

@@ -8,7 +8,7 @@ edition = { workspace = true }
 [dependencies]
 normpath = { workspace = true }
 thiserror = { workspace = true }
-libc = "0.2"
+libc =  { workspace = true }
 
 [target.'cfg(target_os = "windows")'.dependencies.windows]
 version = "0.51"

apps/mobile/modules/sd-core/android/crate/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "sd-mobile-android"
 version = "0.1.0"
-rust-version = "1.64.0"
+rust-version = "1.64"
 license = { workspace = true }
 repository = { workspace = true }
 edition = { workspace = true }

apps/mobile/modules/sd-core/core/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "sd-mobile-core"
 version = "0.1.0"
-rust-version = "1.64.0"
+rust-version = "1.64"
 license = { workspace = true }
 repository = { workspace = true }
 edition = { workspace = true }

apps/mobile/modules/sd-core/ios/crate/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "sd-mobile-ios"
 version = "0.1.0"
-rust-version = "1.64.0"
+rust-version = "1.64"
 license = { workspace = true }
 repository = { workspace = true }
 edition = { workspace = true }

apps/mobile/src/components/drawer/DrawerLocations.tsx

@@ -2,7 +2,13 @@ import { DrawerNavigationHelpers } from '@react-navigation/drawer/lib/typescript
 import { useNavigation } from '@react-navigation/native';
 import { useRef } from 'react';
 import { Pressable, Text, View } from 'react-native';
-import { arraysEqual, byteSize, Location, useLibraryQuery, useOnlineLocations } from '@sd/client';
+import {
+ arraysEqual,
+ humanizeSize,
+ Location,
+ useLibraryQuery,
+ useOnlineLocations
+} from '@sd/client';
 import { ModalRef } from '~/components/layout/Modal';
 import { tw, twStyle } from '~/lib/tailwind';
 
@@ -45,7 +51,7 @@ const DrawerLocationItem: React.FC<DrawerLocationItemProps> = ({
  </View>
  <View style={tw`rounded-md border border-app-lightborder bg-app-box px-1 py-0.5`}>
  <Text style={tw`text-[11px] font-medium text-ink-dull`} numberOfLines={1}>
- {`${byteSize(location.size_in_bytes)}`}
+ {`${humanizeSize(location.size_in_bytes)}`}
  </Text>
  </View>
  </View>

apps/mobile/src/components/locations/GridLocation.tsx

@@ -1,6 +1,6 @@
 import { DotsThreeOutlineVertical } from 'phosphor-react-native';
 import { Pressable, Text, View } from 'react-native';
-import { arraysEqual, byteSize, Location, useOnlineLocations } from '@sd/client';
+import { arraysEqual, humanizeSize, Location, useOnlineLocations } from '@sd/client';
 import { tw, twStyle } from '~/lib/tailwind';
 
 import FolderIcon from '../icons/FolderIcon';
@@ -47,7 +47,7 @@ const GridLocation: React.FC<GridLocationProps> = ({ location, modalRef }: GridL
  </Text>
  </View>
  <Text style={tw`text-left text-[13px] font-bold text-ink-dull`} numberOfLines={1}>
- {`${byteSize(location.size_in_bytes)}`}
+ {`${humanizeSize(location.size_in_bytes)}`}
  </Text>
  </Card>
  );

apps/mobile/src/components/locations/ListLocation.tsx

@@ -1,9 +1,9 @@
 import { useNavigation } from '@react-navigation/native';
-import { Location, arraysEqual, byteSize, useOnlineLocations } from '@sd/client';
 import { DotsThreeVertical } from 'phosphor-react-native';
 import { useRef } from 'react';
 import { Pressable, Text, View } from 'react-native';
 import { Swipeable } from 'react-native-gesture-handler';
+import { arraysEqual, humanizeSize, Location, useOnlineLocations } from '@sd/client';
 import { tw, twStyle } from '~/lib/tailwind';
 import { SettingsStackScreenProps } from '~/navigation/tabs/SettingsStack';
 
@@ -62,22 +62,16 @@ const ListLocation = ({ location }: ListLocationProps) => {
  </View>
  </View>
  <View style={tw`flex-row items-center gap-3`}>
- <View
- style={tw`rounded-md border border-app-box bg-app p-1.5`}
- >
+ <View style={tw`rounded-md border border-app-box bg-app p-1.5`}>
  <Text
  style={tw`text-left text-xs font-medium text-ink-dull`}
  numberOfLines={1}
  >
- {`${byteSize(location.size_in_bytes)}`}
+ {`${humanizeSize(location.size_in_bytes)}`}
  </Text>
  </View>
  <Pressable hitSlop={24} onPress={() => swipeRef.current?.openRight()}>
- <DotsThreeVertical
- weight="bold"
- size={20}
- color={tw.color('ink-dull')}
- />
+ <DotsThreeVertical weight="bold" size={20} color={tw.color('ink-dull')} />
  </Pressable>
  </View>
  </Card>

apps/mobile/src/components/modal/inspector/ActionsModal.tsx

@@ -14,9 +14,9 @@ import { PropsWithChildren, useRef } from 'react';
 import { Pressable, Text, View, ViewStyle } from 'react-native';
 import FileViewer from 'react-native-file-viewer';
 import {
- byteSize,
  getIndexedItemFilePath,
  getItemObject,
+ humanizeSize,
  useLibraryMutation,
  useLibraryQuery
 } from '@sd/client';
@@ -119,7 +119,7 @@ export const ActionsModal = () => {
  </Text>
  <View style={tw`flex flex-row`}>
  <Text style={tw`text-xs text-ink-faint`}>
- {`${byteSize(filePath?.size_in_bytes_bytes)}`},
+ {`${humanizeSize(filePath?.size_in_bytes_bytes)}`},
  </Text>
  <Text style={tw`text-xs text-ink-faint`}>
  {' '}