From 405bc6dba64583cec6f759cfc4f177cd47731780 Mon Sep 17 00:00:00 2001 From: Artem Vorotnikov Date: Sat, 15 Oct 2022 03:06:25 +0400 Subject: [PATCH] Use serde's rename_all everywhere --- src/types/response.rs | 56 +++++++------------------------------------ 1 file changed, 9 insertions(+), 47 deletions(-) diff --git a/src/types/response.rs b/src/types/response.rs index 8bb0e55..e3d3a51 100644 --- a/src/types/response.rs +++ b/src/types/response.rs @@ -13,31 +13,24 @@ impl RpcResponse { pub trait RpcResponseArgument {} #[derive(Deserialize, Debug, Clone)] +#[serde(rename_all = "kebab-case")] pub struct SessionGet { - #[serde(rename = "blocklist-enabled")] pub blocklist_enabled: bool, - #[serde(rename = "download-dir")] pub download_dir: String, pub encryption: String, - #[serde(rename = "rpc-version")] pub rpc_version: i32, - #[serde(rename = "rpc-version-minimum")] pub rpc_version_minimum: i32, pub version: String, } impl RpcResponseArgument for SessionGet {} #[derive(Deserialize, Debug, Clone)] +#[serde(rename_all = "camelCase")] pub struct SessionStats { - #[serde(rename = "torrentCount")] pub torrent_count: i32, - #[serde(rename = "activeTorrentCount")] pub active_torrent_count: i32, - #[serde(rename = "pausedTorrentCount")] pub paused_torrent_count: i32, - #[serde(rename = "downloadSpeed")] pub download_speed: i64, - #[serde(rename = "uploadSpeed")] pub upload_speed: i64, #[serde(rename = "current-stats")] pub current_stats: Stats, @@ -51,109 +44,78 @@ pub struct SessionClose {} impl RpcResponseArgument for SessionClose {} #[derive(Deserialize, Debug, Clone)] +#[serde(rename_all = "kebab-case")] pub struct BlocklistUpdate { - #[serde(rename = "blocklist-size")] pub blocklist_size: Option, } impl RpcResponseArgument for BlocklistUpdate {} #[derive(Deserialize, Debug, Clone)] +#[serde(rename_all = "kebab-case")] pub struct FreeSpace { pub path: String, - #[serde(rename = "size-bytes")] pub size_bytes: i64, } impl RpcResponseArgument for FreeSpace {} #[derive(Deserialize, Debug, Clone)] +#[serde(rename_all = "kebab-case")] pub struct PortTest { - #[serde(rename = "port-is-open")] pub port_is_open: bool, } impl RpcResponseArgument for PortTest {} #[derive(Deserialize, Debug, Clone)] +#[serde(rename_all = "camelCase")] pub struct Torrent { - #[serde(rename = "activityDate")] pub activity_date: Option, - #[serde(rename = "addedDate")] pub added_date: Option, - #[serde(rename = "doneDate")] pub done_date: Option, - #[serde(rename = "downloadDir")] pub download_dir: Option, - #[serde(rename = "editDate")] pub edit_date: Option, pub error: Option, - #[serde(rename = "errorString")] pub error_string: Option, pub eta: Option, pub id: Option, - #[serde(rename = "isFinished")] pub is_finished: Option, - #[serde(rename = "isPrivate")] pub is_private: Option, - #[serde(rename = "isStalled")] pub is_stalled: Option, - #[serde(rename = "labels")] pub labels: Option>, - #[serde(rename = "leftUntilDone")] pub left_until_done: Option, - #[serde(rename = "metadataPercentComplete")] pub metadata_percent_complete: Option, pub name: Option, - #[serde(rename = "hashString")] pub hash_string: Option, - #[serde(rename = "peersConnected")] pub peers_connected: Option, - #[serde(rename = "peersGettingFromUs")] pub peers_getting_from_us: Option, - #[serde(rename = "peersSendingToUs")] pub peers_sending_to_us: Option, - #[serde(rename = "percentDone")] pub percent_done: Option, - #[serde(rename = "rateDownload")] pub rate_download: Option, - #[serde(rename = "rateUpload")] pub rate_upload: Option, - #[serde(rename = "recheckProgress")] pub recheck_progress: Option, - #[serde(rename = "secondsSeeding")] pub seconds_seeding: Option, - #[serde(rename = "seedRatioLimit")] pub seed_ratio_limit: Option, - #[serde(rename = "sizeWhenDone")] pub size_when_done: Option, pub status: Option, - #[serde(rename = "torrentFile")] pub torrent_file: Option, - #[serde(rename = "totalSize")] pub total_size: Option, pub trackers: Option>, - #[serde(rename = "uploadRatio")] pub upload_ratio: Option, - #[serde(rename = "uploadedEver")] pub uploaded_ever: Option, pub files: Option>, /// for each file in files, whether or not they will be downloaded (0 or 1) pub wanted: Option>, /// for each file in files, their download priority (low:-1,normal:0,high:1) pub priorities: Option>, - #[serde(rename = "fileStats")] pub file_stats: Option>, } #[derive(Deserialize, Debug, Clone)] +#[serde(rename_all = "camelCase")] pub struct Stats { - #[serde(rename = "filesAdded")] pub files_added: i32, - #[serde(rename = "downloadedBytes")] pub downloaded_bytes: i64, - #[serde(rename = "uploadedBytes")] pub uploaded_bytes: i64, - #[serde(rename = "secondsActive")] pub seconds_active: i64, - #[serde(rename = "sessionCount")] pub session_count: Option, } @@ -170,16 +132,16 @@ pub struct Trackers { } #[derive(Deserialize, Debug, Clone)] +#[serde(rename_all = "camelCase")] pub struct File { pub length: i64, - #[serde(rename = "bytesCompleted")] pub bytes_completed: i64, pub name: String, } #[derive(Deserialize, Debug, Clone)] +#[serde(rename_all = "camelCase")] pub struct FileStat { - #[serde(rename = "bytesCompleted")] pub bytes_completed: i64, pub wanted: bool, /// low: -1, normal: 0, high: 1