Merge remote-tracking branch 'origin/alvinosh/adding-cli-commands' in…

…to alvinosh/adding-cli-commands

Cargo.toml

@@ -8,7 +8,7 @@ name = "ark-cli"
 
 [dependencies]
 tokio = { version = "1.35.1", features = ["full"] }
-arklib = { git = "https://github.com/ARK-Builders/arklib", rev = "1249e6c" }
+arklib = { git = "https://github.com/ARK-Builders/arklib", rev = "2c7ceda" }
 clap = { version = "3.0.10", features = ["derive"] }
 env_logger = "0.9.0"
 fs_extra = "1.2.0"

src/main.rs

@@ -1,4 +1,4 @@
-use std::env::{self, current_dir};
+use std::env::current_dir;
 use std::fs::{canonicalize, create_dir_all, metadata, File};
 use std::io::prelude::*;
 use std::io::BufReader;
@@ -7,11 +7,12 @@ use std::str::FromStr;
 use std::thread;
 use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
 
-use arklib::id::{app_id, ResourceId};
+use arklib::app_id;
+use arklib::id::ResourceId;
 use arklib::index::ResourceIndex;
 use arklib::pdf::PDFQuality;
 use arklib::{
-    modify, modify_json, AtomicFile, ARK_FOLDER, DEVICE_ID, FAVORITES_FILE,
+    modify, modify_json, AtomicFile, APP_ID_FILE, ARK_FOLDER, FAVORITES_FILE,
     METADATA_STORAGE_FOLDER, PREVIEWS_STORAGE_FOLDER,
     PROPERTIES_STORAGE_FOLDER, SCORE_STORAGE_FILE, STATS_FOLDER,
     TAG_STORAGE_FILE, THUMBNAILS_STORAGE_FOLDER,
@@ -536,17 +537,17 @@ fn get_storage_from_path(storage: &PathBuf) -> Option<PathBuf> {
                     .join(ARK_FOLDER)
                     .join(FAVORITES_FILE),
             ),
-            "device" => Some(
+            "app-id" => Some(
                 provide_root(&None)
                     .join(ARK_FOLDER)
-                    .join(DEVICE_ID),
+                    .join(APP_ID_FILE),
             ),
-            "tage" => Some(
+            "tags" => Some(
                 provide_root(&None)
                     .join(ARK_FOLDER)
                     .join(TAG_STORAGE_FILE),
             ),
-            "score" => Some(
+            "scores" => Some(
                 provide_root(&None)
                     .join(ARK_FOLDER)
                     .join(SCORE_STORAGE_FILE),