From e8a2707987880dd0a6a87a046f00ac15e7c8a76f Mon Sep 17 00:00:00 2001 From: Candifloss Date: Fri, 10 Oct 2025 11:46:39 +0530 Subject: [PATCH] Seperate library from project - Move OWM library crate to a seperate repo - https://git.candifloss.cc/candifloss/OpenWeatherMapSDK.git --- Cargo.toml | 2 +- owm_widg_config/Cargo.toml | 2 +- owm_widg_config/src/free25.rs | 2 +- weatherd/Cargo.toml | 4 ++-- weatherd/src/main.rs | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e3434cb..7838629 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] resolver = "3" members = [ - "owm_api25", "owm_widg_config", "weatherd", + "owm_widg_config", "weatherd", "widget", ] diff --git a/owm_widg_config/Cargo.toml b/owm_widg_config/Cargo.toml index 9ed1e67..9342e87 100644 --- a/owm_widg_config/Cargo.toml +++ b/owm_widg_config/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" edition = "2024" [dependencies] -owm_api25 = { path = "../owm_api25" } +owm-rs = { git = "https://git.candifloss.cc/candifloss/OpenWeatherMapSDK.git" } serde = { version = "1.0.225", features = ["derive"] } toml = "0.9.7" dirs = "6.0.0" \ No newline at end of file diff --git a/owm_widg_config/src/free25.rs b/owm_widg_config/src/free25.rs index f7f5a8c..9da378b 100644 --- a/owm_widg_config/src/free25.rs +++ b/owm_widg_config/src/free25.rs @@ -1,4 +1,4 @@ -use owm_api25::query::{QueryParams, Units}; +use owm_rs::free_api_v25::query::{QueryParams, Units}; use serde::Deserialize; #[derive(Debug, Deserialize)] diff --git a/weatherd/Cargo.toml b/weatherd/Cargo.toml index 54ca34a..57d519f 100644 --- a/weatherd/Cargo.toml +++ b/weatherd/Cargo.toml @@ -9,5 +9,5 @@ toml = "0.9.7" dirs = "6.0.0" serde = { version = "1.0.225", features = ["derive"] } serde_json = "1.0.145" -owm_api25 = { path = "../owm_api25" } -owm_widg_config = { path = "../owm_widg_config" } \ No newline at end of file +owm_widg_config = { path = "../owm_widg_config" } +owm-rs = { git = "https://git.candifloss.cc/candifloss/OpenWeatherMapSDK.git" } \ No newline at end of file diff --git a/weatherd/src/main.rs b/weatherd/src/main.rs index 372fe69..15946d4 100644 --- a/weatherd/src/main.rs +++ b/weatherd/src/main.rs @@ -1,4 +1,4 @@ -use owm_api25::current::WeatherResponse; +use owm_rs::free_api_v25::{current::WeatherResponse, query::QueryParams}; use owm_widg_config::config::Config; use reqwest::blocking; use std::error::Error; @@ -31,7 +31,7 @@ fn fetch_and_cache() -> Result<(), Box> { match cfg.general.api_version.as_str() { "free_2.5" => { - let query = owm_api25::query::QueryParams::from(cfg.query_params); + let query = QueryParams::from(cfg.query_params); let url = query.weather_url()?; let resp = blocking::get(&url)?.json::()?;