0.14.1 - Rename VRCDS to NSVR

Author: ShayBox

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "vrc-log"
-version = "0.14.0"
+version = "0.14.1"
 authors = ["Shayne Hartford <shaybox@shaybox.com>"]
 edition = "2021"
 description = "VRChat Local Avatar ID Logger"
@@ -24,7 +24,7 @@ crossterm = { version = "0.29", optional = true }
 derive-config = { version = "2", features = ["dirs", "toml"] }
 discord-presence = { version = "2", optional = true }
 futures = "0.3"
-inquire = "0.7"
+inquire = "0.8"
 lazy-regex = "3"
 notify = "8"
 parking_lot = "0.12"
@@ -40,22 +40,22 @@ tracing = "0.1"
 tracing-subscriber = { version = "=0.3.19", features = ["env-filter", "time"] }
 
 [target.'cfg(windows)'.dependencies]
-windows = { version = "0.61", features = [
+windows = { version = "0.62", features = [
     "Win32_Foundation",
     "Win32_Security",
     "Win32_System_Threading",
 ] }
 
 [features]
-default = ["cache", "avtrdb", "vrcdb", "vrcds", "vrcwb", "paw", "title", "rustls-tls"]
+default = ["cache", "avtrdb", "nsvr", "paw", "vrcdb", "vrcwb", "title", "rustls-tls"]
 
 # VRChat Avatar Database Providers
 cache = ["dep:tokio-rusqlite-new"]
 avtrdb = ["dep:reqwest", "discord"]
+nsvr = ["dep:reqwest", "discord"]
+paw = ["dep:reqwest"]
 vrcdb = ["dep:reqwest", "discord"]
-vrcds = ["dep:reqwest", "discord"]
 vrcwb = ["dep:reqwest", "discord"]
-paw = ["dep:reqwest"]
 
 discord = ["dep:discord-presence", "dep:cached"]
 title = ["dep:crossterm"]

Cargo.toml

@@ -51,10 +51,10 @@ You must manually close it to scan the collected avatars, it will re-open automa
 ### Supported Avatar Database Providers
 
 - [avtrDB - Avatar Search] - [Discord](https://discord.gg/ZxB6w2hGfU) / [VRCX](https://api.avtrdb.com/v1/avatar/search/vrcx) / [Web](https://avtrdb.com)
+- [NSVR - NekoSune Community] - [VRCX](https://avtr.nekosunevr.co.uk/vrcx_search) / [Web](https://avtr.nekosunevr.co.uk)
+- [PAW - Puppy's Avatar World] - [Discord](https://discord.gg/zHhs4nQYxX) / [VRCX](https://paw-api.amelia.fun/vrcx_search) / [Web](https://paw.amelia.fun)
 - [VRCDB - Avatar Search] - [Discord](https://discord.gg/q427ecnUvj) / [VRCX](https://vrcx.vrcdb.com/avatars/Avatar/VRCX) / [Web](https://vrcdb.com) / [World](https://vrchat.com/home/world/wrld_1146f625-5d42-40f5-bfe7-06a7664e2796)
-- [VRCDS - Project Dark Star] - [VRCX](https://avtr.nekosunevr.co.uk/vrcx_search) / [Web](https://avtr.nekosunevr.co.uk)
 - [VRCWB - World Balancer] - [Discord](https://discord.gg/Uw7aAShdsp) / [VRCX](https://avatar.worldbalancer.com/vrcx_search.php) / [Web](https://avatar.worldbalancer.com/search.php)
-- [PAW - Puppy's Avatar World] - [Discord](https://discord.gg/zHhs4nQYxX) / [VRCX](https://paw-api.amelia.fun/vrcx_search) / [Web](https://paw.amelia.fun)
 
 #### Unsupported Avatar Database Providers
 
@@ -64,18 +64,18 @@ You must manually close it to scan the collected avatars, it will re-open automa
 
 Additional contributions welcome, please open an issue, pull request, or join Discord.
 
+[VRCX]: https://github.com/vrcx-team/VRCX?tab=readme-ov-file#--vrcx
+
 [avtrDB - Avatar Search]: https://avtrdb.com
 
-[Just H Party]: https://avtr.just-h.party
+[NSVR - NekoSune Community]: https://avtr.nekosunevr.co.uk
 
-[Prismic's Avatar Search]: https://vrchat.com/home/world/wrld_57514404-7f4e-4aee-a50a-57f55d3084bf
+[PAW - Puppy's Avatar World]: https://paw.amelia.fun
 
 [VRCDB - Avatar Search]: https://vrcdb.com/
 
-[VRCDS - Project Dark Star]: https://avtr.nekosunevr.co.uk
-
 [VRCWB - World Balancer]: https://avatar.worldbalancer.com
 
-[VRCX]: https://github.com/vrcx-team/VRCX?tab=readme-ov-file#--vrcx
+[Just H Party]: https://avtr.just-h.party
 
-[PAW - Puppy's Avatar World]: https://paw.amelia.fun
+[Prismic's Avatar Search]: https://vrchat.com/home/world/wrld_57514404-7f4e-4aee-a50a-57f55d3084bf

README.md

@@ -152,12 +152,12 @@ pub async fn process_avatars(
             ProviderKind::CACHE => None,
             #[cfg(feature = "avtrdb")]
             ProviderKind::AVTRDB => provider!(AvtrDB::new(&settings)),
+            #[cfg(feature = "nsvr")]
+            ProviderKind::NSVR => provider!(NSVR::new(&settings)),
             #[cfg(feature = "paw")]
             ProviderKind::PAW => provider!(Paw::new(&settings)),
             #[cfg(feature = "vrcdb")]
             ProviderKind::VRCDB => provider!(VrcDB::new(&settings)),
-            #[cfg(feature = "vrcds")]
-            ProviderKind::VRCDS => provider!(VrcDS::new(&settings)),
             #[cfg(feature = "vrcwb")]
             ProviderKind::VRCWB => provider!(VrcWB::new(&settings)),
         })

src/lib.rs

@@ -7,12 +7,12 @@ use strum::{Display, EnumIter};
 pub mod avtrdb;
 #[cfg(feature = "cache")]
 pub mod cache;
+#[cfg(feature = "nsvr")]
+pub mod nsvr;
 #[cfg(feature = "paw")]
 pub mod paw;
 #[cfg(feature = "vrcdb")]
 pub mod vrcdb;
-#[cfg(feature = "vrcds")]
-pub mod vrcds;
 #[cfg(feature = "vrcwb")]
 pub mod vrcwb;
 
@@ -25,15 +25,15 @@ pub enum ProviderKind {
     #[cfg(feature = "avtrdb")]
     #[strum(to_string = "avtrDB - Avatar Search")]
     AVTRDB,
+    #[cfg(feature = "nsvr")]
+    #[strum(to_string = "NSVR - NekoSune Community")]
+    NSVR,
     #[cfg(feature = "paw")]
     #[strum(to_string = "PAW - Puppy's Avatar World")]
     PAW,
     #[cfg(feature = "vrcdb")]
     #[strum(to_string = "VRCDB - Avatar Search")]
     VRCDB,
-    #[cfg(feature = "vrcds")]
-    #[strum(to_string = "VRCDS - Project Dark Star")]
-    VRCDS,
     #[cfg(feature = "vrcwb")]
     #[strum(to_string = "VRCWB - World Balancer")]
     VRCWB,

src/provider/mod.rs

@@ -13,12 +13,12 @@ use crate::{
 
 const URL: &str = "https://avtr.nekosunevr.co.uk/v1/vrchat/avatars/store/putavatarExternal";
 
-pub struct VrcDS<'a> {
+pub struct NSVR<'a> {
     settings: &'a Settings,
     client:   Client,
 }
 
-impl<'a> VrcDS<'a> {
+impl<'a> NSVR<'a> {
     #[must_use]
     pub fn new(settings: &'a Settings) -> Self {
         Self {
@@ -29,9 +29,9 @@ impl<'a> VrcDS<'a> {
 }
 
 #[async_trait]
-impl Provider for VrcDS<'_> {
+impl Provider for NSVR<'_> {
     fn kind(&self) -> ProviderKind {
-        ProviderKind::VRCDS
+        ProviderKind::NSVR
     }
 
     async fn check_avatar_id(&self, _avatar_id: &str) -> Result<bool> {
@@ -72,6 +72,11 @@ impl Provider for VrcDS<'_> {
         let unique = match status {
             StatusCode::OK => false,
             StatusCode::NOT_FOUND => true,
+            StatusCode::TOO_MANY_REQUESTS => {
+                warn!("[{kind}] 429 Rate Limit, Please Wait 1 Minute...");
+                tokio::time::sleep(Duration::from_secs(60)).await;
+                Box::pin(self.send_avatar_id(avatar_id)).await?
+            }
             _ => bail!("[{kind}] {status} | {text}"),
         };
 

src/provider/vrcds.rs src/provider/nsvr.rssrc/provider/vrcds.rs renamed to src/provider/nsvr.rs

@@ -16,6 +16,7 @@ const URL: &str = "https://paw-api.amelia.fun/update";
 const AVATAR_URL: &str = "https://paw-api.amelia.fun/avatar";
 
 pub struct Paw<'a> {
+    #[allow(dead_code)]
     settings: &'a Settings,
     client:   Client,
 }

src/provider/paw.rs

@@ -2,11 +2,11 @@
 pub use super::avtrdb::AvtrDB;
 #[cfg(feature = "cache")]
 pub use super::cache::Cache;
+#[cfg(feature = "nsvr")]
+pub use super::nsvr::NSVR;
+#[cfg(feature = "paw")]
+pub use super::paw::Paw;
 #[cfg(feature = "vrcdb")]
 pub use super::vrcdb::VrcDB;
-#[cfg(feature = "vrcds")]
-pub use super::vrcds::VrcDS;
 #[cfg(feature = "vrcwb")]
 pub use super::vrcwb::VrcWB;
-#[cfg(feature = "paw")]
-pub use super::paw::Paw;