chore: fix compiler warnings
This commit is contained in:
parent
d111f3ba80
commit
2a7d07c966
6 changed files with 19 additions and 19 deletions
|
|
@ -43,9 +43,7 @@ use cosmic::{
|
||||||
use cosmic_panel_config::CosmicPanelConfig;
|
use cosmic_panel_config::CosmicPanelConfig;
|
||||||
use cosmic_settings_page::{self as page, section};
|
use cosmic_settings_page::{self as page, section};
|
||||||
#[cfg(feature = "page-accessibility")]
|
#[cfg(feature = "page-accessibility")]
|
||||||
use cosmic_settings_subscriptions::accessibility::{
|
use cosmic_settings_subscriptions::accessibility::subscription as a11y_subscription;
|
||||||
DBusRequest, DBusUpdate, subscription as a11y_subscription,
|
|
||||||
};
|
|
||||||
#[cfg(feature = "wayland")]
|
#[cfg(feature = "wayland")]
|
||||||
use desktop::{
|
use desktop::{
|
||||||
dock,
|
dock,
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ use cosmic_settings_page::{
|
||||||
self as page, Insert,
|
self as page, Insert,
|
||||||
section::{self, Section},
|
section::{self, Section},
|
||||||
};
|
};
|
||||||
use cosmic_settings_subscriptions::accessibility::{self, DBusRequest, DBusUpdate};
|
use cosmic_settings_subscriptions::accessibility::{DBusRequest, DBusUpdate};
|
||||||
use cosmic_settings_subscriptions::cosmic_a11y_manager;
|
use cosmic_settings_subscriptions::cosmic_a11y_manager;
|
||||||
use num_traits::FromPrimitive;
|
use num_traits::FromPrimitive;
|
||||||
use slotmap::SlotMap;
|
use slotmap::SlotMap;
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ use cosmic_bg_config::Source;
|
||||||
use cosmic_settings_wallpaper as wallpaper;
|
use cosmic_settings_wallpaper as wallpaper;
|
||||||
use std::collections::VecDeque;
|
use std::collections::VecDeque;
|
||||||
use std::env;
|
use std::env;
|
||||||
use std::io::Read;
|
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
|
||||||
const NAME: &str = "com.system76.CosmicSettings.Wallpaper";
|
const NAME: &str = "com.system76.CosmicSettings.Wallpaper";
|
||||||
|
|
|
||||||
|
|
@ -291,7 +291,11 @@ impl Page {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
network_manager::Request::SelectAccessPoint(ssid, hw_address, network_type) => {
|
network_manager::Request::SelectAccessPoint(
|
||||||
|
ssid,
|
||||||
|
_hw_address,
|
||||||
|
_network_type,
|
||||||
|
) => {
|
||||||
self.connecting.remove(ssid.as_ref());
|
self.connecting.remove(ssid.as_ref());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -362,7 +362,7 @@ impl Page {
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut command = None;
|
let mut command = None;
|
||||||
if let Some(&node_id) = self.sink_ids.get(self.active_sink.unwrap_or(0)) {
|
if !self.sink_ids.get(self.active_sink.unwrap_or(0)).is_none() {
|
||||||
command = Some(cosmic::task::future(async move {
|
command = Some(cosmic::task::future(async move {
|
||||||
tokio::time::sleep(Duration::from_millis(64)).await;
|
tokio::time::sleep(Duration::from_millis(64)).await;
|
||||||
crate::pages::Message::Sound(Message::SinkBalanceApply)
|
crate::pages::Message::Sound(Message::SinkBalanceApply)
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,12 @@
|
||||||
use std::any::TypeId;
|
use std::any::TypeId;
|
||||||
|
|
||||||
use ashpd::desktop::location::{Location, LocationProxy};
|
use ashpd::desktop::location::{Location, LocationProxy};
|
||||||
use chrono::Datelike;
|
|
||||||
use cosmic::iced::{
|
use cosmic::iced::{
|
||||||
Subscription,
|
Subscription,
|
||||||
futures::{SinkExt, StreamExt, channel::mpsc::Sender, future},
|
futures::{SinkExt, StreamExt, channel::mpsc::Sender, future},
|
||||||
stream,
|
stream,
|
||||||
};
|
};
|
||||||
use sunrise::sunrise_sunset;
|
use sunrise::{Coordinates, SolarDay, SolarEvent};
|
||||||
use tokio::select;
|
use tokio::select;
|
||||||
|
|
||||||
pub fn daytime() -> cosmic::iced::Subscription<bool> {
|
pub fn daytime() -> cosmic::iced::Subscription<bool> {
|
||||||
|
|
@ -45,11 +44,16 @@ async fn inner(mut tx: Sender<bool>) -> anyhow::Result<()> {
|
||||||
let Some(loc) = loc.as_ref() else {
|
let Some(loc) = loc.as_ref() else {
|
||||||
break;
|
break;
|
||||||
};
|
};
|
||||||
let (lat, long) = (loc.latitude(), loc.longitude());
|
|
||||||
|
let coord = Coordinates::new(loc.latitude(), loc.longitude()).unwrap();
|
||||||
let now = chrono::Local::now();
|
let now = chrono::Local::now();
|
||||||
let date = now.date_naive();
|
let date = now.date_naive();
|
||||||
let (sunrise, sunset) = sunrise_sunset(lat, long, date.year(), date.month0(), date.day0());
|
|
||||||
let now_in_seconds = now.timestamp();
|
let now_in_seconds = now.timestamp();
|
||||||
|
let current_solar_day = SolarDay::new(coord, date);
|
||||||
|
let sunrise = current_solar_day
|
||||||
|
.event_time(SolarEvent::Sunrise)
|
||||||
|
.timestamp();
|
||||||
|
let sunset = current_solar_day.event_time(SolarEvent::Sunset).timestamp();
|
||||||
let daytime = now_in_seconds >= sunrise && now_in_seconds <= sunset;
|
let daytime = now_in_seconds >= sunrise && now_in_seconds <= sunset;
|
||||||
tx.send(daytime).await?;
|
tx.send(daytime).await?;
|
||||||
|
|
||||||
|
|
@ -59,14 +63,9 @@ async fn inner(mut tx: Sender<bool>) -> anyhow::Result<()> {
|
||||||
sunrise - now_in_seconds
|
sunrise - now_in_seconds
|
||||||
} else {
|
} else {
|
||||||
let tmrw = now + chrono::Duration::days(1);
|
let tmrw = now + chrono::Duration::days(1);
|
||||||
let tmrw_date = tmrw.date_naive();
|
let tmrw_sunrise = SolarDay::new(coord, tmrw.date_naive())
|
||||||
let (tmrw_sunrise, _) = sunrise_sunset(
|
.event_time(SolarEvent::Sunrise)
|
||||||
lat,
|
.timestamp();
|
||||||
long,
|
|
||||||
tmrw_date.year(),
|
|
||||||
tmrw_date.month0(),
|
|
||||||
tmrw_date.day0(),
|
|
||||||
);
|
|
||||||
tmrw_sunrise - now_in_seconds
|
tmrw_sunrise - now_in_seconds
|
||||||
};
|
};
|
||||||
next = select! {
|
next = select! {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue