fix: media directory & add profile directory

Author: Groupguanfang

index.d.ts

@@ -34,9 +34,9 @@ export declare class ElementJsonFileReference {
 }
 
 export declare class MediaDirectory {
-  static from(resource: Resource): MediaDirectory | null
+  static from(resourceDirectory: ResourceDirectory): MediaDirectory | null
   getUri(): Uri
-  getResource(): Resource
+  getResourceDirectory(): ResourceDirectory
   findAll(): Array<Uri>
 }
 
@@ -64,6 +64,13 @@ export declare class Product {
   getResourceDirectories(): Array<Uri>
 }
 
+export declare class ProfileDirectory {
+  static from(resourceDirectory: ResourceDirectory): ProfileDirectory | null
+  getUri(): Uri
+  getResourceDirectory(): ResourceDirectory
+  findAll(): Array<Uri>
+}
+
 export declare class Project {
   getProjectDetector(): ProjectDetector
   static findAll(projectDetector: ProjectDetector): Array<Project>

index.js

@@ -557,13 +557,14 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { ElementDirectory, ElementJsonFile, ElementJsonFileReference, MediaDirectory, Module, Product, Project, ProjectDetector, QualifierUtils, RawfileDirectory, ResfileDirectory, Resource, ResourceDirectory, Uri, QualifierType } = nativeBinding
+const { ElementDirectory, ElementJsonFile, ElementJsonFileReference, MediaDirectory, Module, Product, ProfileDirectory, Project, ProjectDetector, QualifierUtils, RawfileDirectory, ResfileDirectory, Resource, ResourceDirectory, Uri, QualifierType } = nativeBinding
 export { ElementDirectory }
 export { ElementJsonFile }
 export { ElementJsonFileReference }
 export { MediaDirectory }
 export { Module }
 export { Product }
+export { ProfileDirectory }
 export { Project }
 export { ProjectDetector }
 export { QualifierUtils }

project-detector.wasi-browser.js

@@ -62,6 +62,7 @@ export const ElementJsonFileReference = __napiModule.exports.ElementJsonFileRefe
 export const MediaDirectory = __napiModule.exports.MediaDirectory
 export const Module = __napiModule.exports.Module
 export const Product = __napiModule.exports.Product
+export const ProfileDirectory = __napiModule.exports.ProfileDirectory
 export const Project = __napiModule.exports.Project
 export const ProjectDetector = __napiModule.exports.ProjectDetector
 export const QualifierUtils = __napiModule.exports.QualifierUtils

project-detector.wasi.cjs

@@ -114,6 +114,7 @@ module.exports.ElementJsonFileReference = __napiModule.exports.ElementJsonFileRe
 module.exports.MediaDirectory = __napiModule.exports.MediaDirectory
 module.exports.Module = __napiModule.exports.Module
 module.exports.Product = __napiModule.exports.Product
+module.exports.ProfileDirectory = __napiModule.exports.ProfileDirectory
 module.exports.Project = __napiModule.exports.Project
 module.exports.ProjectDetector = __napiModule.exports.ProjectDetector
 module.exports.QualifierUtils = __napiModule.exports.QualifierUtils

src/node/index.ts

@@ -5,6 +5,7 @@ export * from './interfaces'
 export * from './media-directory'
 export * from './module'
 export * from './product'
+export * from './profile-directory'
 export * from './project'
 export * from './project-detector'
 export * from './rawfile-directory'

src/node/media-directory.ts

@@ -1,6 +1,6 @@
 import type { Uri } from '../../index'
 import type { ProjectDetector } from './project-detector'
-import type { Resource } from './resource'
+import type { ResourceDirectory } from './resource-directory'
 import { signal } from 'alien-signals'
 import { MediaDirectory as RustMediaDirectory } from '../../index'
 import { DisposableSignal } from './types'
@@ -15,21 +15,21 @@ export namespace MediaDirectory {
       return null
     return {
       getUri: () => mediaDirectory.getUri(),
-      getResource: () => mediaDirectory.getResource(),
+      getResourceDirectory: () => mediaDirectory.getResourceDirectory(),
       findAll: () => mediaDirectory.findAll(),
       getUnderlyingMediaDirectory: () => mediaDirectory,
     }
   }
 
-  export function from(resource: Resource): DisposableSignal<MediaDirectory | null> {
-    const mediaDirectory = signal<MediaDirectory | null>(fromRustMediaDirectory(RustMediaDirectory.from(resource.getUnderlyingResource())))
+  export function from(resourceDirectory: ResourceDirectory): DisposableSignal<MediaDirectory | null> {
+    const mediaDirectory = signal<MediaDirectory | null>(fromRustMediaDirectory(RustMediaDirectory.from(resourceDirectory.getUnderlyingResourceDirectory())))
 
     const handle = (event: keyof ProjectDetector.EventMap, uri: Uri) => {
-      if (uri.isEqual(resource.getUri())) {
+      if (uri.isEqual(resourceDirectory.getUri())) {
         switch (event) {
           case 'file-created':
           case 'file-changed':
-            mediaDirectory(fromRustMediaDirectory(RustMediaDirectory.from(resource.getUnderlyingResource())))
+            mediaDirectory(fromRustMediaDirectory(RustMediaDirectory.from(resourceDirectory.getUnderlyingResourceDirectory())))
             break
           case 'file-deleted':
             mediaDirectory(null)
@@ -41,11 +41,11 @@ export namespace MediaDirectory {
       const mediaFileUris = mediaDirectory()?.findAll() ?? []
       const existingMediaFileIndex = mediaFileUris.findIndex(mediaFileUri => mediaFileUri.isEqual(uri))
       if (existingMediaFileIndex !== -1) {
-        mediaDirectory(fromRustMediaDirectory(RustMediaDirectory.from(resource.getUnderlyingResource())))
+        mediaDirectory(fromRustMediaDirectory(RustMediaDirectory.from(resourceDirectory.getUnderlyingResourceDirectory())))
       }
     }
 
-    resource.getProduct().getModule().getProject().getProjectDetector().on('*', handle)
-    return DisposableSignal.fromSignal(mediaDirectory, () => resource.getProduct().getModule().getProject().getProjectDetector().off('*', handle))
+    resourceDirectory.getResource().getProduct().getModule().getProject().getProjectDetector().on('*', handle)
+    return DisposableSignal.fromSignal(mediaDirectory, () => resourceDirectory.getResource().getProduct().getModule().getProject().getProjectDetector().off('*', handle))
   }
 }

src/node/profile-directory.ts

@@ -0,0 +1,51 @@
+import type { Uri } from '../../index'
+import type { ProjectDetector } from './project-detector'
+import type { ResourceDirectory } from './resource-directory'
+import { signal } from 'alien-signals'
+import { ProfileDirectory as RustProfileDirectory } from '../../index'
+import { DisposableSignal } from './types'
+
+export interface ProfileDirectory extends RustProfileDirectory {
+  getUnderlyingProfileDirectory(): RustProfileDirectory
+}
+
+export namespace ProfileDirectory {
+  function fromRustProfileDirectory(profileDirectory: RustProfileDirectory | null): ProfileDirectory | null {
+    if (!profileDirectory)
+      return null
+    return {
+      getUri: () => profileDirectory.getUri(),
+      getResourceDirectory: () => profileDirectory.getResourceDirectory(),
+      findAll: () => profileDirectory.findAll(),
+      getUnderlyingProfileDirectory: () => profileDirectory,
+    }
+  }
+
+  export function from(resourceDirectory: ResourceDirectory): DisposableSignal<ProfileDirectory | null> {
+    const profileDirectory = signal<ProfileDirectory | null>(fromRustProfileDirectory(RustProfileDirectory.from(resourceDirectory.getUnderlyingResourceDirectory())))
+
+    const handle = (event: keyof ProjectDetector.EventMap, uri: Uri) => {
+      if (uri.isEqual(resourceDirectory.getUri())) {
+        switch (event) {
+          case 'file-created':
+          case 'file-changed':
+            profileDirectory(fromRustProfileDirectory(RustProfileDirectory.from(resourceDirectory.getUnderlyingResourceDirectory())))
+            break
+          case 'file-deleted':
+            profileDirectory(null)
+            break
+        }
+        return
+      }
+
+      const profileUris = profileDirectory()?.findAll() ?? []
+      const existingProfileIndex = profileUris.findIndex(profileUri => profileUri.isEqual(uri))
+      if (existingProfileIndex !== -1) {
+        profileDirectory(fromRustProfileDirectory(RustProfileDirectory.from(resourceDirectory.getUnderlyingResourceDirectory())))
+      }
+    }
+
+    resourceDirectory.getResource().getProduct().getModule().getProject().getProjectDetector().on('*', handle)
+    return DisposableSignal.fromSignal(profileDirectory, () => resourceDirectory.getResource().getProduct().getModule().getProject().getProjectDetector().off('*', handle))
+  }
+}

src/rust/lib.rs

@@ -11,3 +11,4 @@ pub mod resfile_directory;
 pub mod resource;
 pub mod resource_directory;
 pub mod utils;
+pub mod profile_directory;

src/rust/media_directory.rs

@@ -1,24 +1,24 @@
-use crate::{resource::Resource, utils::uri::Uri};
+use crate::{resource_directory::ResourceDirectory, utils::uri::Uri};
 use napi::{bindgen_prelude::Reference, Env};
 use napi_derive::napi;
 use std::{fs, path::Path};
 
 #[napi]
 pub struct MediaDirectory {
   uri: Uri,
-  resource: Reference<Resource>,
+  resource_directory: Reference<ResourceDirectory>,
 }
 
 #[napi]
 impl MediaDirectory {
   #[napi]
-  pub fn from(resource: Reference<Resource>) -> Option<MediaDirectory> {
-    let uri = Uri::file(Path::new(&resource.get_uri().fs_path()).join("media").to_string_lossy().to_string());
+  pub fn from(resource_directory: Reference<ResourceDirectory>) -> Option<MediaDirectory> {
+    let uri = Uri::file(Path::new(&resource_directory.get_uri().fs_path()).join("media").to_string_lossy().to_string());
     if !fs::metadata(uri.fs_path()).map(|metadata| metadata.is_dir()).unwrap_or(false) {
       return None;
     }
 
-    Some(Self { uri, resource })
+    Some(Self { uri, resource_directory })
   }
 
   #[napi]
@@ -27,8 +27,8 @@ impl MediaDirectory {
   }
 
   #[napi]
-  pub fn get_resource(&self, env: Env) -> Reference<Resource> {
-    self.resource.clone(env).unwrap()
+  pub fn get_resource_directory(&self, env: Env) -> Reference<ResourceDirectory> {
+    self.resource_directory.clone(env).unwrap()
   }
 
   #[napi]

src/rust/profile_directory.rs

@@ -0,0 +1,50 @@
+use std::{fs, path::Path};
+use crate::{resource_directory::ResourceDirectory, utils::uri::Uri};
+use napi::{bindgen_prelude::Reference, Env};
+use napi_derive::napi;
+
+#[napi]
+pub struct ProfileDirectory {
+  uri: Uri,
+  resource_directory: Reference<ResourceDirectory>,
+}
+
+#[napi]
+impl ProfileDirectory {
+  #[napi]
+  pub fn from(resource_directory: Reference<ResourceDirectory>) -> Option<ProfileDirectory> {
+    let uri = Uri::file(Path::new(&resource_directory.get_uri().fs_path()).join("profile").to_string_lossy().to_string());
+    if !fs::metadata(uri.fs_path()).map(|metadata| metadata.is_dir()).unwrap_or(false) {
+      return None;
+    }
+
+    Some(Self { uri, resource_directory })
+  }
+
+  #[napi]
+  pub fn get_uri(&self) -> Uri {
+    self.uri.clone()
+  }
+
+  #[napi]
+  pub fn get_resource_directory(&self, env: Env) -> Reference<ResourceDirectory> {
+    self.resource_directory.clone(env).unwrap()
+  }
+
+  #[napi]
+  pub fn find_all(&self) -> Vec<Uri> {
+    let mut profile_directories = Vec::new();
+    let profiles = match fs::read_dir(self.uri.fs_path()) {
+      Ok(profiles) => profiles,
+      Err(_) => return profile_directories,
+    };
+
+    for profile in profiles.flatten() {
+      if profile.metadata().map(|metadata| metadata.is_dir()).unwrap_or(false) {
+        profile_directories.push(Uri::file(profile.path().to_string_lossy().to_string()));
+      }
+    }
+
+    profile_directories
+  }
+}