ask for confirmation before overwriting

khal/cli.py

@@ -248,7 +248,7 @@ def new(ctx, description, location, repeat, until):
     @click.option('--include-calendar', '-a', help=('The calendar to use.'),
                   expose_value=False, callback=_calendar_select_callback,
                   metavar='CAL')
-    @click.option('--batch', help=('do not ask for confirmation.'),
+    @click.option('--batch', help=('do not ask for any confirmation.'),
                   is_flag=True)
     @click.option('--random_uid', '-r', help=('Select a random uid.'),
                   is_flag=True)
@@ -258,9 +258,11 @@ def import_ics(ctx, ics, batch, random_uid):
         '''Import events from an .ics file.
 
         If an event with the same UID is already present in the (implicitly)
-        selected calendar import will update (i.e. overwrite) that old event
-        with the imported one. If this behaviour is not desired, that the
-        `--random-uid` flag.
+        selected calendar import will ask before updating (i.e. overwriting)
+        that old event with the imported one, unless --batch is given, than it
+        will always update. If this behaviour is not desired, use the
+        `--random-uid` flag to generate a new, random UID.
+
         '''
         ics_str = ics.read()
         controllers.import_ics(

khal/controllers.py

@@ -200,7 +200,8 @@ def interactive(collection, conf):
 
 def import_ics(collection, conf, ics, batch=False, random_uid=False):
     """
-    :param batch: setting this to True will insert without asking for approval
+    :param batch: setting this to True will insert without asking for approval,
+                  even when an event with the same uid already exists
     :type batch: bool
     """
     cal = icalendar.Calendar.from_ical(ics)
@@ -218,14 +219,18 @@ def import_ics(collection, conf, ics, batch=False, random_uid=False):
                           locale=conf['locale'])
             if not batch:
                 echo(event.long())
-        if batch or confirm('Do you want to import this event into `{}`?'
-                            ''.format(collection.default_calendar_name)):
+        if batch or confirm("Do you want to import this event into `{}`?"
+                            "".format(collection.default_calendar_name)):
             ics = aux.ics_from_list(vevent, random_uid)
             try:
                 collection.new(
                     Item(ics.to_ical().decode('utf-8')),
                     collection=collection.default_calendar_name)
             except DuplicateUid:
-                collection.force_update(
-                    Item(ics.to_ical().decode('utf-8')),
-                    collection=collection.default_calendar_name)
+                if batch or confirm("An event with the same UID already exists. "
+                                    "Do you want to update it?"):
+                    collection.force_update(
+                        Item(ics.to_ical().decode('utf-8')),
+                        collection=collection.default_calendar_name)
+                else:
+                    logger.warn("Not importing event with UID `{}`".format(event.uid))