From 1dde5c568967dbcb9100617e2dfb5bd7f3fa6ece Mon Sep 17 00:00:00 2001
From: fufesou <fufesou@users.noreply.github.com>
Date: Sat, 24 Feb 2024 20:11:27 +0800
Subject: [PATCH] Refact. get_version_number support '- patch version' (#7197)

Signed-off-by: fufesou <shuanglongchen@yeah.net>
---
 libs/hbb_common/src/lib.rs | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/libs/hbb_common/src/lib.rs b/libs/hbb_common/src/lib.rs
index c3f5301f6..0edb2db9f 100644
--- a/libs/hbb_common/src/lib.rs
+++ b/libs/hbb_common/src/lib.rs
@@ -240,11 +240,31 @@ pub fn is_valid_custom_id(id: &str) -> bool {
         .is_match(id)
 }
 
+// Support 1.1.10-1, the number after - is a patch version.
 pub fn get_version_number(v: &str) -> i64 {
+    let mut versions = v.split('-');
+
     let mut n = 0;
-    for x in v.split('.') {
-        n = n * 1000 + x.parse::<i64>().unwrap_or(0);
+
+    // The first part is the version number.
+    // 1.1.10 -> 1001100, 1.2.3 -> 1001030, multiple the last number by 10
+    // to leave space for patch version.
+    if let Some(v) = versions.next() {
+        let mut last = 0;
+        for x in v.split('.') {
+            last = x.parse::<i64>().unwrap_or(0);
+            n = n * 1000 + last;
+        }
+        n -= last;
+        n += last * 10;
     }
+
+    if let Some(v) = versions.next() {
+        n += v.parse::<i64>().unwrap_or(0);
+    }
+
+    // Ignore the rest
+
     n
 }
 
@@ -465,4 +485,12 @@ mod test {
         let addr_v6 = "[::1]:8080".parse().unwrap();
         assert_eq!(AddrMangle::decode(&AddrMangle::encode(addr_v6)), addr_v6);
     }
+
+    #[test]
+    fn test_get_version_number() {
+        assert_eq!(get_version_number("1.1.10"), 1001100);
+        assert_eq!(get_version_number("1.1.10-1"), 1001101);
+        assert_eq!(get_version_number("1.1.11-1"), 1001111);
+        assert_eq!(get_version_number("1.2.3"), 1002030);
+    }
 }