Merge branch 'master' into weblate-pop-os-cosmic-files

Author: jackpot51

Cargo.lock

@@ -44,8 +44,8 @@ xdg-mime = { git = "https://github.com/ebassi/xdg-mime-rs" }
 bzip2 = { version = "0.6", optional = true }            #TODO: replace with pure Rust crate
 flate2 = "1.1"
 tar = "0.4.44"
-lzma-rust2 = { version = "0.13", optional = true }
-ordermap = { version = "0.5.10", features = ["serde"] }
+lzma-rust2 = { version = "0.14", optional = true }
+ordermap = { version = "0.5.12", features = ["serde"] }
 # Internationalization
 i18n-embed = { version = "0.16", features = [
     "fluent-system",
@@ -59,7 +59,7 @@ zip = "5.1.1"
 uzers = "0.12.1"
 md-5 = "0.10.6"
 png = "0.18"
-jxl-oxide = { version = "0.12.4", features = ["image"] }
+jxl-oxide = { version = "0.12.5", features = ["image"] }
 num_cpus = "1.17.0"
 
 # Completion-based IO runtime to enable io_uring / IOCP file IO support.
@@ -135,6 +135,3 @@ tokio = { version = "1", features = ["rt", "macros"] }
 
 [workspace]
 members = ["cosmic-files-applet"]
-
-[patch.crates-io]
-license = { git = "https://github.com/evenorog/license.git" }

Cargo.toml

@@ -534,6 +534,12 @@ pub struct DialogPages {
     pages: VecDeque<DialogPage>,
 }
 
+impl Default for DialogPages {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl DialogPages {
     pub fn new() -> Self {
         Self {
@@ -996,7 +1002,6 @@ impl App {
         self.margin = overlaps;
     }
 
-    #[must_use]
     fn open_tab_entity(
         &mut self,
         location: Location,
@@ -1061,18 +1066,14 @@ impl App {
     }
 
     // This wrapper ensures that local folders use trash and remote folders permanently delete with a dialog
-    #[must_use]
     fn delete(&mut self, paths: Vec<PathBuf>) -> Task<Message> {
         let mut dialog_paths = Vec::new();
         let mut trash_paths = Vec::new();
 
         for path in paths {
             //TODO: is there a smarter way to check this? (like checking for trash folders)
             let can_trash = match path.metadata() {
-                Ok(metadata) => match tab::fs_kind(&metadata) {
-                    tab::FsKind::Local => true,
-                    _ => false,
-                },
+                Ok(metadata) => matches!(tab::fs_kind(&metadata), tab::FsKind::Local),
                 Err(err) => {
                     log::warn!("failed to get metadata for {:?}: {}", path, err);
                     false
@@ -1097,7 +1098,6 @@ impl App {
         Task::batch(tasks)
     }
 
-    #[must_use]
     fn operation(&mut self, operation: Operation) -> Task<Message> {
         let id = self.pending_operation_id;
         let controller = Controller::default();
@@ -1157,7 +1157,6 @@ impl App {
         }
     }
 
-    #[must_use]
     fn rescan_operation_selection(&mut self, op_sel: OperationSelection) -> Task<Message> {
         log::info!("rescan_operation_selection {:?}", op_sel);
         let entity = self.tab_model.active();
@@ -2023,7 +2022,7 @@ impl App {
             }
         }
 
-        return false;
+        false
     }
 }
 
@@ -2085,7 +2084,7 @@ impl Application for App {
                 .unwrap()
                 .block_on(async move {
                     while let Some(task) = compio_rx.recv().await {
-                        _ = compio::runtime::spawn(task).detach();
+                        compio::runtime::spawn(task).detach();
                     }
                 })
         });
@@ -2096,6 +2095,7 @@ impl Application for App {
             .version(env!("CARGO_PKG_VERSION"))
             .author("System76")
             .license("GPL-3.0-only")
+            .license_url("https://spdx.org/licenses/GPL-3.0-only")
             .developers([("Jeremy Soller", "[email protected]")])
             .links([
                 (fl!("repository"), "https://github.com/pop-os/cosmic-files"),
@@ -2241,7 +2241,7 @@ impl Application for App {
 
         if location_opt
             .and_then(|x| x.path_opt())
-            .map_or(false, |x| x.is_file())
+            .is_some_and(|x| x.is_file())
         {
             items.push(cosmic::widget::menu::Item::Button(
                 fl!("open"),
@@ -2319,14 +2319,14 @@ impl Application for App {
                                 found |= item.path().is_some_and(|p| path.starts_with(&p))
                                     || item.name() == *name
                                     || item.uri() == *uri;
-                                (!item.is_mounted() && found).then(|| *k)
+                                (!item.is_mounted() && found).then_some(*k)
                             })
                         })
                         .or(if found {
                             None
                         } else {
                             // TODO do we need to choose the correct mounter?
-                            self.mounter_items.iter().map(|(k, _)| *k).next()
+                            self.mounter_items.keys().map(|k| *k).next()
                         })
                     {
                         if let Some(mounter) = MOUNTERS.get(&key) {
@@ -2968,8 +2968,8 @@ impl Application for App {
                 }
             },
             Message::ModifiersChanged(window_id, modifiers) => {
+                self.modifiers = modifiers;
                 if self.core.main_window_id() == Some(window_id) {
-                    self.modifiers = modifiers;
                     let entity = self.tab_model.active();
                     return self.update(Message::TabMessage(
                         Some(entity),
@@ -3078,7 +3078,7 @@ impl Application for App {
             }
             Message::NetworkDriveSubmit => {
                 //TODO: know which mounter to use for network drives
-                for (mounter_key, mounter) in MOUNTERS.iter() {
+                if let Some((mounter_key, mounter)) = MOUNTERS.iter().next() {
                     self.network_drive_connecting =
                         Some((*mounter_key, self.network_drive_input.clone()));
                     return mounter
@@ -3876,7 +3876,7 @@ impl Application for App {
                                         };
                                         let window_id = WindowId::unique();
                                         self.windows.insert(
-                                            window_id.clone(),
+                                            window_id,
                                             WindowKind::ContextMenu(entity, widget::Id::unique()),
                                         );
                                         commands.push(self.update(Message::Surface(
@@ -3900,7 +3900,7 @@ impl Application for App {
                                                         parent: parent_id.unwrap_or(
                                                             app.core
                                                                 .main_window_id()
-                                                                .unwrap_or_else(|| WindowId::NONE),
+                                                                .unwrap_or(WindowId::NONE),
                                                         ),
                                                         id: window_id,
                                                         positioner,
@@ -4061,7 +4061,7 @@ impl Application for App {
                             .sort_names
                             .get(&location_str)
                             .or_else(|| SORT_OPTION_FALLBACK.get(&location_str))
-                            .unwrap_or_else(|| &(HeadingOptions::Name, true));
+                            .unwrap_or(&(HeadingOptions::Name, true));
 
                         tab.sort_name = sort.0;
                         tab.sort_direction = sort.1;
@@ -4376,7 +4376,7 @@ impl Application for App {
                         .and_then(|x| x.path_opt())
                         .map(ToOwned::to_owned)
                     {
-                        return self.open_file(&[path]).into();
+                        return self.open_file(&[path]);
                     }
                 }
                 NavMenuAction::OpenWith(entity) => {
@@ -4634,7 +4634,7 @@ impl Application for App {
                     if let Some(p) = paths.first() {
                         {
                             for (k, mounter_items) in &self.mounter_items {
-                                if let Some(mounter) = MOUNTERS.get(&k) {
+                                if let Some(mounter) = MOUNTERS.get(k) {
                                     if let Some(item) = mounter_items
                                         .iter()
                                         .find(|item| item.path().is_some_and(|path| path == *p))
@@ -4695,7 +4695,7 @@ impl Application for App {
         Some(match &self.context_page {
             ContextPage::About => context_drawer::about(
                 &self.about,
-                Message::LaunchUrl,
+                |url| Message::LaunchUrl(url.to_string()),
                 Message::ToggleContextPage(ContextPage::About),
             ),
             ContextPage::EditHistory => context_drawer::context_drawer(
@@ -4766,10 +4766,7 @@ impl Application for App {
                 );
             }
         }
-
-        let Some(dialog_page) = self.dialog_pages.front() else {
-            return None;
-        };
+        let dialog_page = self.dialog_pages.front()?;
 
         let cosmic_theme::Spacing {
             space_xxs, space_s, ..
@@ -4854,8 +4851,7 @@ impl Application for App {
                                         archive_type: archive_types[index],
                                         password: password.clone(),
                                     })
-                                })
-                                .into(),
+                                }),
                             ])
                             .align_y(Alignment::Center)
                             .spacing(space_xxs)
@@ -5962,8 +5958,7 @@ impl Application for App {
                             // watching the trash which is slow but also properly get events.
                             let trash_paths = trash_bins
                                 .into_iter()
-                                .map(|path| [path.join("files"), path])
-                                .flatten();
+                                .flat_map(|path| [path.join("files"), path]);
                             for path in trash_paths {
                                 if let Err(e) =
                                     watcher.watch(&path, notify::RecursiveMode::NonRecursive)

src/app.rs

@@ -245,7 +245,6 @@ fn zip_extract<R: io::Read + io::Seek, P: AsRef<Path>>(
                 controller.set_progress(total_progress);
             }
         }
-        outfile.sync_all()?;
         #[cfg(unix)]
         {
             // Check for real permissions, which we'll set in a second pass

src/archive.rs

@@ -159,11 +159,9 @@ impl<T: AsRef<str>> From<T> for DialogLabel {
             let underline = next_underline;
             next_underline = false;
 
-            if c == '_' {
-                if !underline {
-                    next_underline = true;
-                    continue;
-                }
+            if c == '_' && !underline {
+                next_underline = true;
+                continue;
             }
 
             if underline && key_bind_opt.is_none() {
@@ -1041,10 +1039,7 @@ impl Application for App {
             );
         }
 
-        let dialog_page = match self.dialog_pages.front() {
-            Some(some) => some,
-            None => return None,
-        };
+        let dialog_page = self.dialog_pages.front()?;
 
         let dialog = match dialog_page {
             DialogPage::NewFolder { parent, name } => {
@@ -1628,7 +1623,7 @@ impl Application for App {
                                         };
                                         use cosmic::iced::Rectangle;
                                         let window_id = window::Id::unique();
-                                        self.context_menu_window = Some(window_id.clone());
+                                        self.context_menu_window = Some(window_id);
                                         let autosize_id = widget::Id::unique();
                                         commands.push(self.update(Message::Surface(
                                             cosmic::surface::action::app_popup(

src/dialog.rs

@@ -535,13 +535,13 @@ pub fn menu_bar<'a>(
         menu::Item::CheckBox(
             label,
             None,
-            sort_options.map_or(false, |(sort_name, sort_direction, _)| {
+            sort_options.is_some_and(|(sort_name, sort_direction, _)| {
                 sort_name == sort && sort_direction == dir
             }),
             Action::SetSort(sort, dir),
         )
     };
-    let in_trash = tab_opt.map_or(false, |tab| tab.location == Location::Trash);
+    let in_trash = tab_opt.is_some_and(|tab| tab.location == Location::Trash);
 
     let mut selected_dir = 0;
     let mut selected = 0;
@@ -637,26 +637,26 @@ pub fn menu_bar<'a>(
                         menu::Item::CheckBox(
                             fl!("grid-view"),
                             None,
-                            tab_opt.map_or(false, |tab| matches!(tab.config.view, tab::View::Grid)),
+                            tab_opt.is_some_and(|tab| matches!(tab.config.view, tab::View::Grid)),
                             Action::TabViewGrid,
                         ),
                         menu::Item::CheckBox(
                             fl!("list-view"),
                             None,
-                            tab_opt.map_or(false, |tab| matches!(tab.config.view, tab::View::List)),
+                            tab_opt.is_some_and(|tab| matches!(tab.config.view, tab::View::List)),
                             Action::TabViewList,
                         ),
                         menu::Item::Divider,
                         menu::Item::CheckBox(
                             fl!("show-hidden-files"),
                             None,
-                            tab_opt.map_or(false, |tab| tab.config.show_hidden),
+                            tab_opt.is_some_and(|tab| tab.config.show_hidden),
                             Action::ToggleShowHidden,
                         ),
                         menu::Item::CheckBox(
                             fl!("list-directories-first"),
                             None,
-                            tab_opt.map_or(false, |tab| tab.config.folders_first),
+                            tab_opt.is_some_and(|tab| tab.config.folders_first),
                             Action::ToggleFoldersFirst,
                         ),
                         menu::Item::CheckBox(

src/menu.rs

@@ -439,7 +439,7 @@ impl MimeAppCache {
 
     fn get_default_terminal(&self) -> Option<String> {
         let output = process::Command::new("xdg-mime")
-            .args(&["query", "default", "x-scheme-handler/terminal"])
+            .args(["query", "default", "x-scheme-handler/terminal"])
             .output()
             .ok()?;
 

src/mime_app.rs

@@ -69,15 +69,15 @@ pub fn mime_for_path<P: AsRef<Path>>(
             gb.file_name(file_name);
         }
     } else {
-        gb.path(&path);
+        gb.path(path);
     }
     if let Some(metadata) = metadata_opt {
         gb.metadata(metadata.clone());
     }
     let guess = gb.guess();
     if guess.uncertain() {
         // If uncertain, try mime_guess. This could happen on platforms without shared-mime-info
-        mime_guess::from_path(&path).first_or_octet_stream()
+        mime_guess::from_path(path).first_or_octet_stream()
     } else {
         guess.mime_type().clone()
     }

src/mime_icon.rs

@@ -99,10 +99,7 @@ fn network_scan(uri: &str, sizes: IconSizes) -> Result<Vec<tab::Item>, String> {
 
         let metadata = if !force_dir && !info.boolean(gio::FILE_ATTRIBUTE_FILESYSTEM_REMOTE) {
             let mtime = info.attribute_uint64(gio::FILE_ATTRIBUTE_TIME_MODIFIED);
-            let is_dir = match info.file_type() {
-                gio::FileType::Directory => true,
-                _ => false,
-            };
+            let is_dir = matches!(info.file_type(), gio::FileType::Directory);
             let size_opt = match is_dir {
                 true => None,
                 false => Some(info.size() as u64),