Support rustrover-eap versioning

navarroaxel · Aug 14, 2024 · 6e535b2 · 6e535b2
1 parent 229b94d
commit 6e535b2
Show file tree

Hide file tree

Showing 11 changed files with 306 additions and 186 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "checkupdates-external"
 version = "0.1.0"
 authors = ["Axel Navarro <[email protected]>"]
-edition = "2018"
+edition = "2024"
 repository =  "https://github.com/navarroaxel/archlinux-checkupdates-external"
 homepage =  "https://github.com/navarroaxel/archlinux-checkupdates-external"
 readme = "README.md"
@@ -17,5 +17,5 @@ teamviewer = { path = "crates/teamviewer" }
 yum = { path = "crates/yum" }
 
 futures = "0.3.30"
-reqwest = { version = "0.12.4", features = ["json", "gzip"] }
-tokio = { version = "1.37.0", features = ["full"] }
+reqwest = { version = "0.12.5", features = ["json", "gzip"] }
+tokio = { version = "1.39.2", features = ["full"] }
diff --git a/crates/aur/Cargo.toml b/crates/aur/Cargo.toml
@@ -8,5 +8,5 @@ edition = "2021"
 
 [dependencies]
 futures = "0.3.30"
-reqwest = { version = "0.12.4", features = ["json", "gzip"] }
-serde = { version = "1.0.202", features = ["derive"] }
+reqwest = { version = "0.12.5", features = ["json", "gzip"] }
+serde = { version = "1.0.207", features = ["derive"] }
diff --git a/crates/chrome/Cargo.toml b/crates/chrome/Cargo.toml
@@ -10,4 +10,4 @@ edition = "2021"
 aur = { path = "../aur" }
 yum = { path = "../yum" }
 
-reqwest = { version = "0.12.4", features = ["json", "gzip"] }
+reqwest = { version = "0.12.5", features = ["json", "gzip"] }
diff --git a/crates/edge/Cargo.toml b/crates/edge/Cargo.toml
@@ -10,4 +10,4 @@ edition = "2021"
 aur = { path = "../aur" }
 yum = { path = "../yum" }
 
-reqwest = { version = "0.12.4", features = ["json", "gzip"] }
+reqwest = { version = "0.12.5", features = ["json", "gzip"] }
diff --git a/crates/jetbrains/Cargo.toml b/crates/jetbrains/Cargo.toml
@@ -9,6 +9,6 @@ edition = "2021"
 [dependencies]
 aur = { path = "../aur" }
 
-reqwest = { version = "0.12.4", features = ["json", "gzip"] }
-serde = { version = "1.0.202", features = ["derive"] }
+reqwest = { version = "0.12.5", features = ["json", "gzip"] }
+serde = { version = "1.0.207", features = ["derive"] }
 serde-xml-rs = "0.6.0"
diff --git a/crates/jetbrains/src/print.rs b/crates/jetbrains/src/print.rs
@@ -29,6 +29,12 @@ fn print_update(package: &str, version: String, new_version: &str) {
     }
 }
 
+fn get_package_pre_build(version: String) -> String {
+    let mut splitter = version.split("pre+");
+    splitter.next();
+    splitter.next().unwrap().to_string()
+}
+
 fn print_jetbrains_update(
     channel_name: &str,
     package: &AurPackage,
@@ -47,7 +53,14 @@ fn print_jetbrains_update(
     let build = channel.builds.first().unwrap();
     let mut version = remove_epoch(package.get_package_version());
     let new_version;
-    if is_eap {
+    if package.name == "rustrover-eap" {
+        if version.contains("pre") {
+            version = get_package_pre_build(version);
+            new_version = build.full_number.as_ref().unwrap();
+        } else {
+            new_version = &build.version;
+        }
+    } else if is_eap {
         version = get_package_build(version);
         new_version = build.full_number.as_ref().unwrap();
     } else {

diff --git a/crates/mongodb/Cargo.toml b/crates/mongodb/Cargo.toml
@@ -10,4 +10,4 @@ edition = "2021"
 aur = { path = "../aur" }
 yum = { path = "../yum" }
 
-reqwest = { version = "0.12.4", features = ["json", "gzip"] }
+reqwest = { version = "0.12.5", features = ["json", "gzip"] }
diff --git a/crates/teamviewer/Cargo.toml b/crates/teamviewer/Cargo.toml
@@ -10,4 +10,4 @@ edition = "2021"
 aur = { path = "../aur" }
 yum = { path = "../yum" }
 
-reqwest = { version = "0.12.4", features = ["json", "gzip"] }
+reqwest = { version = "0.12.5", features = ["json", "gzip"] }
diff --git a/crates/yum/Cargo.toml b/crates/yum/Cargo.toml
@@ -10,8 +10,8 @@ edition = "2021"
 aur = { path = "../aur" }
 
 itertools = "0.13.0"
-libflate = "2.0.0"
-reqwest = { version = "0.12.4", features = ["json", "gzip"] }
+libflate = "2.1.0"
+reqwest = { version = "0.12.5", features = ["json", "gzip"] }
 semver = "1.0.23"
-serde = { version = "1.0.202", features = ["derive"] }
+serde = { version = "1.0.207", features = ["derive"] }
 serde-xml-rs = "0.6.0"
diff --git a/src/main.rs b/src/main.rs
@@ -52,6 +52,8 @@ async fn check_teamviewer_updates() -> Result<(), Error> {
 
 async fn check_jetbrains_updates() -> Result<(), Error> {
     let jetbrains_products = vec![
+        vec!["aqua", "Aqua", "QA-RELEASE-licensing-RELEASE"],
+        vec!["aqua-eap", "Aqua", "QA-EAP-licensing-EAP"],
         vec!["clion", "CLion", "CL-RELEASE-licensing-RELEASE"],
         vec!["datagrip", "DataGrip", "DB-RELEASE-licensing-RELEASE"],
         vec!["goland", "GoLand", "GO-RELEASE-licensing-RELEASE"],