Files Refactor

Refactor files logic, add extensive testing, introduce umbrel event bus for signalling between modules.

Co-authored-by: Nathan Fretz <[email protected]>
Co-authored-by: Mayank Chhabra <[email protected]>
Co-authored-by: mayankchhabra <[email protected]>

Author: 3 people

.github/workflows/ci.yml

@@ -24,9 +24,17 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18
+      # This is needed for the samba integration tests
+      - name: Setup umbrel user
+        run: |
+          sudo adduser --gecos "" --disabled-password umbrel
+          echo "umbrel:umbrel" | sudo chpasswd
+          sudo usermod -aG sudo umbrel
       - name: Install dependencies
         run: |
-          sudo apt-get install -y imagemagick
+          sudo apt-get update
+          sudo apt-get install -y unar imagemagick ffmpeg samba wsdd2
+          sudo systemctl disable smbd wsdd2
           sudo npm clean-install
       - run: sudo npm run ${{ matrix.task }}
   ui:

packages/os/overlay-common/etc/samba/smb.conf

@@ -119,21 +119,17 @@ RUN apt-get install --yes sudo nano vim less man iproute2 iputils-ping curl wget
 
 # Install umbreld dependencies
 # (many of these can be remove after the apps refactor)
-RUN apt-get install --yes python3 fswatch jq rsync git gettext-base gnupg procps dmidecode samba wsdd2 p7zip-full imagemagick ffmpeg
+RUN apt-get install --yes python3 fswatch jq rsync git gettext-base gnupg procps dmidecode unar imagemagick ffmpeg samba wsdd2
+
+# Disable automatically starting smbd and wsdd2 at boot so umbreld can initialize them only when they're needed
+RUN systemctl disable smbd wsdd2
 
 # Support for alternate filesystems
 # For some reason this always fails on arm64 but it's ok since we
 # don't support external storage on Pi anyway.
 RUN [ "${TARGETARCH}" = "amd64" ] && apt-get install --yes ntfs-3g || true
 
-# TODO: udisks2 recommends eject (2.38.1-5+deb12u3) which is currently missing
-RUN apt-get install --yes --no-install-recommends udisks2
-
-# Disable automatically starting smbd at boot so umbreld can initialize it first
-RUN systemctl disable smbd.service
-
 # Install Node.js
-RUN apt-get install --yes python3 fswatch jq rsync git gettext-base gnupg procps dmidecode
 RUN NODE_ARCH=$([ "${TARGETARCH}" = "arm64" ] && echo "arm64" || echo "x64") && \
     NODE_SHA256=$(eval echo \$NODE_SHA256_${TARGETARCH}) && \
     curl -fsSL https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-${NODE_ARCH}.tar.gz -o node.tar.gz && \
@@ -153,12 +149,12 @@ RUN sh /tmp/install-docker.sh --version v${DOCKER_VERSION}
 RUN rm /tmp/install-docker.sh
 
 # Add Umbrel user
-RUN addgroup --gid 1000 umbrel && adduser --uid 1000 --gid 1000 --gecos "" --disabled-password umbrel
+RUN adduser --gecos "" --disabled-password umbrel
 RUN echo "umbrel:umbrel" | chpasswd
-RUN usermod -aG sudo,sambashare umbrel
+RUN usermod -aG sudo umbrel
 
 # Preload images
-RUN apt-get install --yes skopeo
+RUN sudo apt-get install --yes skopeo
 RUN mkdir -p /images
 RUN skopeo copy docker://getumbrel/tor@sha256:2ace83f22501f58857fa9b403009f595137fa2e7986c4fda79d82a8119072b6a docker-archive:/images/tor
 RUN skopeo copy docker://getumbrel/auth-server@sha256:b4a4b37896911a85fb74fa159e010129abd9dff751a40ef82f724ae066db3c2a docker-archive:/images/auth

packages/os/overlay-common/etc/sysctl.d/99-inotify.conf

