Merge branch 'master' into dev

biliup · Jul 14, 2023 · 9af79e2 · 9af79e2
2 parents da782ea + 2787fd3
commit 9af79e2
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,7 +24,7 @@ jobs:
         build: [x86_64-linux, x86_64-linux-musl, aarch64-linux, arm-linux, x86_64-macos, x86_64-windows, aarch64-macos] #, x86_64-win-gnu, win32-msvc
         include:
         - build: x86_64-linux
-          os: ubuntu-18.04
+          os: ubuntu-latest
           rust: stable
           target: x86_64-unknown-linux-gnu
           cross: false
@@ -34,12 +34,12 @@ jobs:
           target: x86_64-unknown-linux-musl
           cross: true
         - build: aarch64-linux
-          os: ubuntu-18.04
+          os: ubuntu-latest
           rust: stable
           target: aarch64-unknown-linux-gnu
           cross: true
         - build:  arm-linux
-          os: ubuntu-18.04
+          os: ubuntu-latest
           rust: stable
           target: arm-unknown-linux-gnueabi
           cross: true

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -58,7 +58,7 @@ OPTIONS:
     -h, --help                         Print help information
         --interactive <INTERACTIVE>    [default: 0]
     -l, --line <LINE>                  选择上传线路 [possible values: bda2, ws, qn, kodo, cos, cos-
-                                       internal]
+                                       internal, bldsa]
         --limit <LIMIT>                单视频文件最大并发数 [default: 3]
         --mission-id <MISSION_ID>
         --no-reprint <NO_REPRINT>      自制声明, 0-允许转载，1-禁止转载 [default: 0]

diff --git a/crates/biliup/Cargo.toml b/crates/biliup/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "biliup"
-version = "0.1.15"
+version = "0.1.16"
 edition = "2021"
 description = "Upload video to bilibili."
 license = "MIT OR Apache-2.0"
@@ -87,4 +87,4 @@ openssl = { version = "0.10.42", features = ["vendored"] }
 
 [build-dependencies]
 native-tls = { version = "0.2.11", features = ["vendored"] }
-openssl = { version = "0.10.42", features = ["vendored"] }
+openssl = { version = "0.10.42", features = ["vendored"] }
diff --git a/crates/biliup/src/uploader/line.rs b/crates/biliup/src/uploader/line.rs
@@ -278,3 +278,12 @@ pub fn cos_internal() -> Line {
         cost: 0,
     }
 }
+
+pub fn bldsa() -> Line {
+    Line {
+        os: Uploader::Upos,
+        query: "upcdn=bldsa&probe_version=20211012".into(),
+        probe_url: "//upos-cs-upcdnbldsa.bilivideo.com/OK".into(),
+        cost: 0,
+    }
+}
diff --git a/crates/bin/cli.rs b/crates/bin/cli.rs
@@ -120,6 +120,7 @@ pub enum UploadLine {
     Kodo,
     Cos,
     CosInternal,
+    Bldsa,
 }
 
 fn human_size(s: &str) -> Result<u64, String> {

diff --git a/crates/bin/uploader.rs b/crates/bin/uploader.rs
@@ -184,6 +184,7 @@ pub async fn upload(
         Some(UploadLine::Qn) => line::qn(),
         Some(UploadLine::Cos) => line::cos(),
         Some(UploadLine::CosInternal) => line::cos_internal(),
+        Some(UploadLine::Bldsa) => line::bldsa(),
         None => Probe::probe(&client.client).await.unwrap_or_default(),
     };
     // let line = line::kodo();

diff --git a/crates/stream-gears/Cargo.toml b/crates/stream-gears/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stream-gears"
-version = "0.1.15"
+version = "0.1.16"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/crates/stream-gears/src/uploader.rs b/crates/stream-gears/src/uploader.rs
@@ -22,6 +22,7 @@ pub enum UploadLine {
     Kodo,
     Cos,
     CosInternal,
+    Bldsa,
 }
 
 #[derive(FromPyObject)]
@@ -74,6 +75,7 @@ pub async fn upload(
         Some(UploadLine::Qn) => line::qn(),
         Some(UploadLine::Cos) => line::cos(),
         Some(UploadLine::CosInternal) => line::cos_internal(),
+        Some(UploadLine::Bldsa) => line::bldsa(),
         None => Probe::probe(&client.client).await.unwrap_or_default(),
     };
     // let line = line::kodo();