Skip events on re-import that the calendar already has

Importing an export twice left second copies of everything. The import has kept the file's own UID since it was written -- inventing one only where an event arrives without -- so what was needed to recognise an event that is already here was there all along, and nothing looked at it. Asked for on #173 after the reporter's colleague hit the duplication in testing, and decided there: skip on a UID the calendar already holds, import what arrives without one. An event with no UID is not one anything can match to, and a softer match -- title and time, say -- guesses in both directions. The UIDs are read once per import rather than once per event. CalendarEvent/ query does take a uid filter, which is what findByUid uses, but a file of two thousand events would be two thousand queries. Read without expandRecurrences so a weekly series is one event with one UID rather than one per occurrence, and narrowed to the target calendar from calendarIds rather than through an inCalendar filter this client has not confirmed the server supports. Matching is per calendar. A UID is what makes an event the same event across calendars, so the same event being in two of them is not a duplicate and the second calendar still gets its copy. importIcs now answers with both counts. "Imported 40 events" over a file of 240 reads as a failure when 200 of them were simply already there, and a re-import of an unchanged file would otherwise report importing nothing at all rather than saying everything was already here. The three import toasts are translated in all nine catalogues while the messages were being written -- the plural for the existing one had never been added and was falling back to English. Closes #222.
2026-09-02 08:52:33 -07:00
parent f1a8f162cf
commit 74f6d1d0aa
12 changed files with 152 additions and 14 deletions
@@ -1073,6 +1073,9 @@ export const catalog: Catalog = {
    "Nothing unread here": "Hier ist nichts ungelesen",
  },
  plurals: {
+    "Imported {n} events": { one: "{n} Termin importiert", other: "{n} Termine importiert" },
+    "Already here: {n} events, nothing imported": { one: "Bereits vorhanden: {n} Termin, nichts importiert", other: "Bereits vorhanden: {n} Termine, nichts importiert" },
+    "{n} were already here": { one: "{n} war bereits vorhanden", other: "{n} waren bereits vorhanden" },
    "{n} messages": { one: "{n} Nachricht", other: "{n} Nachrichten" },
    "{n} selected": { one: "{n} ausgewählt", other: "{n} ausgewählt" },
    "{n} conversations": { one: "{n} Konversation", other: "{n} Konversationen" },
@@ -1046,6 +1046,9 @@ export const catalog: Catalog = {
    "Nothing unread here": "Aquí no hay nada sin leer",
  },
  plurals: {
+    "Imported {n} events": { one: "{n} evento importado", other: "{n} eventos importados" },
+    "Already here: {n} events, nothing imported": { one: "Ya estaba aquí: {n} evento, no se importó nada", other: "Ya estaban aquí: {n} eventos, no se importó nada" },
+    "{n} were already here": { one: "{n} ya estaba aquí", other: "{n} ya estaban aquí" },
    "{n} messages": { one: "{n} mensaje", other: "{n} mensajes" },
    "{n} selected": { one: "{n} seleccionado", other: "{n} seleccionados" },
    "{n} conversations": { one: "{n} conversación", other: "{n} conversaciones" },
@@ -1051,6 +1051,9 @@ export const catalog: Catalog = {
    "Nothing unread here": "Rien de non lu ici",
  },
  plurals: {
+    "Imported {n} events": { one: "{n} événement importé", other: "{n} événements importés" },
+    "Already here: {n} events, nothing imported": { one: "Déjà présent : {n} événement, rien d’importé", other: "Déjà présents : {n} événements, rien d’importé" },
+    "{n} were already here": { one: "{n} était déjà présent", other: "{n} étaient déjà présents" },
    "{n} messages": { one: "{n} message", other: "{n} messages" },
    "{n} selected": { one: "{n} sélectionné", other: "{n} sélectionnés" },
    "{n} conversations": { one: "{n} conversation", other: "{n} conversations" },
@@ -1054,6 +1054,9 @@ export const catalog: Catalog = {
    "Nothing unread here": "ここに未読はありません",
  },
  plurals: {
+    "Imported {n} events": { other: "{n} 件の予定をインポートしました" },
+    "Already here: {n} events, nothing imported": { other: "すでに存在: {n} 件、インポートなし" },
+    "{n} were already here": { other: "{n} 件はすでに存在していました" },
    /*
     * One form each, because Japanese has one. Intl.PluralRules returns
     * `other` for every number, so `one`, `few` and `many` would never be
@@ -1042,6 +1042,9 @@ export const catalog: Catalog = {
    "Nothing unread here": "Hier is niets ongelezen",
  },
  plurals: {
+    "Imported {n} events": { one: "{n} afspraak geïmporteerd", other: "{n} afspraken geïmporteerd" },
+    "Already here: {n} events, nothing imported": { one: "Al aanwezig: {n} afspraak, niets geïmporteerd", other: "Al aanwezig: {n} afspraken, niets geïmporteerd" },
+    "{n} were already here": { one: "{n} was er al", other: "{n} waren er al" },
    "{n} messages": { one: "{n} bericht", other: "{n} berichten" },
    "{n} selected": { one: "{n} geselecteerd", other: "{n} geselecteerd" },
    "{n} conversations": { one: "{n} gesprek", other: "{n} gesprekken" },
@@ -1049,6 +1049,9 @@ export const catalog: Catalog = {
    "Nothing unread here": "Não há nada não lido aqui",
  },
  plurals: {
+    "Imported {n} events": { one: "{n} evento importado", other: "{n} eventos importados" },
+    "Already here: {n} events, nothing imported": { one: "Já estava aqui: {n} evento, nada importado", other: "Já estavam aqui: {n} eventos, nada importado" },
+    "{n} were already here": { one: "{n} já estava aqui", other: "{n} já estavam aqui" },
    "{n} messages": { one: "{n} mensagem", other: "{n} mensagens" },
    "{n} selected": { one: "{n} selecionada", other: "{n} selecionadas" },
    "{n} conversations": { one: "{n} conversa", other: "{n} conversas" },
@@ -1048,6 +1048,9 @@ export const catalog: Catalog = {
    "Nothing unread here": "Здесь нет непрочитанного",
  },
  plurals: {
+    "Imported {n} events": { one: "Импортировано {n} событие", few: "Импортировано {n} события", many: "Импортировано {n} событий", other: "Импортировано {n} события" },
+    "Already here: {n} events, nothing imported": { one: "Уже есть: {n} событие, ничего не импортировано", few: "Уже есть: {n} события, ничего не импортировано", many: "Уже есть: {n} событий, ничего не импортировано", other: "Уже есть: {n} события, ничего не импортировано" },
+    "{n} were already here": { one: "{n} уже было здесь", few: "{n} уже были здесь", many: "{n} уже были здесь", other: "{n} уже были здесь" },
    /*
     * Three forms, which is the whole reason plural() takes a map rather than
     * (one, other). Intl.PluralRules picks: 1 is `one`, 2-4 are `few`, 5-20
@@ -1042,6 +1042,9 @@ export const catalog: Catalog = {
    "Nothing unread here": "Тут немає непрочитаного",
  },
  plurals: {
+    "Imported {n} events": { one: "Імпортовано {n} подію", few: "Імпортовано {n} події", many: "Імпортовано {n} подій", other: "Імпортовано {n} події" },
+    "Already here: {n} events, nothing imported": { one: "Уже є: {n} подія, нічого не імпортовано", few: "Уже є: {n} події, нічого не імпортовано", many: "Уже є: {n} подій, нічого не імпортовано", other: "Уже є: {n} події, нічого не імпортовано" },
+    "{n} were already here": { one: "{n} уже була тут", few: "{n} уже були тут", many: "{n} уже були тут", other: "{n} уже були тут" },
    /*
     * Ukrainian takes the same three forms as Russian and the same rule, but
     * not the same words. Sharing a plural structure is not sharing a
@@ -1053,6 +1053,9 @@ export const catalog: Catalog = {
    "Nothing unread here": "这里没有未读邮件",
  },
  plurals: {
+    "Imported {n} events": { other: "已导入 {n} 个日程" },
+    "Already here: {n} events, nothing imported": { other: "已存在 {n} 个，未导入" },
+    "{n} were already here": { other: "{n} 个已存在" },
    /*
     * One form each, because Chinese has one. Intl.PluralRules returns `other`
     * for every number, so `one`, `few` and `many` would never be selected —