@@ -218,6 +218,12 @@
   "files-audio-island.now-playing": "Jetzt läuft",
   "files-audio-island.pause": "Pausieren",
   "files-audio-island.play": "Abspielen",
+  "files-collision.action.keep-both": "Beide behalten",
+  "files-collision.action.replace": "Ersetzen",
+  "files-collision.action.skip": "Überspringen",
+  "files-collision.destination.original-location": "seinem ursprünglichen Speicherort",
+  "files-collision.message": "Möchtest du das vorhandene Element ersetzen oder beide behalten?",
+  "files-collision.title": "\"{{itemName}}\" ist bereits in {{destinationName}} vorhanden",
   "files-download.confirm": "Herunterladen",
   "files-download.description": "Files kann diesen Dateityp nicht öffnen. Möchtest du ihn stattdessen herunterladen?",
   "files-download.title": "„{{name}}“ herunterladen?",
@@ -240,6 +246,7 @@
   "files-error.rename": "Fehler beim Umbenennen: {{message}}",
   "files-error.restore": "Fehler beim Wiederherstellen: {{message}}",
   "files-error.trash": "Fehler beim Verschieben in den Papierkorb: {{message}}",
+  "files-error.upload": "Fehler beim Hochladen: {{message}}",
   "files-extension-change.confirm": "Fortfahren",
   "files-extension-change.description-add": "Bist du sicher, dass du die Dateiendung von „{{fileName}}“ in „{{extension}}“ ändern möchtest? Dadurch kann die Datei möglicherweise unlesbar werden.",
   "files-extension-change.description-remove": "Bist du sicher, dass du die Dateiendung von „{{fileName}}“ entfernen möchtest?",
@@ -250,8 +257,11 @@
   "files-folder": "Ordner",
   "files-listing.empty": "Keine Elemente",
   "files-listing.error": "Es ist ein Fehler aufgetreten",
+  "files-listing.item-count_one": "{{count}} Element",
+  "files-listing.item-count_other": "{{count}} Elemente",
   "files-listing.loading": "Wird geladen...",
   "files-listing.no-such-file": "Keine solche Datei oder kein solcher Ordner",
+  "files-listing.selected-count": "{{selectedCount}} von {{totalCount}} ausgewählt",
   "files-name-drawer.new-folder": "Neuer Ordner",
   "files-name-drawer.new-folder-description": "Gib einen Namen für den neuen Ordner ein.",
   "files-name-drawer.new-folder-input": "Ordnername",

packages/os/umbrelos.Dockerfile

@@ -218,6 +218,12 @@
   "files-audio-island.now-playing": "Now Playing",
   "files-audio-island.pause": "Pause",
   "files-audio-island.play": "Play",
+  "files-collision.action.keep-both": "Keep Both",
+  "files-collision.action.replace": "Replace",
+  "files-collision.action.skip": "Skip",
+  "files-collision.destination.original-location": "its original location",
+  "files-collision.message": "Do you want to replace the existing item or keep both?",
+  "files-collision.title": "\"{{itemName}}\" already exists in {{destinationName}}",
   "files-download.confirm": "Download",
   "files-download.description": "Files cannot open this type of file. Would you like to download it instead?",
   "files-download.title": "Download {{name}}?",
@@ -240,6 +246,7 @@
   "files-error.rename": "Error renaming: {{message}}",
   "files-error.restore": "Error restoring: {{message}}",
   "files-error.trash": "Error moving to trash: {{message}}",
+  "files-error.upload": "Error uploading: {{message}}",
   "files-extension-change.confirm": "Continue",
   "files-extension-change.description-add": "Are you sure you want to change the extension of '{{fileName}}' to '{{extension}}'? This may cause the file to be unreadable.",
   "files-extension-change.description-remove": "Are you sure you want to remove the extension of '{{fileName}}'?",
@@ -250,8 +257,11 @@
   "files-folder": "Folder",
   "files-listing.empty": "No items",
   "files-listing.error": "An error occurred",
+  "files-listing.item-count_one": "{{count}} item",
+  "files-listing.item-count_other": "{{count}} items",
   "files-listing.loading": "Loading...",
   "files-listing.no-such-file": "No such file or folder",
