hotfix 1

changelog

···
 
   Dev Stuff:
     - Fixed indentation to be more constistant
-    - main.rs is no longer like 400 quintillion lines long
+    - main.rs is no longer like 400 quintillion lines long
+
+  Hotfix 1:
+    - Fixed photos with legacy naming scheme not loading

src-tauri/Cargo.lock

···
 
 [[package]]
 name = "vrcpm-rs"
-version = "0.2.0"
+version = "0.2.0-hot1"
 dependencies = [
  "dirs",
  "fast_image_resize",

src-tauri/Cargo.toml

···
 [package]
 name = "vrcpm-rs"
-version = "0.2.0"
+version = "0.2.0-hot1"
 description = "VRChat Photo Manager"
 authors = ["_phaz"]
 edition = "2021"

src-tauri/src/frontend_calls/load_photo_meta.rs

···
           .unwrap();
       }
       Err(_) => {
-        println!("Cannot read image file");
+        println!("Cannot read image file: {:?}", base_dir);
       }
     }
   });

src-tauri/src/frontend_calls/load_photos.rs

···
             let re1 = Regex::new(r"(?m)VRChat_[0-9]{4}-[0-9]{2}-[0-9]{2}_[0-9]{2}-[0-9]{2}-[0-9]{2}.[0-9]{3}_[0-9]{4}x[0-9]{4}.png").unwrap();
             let re2 = Regex::new(
   r"(?m)VRChat_[0-9]{4}-[0-9]{2}-[0-9]{2}_[0-9]{2}-[0-9]{2}-[0-9]{2}.[0-9]{3}_[0-9]{4}x[0-9]{4}_wrld_[a-z0-9]{8}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{12}.png").unwrap();
+            let re3 = Regex::new("VRChat_[0-9]{4}x[0-9]{4}_[0-9]{4}-[0-9]{2}-[0-9]{2}_[0-9]{2}-[0-9]{2}-[0-9]{2}.[0-9]{3}.png").unwrap();
 
-            if re1.is_match(p.file_name().to_str().unwrap())
-              || re2.is_match(p.file_name().to_str().unwrap())
+            let name = p.file_name();
+            let name = name.to_str().unwrap();
+
+            let re3_match = re3.is_match(name);
+
+            if re1.is_match(name)
+              || re2.is_match(name)
+              || re3_match
             {
               let path = fname.to_path_buf().clone();
               let metadata = fs::metadata(&path).unwrap();
···
               if metadata.is_file() {
                 size += metadata.len() as usize;
 
-                let path = path.strip_prefix(&base_dir).unwrap().to_path_buf();
-                photos.push(path);
+                let pth = path.strip_prefix(&base_dir).unwrap().to_path_buf();
+
+                if re3_match{
+                  photos.push(path::PathBuf::from("legacy://").join(pth));
+                } else{
+                  photos.push(pth);
+                }
               }
             } else {
               println!("Ignoring {:#?} as it doesn't match regex", p.file_name());

src/Components/PhotoList.tsx

···
     scaledHeight?: number;
 
     dateString: string;
+    date: Date;
+
+    legacy: boolean = false;
 
     public onMetaLoaded: () => void = () => {};
 
-    constructor( path: string ){
+    constructor( path: string, isLegacy: boolean = false ){
       this.path = path;
-      this.dateString = this.path.split('_')[1];
+      this.legacy = isLegacy;
+
+      if(this.legacy)
+        this.dateString = this.path.split('_')[2];
+      else
+        this.dateString = this.path.split('_')[1];
+
+      let splitDateString = this.dateString.split('-');
+
+      this.date = new Date();
+
+      this.date.setFullYear(parseInt(splitDateString[0]));
+      this.date.setMonth(parseInt(splitDateString[1]));
+      this.date.setDate(parseInt(splitDateString[2]));
     }
 
     loadMeta(){
···
       props.setPhotoCount(photoPaths.length);
       props.setPhotoSize(event.payload.size);
 
+      let doesHaveLegacy = false;
+
       photoPaths.forEach(( path: string ) => {
-        let photo = new Photo(path);
-        photos.push(photo);
+        let photo
 
+        if(path.slice(0, 9) === "legacy://"){
+          photo = new Photo(path.slice(9), true);
+          doesHaveLegacy = true;
+        } else
+          photo = new Photo(path, false);
+
+        photos.push(photo);
         photo.loadMeta();
       })
+
+      if(doesHaveLegacy){
+        photos = photos.sort(( a, b ) => b.date.valueOf() - a.date.valueOf());
+      }
     })
   }