leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(time): handle invalid strftime formatters

Browse source 
Invalid format strings trigger a panic for the strftime formatter's Display implementation. This can occur frequently when the user is inputting a format string in COSMIC Settings. A plain '%' immediately causes a panic.

This commit handles invalid formatters correctly by writing to a buffer instead of relying on to_string() (Display).
This commit is contained in:
Joshua Megnauth 2025-11-18 15:29:56 -05:00 • committed by GitHub
parent 226c50e233
commit fd01e07304
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

30
cosmic-applet-time/src/window.rs
View file

@ -163,13 +163,27 @@ impl Window {
calendar
}
/// Format with strftime if non-empty and ignore errors.
///
/// Do not use to_string(). The formatter panics on invalid specifiers.
fn maybe_strftime(&self) -> Option<String> {
// strftime may override locale specific elements so it stands alone rather
// than using ICU.
(!self.config.format_strftime.is_empty())
.then(|| {
let mut s = String::new();
self.now
.format(&self.config.format_strftime)
.write_to(&mut s)
.map(|_| s)
.ok()
})
.flatten()
}
fn vertical_layout(&self) -> Element<'_, Message> {
let elements: Vec<Element<'_, Message>> = if !self.config.format_strftime.is_empty() {
// strftime formatter may override locale specific elements so it stands alone rather
// than using ICU to determine a format.
self.now
.format(&self.config.format_strftime)
.to_string()
let elements: Vec<Element<'_, Message>> = if let Some(strftime) = self.maybe_strftime() {
strftime
.split_whitespace()
.map(|piece| self.core.applet.text(piece.to_owned()).into())
.collect()
@ -235,8 +249,8 @@ impl Window {
}
fn horizontal_layout(&self) -> Element<'_, Message> {
let formatted_date = if !self.config.format_strftime.is_empty() {
self.now.format(&self.config.format_strftime).to_string()
let formatted_date = if let Some(strftime) = self.maybe_strftime() {
strftime
} else {
let datetime = self.create_datetime(&self.now);
let mut prefs = DateTimeFormatterPreferences::from(self.locale.clone());