+  "files-listing.selected-count": "{{selectedCount}} of {{totalCount}} selected",
   "files-name-drawer.new-folder": "New Folder",
   "files-name-drawer.new-folder-description": "Enter a name for the new folder.",
   "files-name-drawer.new-folder-input": "Folder Name",

packages/ui/public/locales/de.json

@@ -218,6 +218,12 @@
   "files-audio-island.now-playing": "Reproduciendo ahora",
   "files-audio-island.pause": "Pausar",
   "files-audio-island.play": "Reproducir",
+  "files-collision.action.keep-both": "Conservar ambos",
+  "files-collision.action.replace": "Reemplazar",
+  "files-collision.action.skip": "Omitir",
+  "files-collision.destination.original-location": "su ubicación original",
+  "files-collision.message": "¿Quieres reemplazar el elemento existente o conservar ambos?",
+  "files-collision.title": "\"{{itemName}}\" ya existe en {{destinationName}}",
   "files-download.confirm": "Descargar",
   "files-download.description": "Files no puede abrir este tipo de archivo. ¿Quieres descargarlo?",
   "files-download.title": "¿Descargar {{name}}?",
@@ -240,6 +246,7 @@
   "files-error.rename": "Error al renombrar: {{message}}",
   "files-error.restore": "Error al restaurar: {{message}}",
   "files-error.trash": "Error al mover a la papelera: {{message}}",
+  "files-error.upload": "Error al subir: {{message}}",
   "files-extension-change.confirm": "Continuar",
   "files-extension-change.description-add": "¿Estás seguro de que quieres cambiar la extensión de '{{fileName}}' a '{{extension}}'? Esto podría hacer que el archivo fuera ilegible.",
   "files-extension-change.description-remove": "¿Estás seguro de que quieres quitar la extensión de '{{fileName}}'?",
@@ -250,8 +257,11 @@
   "files-folder": "Carpeta",
   "files-listing.empty": "No hay elementos",
   "files-listing.error": "Ocurrió un error",
+  "files-listing.item-count_one": "{{count}} elemento",
+  "files-listing.item-count_other": "{{count}} elementos",
   "files-listing.loading": "Cargando...",
   "files-listing.no-such-file": "No existe tal archivo o carpeta",
+  "files-listing.selected-count": "{{selectedCount}} de {{totalCount}} seleccionados",
   "files-name-drawer.new-folder": "Nueva carpeta",
   "files-name-drawer.new-folder-description": "Ingresa un nombre para la nueva carpeta.",
   "files-name-drawer.new-folder-input": "Nombre de carpeta",

packages/ui/public/locales/en.json

@@ -218,6 +218,12 @@
   "files-audio-island.now-playing": "Lecture en cours",
   "files-audio-island.pause": "Pause",
   "files-audio-island.play": "Lire",
+  "files-collision.action.keep-both": "Conserver les deux",
+  "files-collision.action.replace": "Remplacer",
+  "files-collision.action.skip": "Ignorer",
+  "files-collision.destination.original-location": "son emplacement d’origine",
+  "files-collision.message": "Voulez-vous remplacer l’élément existant ou conserver les deux ?",
+  "files-collision.title": "\"{{itemName}}\" existe déjà dans {{destinationName}}",
   "files-download.confirm": "Télécharger",
   "files-download.description": "Files ne peut pas ouvrir ce type de fichier. Voulez-vous plutôt le télécharger ?",
   "files-download.title": "Télécharger {{name}} ?",
@@ -240,6 +246,7 @@
   "files-error.rename": "Erreur lors du renommage : {{message}}",
   "files-error.restore": "Erreur lors de la restauration : {{message}}",
   "files-error.trash": "Erreur lors du déplacement vers la corbeille : {{message}}",
