Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:zzndb001
anki-sync-server-rs
ccd9ca1a8309b80bcb50ddc5d99c7ce63440bce9_anki_r...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File ccd9ca1a8309b80bcb50ddc5d99c7ce63440bce9_anki_rslib.patch of Package anki-sync-server-rs
From 5fe99ad8f42ec680958fda85305df447de14e050 Mon Sep 17 00:00:00 2001 From: zzndb <20870493+zzndb@users.noreply.github.com> Date: Thu, 23 May 2024 22:02:09 +0800 Subject: [PATCH] anki 24.04.1 --- rslib/i18n/gather.rs | 6 +++--- rslib/src/error/mod.rs | 2 +- rslib/src/sync/http_server/media_manager/mod.rs | 4 ++-- rslib/src/sync/http_server/mod.rs | 10 +++++----- rslib/src/sync/http_server/user.rs | 2 +- rslib/src/sync/request/mod.rs | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rslib/i18n/gather.rs b/rslib/i18n/gather.rs index a25e5813e..de3ead224 100644 --- a/rslib/i18n/gather.rs +++ b/rslib/i18n/gather.rs @@ -21,16 +21,16 @@ pub fn get_ftl_data() -> TranslationsByLang { let ftl_base = source_tree_root(); add_folder(&mut map, &ftl_base.join("core"), "templates"); // And core translations from submodule - add_translation_root(&mut map, &ftl_base.join("core-repo/core"), true); + // add_translation_root(&mut map, &ftl_base.join("core-repo/core"), true); if let Some(path) = extra_ftl_root() { // Mobile client has requested its own extra translations - add_translation_root(&mut map, &path, false); + // add_translation_root(&mut map, &path, false); } else { // Qt core templates from this repo add_folder(&mut map, &ftl_base.join("qt"), "templates"); // And translations from submodule - add_translation_root(&mut map, &ftl_base.join("qt-repo/desktop"), true) + // add_translation_root(&mut map, &ftl_base.join("qt-repo/desktop"), true) } map } diff --git a/rslib/src/error/mod.rs b/rslib/src/error/mod.rs index 40af3d3a8..b884f0108 100644 --- a/rslib/src/error/mod.rs +++ b/rslib/src/error/mod.rs @@ -11,7 +11,7 @@ mod search; pub mod windows; use anki_i18n::I18n; -use anki_io::FileIoError; +pub use anki_io::FileIoError; use anki_io::FileOp; pub use db::DbError; pub use db::DbErrorKind; diff --git a/rslib/src/sync/http_server/media_manager/mod.rs b/rslib/src/sync/http_server/media_manager/mod.rs index 8eae3d97f..0e4e2bd56 100644 --- a/rslib/src/sync/http_server/media_manager/mod.rs +++ b/rslib/src/sync/http_server/media_manager/mod.rs @@ -16,13 +16,13 @@ use crate::sync::media::changes::MediaChange; use crate::sync::media::database::server::ServerMediaDatabase; use crate::sync::media::sanity::MediaSanityCheckResponse; -pub(crate) struct ServerMediaManager { +pub struct ServerMediaManager { pub media_folder: PathBuf, pub db: ServerMediaDatabase, } impl ServerMediaManager { - pub(crate) fn new(user_folder: &Path) -> HttpResult<ServerMediaManager> { + pub fn new(user_folder: &Path) -> HttpResult<ServerMediaManager> { let media_folder = user_folder.join("media"); create_dir_all(&media_folder).or_internal_err("media folder create")?; Ok(Self { diff --git a/rslib/src/sync/http_server/mod.rs b/rslib/src/sync/http_server/mod.rs index 1b4c0ee80..12cc8d970 100644 --- a/rslib/src/sync/http_server/mod.rs +++ b/rslib/src/sync/http_server/mod.rs @@ -3,9 +3,9 @@ mod handlers; mod logging; -mod media_manager; -mod routes; -mod user; +pub mod media_manager; +pub mod routes; +pub mod user; use std::collections::HashMap; use std::future::Future; @@ -49,12 +49,12 @@ use crate::sync::request::MAXIMUM_SYNC_PAYLOAD_BYTES; use crate::sync::response::SyncResponse; pub struct SimpleServer { - state: Mutex<SimpleServerInner>, + pub state: Mutex<SimpleServerInner>, } pub struct SimpleServerInner { /// hkey->user - users: HashMap<String, User>, + pub users: HashMap<String, User>, } #[derive(serde::Deserialize, Debug)] diff --git a/rslib/src/sync/http_server/user.rs b/rslib/src/sync/http_server/user.rs index 72dcc7197..1fccdb337 100644 --- a/rslib/src/sync/http_server/user.rs +++ b/rslib/src/sync/http_server/user.rs @@ -13,7 +13,7 @@ use crate::sync::error::HttpResult; use crate::sync::error::OrHttpErr; use crate::sync::http_server::media_manager::ServerMediaManager; -pub(in crate::sync) struct User { +pub struct User { pub name: String, pub password_hash: String, pub col: Option<Collection>, diff --git a/rslib/src/sync/request/mod.rs b/rslib/src/sync/request/mod.rs index a6f9ea8d8..bfaac228e 100644 --- a/rslib/src/sync/request/mod.rs +++ b/rslib/src/sync/request/mod.rs @@ -2,7 +2,7 @@ // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html pub mod header_and_stream; -mod multipart; +pub mod multipart; use std::any::Any; use std::env; @@ -39,7 +39,7 @@ use crate::version::sync_client_version_short; #[derive(Clone)] pub struct SyncRequest<T> { pub data: Vec<u8>, - json_output_type: PhantomData<T>, + pub json_output_type: PhantomData<T>, pub sync_version: SyncVersion, /// empty with older clients pub client_version: String, -- 2.44.0
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor