Merge branch 'main' of https://github.com/spacedropco/drive

src-tauri/Cargo.toml

@@ -11,8 +11,7 @@ build = "src/build.rs"
 
 [build-dependencies]
 tauri-build = { version = "1.0.0-beta.3" }
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
+swift-rs = "0.1.0"
 
 [dependencies]
 tauri = { version = "1.0.0-beta.5", features = ["api-all", "menu"] }

src-tauri/src/build.rs

@@ -1,7 +1,8 @@
-use swift_rs::build_utils;
+use swift_rs::build_utils::{link_swift, link_swift_package};
 
 fn main() {
-  build_utils::link_swift();
-  build_utils::link_swift_package("swift-lib", "./swift-lib/");
+  link_swift();
+  link_swift_package("swift-lib", "./swift-lib/");
+
   tauri_build::build();
 }

src-tauri/src/commands.rs

@@ -35,8 +35,7 @@ pub async fn scan_dir(path: String) -> Result<(), String> {
 }
 #[tauri::command(async)]
 pub async fn get_file_thumb(path: &str) -> Result<String, String> {
-  let path = &path.to_string();
-  let thumbnail_b46 = get_file_thumbnail_base64(path.into()).to_string();
+  let thumbnail_b46 = get_file_thumbnail_base64(path).to_string();
 
   Ok(thumbnail_b46)
 }

src-tauri/src/swift/mod.rs

@@ -1,59 +1,10 @@
-#[derive(Debug)]
-#[repr(C)]
-struct SRArray<T> {
-  _nsobject_offset: u8,
-  data: *mut T,
-  length: usize,
-}
-
-impl<T> SRArray<T> {
-  fn into_slice(&self) -> &'static [T] {
-    unsafe { std::slice::from_raw_parts(self.data, self.length) }
-  }
-}
-
-#[derive(Debug)]
-#[repr(C)]
-struct SRData {
-  _nsobject_offset: u8,
-  data: *mut SRArray<u8>,
-}
-
-impl SRData {
-  pub fn into_slice(&self) -> &'static [u8] {
-    unsafe { (*self.data).into_slice() }
-  }
-
-  pub fn data(&self) -> &SRArray<u8> {
-    unsafe { &*(self.data) }
-  }
-}
-
-#[derive(Debug)]
-#[repr(C)]
-pub struct SRString(SRData);
-
-impl SRString {
-  pub fn to_string(&self) -> String {
-    unsafe { std::str::from_utf8_unchecked(self.0.into_slice()) }.into()
-  }
-}
-
-impl From<&String> for &SRString {
-  fn from(string: &String) -> &'static SRString {
-    unsafe { allocate_string(string.as_ptr(), string.len()) }
-  }
-}
+use swift_rs::types::SRString;
 
 extern "C" {
-  fn return_data() -> &'static SRData;
-  fn return_string() -> &'static SRString;
-  fn echo_string(string: &SRString);
-  fn allocate_string(data: *const u8, size: usize) -> &'static SRString;
   #[link_name = "get_file_thumbnail_base64"]
   fn get_file_thumbnail_base64_(path: &SRString) -> &'static SRString;
 }
 
-pub fn get_file_thumbnail_base64(path: &SRString) -> &'static SRString {
-  unsafe { get_file_thumbnail_base64_(path) }
+pub fn get_file_thumbnail_base64(path: &str) -> &'static SRString {
+  unsafe { get_file_thumbnail_base64_(path.into()) }
 }

src-tauri/swift-lib/Package.resolved

@@ -0,0 +1,16 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "SwiftRs",
+        "repositoryURL": "https://github.com/Brendonovich/swift-rs",
+        "state": {
+          "branch": null,
+          "revision": "196359dfb25a9520d534655c1321150e36c1b1dd",
+          "version": "0.1.0"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

src-tauri/swift-lib/Package.swift

@@ -18,13 +18,14 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
+        .package(name: "SwiftRs", url: "https://github.com/Brendonovich/swift-rs", from: "0.1.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "swift-lib",
-            dependencies: [],
+            dependencies: [.product(name: "SwiftRs", package: "SwiftRs")],
             path: "src")
     ]
 )

src-tauri/swift-lib/src/lib.swift

@@ -1,70 +1,6 @@
 import Foundation
 import AppKit
-
-// Size: 24 bytes
-public class SRArray<T>: NSObject {
-    var pointer: UnsafePointer<T>
-    var length: Int
-    
-    init(_ data: [T]) {
-        let mut_data = UnsafeMutablePointer<T>.allocate(capacity: data.count)
-        mut_data.initialize(from: data, count: data.count)
-        
-        self.pointer = UnsafePointer(mut_data)
-        self.length = data.count
-    }
-}
-
-// Size: 16 bytes
-public class SRData: NSObject {
-    var data: SRArray<UInt8>
-
-    init(_ data: [UInt8]) {
-        self.data = SRArray(data)
-    }
-    
-    func to_data() -> Data {
-        return Data(bytes: self.data.pointer, count: self.data.length)
-    }
-}
-
-// Size: 16 bytes
-public class SRString: SRData {
-    init(_ string: String) {
-        super.init(Array(string.utf8))
-    }
-
-    func to_string() -> String {
-        return String(bytes: self.to_data(), encoding: .utf8)!
-    }
-}
-
-@_cdecl("return_data")
-public func returnData() -> SRData {
-    return SRData([1,2,3])
-}
-
-
-@_cdecl("return_string")
-public func returnString() -> SRString {
-    return SRString("123456")
-}
-
-@_cdecl("echo_string")
-public func echoString(string: SRString) {
-    print(string.to_string())
-}
-
-// SRstring pointer is passed to rust correctly
-// data pointer is passed to rust correctly
-// guessing that the type of SRArray isn't the same
-@_cdecl("allocate_string")
-public func allocate_string(data: UnsafePointer<UInt8>, size: Int) -> SRString {
-    let buffer = UnsafeBufferPointer(start: data, count: size)
-    let string = String(bytes: buffer, encoding: .utf8)!;
-    let SRstring = SRString(string);
-    return SRstring
-}
+import SwiftRs
 
 @_cdecl("get_file_thumbnail_base64")
 public func getFileThumbnailBase64(path: SRString) -> SRString {
@@ -74,5 +10,4 @@ public func getFileThumbnailBase64(path: SRString) -> SRString {
     let bitmap = NSBitmapImageRep(data: image.tiffRepresentation!)!.representation(using: .png, properties: [:])!
 
     return SRString(bitmap.base64EncodedString())
-}
-
+}