+  "files-error.upload": "Erreur lors du téléversement : {{message}}",
   "files-extension-change.confirm": "Continuer",
   "files-extension-change.description-add": "Êtes-vous sûr de vouloir changer l’extension de « {{fileName}} » en « {{extension}} » ? Cela pourrait rendre le fichier illisible.",
   "files-extension-change.description-remove": "Êtes-vous sûr de vouloir supprimer l’extension de « {{fileName}} » ?",
@@ -250,8 +257,11 @@
   "files-folder": "Dossier",
   "files-listing.empty": "Aucun élément",
   "files-listing.error": "Une erreur s'est produite",
+  "files-listing.item-count_one": "{{count}} élément",
+  "files-listing.item-count_other": "{{count}} éléments",
   "files-listing.loading": "Chargement...",
   "files-listing.no-such-file": "Aucun fichier ou dossier de ce nom",
+  "files-listing.selected-count": "{{selectedCount}} sur {{totalCount}} sélectionnés",
   "files-name-drawer.new-folder": "Nouveau dossier",
   "files-name-drawer.new-folder-description": "Entrez un nom pour le nouveau dossier.",
   "files-name-drawer.new-folder-input": "Nom du dossier",

packages/ui/public/locales/es.json

@@ -218,6 +218,12 @@
   "files-audio-island.now-playing": "Most szól",
   "files-audio-island.pause": "Szünet",
   "files-audio-island.play": "Lejátszás",
+  "files-collision.action.keep-both": "Mindkettő megtartása",
+  "files-collision.action.replace": "Felülírás",
+  "files-collision.action.skip": "Kihagyás",
+  "files-collision.destination.original-location": "az eredeti helyén",
+  "files-collision.message": "Szeretnéd felülírni a meglévő elemet, vagy megtartani mindkettőt?",
+  "files-collision.title": "\"{{itemName}}\" már létezik a(z) {{destinationName}} helyen",
   "files-download.confirm": "Letöltés",
   "files-download.description": "A Files nem tudja megnyitni ezt a fájltípust. Inkább letöltöd?",
   "files-download.title": "Letöltés: {{name}}?",
@@ -240,6 +246,7 @@
   "files-error.rename": "Hiba az átnevezés során: {{message}}",
   "files-error.restore": "Hiba a visszaállítás során: {{message}}",
   "files-error.trash": "Hiba a kukába helyezéskor: {{message}}",
+  "files-error.upload": "Hiba a feltöltés során: {{message}}",
   "files-extension-change.confirm": "Folytatás",
   "files-extension-change.description-add": "Biztosan meg szeretnéd változtatni a(z) „{{fileName}}” fájlkiterjesztését „{{extension}}”-re? Ez a fájl olvashatatlanságát okozhatja.",
   "files-extension-change.description-remove": "Biztosan szeretnéd eltávolítani a(z) „{{fileName}}” fájlkiterjesztését?",
@@ -250,8 +257,11 @@
   "files-folder": "Mappa",
   "files-listing.empty": "Nincsenek elemek",
   "files-listing.error": "Hiba történt",
+  "files-listing.item-count_one": "{{count}} elem",
+  "files-listing.item-count_other": "{{count}} elem",
   "files-listing.loading": "Betöltés...",
   "files-listing.no-such-file": "Nincs ilyen fájl vagy mappa",
+  "files-listing.selected-count": "{{selectedCount}} / {{totalCount}} kiválasztva",
   "files-name-drawer.new-folder": "Új mappa",
   "files-name-drawer.new-folder-description": "Adj meg egy nevet az új mappának.",
   "files-name-drawer.new-folder-input": "Mappa neve",

packages/ui/public/locales/fr.json

@@ -218,6 +218,12 @@
   "files-audio-island.now-playing": "In riproduzione",
   "files-audio-island.pause": "Pausa",
   "files-audio-island.play": "Riproduci",
+  "files-collision.action.keep-both": "Mantieni entrambi",
+  "files-collision.action.replace": "Sostituisci",
+  "files-collision.action.skip": "Ignora",
+  "files-collision.destination.original-location": "la sua posizione originale",
+  "files-collision.message": "Vuoi sostituire l'elemento esistente o mantenerli entrambi?",
+  "files-collision.title": "\"{{itemName}}\" esiste già in {{destinationName}}",
   "files-download.confirm": "Scarica",
   "files-download.description": "Files non può aprire questo tipo di file. Vuoi scaricarlo invece?",
   "files-download.title": "Scaricare {{name}}?",
@@ -240,6 +246,7 @@
   "files-error.rename": "Errore durante la rinomina: {{message}}",
   "files-error.restore": "Errore durante il ripristino: {{message}}",
   "files-error.trash": "Errore durante lo spostamento nel Cestino: {{message}}",
+  "files-error.upload": "Errore di caricamento: {{message}}",
   "files-extension-change.confirm": "Continua",
   "files-extension-change.description-add": "Sei sicuro di voler cambiare l'estensione di '{{fileName}}' in '{{extension}}'? Questo potrebbe rendere il file illeggibile.",
   "files-extension-change.description-remove": "Sei sicuro di voler rimuovere l'estensione di '{{fileName}}'?",
@@ -250,8 +257,11 @@
   "files-folder": "Cartella",
   "files-listing.empty": "Nessun elemento",
   "files-listing.error": "Si è verificato un errore",
+  "files-listing.item-count_one": "{{count}} elemento",
+  "files-listing.item-count_other": "{{count}} elementi",
   "files-listing.loading": "Caricamento in corso...",
   "files-listing.no-such-file": "Nessun file o cartella corrispondente",
+  "files-listing.selected-count": "{{selectedCount}} di {{totalCount}} selezionati",
   "files-name-drawer.new-folder": "Nuova cartella",
   "files-name-drawer.new-folder-description": "Inserisci un nome per la nuova cartella.",
   "files-name-drawer.new-folder-input": "Nome cartella",

packages/ui/public/locales/hu.json

@@ -218,6 +218,12 @@
   "files-audio-island.now-playing": "再生中",
   "files-audio-island.pause": "一時停止",
   "files-audio-island.play": "再生",
+  "files-collision.action.keep-both": "両方とも残す",
+  "files-collision.action.replace": "置き換える",
+  "files-collision.action.skip": "スキップ",
+  "files-collision.destination.original-location": "元の場所",
+  "files-collision.message": "既存のアイテムを置き換えるか、両方とも残しますか？",
+  "files-collision.title": "「{{itemName}}」はすでに{{destinationName}}に存在します",
   "files-download.confirm": "ダウンロード",
   "files-download.description": "「Files」ではこの種類のファイルを開けません。代わりにダウンロードしますか？",
   "files-download.title": "「{{name}}」をダウンロードしますか？",
@@ -240,6 +246,7 @@
   "files-error.rename": "名前を変更できませんでした: {{message}}",
   "files-error.restore": "復元できませんでした: {{message}}",
   "files-error.trash": "ゴミ箱に移動できませんでした: {{message}}",
+  "files-error.upload": "アップロードエラー: {{message}}",
   "files-extension-change.confirm": "続行",
   "files-extension-change.description-add": "「{{fileName}}」の拡張子を「{{extension}}」に変更してもよろしいですか？ ファイルが読み込めなくなる可能性があります。",
   "files-extension-change.description-remove": "「{{fileName}}」の拡張子を削除してもよろしいですか？",
@@ -250,8 +257,11 @@
   "files-folder": "フォルダ",
   "files-listing.empty": "アイテムがありません",
   "files-listing.error": "エラーが発生しました",
+  "files-listing.item-count_one": "{{count}} 件の項目",
+  "files-listing.item-count_other": "{{count}} 件の項目",
   "files-listing.loading": "読み込み中...",
   "files-listing.no-such-file": "そのようなファイルまたはフォルダはありません",
+  "files-listing.selected-count": "全{{totalCount}}件のうち{{selectedCount}}件を選択",
   "files-name-drawer.new-folder": "新規フォルダ",
   "files-name-drawer.new-folder-description": "新しいフォルダの名前を入力してください。",
   "files-name-drawer.new-folder-input": "フォルダ名",