refactor: rename google-drive3 to anni-google-drive3

ProjectAnni · Dec 5, 2022 · 7f0d3b2 · 7f0d3b2
1 parent ae32302
commit 7f0d3b2
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/anni-provider/Cargo.toml b/anni-provider/Cargo.toml
@@ -19,7 +19,7 @@ thiserror = "1.0"
 anni-repo = { path = "../anni-repo", features = ["db-read"] }
 log = "0.4"
 
-google-drive3 = { path = "../third_party/google-drive3" }
+anni-google-drive3 = { path = "../third_party/google-drive3" }
 
 uuid = "1"
 sha2 = "0.10.2"

diff --git a/anni-provider/src/common.rs b/anni-provider/src/common.rs
@@ -238,10 +238,10 @@ pub enum ProviderError {
     RepoError(#[from] anni_repo::error::Error),
 
     #[error(transparent)]
-    OAuthError(#[from] google_drive3::oauth2::Error),
+    OAuthError(#[from] anni_google_drive3::oauth2::Error),
 
     #[error(transparent)]
-    DriveError(#[from] google_drive3::Error),
+    DriveError(#[from] anni_google_drive3::Error),
 
     #[error(transparent)]
     RequestError(#[from] reqwest::Error),

diff --git a/anni-provider/src/providers/drive.rs b/anni-provider/src/providers/drive.rs
@@ -1,8 +1,8 @@
 use crate::{AnniProvider, AudioInfo, AudioResourceReader, ProviderError, Range, ResourceReader};
-use async_trait::async_trait;
-use google_drive3::{
+use anni_google_drive3::{
     hyper, hyper::client::HttpConnector, hyper_rustls::HttpsConnector, oauth2, DriveHub,
 };
+use async_trait::async_trait;
 use std::borrow::Cow;
 use std::collections::{HashMap, HashSet};
 use std::num::NonZeroU8;
@@ -11,12 +11,12 @@ use std::path::{Path, PathBuf};
 use self::oauth2::authenticator::Authenticator;
 use self::oauth2::authenticator_delegate::DefaultInstalledFlowDelegate;
 use crate::utils::read_duration;
+use anni_google_drive3::api::{FileList, FileListCall};
+use anni_google_drive3::hyper_rustls::HttpsConnectorBuilder;
 use anni_repo::db::RepoDatabaseRead;
 use anni_repo::library::{AlbumFolderInfo, DiscFolderInfo};
 use dashmap::DashMap;
 use futures::TryStreamExt;
-use google_drive3::api::{FileList, FileListCall};
-use google_drive3::hyper_rustls::HttpsConnectorBuilder;
 use parking_lot::Mutex;
 use std::str::FromStr;
 use tokio::sync::Semaphore;

diff --git a/anni/Cargo.toml b/anni/Cargo.toml
@@ -50,7 +50,7 @@ chrono = "0.4"
 inquire = "0.4.0"
 notify = { version = "5.0.0", default-features = false, features = ["macos_kqueue"] }
 notify-debouncer-mini = { version = "0.2.1", default-features = false }
-google-drive3 = { path = "../third_party/google-drive3" }
+anni-google-drive3 = { path = "../third_party/google-drive3" }
 
 [dependencies.reqwest]
 version = "0.11.11"

diff --git a/third_party/google-drive3/Cargo.toml b/third_party/google-drive3/Cargo.toml
@@ -1,15 +1,10 @@
-# DO NOT EDIT !
-# This file was generated automatically from 'src/mako/Cargo.toml.mako'
-# DO NOT EDIT !
 [package]
-
-name = "google-drive3"
-version = "4.0.0+20220225"
+name = "anni-google-drive3"
+version = "0.1.0+4.0.0-20220225"
 authors = ["Sebastian Thiel <[email protected]>"]
-description = "A complete library to interact with drive (protocol v3)"
-repository = "https://github.com/Byron/google-apis-rs/tree/main/gen/drive3"
+description = "Patched library to interact with drive (protocol v3) with range support"
+repository = "https://github.com/ProjectAnni/anni/tree/master/third_party/google-drive3"
 homepage = "https://developers.google.com/drive/"
-documentation = "https://docs.rs/google-drive3/3.0.0+20220225"
 license = "MIT"
 keywords = ["drive", "google", "protocol", "web", "api"]
 autobins = false

diff --git a/third_party/google-drive3/README.md b/third_party/google-drive3/README.md
@@ -3,12 +3,18 @@ DO NOT EDIT !
 This file was generated automatically from 'src/mako/api/README.md.mako'
 DO NOT EDIT !
 -->
+
 The `google-drive3` library allows access to all features of the *Google drive* service.
 
 This documentation was generated from *drive* crate version *3.0.0+20220225*, where *20220225* is the exact revision of the *drive:v3* schema built by the [mako](http://www.makotemplates.org/) code generator *v3.0.0*.
 
 Everything else about the *drive* *v3* API can be found at the
 [official documentation site](https://developers.google.com/drive/).
+
+# Patch detail
+
+We patched the original crate to add support for `Range` header used by `get` operations.
+
 # Features
 
 Handle the following *Resources* with ease from the central [hub](https://docs.rs/google-drive3/3.0.0+20220225/google_drive3/DriveHub) ...