Refactoring ls and date

src/uu/date/src/date.rs

@@ -275,6 +275,8 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
             match date {
                 Ok(date) => {
                     // TODO - Revisit when chrono 0.5 is released. https://github.com/chronotope/chrono/issues/970
+                    // From this line to line 292 can be refactored in the timezone_date.rs module
+                    // custom_time_format(format_string, Utc::now().date_naive());
                     let tz = match std::env::var("TZ") {
                         // TODO Support other time zones...
                         Ok(s) if s == "UTC0" || s.is_empty() => Tz::Etc__UTC,
@@ -284,11 +286,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
                         },
                     };
                     let offset = tz.offset_from_utc_date(&Utc::now().date_naive());
-                    let tz_abbreviation = offset.abbreviation();
+                    let tz_abbreviation = offset.abbreviation().unwrap_or("UTC");
                     // GNU `date` uses `%N` for nano seconds, however crate::chrono uses `%f`
                     let format_string = &format_string
                         .replace("%N", "%f")
-                        .replace("%Z", tz_abbreviation.unwrap_or("UTC"));
+                        .replace("%Z", tz_abbreviation);
                     // Refuse to pass this string to chrono as it is crashing in this crate
                     if format_string.contains("%#z") {
                         return Err(USimpleError::new(

src/uu/ls/src/ls.rs

@@ -386,7 +386,10 @@ impl TimeStyle {
             //So it's not yet implemented
             (Self::Locale, true) => time.format("%b %e %H:%M").to_string(),
             (Self::Locale, false) => time.format("%b %e  %Y").to_string(),
-            (Self::Format(e), _) => custom_time_format(e, time),
+            (Self::Format(e), _) => {
+                // this line can be replaced with the one in timzone_date.rs
+                custom_time_format(e, time)
+            }
         }
     }
 }

src/uucore/src/lib/features/timezone_date.rs

@@ -0,0 +1,25 @@
+mod timezone_date {
+    /// Get the alphabetic abbreviation of the current timezone.
+    ///
+    /// For example, "UTC" or "CET" or "PDT".
+    fn timezone_abbrev() -> &str {
+        let tz = match std::env::var("TZ") {
+            // TODO Support other time zones...
+            Ok(s) if s == "UTC0" || s.is_empty() => Tz::Etc__UTC,
+            _ => match get_timezone() {
+                Ok(tz_str) => tz_str.parse().unwrap(),
+                Err(_) => Tz::Etc__UTC,
+            },
+        };
+        let offset = tz.offset_from_utc_date(&Utc::now().date_naive());
+        offset.abbreviation().unwrap_or("UTC").to_string()
+    }
+
+    /// Format the given time according to a custom format string.
+    pub fn custom_time_format(fmt: &str, time: DateTime<Local>) -> String {
+        // TODO - Revisit when chrono 0.5 is released. https://github.com/chronotope/chrono/issues/970
+        // GNU `date` uses `%N` for nano seconds, however the `chrono` crate uses `%f`.
+        let fmt = fmt.replace("%N", "%f").replace("%Z", timezone_abbrev());
+        time.format(&fmt).to_string()
+    }
+}