[meld] meldwindow: Handle missing files when adding new comparisons
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] meldwindow: Handle missing files when adding new comparisons
- Date: Sun, 9 Jan 2022 01:22:35 +0000 (UTC)
commit 96c2f13e65c61ded21fba687ab3e417a213d92b4
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Jan 9 10:54:17 2022 +1000
meldwindow: Handle missing files when adding new comparisons
Our individual comparison types generally have handling for `None`s in
their locations, and this can be useful in certain situations.
meld/meldwindow.py | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index 6f77fded..49c04ee3 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -16,7 +16,7 @@
import logging
import os
-from typing import Optional, Sequence
+from typing import Any, Dict, Optional, Sequence
from gi.repository import Gdk, Gio, GLib, Gtk
@@ -388,13 +388,21 @@ class MeldWindow(Gtk.ApplicationWindow):
doc.set_merge_output_file(merge_output)
return doc
- def append_diff(self, gfiles, auto_compare=False, auto_merge=False,
- merge_output=None, meta=None):
+ def append_diff(
+ self,
+ gfiles: Sequence[Optional[Gio.File]],
+ auto_compare: bool = False,
+ auto_merge: bool = False,
+ merge_output: Optional[Gio.File] = None,
+ meta: Optional[Dict[str, Any]] = None,
+ ):
have_directories = False
have_files = False
for f in gfiles:
- if f.query_file_type(
- Gio.FileQueryInfoFlags.NONE, None) == Gio.FileType.DIRECTORY:
+ if not f:
+ continue
+ file_type = f.query_file_type(Gio.FileQueryInfoFlags.NONE, None)
+ if file_type == Gio.FileType.DIRECTORY:
have_directories = True
else:
have_files = True
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]