leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into anonymous-fix

Browse source 
Signed-off-by: mkljczk <git@mkljczk.pl>
This commit is contained in:
mkljczk 2025-01-22 17:47:34 +01:00
commit 32c54d4375
20 changed files with 1420 additions and 786 deletions
Download patch file Download diff file Expand all files Collapse all files

1046
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
examples/copy.rs
View file

@ -2,7 +2,7 @@ use cosmic_files::operation::{recursive::Context, Controller, ReplaceResult};
use std::{error::Error, io, path::PathBuf}; use std::{error::Error, io, path::PathBuf};
fn main() -> Result<(), Box<dyn Error>> { fn main() -> Result<(), Box<dyn Error>> {
let mut context = Context::new(Controller::new()) let mut context = Context::new(Controller::default())
.on_progress(|op, progress| { .on_progress(|op, progress| {
println!("{:?}: {:?}", op.to, progress); println!("{:?}: {:?}", op.to, progress);
}) })

275
i18n/nl/cosmic_files.ftl Normal file
View file

@ -0,0 +1,275 @@
cosmic-files = COSMIC-bestandsbeheerder
empty-folder = Lege map
empty-folder-hidden = Lege map (met verborgen bestanden)
no-results = Geen resultaten gevonden
filesystem = Bestandssysteem
home = Gebruikersmap
networks = Netwerken
notification-in-progress = Bestanden worden momenteel bewerkt.
trash = Prullenbak
recents = Recente bestanden
undo = Ongedaan maken
today = Vandaag
# Desktop view options
desktop-view-options = Opties voor bureaubladweergave
show-on-desktop = Op bureaublad weergeven
desktop-folder-content = Bestanden in Bureaublad
mounted-drives = Gekoppelde schijven
trash-folder-icon = Prullenbakicoon
icon-size-and-spacing = Grootte en ruimte tussen iconen
icon-size = Icoon grootte
# List view
name = Naam
modified = Bewerkt
trashed-on = Tijd van verwijderen
size = Grootte
# Progress footer
details = Details
dismiss = Bericht negeren
operations-running = {$running} bewerkingen worden uitgevoerd ({$percent}%)...
operations-running-finished = {$running} bewerkingen worden uitgevoerd ({$percent}%), {$finished} voltooid...
pause = Pauze
resume = Hervatten
# Dialogs
## Compress Dialog
create-archive = Maak een archiefbestand
## Empty Trash Dialog
empty-trash = Prullenbak legen?
empty-trash-warning = Weet u zeker dat u alles in de prullenbak permanent wilt verwijderen?
## Mount Error Dialog
mount-error = Toegang tot schijf niet mogelijk
## New File/Folder Dialog
create-new-file = Nieuw bestand aanmaken
create-new-folder = Nieuwe map aanmaken
file-name = Bestandsnaam
folder-name = Mapnaam
file-already-exists = Er bestaat al een bestand met deze naam.
folder-already-exists = Er bestaat al een map met deze naam.
name-hidden = Namen die met '.' beginnen worden verborgen.
name-invalid = De naam '{$filename}' is niet geldig.
name-no-slashes = De naam mag geen schuine strepen bevatten.
## Open/Save Dialog
cancel = Annuleren
create = Aanmaken
open = Openen
open-file = Bestand openen
open-folder = Map openen
open-in-new-tab = Open in nieuw tabblad
open-in-new-window = Open in nieuw venster
open-item-location = Open locatie van item
open-multiple-files = Meerdere bestanden openen
open-multiple-folders = Meerdere mappen openen
save = Opslaan
save-file = Bestand opslaan
## Open With Dialog
open-with-title = Hoe wilt u '{$name}' openen?
browse-store = Verken {$store}
## Rename Dialog
rename-file = Bestand hernoemen
rename-folder = Map hernoemen
## Replace Dialog
replace = Vervangen
replace-title = '{$filename}' bestaat al op deze locatie.
replace-warning = Wilt u het bestand vervangen door de nieuwe versie? Dit zal de bestaande inhoud overschrijven.
replace-warning-operation = Wilt u het bestand vervangen? Bestaande inhoud wordt overschreven!
original-file = Oorspronkelijk bestand
replace-with = Vervangen door
apply-to-all = Op alles toepassen
keep-both = Beide behouden
skip = Overslaan
## Set as Executable and Launch Dialog
set-executable-and-launch = Bestand uitvoerbaar maken en dan openen
set-executable-and-launch-description = Wilt u '{$name}' uitvoerbaar maken en dan openen?
set-and-launch = Maak uitvoerbaar en open
## Metadata Dialog
owner = Eigenaar
group = Groep
other = Anderen
read = Lezen
write = Schrijven
execute = Uitvoeren
# Context Pages
## About
git-description = Git commit {$hash} op {$date}
## Add Network Drive
add-network-drive = Netwerkschijf toevoegen
connect = Verbinden
connect-anonymously = Anoniem verbinden
connecting = Verbinding maken...
domain = Domein
enter-server-address = Serveradres invoeren
network-drive-description =
Serveradressen bestaan uit protocolvoorvoegsel en netwerkadres.
Voorbeelden: ssh://192.168.0.1, ftp://[2001:db8::1]
### Make sure to keep the comma which separates the columns
network-drive-schemes =
Beschikbare protocollen,Voorvoegsel
AppleTalk,afp://
File Transfer Protocol,ftp:// of ftps://
Network File System,nfs://
Server Message Block,smb://
SSH File Transfer Protocol,sftp:// of ssh://
WebDav,dav:// of davs://
network-drive-error = Geen toegang tot de netwerkschijf
password = Wachtwoord
remember-password = Wachtwoord onthouden
try-again = Opnieuw proberen
username = Gebruikersnaam
## Operations
cancelled = Geannuleerd
edit-history = Geschiedenis bewerken
history = Geschiedenis
no-history = Geen items in de geschiedenis.
pending = In afwachting
progress = {$percent}%
progress-cancelled = {$percent}%, geannuleerd
progress-paused = {$percent}%, gepauzeerd
failed = Mislukt
complete = Voltooid
compressing = { $items} {$items ->
[one] bestand wordt
*[other] bestanden worden
} van '{$from}' naar '{$to}' gecomprimeerd ({$progress})...
compressed = { $items} {$items ->
[one] bestand
*[other] bestanden
} gecomprimeerd van '{$from}' naar '{$to}'
copy_noun = Kopie
creating = '{$name}' in '{$parent}' aanmaken
created = '{$name}' in '{$parent}' aangemaakt
copying = {$items} {$items ->
[one] bestand wordt
*[other] bestanden worden
} van '{$from}' naar '{$to}' gekopieerd ({$progress})...
emptying-trash = {trash} wordt geleegd ({$progress})...
emptied-trash = {trash} geleegd
extracting = {$items} {$items ->
[one] bestand wordt
*[other] bestanden worden
} van '{$from}' naar '{$to}' uitgepakt ({$progress})...
extracted = {$items} {$items ->
[one] bestand
*[other] bestanden
} uitgepakt van '{$from}' naar '{$to}'
setting-executable-and-launching = '{$name}' wordt uitvoerbaar gemaakt en geopend
set-executable-and-launched = '{$name}' uitvoerbaar maken en openen
moving = {$items} {$items ->
[one] bestand wordt
*[other] bestanden worden
} van '{$from}' naar '{$to}' verplaatst ({$progress})...
moved = {$items} {$items ->
[one] bestand
*[other] bestanden
} verplaatst van '{$form}' naar '{$to}'
renaming = '{$from}' als '{$to}' hernoemen
renamed = '{$form}' als '{$to}' hernoemd
restoring = {$items} {$items ->
[one] bestand wordt
*[other] bestanden worden
} uit {trash} teruggezet ({$progress})...
restored = {$items} {$items ->
[one] bestand
*[other] bestanden
} uit {trash} teruggezet
unknown-folder = Onbekende map
## Open with
open-with = Openen met...
default-app = {$name} (standaard)
## Show details
show-details = Details weergeven
type = Type: {$mime}
items = Bestanden: {$items}
item-size = Grootte: {$size}
item-created = Aangemaakt op: {$created}
item-modified = Bewerkt op: {$modified}
item-accessed = Geopend op: {$accessed}
calculating = Wordt berekend...
## Settings
settings = Instellingen
### Appearance
appearance = Uiterlijk
theme = Thema
match-desktop = Systeemstandaard
dark = Donker
light = Licht
# Context menu
add-to-sidebar = Aan de zijbalk toevoegen
compress = Comprimeren
extract-here = Uitpakken
new-file = Nieuw bestand...
new-folder = Nieuwe map...
open-in-terminal = Openen in terminal
move-to-trash = Naar prullenbak verplaatsen
restore-from-trash = Uit prullenbak terugzetten
remove-from-sidebar = Uit de zijbalk verwijderen
sort-by-name = Sorteren op naam
sort-by-modified = Sorteren op laatst bewerkt
sort-by-size = Sorteren op grootte
sort-by-trashed = Sorteren op tijdstip van verwijderen
## Desktop
change-wallpaper = Schermachtergrond wijzigen...
desktop-appearance = Bureaublad uiterlijk...
display-settings = Beeldschermbeheer...
# Menu
## File
file = Bestand
new-tab = Nieuw tabblad
new-window = Nieuw venster
rename = Hernoemen...
close-tab = Tabblad sluiten
quit = Sluiten
## Edit
edit = Bewerken
cut = Knippen
copy = Kopiëren
paste = Plakken
select-all = Alles selecteren
## View
zoom-in = Inzoomen
default-size = Zoomniveau terugzetten
zoom-out = Uitzoomen
view = Aanzicht
grid-view = Rasterweergave
list-view = Lijstweergave
show-hidden-files = Verborgen bestanden tonen
list-directories-first = Mappen bovenaan weergeven
gallery-preview = Galerijweergave
menu-settings = Instellingen...
menu-about = Over COSMIC-bestandsbeheerder...
## Sort
sort = Sorteren
sort-a-z = A-Z
sort-z-a = Z-A
sort-newest-first = Nieuwste bovenaan
sort-oldest-first = Oudste bovenaan
sort-smallest-to-largest = Van klein naar groot
sort-largest-to-smallest = Van groot naar klein

54
i18n/pl/cosmic_files.ftl
View file

@ -3,7 +3,7 @@ empty-folder = Pusty katalog
empty-folder-hidden = Pusty katalog (z ukrytymi plikami) empty-folder-hidden = Pusty katalog (z ukrytymi plikami)
no-results = Brak wyników no-results = Brak wyników
filesystem = System plików filesystem = System plików
home = Katalog Domowy home = Katalog domowy
networks = Sieci networks = Sieci
notification-in-progress = Operacje na plikach w toku. notification-in-progress = Operacje na plikach w toku.
trash = Kosz trash = Kosz
@ -12,7 +12,7 @@ undo = Cofnij
today = Dzisiaj today = Dzisiaj
# Desktop view options # Desktop view options
desktop-view-options = Opcje widoku pulpitu... desktop-view-options = Opcje widoku pulpitu…
show-on-desktop = Pokaż na Pulpicie show-on-desktop = Pokaż na Pulpicie
desktop-folder-content = Zawartość katalogu Pulpit desktop-folder-content = Zawartość katalogu Pulpit
mounted-drives = Podpięte dyski mounted-drives = Podpięte dyski
@ -29,8 +29,8 @@ size = Rozmiar
# Progress footer # Progress footer
details = Detale details = Detale
dismiss = Odrzuć wiadomość dismiss = Odrzuć wiadomość
operations-running = {$running} bieżące działania ({$percent}%)... operations-running = {$running} bieżące działania ({$percent}%)…
operations-running-finished = {$running} bieżące działania ({$percent}%), {$finished} ukończone... operations-running-finished = {$running} bieżące działania ({$percent}%), {$finished} ukończone…
pause = Wstrzymaj pause = Wstrzymaj
resume = Wznów resume = Wznów
@ -53,8 +53,8 @@ file-name = Nazwa pliku
folder-name = Nazwa katalogu folder-name = Nazwa katalogu
file-already-exists = Plik z taką nazwą już istnieje. file-already-exists = Plik z taką nazwą już istnieje.
folder-already-exists = Katalog z taką nazwą już istnieje. folder-already-exists = Katalog z taką nazwą już istnieje.
name-hidden = Nazwy zaczynające się na "." będą ukryte. name-hidden = Nazwy zaczynające się od „.” będą ukryte.
name-invalid = Musisz zmienić nazwę na inną z "{$filename}". name-invalid = Musisz zmienić nazwę na inną z „{$filename}”.
name-no-slashes = Nazwa nie może zawierać ukośników. name-no-slashes = Nazwa nie może zawierać ukośników.
# Open/Save Dialog # Open/Save Dialog
@ -72,7 +72,7 @@ save = Zapisz
save-file = Zapisz plik save-file = Zapisz plik
## Open With Dialog ## Open With Dialog
open-with-title = Czym chcesz otworzyć "{$name}"? open-with-title = Czym chcesz otworzyć „{$name}”?
browse-store = Przeglądaj {$store} browse-store = Przeglądaj {$store}
# Rename Dialog # Rename Dialog
@ -92,7 +92,7 @@ skip = Pomiń
## Set as Executable and Launch Dialog ## Set as Executable and Launch Dialog
set-executable-and-launch = Ustaw jako wykonywalny i uruchom set-executable-and-launch = Ustaw jako wykonywalny i uruchom
set-executable-and-launch-description = Czu chcesz ustawić "{$name}" jako wykonywalny i uruchomić? set-executable-and-launch-description = Czy chcesz ustawić plik „{$name}” jako wykonywalny i uruchomić go?
set-and-launch = Ustaw i uruchom set-and-launch = Ustaw i uruchom
## Metadata Dialog ## Metadata Dialog
@ -112,7 +112,7 @@ git-description = Git commit {$hash} z {$date}
add-network-drive = Dodaj dysk sieciowy add-network-drive = Dodaj dysk sieciowy
connect = Połącz connect = Połącz
connect-anonymously = Połącz anonimowo connect-anonymously = Połącz anonimowo
connecting = Łączenie... connecting = Łączenie…
domain = Domena domain = Domena
enter-server-address = Wprowadź adres serwera enter-server-address = Wprowadź adres serwera
network-drive-description = network-drive-description =
@ -148,50 +148,50 @@ compressing = Spakuj {$items} {$items ->
[one] element [one] element
[few] elementy [few] elementy
*[other] elementów *[other] elementów
} z "{$from}" do "{$to}" ({$progress})... } z „{$from}” do „{$to}” ({$progress})…
compressed = Spakowano {$items} {$items -> compressed = Spakowano {$items} {$items ->
[one] element [one] element
[few] elementy [few] elementy
*[other] elementów *[other] elementów
} z "{$from}" do "{$to}" } z „{$from}” do „{$to}”
copy_noun = Kopiuj copy_noun = Kopiuj
creating = Tworzy {$name} w {$parent} creating = Tworzy {$name} w {$parent}
created = Stworzono {$name} w {$parent} created = Stworzono {$name} w {$parent}
copying = Kopiowanie {$items} {$items -> copying = Kopiowanie {$items} {$items ->
[one] elementu [one] elementu
*[other] elementów *[other] elementów
} z "{$from}" do "{$to}" ({$progress})... } z „{$from}” do „{$to}” ({$progress})…
copied = Skopiowano {$items} {$items -> copied = Skopiowano {$items} {$items ->
[one] element [one] element
[few] elementy [few] elementy
*[other] elementów *[other] elementów
} z "{$from}" do "{$to}" } z „{$from}” do „{$to}”
emptying-trash = Opróżnianie {trash} ({$progress})... emptying-trash = Opróżnianie {trash} ({$progress})…
emptied-trash = Opróżniono {trash} emptied-trash = Opróżniono {trash}
extracting = Wypakowywanie {$items} {$items -> extracting = Wypakowywanie {$items} {$items ->
[one] elementu [one] elementu
*[other] elementów *[other] elementów
} z "{$from}" do "{$to}" ({$progress})... } z „{$from}” do „{$to}” ({$progress})…
extracted = Wypakowano {$items} {$items -> extracted = Wypakowano {$items} {$items ->
[one] element [one] element
[few] elementy [few] elementy
*[other] elementów *[other] elementów
} z "{$from}" do "{$to}" } z „{$from}” do „{$to}”
moving = Przenoszenie {$items} {$items -> moving = Przenoszenie {$items} {$items ->
[one] elementu [one] elementu
*[other] elementów *[other] elementów
} z "{$from}" do "{$to}" ({$progress})... } z „{$from}” do „{$to}” ({$progress})…
moved = Przeniesiono {$items} {$items -> moved = Przeniesiono {$items} {$items ->
[one] element [one] element
[few] elementy [few] elementy
*[other] elementów *[other] elementów
} z "{$from}" do "{$to}" } z „{$from}” do „{$to}”
renaming = Zmieniana nazwa {$from} na {$to} renaming = Zmieniana nazwa {$from} na {$to}
renamed = Zmieniono nazwę {$from} na {$to} renamed = Zmieniono nazwę {$from} na {$to}
restoring = Przywracanie {$items} {$items -> restoring = Przywracanie {$items} {$items ->
[one] elementu [one] elementu
*[other] elementów *[other] elementów
} z {trash} ({$progress})... } z {trash} ({$progress})…
restored = Przywrócono {$items} {$items -> restored = Przywrócono {$items} {$items ->
[one] element [one] element
[few] elementy [few] elementy
@ -200,7 +200,7 @@ restored = Przywrócono {$items} {$items ->
unknown-folder = nieznany katalog unknown-folder = nieznany katalog
## Open with ## Open with
open-with = Otwórz za pomocą... open-with = Otwórz za pomocą…
default-app = {$name} (domyślnie) default-app = {$name} (domyślnie)
## Show details ## Show details
@ -211,7 +211,7 @@ item-size = Rozmiar: {$size}
item-created = Utworzono: {$created} item-created = Utworzono: {$created}
item-modified = Zmodyfikowano: {$modified} item-modified = Zmodyfikowano: {$modified}
item-accessed = Otwarto: {$accessed} item-accessed = Otwarto: {$accessed}
calculating = Obliczanie... calculating = Obliczanie…
## Settings ## Settings
settings = Ustawienia settings = Ustawienia
@ -239,9 +239,9 @@ sort-by-size = Uszereguj według rozmiaru
sort-by-trashed = Uszereguj według czasu usunięcia sort-by-trashed = Uszereguj według czasu usunięcia
## Desktop ## Desktop
change-wallpaper = Zmień tapetę... change-wallpaper = Zmień tapetę…
desktop-appearance = Wygląd pulpitu... desktop-appearance = Wygląd pulpitu…
display-settings = Ustawienia wyświetlacza... display-settings = Ustawienia wyświetlacza…
# Menu # Menu
@ -249,7 +249,7 @@ display-settings = Ustawienia wyświetlacza...
file = Plik file = Plik
new-tab = Nowa karta new-tab = Nowa karta
new-window = Nowe okno new-window = Nowe okno
rename = Zmień nazwę... rename = Zmień nazwę…
close-tab = Zamknij kartę close-tab = Zamknij kartę
quit = Zamknij quit = Zamknij
@ -270,8 +270,8 @@ list-view = Widok listy
show-hidden-files = Pokaż ukryte pliki show-hidden-files = Pokaż ukryte pliki
list-directories-first = Najpierw wyświetlaj katalogi list-directories-first = Najpierw wyświetlaj katalogi
gallery-preview = Podgąd galerii gallery-preview = Podgąd galerii
menu-settings = Ustawienia... menu-settings = Ustawienia…
menu-about = O Plikach COSMIC... menu-about = O Plikach COSMIC…
## Sort ## Sort
sort = Uszereguj sort = Uszereguj

328
i18n/sv/cosmic_files.ftl
View file

@ -1,90 +1,129 @@
cosmic-files = COSMIC Files
empty-folder = Tom katalog empty-folder = Tom katalog
empty-folder-hidden = Tom katalog (har dolda objekt) empty-folder-hidden = Tom katalog (har dolda objekt)
no-results = Inga resultat hittades
filesystem = Filsystem filesystem = Filsystem
home = Hem home = Hem
networks = Nätverk networks = Nätverk
notification-in-progress = Filoperationer pågår.
trash = Papperskorg trash = Papperskorg
recents = Senaste recents = Senaste
undo = Ångra undo = Ångra
today = Idag today = Idag
# Dialog # Skrivbordsvyalternativ
desktop-view-options = Skrivbordsvyalternativ...
show-on-desktop = Visa på skrivbord
desktop-folder-content = Skrivbordsmappinnehåll
mounted-drives = Monterade enheter
trash-folder-icon = Ikon för papperskorgen
icon-size-and-spacing = Ikonstorlek och mellanrum
icon-size = Ikonstorlek
# Dialogruta
cancel = Avbryt cancel = Avbryt
open = Öppna open = Öppna
# List view # Dialogrutor
## Komprimera dialogruta
create-archive = Skapa arkiv
## Töm papperskorgen dialogruta
empty-trash = Töm papperskorgen
empty-trash-warning = Är du säker på att du vill ta bort alla objekt i papperskorgen permanent?
## Monteringsfel dialogruta
mount-error = Kan inte komma åt enheten
## Ny Fil/katalog dialogruta
create-new-file = Skapa ny fil
create-new-folder = Skapa ny katalog
file-name = Filnamn
folder-name = Katalognamn
file-already-exists = En fil med det namnet finns redan.
folder-already-exists = En katalog med det namnet finns redan.
name-hidden = Namn som börjar med "." kommer att vara dolda.
name-invalid = Namnet kan inte vara "{$filename}".
name-no-slashes = Namnet får inte innehålla snedstreck.
## Öppna/Spara dialogruta
cancel = Avbryt
create = Skapa
open = Öppna
open-file = Öppna fil
open-folder = Öppna katalog
open-in-new-tab = Öppna i en ny flik
open-in-new-window = Öppna i nytt fönster
open-item-location = Öppna objektets plats
open-multiple-files = Öppna flera filer
open-multiple-folders = Öppna flera kataloger
save = Spara
save-file = Spara fil
## Öppna med dialogruta
open-with-title = Hur vill du öppna "{$name}"?
browse-store = Bläddra i {$store}
## Byt namn dialogruta
rename-file = Byt namn på fil
rename-folder = Byt namn på katalog
## Ersätt dialogruta
replace = Ersätt
replace-title = "{$filename}" existerar redan på den här platsen.
replace-warning = Vill du ersätta den med den du sparar? Om du ersätter den kommer dess innehåll att skrivas över.
replace-warning-operation = Vill du ersätta den? Om du ersätter den kommer dess innehåll att skrivas över.
original-file = Originalfil
replace-with = Ersätt med
apply-to-all = Verkställ för alla
keep-both = Behåll båda
skip = Hoppa över
## Ställ in som körbar och starta dialogruta
set-executable-and-launch = Ställ in som körbar och starta
set-executable-and-launch-description = Vill du ställa in "{$name}" som körbar och starta den?
set-and-launch = Ställ in och starta
## Metadata dialogruta
owner = Ägare
group = Grupp
other = Andra
read = Läs
write = Skriv
execute = Exekvera
# Listvy
name = Namn name = Namn
modified = Modifierad modified = Modifierad
trashed-on = Kastad
size = Storlek size = Storlek
# Context Pages # Framstegssidfot
details = Detaljer
dismiss = Stäng meddelande
operations-running = {$running} operationer körs ({$percent}%)...
operations-running-finished = {$running} operationer körs ({$percent}%), {$finished} färdig...
pause = Paus
resume = Återuppta
## Operations # Kontextsidor
operations = Operationer
pending = Väntar
failed = Misslyckades
complete = Slutförd
history = Historik
## Properties
properties = Egenskaper
## Settings
settings = Inställningar
### Appearance
appearance = Utseende
theme = Tema
match-desktop = Matcha skrivbordet
dark = Mörkt
light = Ljust
# Context menu
new-file = Ny fil
new-folder = Ny katalog
add-to-sidebar = Lägg till i sidofält
move-to-trash = Flytta till papperskorg
restore-from-trash = Återställ från papperskorgen
# Menu
## File
file = Fil
new-tab = Ny flik
new-window = Nytt fönster
rename = Byt namn...
menu-show-details = Visa detaljer...
close-tab = Stäng flik
quit = Avsluta
## Edit
edit = Redigera
cut = Klipp ut
copy = Kopiera
paste = Klistra in
select-all = Välj alla
## View
zoom-in = Zooma in
default-size = Standardstorlek
zoom-out = Zooma ut
view = Visa
grid-view = Rutnätsvy
list-view = Listvy
show-hidden-files = Visa dolda filer
list-directories-first = Lista kataloger först
gallery-preview = Galleri förhandsvisning
menu-settings = Inställningar...
menu-about = Om COSMIC Files...
## Open with
open-with = Öppna med...
default-app = {$name} (standard)
## Show details
show-details = Visa detaljer
## Om
git-description = Git commit {$hash} på {$date}
## Lägg till en Nätverksenhet
add-network-drive = Lägg till en Nätverksenhet
connect = Anslut
connect-anonymously = Anslut anonymt
connecting = Ansluter...
domain = Domän
enter-server-address = Ange server address
try-again = Försök igen
username = Användarnamn
network-drive-description = network-drive-description =
Serveradresser inkluderar ett protokollprefix och en adress. Serveradresser inkluderar ett protokollprefix och en adress.
Exempel: ssh://192.168.0.1, ftp://[2001:db8::1] Exempel: ssh://192.168.0.1, ftp://[2001:db8::1]
@ -101,17 +140,148 @@ network-drive-error = Kan inte komma åt nätverksenheten
password = Lösenord password = Lösenord
remember-password = Kom ihåg lösenord remember-password = Kom ihåg lösenord
## Lägg till en Nätverksenhet ## Operationer
add-network-drive = Lägg till en Nätverksenhet cancelled = Avbruten
connect = Anslut edit-history = Redigera historik
connect-anonymously = Anslut anonymt history = Historik
connecting = Ansluter... no-history = Inga objekt i historiken.
domain = Domän pending = Väntar
enter-server-address = Ange server address progress = {$percent}%
try-again = Försök igen progress-cancelled = {$percent}%, avbruten
username = Användarnamn progress-paused = {$percent}%, pausad
failed = Misslyckades
complete = Färdig
compressing = Komprimerar {$items} {$items ->
[one] item
*[other] items
} from "{$from}" to "{$to}" ({$progress})...
compressed = Komprimerade {$items} {$items ->
[one] item
*[other] items
} from "{$from}" to "{$to}"
copy_noun = Koperia
creating = Skapar "{$name}" i "{$parent}"
created = Skapade "{$name}" i "{$parent}"
copying = Kopierar {$items} {$items ->
[one] objekt
*[other] flera objekt
} från "{$from}" till "{$to}" ({$progress})...
copied = Kopierade {$items} {$items ->
[one] objekt
*[other] flera objekt
} från "{$from}" till "{$to}"
emptying-trash = Tömmer {trash} ({$progress})...
emptied-trash = Tömde {trash}
extracting = Packar upp {$items} {$items ->
[one] objekt
*[other] flera objekt
} från "{$from}" till "{$to}" ({$progress})...
extracted = Packade upp {$items} {$items ->
[one] objekt
*[other] flera objekt
} från "{$from}" till "{$to}"
setting-executable-and-launching = Ställer in "{$name}" som exekverbar och startar
set-executable-and-launched = Ställ in "{$name}" som exekverbar och startar
moving = Flyttar {$items} {$items ->
[one] objekt
*[other] flera objekt
} från "{$from}" till "{$to}" ({$progress})...
moved = Flyttade {$items} {$items ->
[one] objekt
*[other] flera objekt
} från "{$from}" till "{$to}"
renaming = Byter namn "{$from}" till "{$to}"
renamed = Bytt namn "{$from}" till "{$to}"
restoring = Återställer {$items} {$items ->
[one] objekt
*[other] flera objekt
} från {trash} ({$progress})...
restored = Återställt {$items} {$items ->
[one] objekt
*[other] flera objekt
} från {trash}
unknown-folder = okänd katalog
## Sort ## Öppna med
open-with = Öppna med...
default-app = {$name} (default)
## Visa detaljer
show-details = Visa detaljer
type = Type: {$mime}
items = Items: {$items}
item-size = Size: {$size}
item-created = Created: {$created}
item-modified = Modified: {$modified}
item-accessed = Accessed: {$accessed}
calculating = Beräknar...
## Egenskaper
properties = Egenskaper
## Inställningar
settings = Inställningar
### Utseende
appearance = Utseende
theme = Tema
match-desktop = Matcha skrivbordet
dark = Mörkt
light = Ljust
# Kontext meny
add-to-sidebar = Lägg till i sidofält
compress = Komprimera
extract-here = Packa upp
new-file = Ny fil
new-folder = Ny katalog
open-in-terminal = Öppna i terminal
move-to-trash = Flytta till papperskorg
restore-from-trash = Återställ från papperskorgen
remove-from-sidebar = Ta bort från sidofält
sort-by-name = Sortera efter namn
sort-by-modified = Sortera efter modifierad
sort-by-size = Sortera efter storlek
sort-by-trashed = Sortera efter borttagningstid
## Skrivbord
change-wallpaper = Byt bakgrund...
desktop-appearance = Skrivbordsutseende...
display-settings = Skärminställningar...
# Meny
## Fil
file = Fil
new-tab = Ny flik
new-window = Nytt fönster
rename = Byt namn...
menu-show-details = Visa detaljer...
close-tab = Stäng flik
quit = Avsluta
## Redigera
edit = Redigera
cut = Klipp ut
copy = Kopiera
paste = Klistra in
select-all = Välj alla
## Visa
zoom-in = Zooma in
default-size = Standardstorlek
zoom-out = Zooma ut
view = Visa
grid-view = Rutnätsvy
list-view = Listvy
show-hidden-files = Visa dolda filer
list-directories-first = Lista kataloger först
gallery-preview = Galleri förhandsvisning
menu-settings = Inställningar...
menu-about = Om COSMIC Files...
## Sortera
sort = Sortera sort = Sortera
sort-a-z = A-Z sort-a-z = A-Z
sort-z-a = Z-A sort-z-a = Z-A
@ -119,3 +289,7 @@ sort-newest-first = Nyaste först
sort-oldest-first = Äldst först sort-oldest-first = Äldst först
sort-smallest-to-largest = Minsta till största sort-smallest-to-largest = Minsta till största
sort-largest-to-smallest = Största till minsta sort-largest-to-smallest = Största till minsta
## Visa detaljer
show-details = Visa detaljer

97
src/app.rs
View file

@ -125,6 +125,8 @@ pub enum Action {
Rename, Rename,
RestoreFromTrash, RestoreFromTrash,
SearchActivate, SearchActivate,
SelectFirst,
SelectLast,
SelectAll, SelectAll,
SetSort(HeadingOptions, bool), SetSort(HeadingOptions, bool),
Settings, Settings,
@ -190,6 +192,8 @@ impl Action {
Action::RestoreFromTrash => Message::RestoreFromTrash(entity_opt), Action::RestoreFromTrash => Message::RestoreFromTrash(entity_opt),
Action::SearchActivate => Message::SearchActivate, Action::SearchActivate => Message::SearchActivate,
Action::SelectAll => Message::TabMessage(entity_opt, tab::Message::SelectAll), Action::SelectAll => Message::TabMessage(entity_opt, tab::Message::SelectAll),
Action::SelectFirst => Message::TabMessage(entity_opt, tab::Message::SelectFirst),
Action::SelectLast => Message::TabMessage(entity_opt, tab::Message::SelectLast),
Action::SetSort(sort, dir) => { Action::SetSort(sort, dir) => {
Message::TabMessage(entity_opt, tab::Message::SetSort(*sort, *dir)) Message::TabMessage(entity_opt, tab::Message::SetSort(*sort, *dir))
} }
@ -352,6 +356,7 @@ pub enum Message {
WindowClose, WindowClose,
WindowCloseRequested(window::Id), WindowCloseRequested(window::Id),
WindowNew, WindowNew,
WindowUnfocus,
ZoomDefault(Option<Entity>), ZoomDefault(Option<Entity>),
ZoomIn(Option<Entity>), ZoomIn(Option<Entity>),
ZoomOut(Option<Entity>), ZoomOut(Option<Entity>),
@ -772,7 +777,7 @@ impl App {
Task::batch([ Task::batch([
self.update_title(), self.update_title(),
self.update_watcher(), self.update_watcher(),
self.rescan_tab(entity, location, selection_paths), self.update_tab(entity, location, selection_paths),
]), ]),
) )
} }
@ -793,7 +798,7 @@ impl App {
self.progress_operations.insert(id); self.progress_operations.insert(id);
} }
self.pending_operations self.pending_operations
.insert(id, (operation, Controller::new())); .insert(id, (operation, Controller::default()));
} }
fn remove_window(&mut self, id: &window::Id) { fn remove_window(&mut self, id: &window::Id) {
@ -828,7 +833,20 @@ impl App {
return Task::none(); return Task::none();
} }
} }
self.rescan_tab(entity, tab.location.clone(), Some(op_sel.selected)) self.update_tab(entity, tab.location.clone(), Some(op_sel.selected))
}
fn update_tab(
&mut self,
entity: Entity,
location: Location,
selection_paths: Option<Vec<PathBuf>>,
) -> Task<Message> {
if let Location::Search(_, term, ..) = location {
self.search_set(entity, Some(term), selection_paths)
} else {
self.rescan_tab(entity, location, selection_paths)
}
} }
fn rescan_tab( fn rescan_tab(
@ -872,19 +890,11 @@ impl App {
let mut commands = Vec::with_capacity(needs_reload.len()); let mut commands = Vec::with_capacity(needs_reload.len());
for (entity, location) in needs_reload { for (entity, location) in needs_reload {
commands.push(self.rescan_tab(entity, location, None)); commands.push(self.update_tab(entity, location, None));
} }
Task::batch(commands) Task::batch(commands)
} }
fn search(&mut self) -> Task<Message> {
if let Some(term) = self.search_get() {
self.search_set_active(Some(term.to_string()))
} else {
Task::none()
}
}
fn search_get(&self) -> Option<&str> { fn search_get(&self) -> Option<&str> {
let entity = self.tab_model.active(); let entity = self.tab_model.active();
let tab = self.tab_model.data::<Tab>(entity)?; let tab = self.tab_model.data::<Tab>(entity)?;
@ -896,10 +906,15 @@ impl App {
fn search_set_active(&mut self, term_opt: Option<String>) -> Task<Message> { fn search_set_active(&mut self, term_opt: Option<String>) -> Task<Message> {
let entity = self.tab_model.active(); let entity = self.tab_model.active();
self.search_set(entity, term_opt) self.search_set(entity, term_opt, None)
} }
fn search_set(&mut self, tab: Entity, term_opt: Option<String>) -> Task<Message> { fn search_set(
&mut self,
tab: Entity,
term_opt: Option<String>,
selection_paths: Option<Vec<PathBuf>>,
) -> Task<Message> {
let mut title_location_opt = None; let mut title_location_opt = None;
if let Some(tab) = self.tab_model.data_mut::<Tab>(tab) { if let Some(tab) = self.tab_model.data_mut::<Tab>(tab) {
let location_opt = match term_opt { let location_opt = match term_opt {
@ -930,7 +945,7 @@ impl App {
return Task::batch([ return Task::batch([
self.update_title(), self.update_title(),
self.update_watcher(), self.update_watcher(),
self.rescan_tab(tab, location, None), self.rescan_tab(tab, location, selection_paths),
if focus_search { if focus_search {
widget::text_input::focus(self.search_id.clone()) widget::text_input::focus(self.search_id.clone())
} else { } else {
@ -989,7 +1004,7 @@ impl App {
if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) { if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) {
tab.location = location.clone(); tab.location = location.clone();
} }
commands.push(self.rescan_tab(entity, location, None)); commands.push(self.update_tab(entity, location, None));
} }
Task::batch(commands) Task::batch(commands)
} }
@ -1589,6 +1604,18 @@ impl Application for App {
let mut commands = vec![app.update_config()]; let mut commands = vec![app.update_config()];
for location in flags.locations { for location in flags.locations {
if let Some(path) = location.path_opt() {
if path.is_file() {
if let Some(parent) = path.parent() {
commands.push(app.open_tab(
Location::Path(parent.to_path_buf()),
true,
Some(vec![path.to_path_buf()]),
));
continue;
}
}
}
commands.push(app.open_tab(location, true, None)); commands.push(app.open_tab(location, true, None));
} }
@ -2053,14 +2080,15 @@ impl Application for App {
} }
Message::ExtractHere(entity_opt) => { Message::ExtractHere(entity_opt) => {
let paths = self.selected_paths(entity_opt); let paths = self.selected_paths(entity_opt);
if let Some(current_path) = paths.get(0) { if let Some(destination) = paths
if let Some(destination) = current_path.parent().zip(current_path.file_stem()) { .first()
let destination_path = destination.0.to_path_buf(); .and_then(|first| first.parent())
self.operation(Operation::Extract { .map(|parent| parent.to_path_buf())
paths, {
to: destination_path, self.operation(Operation::Extract {
}); paths,
} to: destination,
});
} }
} }
Message::Key(modifiers, key) => { Message::Key(modifiers, key) => {
@ -2137,7 +2165,7 @@ impl Application for App {
}; };
if let Some(title) = title_opt { if let Some(title) = title_opt {
self.tab_model.text_set(entity, title); self.tab_model.text_set(entity, title);
commands.push(self.rescan_tab(entity, home_location.clone(), None)); commands.push(self.update_tab(entity, home_location.clone(), None));
} }
} }
if !commands.is_empty() { if !commands.is_empty() {
@ -2302,11 +2330,7 @@ impl Application for App {
let mut commands = Vec::with_capacity(needs_reload.len()); let mut commands = Vec::with_capacity(needs_reload.len());
for (entity, location) in needs_reload { for (entity, location) in needs_reload {
if let Location::Search(_, term, ..) = location { commands.push(self.update_tab(entity, location, None));
commands.push(self.search_set(entity, Some(term)));
} else {
commands.push(self.rescan_tab(entity, location, None));
}
} }
return Task::batch(commands); return Task::batch(commands);
} }
@ -2545,8 +2569,6 @@ impl Application for App {
commands.push(self.rescan_operation_selection(op_sel)); commands.push(self.rescan_operation_selection(op_sel));
// Manually rescan any trash tabs after any operation is completed // Manually rescan any trash tabs after any operation is completed
commands.push(self.rescan_trash()); commands.push(self.rescan_trash());
// if search is active, update "search" tab view
commands.push(self.search());
return Task::batch(commands); return Task::batch(commands);
} }
Message::PendingDismiss => { Message::PendingDismiss => {
@ -2869,7 +2891,7 @@ impl Application for App {
commands.push(Task::batch([ commands.push(Task::batch([
self.update_title(), self.update_title(),
self.update_watcher(), self.update_watcher(),
self.rescan_tab(entity, tab_path, selection_paths), self.update_tab(entity, tab_path, selection_paths),
])); ]));
} }
tab::Command::DropFiles(to, from) => { tab::Command::DropFiles(to, from) => {
@ -3024,6 +3046,12 @@ impl Application for App {
]); ]);
} }
} }
Message::WindowUnfocus => {
let tab_entity = self.tab_model.active();
if let Some(tab) = self.tab_model.data_mut::<Tab>(tab_entity) {
tab.context_menu = None;
}
}
Message::WindowCloseRequested(id) => { Message::WindowCloseRequested(id) => {
self.remove_window(&id); self.remove_window(&id);
} }
@ -3156,7 +3184,7 @@ impl Application for App {
return Task::batch([ return Task::batch([
self.update_title(), self.update_title(),
self.update_watcher(), self.update_watcher(),
self.rescan_tab(entity, location, None), self.update_tab(entity, location, None),
]); ]);
} }
} }
@ -4377,6 +4405,7 @@ impl Application for App {
Event::Keyboard(KeyEvent::ModifiersChanged(modifiers)) => { Event::Keyboard(KeyEvent::ModifiersChanged(modifiers)) => {
Some(Message::Modifiers(modifiers)) Some(Message::Modifiers(modifiers))
} }
Event::Window(WindowEvent::Unfocused) => Some(Message::WindowUnfocus),
Event::Window(WindowEvent::CloseRequested) => Some(Message::WindowClose), Event::Window(WindowEvent::CloseRequested) => Some(Message::WindowClose),
Event::Window(WindowEvent::Opened { position: _, size }) => { Event::Window(WindowEvent::Opened { position: _, size }) => {
Some(Message::Size(size)) Some(Message::Size(size))

6
src/clipboard.rs
View file

@ -28,6 +28,8 @@ impl ClipboardCopy {
pub fn new<P: AsRef<Path>>(kind: ClipboardKind, paths: &[P]) -> Self { pub fn new<P: AsRef<Path>>(kind: ClipboardKind, paths: &[P]) -> Self {
let available = vec![ let available = vec![
"text/plain".to_string(), "text/plain".to_string(),
"text/plain;charset=utf-8".to_string(),
"UTF8_STRING".to_string(),
"text/uri-list".to_string(), "text/uri-list".to_string(),
"x-special/gnome-copied-files".to_string(), "x-special/gnome-copied-files".to_string(),
]; ];
@ -94,7 +96,9 @@ impl AsMimeTypes for ClipboardCopy {
fn as_bytes(&self, mime_type: &str) -> Option<Cow<'static, [u8]>> { fn as_bytes(&self, mime_type: &str) -> Option<Cow<'static, [u8]>> {
match mime_type { match mime_type {
"text/plain" => Some(self.text_plain.clone()), "text/plain" | "text/plain;charset=utf-8" | "UTF8_STRING" => {
Some(self.text_plain.clone())
}
"text/uri-list" => Some(self.text_uri_list.clone()), "text/uri-list" => Some(self.text_uri_list.clone()),
"x-special/gnome-copied-files" => Some(self.x_special_gnome_copied_files.clone()), "x-special/gnome-copied-files" => Some(self.x_special_gnome_copied_files.clone()),
_ => None, _ => None,

2
src/config.rs
View file

@ -68,7 +68,7 @@ impl Favorite {
Self::Videos, Self::Videos,
] { ] {
if let Some(favorite_path) = favorite.path_opt() { if let Some(favorite_path) = favorite.path_opt() {
if &favorite_path == &path { if favorite_path == path {
return favorite.clone(); return favorite.clone();
} }
} }

95
src/dialog.rs
View file

@ -157,13 +157,15 @@ impl<M: Send + 'static> Dialog<M> {
let (config_handler, config) = Config::load(); let (config_handler, config) = Config::load();
let mut settings = window::Settings::default(); let mut settings = window::Settings {
settings.decorations = false; decorations: false,
settings.exit_on_close_request = false; exit_on_close_request: false,
settings.min_size = Some(Size::new(360.0, 180.0)); min_size: Some(Size::new(360.0, 180.0)),
settings.resizable = true; resizable: true,
settings.size = Size::new(1024.0, 640.0); size: Size::new(1024.0, 640.0),
settings.transparent = true; transparent: true,
..Default::default()
};
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
{ {
@ -251,7 +253,8 @@ impl<M: Send + 'static> Dialog<M> {
self.cosmic self.cosmic
.subscription() .subscription()
.map(DialogMessage) .map(DialogMessage)
.map(self.mapper) .with(self.mapper)
.map(|(mapper, message)| mapper(message))
} }
pub fn update(&mut self, message: DialogMessage) -> Task<M> { pub fn update(&mut self, message: DialogMessage) -> Task<M> {
@ -295,6 +298,7 @@ struct Flags {
kind: DialogKind, kind: DialogKind,
path_opt: Option<PathBuf>, path_opt: Option<PathBuf>,
window_id: window::Id, window_id: window::Id,
#[expect(dead_code)]
config_handler: Option<cosmic_config::Config>, config_handler: Option<cosmic_config::Config>,
config: Config, config: Config,
} }
@ -323,6 +327,7 @@ enum Message {
SearchActivate, SearchActivate,
SearchClear, SearchClear,
SearchInput(String), SearchInput(String),
#[allow(clippy::enum_variant_names)]
TabMessage(tab::Message), TabMessage(tab::Message),
TabRescan(Location, Option<tab::Item>, Vec<tab::Item>), TabRescan(Location, Option<tab::Item>, Vec<tab::Item>),
TabView(tab::View), TabView(tab::View),
@ -344,6 +349,7 @@ impl From<AppMessage> for Message {
AppMessage::ZoomDefault(_entity_opt) => Message::ZoomDefault, AppMessage::ZoomDefault(_entity_opt) => Message::ZoomDefault,
AppMessage::ZoomIn(_entity_opt) => Message::ZoomIn, AppMessage::ZoomIn(_entity_opt) => Message::ZoomIn,
AppMessage::ZoomOut(_entity_opt) => Message::ZoomOut, AppMessage::ZoomOut(_entity_opt) => Message::ZoomOut,
AppMessage::NewItem(_entity_opt, true) => Message::NewFolder,
unsupported => { unsupported => {
log::warn!("{unsupported:?} not supported in dialog mode"); log::warn!("{unsupported:?} not supported in dialog mode");
Message::None Message::None
@ -596,7 +602,7 @@ impl App {
.data(Location::Recents) .data(Location::Recents)
}); });
for (_favorite_i, favorite) in self.flags.config.favorites.iter().enumerate() { for favorite in self.flags.config.favorites.iter() {
if let Some(path) = favorite.path_opt() { if let Some(path) = favorite.path_opt() {
let name = if matches!(favorite, Favorite::Home) { let name = if matches!(favorite, Favorite::Home) {
fl!("home") fl!("home")
@ -972,11 +978,8 @@ impl Application for App {
ContextPage::Preview(..) => self.core.window.show_context, ContextPage::Preview(..) => self.core.window.show_context,
_ => false, _ => false,
}; };
elements.push( elements
menu::dialog_menu(&self.tab, &self.key_binds, show_details) .push(menu::dialog_menu(&self.tab, &self.key_binds, show_details).map(Message::from));
.map(Message::from)
.into(),
);
elements elements
} }
@ -1025,7 +1028,7 @@ impl Application for App {
return self.update(message); return self.update(message);
} }
if let Some(data) = self.nav_model.data::<MounterData>(entity).clone() { if let Some(data) = self.nav_model.data::<MounterData>(entity) {
if let Some(mounter) = MOUNTERS.get(&data.0) { if let Some(mounter) = MOUNTERS.get(&data.0) {
return mounter.mount(data.1.clone()).map(|_| message::none()); return mounter.mount(data.1.clone()).map(|_| message::none());
} }
@ -1167,11 +1170,9 @@ impl Application for App {
let mut still_mounted = false; let mut still_mounted = false;
for item in mounter_items.iter() { for item in mounter_items.iter() {
if let Some(path) = item.path() { if let Some(path) = item.path() {
if path == old_path { if path == old_path && item.is_mounted() {
if item.is_mounted() { still_mounted = true;
still_mounted = true; break;
break;
}
} }
} }
} }
@ -1219,7 +1220,7 @@ impl Application for App {
let mut contains_change = false; let mut contains_change = false;
for event in events.iter() { for event in events.iter() {
for event_path in event.paths.iter() { for event_path in event.paths.iter() {
if event_path.starts_with(&path) { if event_path.starts_with(path) {
match event.kind { match event.kind {
notify::EventKind::Modify( notify::EventKind::Modify(
notify::event::ModifyKind::Metadata(_), notify::event::ModifyKind::Metadata(_),
@ -1233,14 +1234,14 @@ impl Application for App {
for item in items.iter_mut() { for item in items.iter_mut() {
if item.path_opt() == Some(event_path) { if item.path_opt() == Some(event_path) {
//TODO: reload more, like mime types? //TODO: reload more, like mime types?
match fs::metadata(&event_path) { match fs::metadata(event_path) {
Ok(new_metadata) => { Ok(new_metadata) => {
match &mut item.metadata { if let ItemMetadata::Path {
ItemMetadata::Path { metadata,
metadata, ..
.. } = &mut item.metadata
} => *metadata = new_metadata, {
_ => {} *metadata = new_metadata;
} }
} }
Err(err) => { Err(err) => {
@ -1320,12 +1321,9 @@ impl Application for App {
// If we are in directory mode, return the current directory // If we are in directory mode, return the current directory
if self.flags.kind.is_dir() { if self.flags.kind.is_dir() {
match &self.tab.location { if let Location::Path(tab_path) = &self.tab.location {
Location::Path(tab_path) => { self.result_opt = Some(DialogResult::Open(vec![tab_path.clone()]));
self.result_opt = Some(DialogResult::Open(vec![tab_path.clone()])); return window::close(self.flags.window_id);
return window::close(self.flags.window_id);
}
_ => {}
} }
} }
} }
@ -1342,7 +1340,7 @@ impl Application for App {
if let DialogKind::SaveFile { filename } = &self.flags.kind { if let DialogKind::SaveFile { filename } = &self.flags.kind {
if !filename.is_empty() { if !filename.is_empty() {
if let Some(tab_path) = self.tab.location.path_opt() { if let Some(tab_path) = self.tab.location.path_opt() {
let path = tab_path.join(&filename); let path = tab_path.join(filename);
if path.is_dir() { if path.is_dir() {
// cd to directory // cd to directory
let message = Message::TabMessage(tab::Message::Location( let message = Message::TabMessage(tab::Message::Location(
@ -1590,11 +1588,7 @@ impl Application for App {
} }
} }
col = col.push( col = col.push(self.tab.view(&self.key_binds).map(Message::TabMessage));
self.tab
.view(&self.key_binds)
.map(move |message| Message::TabMessage(message)),
);
col.into() col.into()
} }
@ -1708,16 +1702,17 @@ impl Application for App {
]; ];
for (key, mounter) in MOUNTERS.iter() { for (key, mounter) in MOUNTERS.iter() {
let key = *key; subscriptions.push(
subscriptions.push(mounter.subscription().map(move |mounter_message| { mounter.subscription().with(*key).map(
match mounter_message { |(key, mounter_message)| match mounter_message {
MounterMessage::Items(items) => Message::MounterItems(key, items), MounterMessage::Items(items) => Message::MounterItems(key, items),
_ => { _ => {
log::warn!("{:?} not supported in dialog mode", mounter_message); log::warn!("{:?} not supported in dialog mode", mounter_message);
Message::None Message::None
} }
} },
})); ),
);
} }
Subscription::batch(subscriptions) Subscription::batch(subscriptions)

4
src/key_bind.rs
View file

@ -29,10 +29,14 @@ pub fn key_binds(mode: &tab::Mode) -> HashMap<KeyBind, Action> {
bind!([], Key::Named(Named::ArrowLeft), ItemLeft); bind!([], Key::Named(Named::ArrowLeft), ItemLeft);
bind!([], Key::Named(Named::ArrowRight), ItemRight); bind!([], Key::Named(Named::ArrowRight), ItemRight);
bind!([], Key::Named(Named::ArrowUp), ItemUp); bind!([], Key::Named(Named::ArrowUp), ItemUp);
bind!([], Key::Named(Named::Home), SelectFirst);
bind!([], Key::Named(Named::End), SelectLast);
bind!([Shift], Key::Named(Named::ArrowDown), ItemDown); bind!([Shift], Key::Named(Named::ArrowDown), ItemDown);
bind!([Shift], Key::Named(Named::ArrowLeft), ItemLeft); bind!([Shift], Key::Named(Named::ArrowLeft), ItemLeft);
bind!([Shift], Key::Named(Named::ArrowRight), ItemRight); bind!([Shift], Key::Named(Named::ArrowRight), ItemRight);
bind!([Shift], Key::Named(Named::ArrowUp), ItemUp); bind!([Shift], Key::Named(Named::ArrowUp), ItemUp);
bind!([Shift], Key::Named(Named::Home), SelectFirst);
bind!([Shift], Key::Named(Named::End), SelectLast);
bind!([Ctrl, Shift], Key::Character("n".into()), NewFolder); bind!([Ctrl, Shift], Key::Character("n".into()), NewFolder);
bind!([], Key::Named(Named::Enter), Open); bind!([], Key::Named(Named::Enter), Open);
bind!([Ctrl], Key::Named(Named::Space), Preview); bind!([Ctrl], Key::Named(Named::Space), Preview);

24
src/menu.rs
View file

@ -89,7 +89,7 @@ pub fn context_menu<'a>(
let mut selected_trash_only = false; let mut selected_trash_only = false;
let mut selected_desktop_entry = None; let mut selected_desktop_entry = None;
let mut selected_types: Vec<Mime> = vec![]; let mut selected_types: Vec<Mime> = vec![];
tab.items_opt().map(|items| { if let Some(items) = tab.items_opt() {
for item in items.iter() { for item in items.iter() {
if item.selected { if item.selected {
selected += 1; selected += 1;
@ -110,7 +110,7 @@ pub fn context_menu<'a>(
selected_types.push(item.mime.clone()); selected_types.push(item.mime.clone());
} }
} }
}); };
selected_types.sort_unstable(); selected_types.sort_unstable();
selected_types.dedup(); selected_types.dedup();
selected_trash_only = selected_trash_only && selected == 1; selected_trash_only = selected_trash_only && selected == 1;
@ -163,7 +163,7 @@ pub fn context_menu<'a>(
.push(menu_item(fl!("open-in-terminal"), Action::OpenTerminal).into()); .push(menu_item(fl!("open-in-terminal"), Action::OpenTerminal).into());
} }
} }
if matches!(tab.location, Location::Search(..)) { if matches!(tab.location, Location::Search(..) | Location::Recents) {
children.push( children.push(
menu_item(fl!("open-item-location"), Action::OpenItemLocation).into(), menu_item(fl!("open-item-location"), Action::OpenItemLocation).into(),
); );
@ -260,7 +260,7 @@ pub fn context_menu<'a>(
if selected_dir == 1 && selected == 1 || selected_dir == 0 { if selected_dir == 1 && selected == 1 || selected_dir == 0 {
children.push(menu_item(fl!("open"), Action::Open).into()); children.push(menu_item(fl!("open"), Action::Open).into());
} }
if matches!(tab.location, Location::Search(..)) { if matches!(tab.location, Location::Search(..) | Location::Recents) {
children.push( children.push(
menu_item(fl!("open-item-location"), Action::OpenItemLocation).into(), menu_item(fl!("open-item-location"), Action::OpenItemLocation).into(),
); );
@ -342,7 +342,7 @@ pub fn context_menu<'a>(
.into() .into()
} }
pub fn dialog_menu<'a>( pub fn dialog_menu(
tab: &Tab, tab: &Tab,
key_binds: &HashMap<KeyBind, Action>, key_binds: &HashMap<KeyBind, Action>,
show_details: bool, show_details: bool,
@ -359,15 +359,13 @@ pub fn dialog_menu<'a>(
let in_trash = tab.location == Location::Trash; let in_trash = tab.location == Location::Trash;
let mut selected_gallery = 0; let mut selected_gallery = 0;
tab.items_opt().map(|items| { if let Some(items) = tab.items_opt() {
for item in items.iter() { for item in items.iter() {
if item.selected { if item.selected && item.can_gallery() {
if item.can_gallery() { selected_gallery += 1;
selected_gallery += 1;
}
} }
} }
}); };
MenuBar::new(vec![ MenuBar::new(vec![
menu::Tree::with_children( menu::Tree::with_children(
@ -504,7 +502,7 @@ pub fn menu_bar<'a>(
let mut selected_dir = 0; let mut selected_dir = 0;
let mut selected = 0; let mut selected = 0;
let mut selected_gallery = 0; let mut selected_gallery = 0;
tab_opt.and_then(|tab| tab.items_opt()).map(|items| { if let Some(items) = tab_opt.and_then(|tab| tab.items_opt()) {
for item in items.iter() { for item in items.iter() {
if item.selected { if item.selected {
selected += 1; selected += 1;
@ -516,7 +514,7 @@ pub fn menu_bar<'a>(
} }
} }
} }
}); };
MenuBar::new(vec![ MenuBar::new(vec![
menu::Tree::with_children( menu::Tree::with_children(

14
src/mime_app.rs
View file

@ -120,7 +120,7 @@ impl MimeAppCache {
.cache .cache
.entry(mime.clone()) .entry(mime.clone())
.or_insert_with(|| Vec::with_capacity(1)); .or_insert_with(|| Vec::with_capacity(1));
if apps.iter().find(|x| x.id == app.id).is_none() { if !apps.iter().any(|x| x.id == app.id) {
apps.push(MimeApp::from(app)); apps.push(MimeApp::from(app));
} }
} }
@ -191,11 +191,7 @@ impl MimeAppCache {
.cache .cache
.entry(mime.clone()) .entry(mime.clone())
.or_insert_with(|| Vec::with_capacity(1)); .or_insert_with(|| Vec::with_capacity(1));
if apps if !apps.iter().any(|x| filename_eq(&x.path, filename)) {
.iter()
.find(|x| filename_eq(&x.path, filename))
.is_none()
{
if let Some(app) = if let Some(app) =
all_apps.iter().find(|x| filename_eq(&x.path, filename)) all_apps.iter().find(|x| filename_eq(&x.path, filename))
{ {
@ -263,9 +259,7 @@ impl MimeAppCache {
} }
pub fn get(&self, key: &Mime) -> Vec<MimeApp> { pub fn get(&self, key: &Mime) -> Vec<MimeApp> {
self.cache self.cache.get(key).map_or_else(Vec::new, |x| x.clone())
.get(&key)
.map_or_else(|| Vec::new(), |x| x.clone())
} }
} }
@ -292,5 +286,5 @@ pub fn terminal() -> Option<MimeApp> {
} }
// Return whatever was the first terminal found // Return whatever was the first terminal found
mime_app_cache.terminals.first().map(|x| x.clone()) mime_app_cache.terminals.first().cloned()
} }

10
src/mounter/gvfs.rs
View file

@ -97,7 +97,7 @@ fn network_scan(uri: &str, sizes: IconSizes) -> Result<Vec<tab::Item>, String> {
info.icon() info.icon()
.as_ref() .as_ref()
.and_then(|icon| gio_icon_to_path(icon, size)) .and_then(|icon| gio_icon_to_path(icon, size))
.map(|path| widget::icon::from_path(path)) .map(widget::icon::from_path)
.unwrap_or( .unwrap_or(
widget::icon::from_name(if metadata.is_dir() { widget::icon::from_name(if metadata.is_dir() {
"folder" "folder"
@ -388,10 +388,7 @@ impl Gvfs {
let file = gio::File::for_uri(&uri); let file = gio::File::for_uri(&uri);
let needs_mount = match file.find_enclosing_mount(gio::Cancellable::NONE) { let needs_mount = match file.find_enclosing_mount(gio::Cancellable::NONE) {
Ok(_) => false, Ok(_) => false,
Err(err) => match err.kind::<gio::IOErrorEnum>() { Err(err) => matches!(err.kind::<gio::IOErrorEnum>(), Some(gio::IOErrorEnum::NotMounted))
Some(gio::IOErrorEnum::NotMounted) => true,
_ => false
}
}; };
if needs_mount { if needs_mount {
let mount_op = mount_op(uri.clone(), event_tx.clone()); let mount_op = mount_op(uri.clone(), event_tx.clone());
@ -468,7 +465,6 @@ impl Mounter for Gvfs {
Task::perform( Task::perform(
async move { async move {
command_tx.send(Cmd::Mount(item)).unwrap(); command_tx.send(Cmd::Mount(item)).unwrap();
()
}, },
|x| x, |x| x,
) )
@ -479,7 +475,6 @@ impl Mounter for Gvfs {
Task::perform( Task::perform(
async move { async move {
command_tx.send(Cmd::NetworkDrive(uri)).unwrap(); command_tx.send(Cmd::NetworkDrive(uri)).unwrap();
()
}, },
|x| x, |x| x,
) )
@ -498,7 +493,6 @@ impl Mounter for Gvfs {
Task::perform( Task::perform(
async move { async move {
command_tx.send(Cmd::Unmount(item)).unwrap(); command_tx.send(Cmd::Unmount(item)).unwrap();
()
}, },
|x| x, |x| x,
) )

2
src/mounter/mod.rs
View file

@ -117,4 +117,4 @@ pub fn mounters() -> Mounters {
Mounters::new(mounters) Mounters::new(mounters)
} }
pub static MOUNTERS: Lazy<Mounters> = Lazy::new(|| mounters()); pub static MOUNTERS: Lazy<Mounters> = Lazy::new(mounters);

102
src/mouse_area.rs
View file

@ -31,156 +31,150 @@ use crate::tab::DOUBLE_CLICK_DURATION;
pub struct MouseArea<'a, Message> { pub struct MouseArea<'a, Message> {
id: Id, id: Id,
content: Element<'a, Message>, content: Element<'a, Message>,
on_drag: Option<Box<dyn Fn(Option<Rectangle>) -> Message + 'a>>, on_drag: Option<Box<dyn OnDrag<'a, Message>>>,
on_double_click: Option<Box<dyn Fn(Option<Point>) -> Message + 'a>>, on_double_click: Option<Box<dyn OnMouseButton<'a, Message>>>,
on_press: Option<Box<dyn Fn(Option<Point>) -> Message + 'a>>, on_press: Option<Box<dyn OnMouseButton<'a, Message>>>,
on_drag_end: Option<Box<dyn Fn(Option<Point>) -> Message + 'a>>, on_drag_end: Option<Box<dyn OnMouseButton<'a, Message>>>,
on_release: Option<Box<dyn Fn(Option<Point>) -> Message + 'a>>, on_release: Option<Box<dyn OnMouseButton<'a, Message>>>,
on_resize: Option<Box<dyn Fn(Size) -> Message + 'a>>, on_resize: Option<Box<dyn OnResize<'a, Message>>>,
on_right_press: Option<Box<dyn Fn(Option<Point>) -> Message + 'a>>, on_right_press: Option<Box<dyn OnMouseButton<'a, Message>>>,
on_right_press_no_capture: Option<Box<dyn Fn(Option<Point>) -> Message + 'a>>, on_right_press_no_capture: Option<Box<dyn OnMouseButton<'a, Message>>>,
on_right_release: Option<Box<dyn Fn(Option<Point>) -> Message + 'a>>, on_right_release: Option<Box<dyn OnMouseButton<'a, Message>>>,
on_middle_press: Option<Box<dyn Fn(Option<Point>) -> Message + 'a>>, on_middle_press: Option<Box<dyn OnMouseButton<'a, Message>>>,
on_middle_release: Option<Box<dyn Fn(Option<Point>) -> Message + 'a>>, on_middle_release: Option<Box<dyn OnMouseButton<'a, Message>>>,
on_back_press: Option<Box<dyn Fn(Option<Point>) -> Message + 'a>>, on_back_press: Option<Box<dyn OnMouseButton<'a, Message>>>,
on_back_release: Option<Box<dyn Fn(Option<Point>) -> Message + 'a>>, on_back_release: Option<Box<dyn OnMouseButton<'a, Message>>>,
on_forward_press: Option<Box<dyn Fn(Option<Point>) -> Message + 'a>>, on_forward_press: Option<Box<dyn OnMouseButton<'a, Message>>>,
on_forward_release: Option<Box<dyn Fn(Option<Point>) -> Message + 'a>>, on_forward_release: Option<Box<dyn OnMouseButton<'a, Message>>>,
on_scroll: Option<Box<dyn Fn(mouse::ScrollDelta, Modifiers) -> Option<Message> + 'a>>, on_scroll: Option<Box<dyn OnScroll<'a, Message>>>,
on_enter: Option<Box<dyn Fn() -> Message + 'a>>, on_enter: Option<Box<dyn OnEnterExit<'a, Message>>>,
on_exit: Option<Box<dyn Fn() -> Message + 'a>>, on_exit: Option<Box<dyn OnEnterExit<'a, Message>>>,
show_drag_rect: bool, show_drag_rect: bool,
} }
impl<'a, Message> MouseArea<'a, Message> { impl<'a, Message> MouseArea<'a, Message> {
/// The message to emit when a drag is initiated. /// The message to emit when a drag is initiated.
#[must_use] #[must_use]
pub fn on_drag(mut self, message: impl Fn(Option<Rectangle>) -> Message + 'a) -> Self { pub fn on_drag(mut self, message: impl OnDrag<'a, Message>) -> Self {
self.on_drag = Some(Box::new(message)); self.on_drag = Some(Box::new(message));
self self
} }
/// The message to emit when a drag ends. /// The message to emit when a drag ends.
#[must_use] #[must_use]
pub fn on_drag_end(mut self, message: impl Fn(Option<Point>) -> Message + 'a) -> Self { pub fn on_drag_end(mut self, message: impl OnMouseButton<'a, Message>) -> Self {
self.on_drag_end = Some(Box::new(message)); self.on_drag_end = Some(Box::new(message));
self self
} }
/// The message to emit on a double click. /// The message to emit on a double click.
#[must_use] #[must_use]
pub fn on_double_click(mut self, message: impl Fn(Option<Point>) -> Message + 'a) -> Self { pub fn on_double_click(mut self, message: impl OnMouseButton<'a, Message>) -> Self {
self.on_double_click = Some(Box::new(message)); self.on_double_click = Some(Box::new(message));
self self
} }
/// The message to emit on a left button press. /// The message to emit on a left button press.
#[must_use] #[must_use]
pub fn on_press(mut self, message: impl Fn(Option<Point>) -> Message + 'a) -> Self { pub fn on_press(mut self, message: impl OnMouseButton<'a, Message>) -> Self {
self.on_press = Some(Box::new(message)); self.on_press = Some(Box::new(message));
self self
} }
/// The message to emit on a left button release. /// The message to emit on a left button release.
#[must_use] #[must_use]
pub fn on_release(mut self, message: impl Fn(Option<Point>) -> Message + 'a) -> Self { pub fn on_release(mut self, message: impl OnMouseButton<'a, Message>) -> Self {
self.on_release = Some(Box::new(message)); self.on_release = Some(Box::new(message));
self self
} }
/// The message to emit on resizing. /// The message to emit on resizing.
#[must_use] #[must_use]
pub fn on_resize(mut self, message: impl Fn(Size) -> Message + 'a) -> Self { pub fn on_resize(mut self, message: impl OnResize<'a, Message>) -> Self {
self.on_resize = Some(Box::new(message)); self.on_resize = Some(Box::new(message));
self self
} }
/// The message to emit on a right button press. /// The message to emit on a right button press.
#[must_use] #[must_use]
pub fn on_right_press(mut self, message: impl Fn(Option<Point>) -> Message + 'a) -> Self { pub fn on_right_press(mut self, message: impl OnMouseButton<'a, Message>) -> Self {
self.on_right_press = Some(Box::new(message)); self.on_right_press = Some(Box::new(message));
self self
} }
/// The message to emit on a right button press without capturing. /// The message to emit on a right button press without capturing.
#[must_use] #[must_use]
pub fn on_right_press_no_capture( pub fn on_right_press_no_capture(mut self, message: impl OnMouseButton<'a, Message>) -> Self {
mut self,
message: impl Fn(Option<Point>) -> Message + 'a,
) -> Self {
self.on_right_press_no_capture = Some(Box::new(message)); self.on_right_press_no_capture = Some(Box::new(message));
self self
} }
/// The message to emit on a right button release. /// The message to emit on a right button release.
#[must_use] #[must_use]
pub fn on_right_release(mut self, message: impl Fn(Option<Point>) -> Message + 'a) -> Self { pub fn on_right_release(mut self, message: impl OnMouseButton<'a, Message>) -> Self {
self.on_right_release = Some(Box::new(message)); self.on_right_release = Some(Box::new(message));
self self
} }
/// The message to emit on a middle button press. /// The message to emit on a middle button press.
#[must_use] #[must_use]
pub fn on_middle_press(mut self, message: impl Fn(Option<Point>) -> Message + 'a) -> Self { pub fn on_middle_press(mut self, message: impl OnMouseButton<'a, Message>) -> Self {
self.on_middle_press = Some(Box::new(message)); self.on_middle_press = Some(Box::new(message));
self self
} }
/// The message to emit on a middle button release. /// The message to emit on a middle button release.
#[must_use] #[must_use]
pub fn on_middle_release(mut self, message: impl Fn(Option<Point>) -> Message + 'a) -> Self { pub fn on_middle_release(mut self, message: impl OnMouseButton<'a, Message>) -> Self {
self.on_middle_release = Some(Box::new(message)); self.on_middle_release = Some(Box::new(message));
self self
} }
/// The message to emit on a back button press. /// The message to emit on a back button press.
#[must_use] #[must_use]
pub fn on_back_press(mut self, message: impl Fn(Option<Point>) -> Message + 'a) -> Self { pub fn on_back_press(mut self, message: impl OnMouseButton<'a, Message>) -> Self {
self.on_back_press = Some(Box::new(message)); self.on_back_press = Some(Box::new(message));
self self
} }
/// The message to emit on a back button release. /// The message to emit on a back button release.
#[must_use] #[must_use]
pub fn on_back_release(mut self, message: impl Fn(Option<Point>) -> Message + 'a) -> Self { pub fn on_back_release(mut self, message: impl OnMouseButton<'a, Message>) -> Self {
self.on_back_release = Some(Box::new(message)); self.on_back_release = Some(Box::new(message));
self self
} }
/// The message to emit on a forward button press. /// The message to emit on a forward button press.
#[must_use] #[must_use]
pub fn on_forward_press(mut self, message: impl Fn(Option<Point>) -> Message + 'a) -> Self { pub fn on_forward_press(mut self, message: impl OnMouseButton<'a, Message>) -> Self {
self.on_forward_press = Some(Box::new(message)); self.on_forward_press = Some(Box::new(message));
self self
} }
/// The message to emit on a forward button release. /// The message to emit on a forward button release.
#[must_use] #[must_use]
pub fn on_forward_release(mut self, message: impl Fn(Option<Point>) -> Message + 'a) -> Self { pub fn on_forward_release(mut self, message: impl OnMouseButton<'a, Message>) -> Self {
self.on_forward_release = Some(Box::new(message)); self.on_forward_release = Some(Box::new(message));
self self
} }
/// The message to emit on a scroll. /// The message to emit on a scroll.
#[must_use] #[must_use]
pub fn on_scroll( pub fn on_scroll(mut self, message: impl OnScroll<'a, Message>) -> Self {
mut self,
message: impl Fn(mouse::ScrollDelta, Modifiers) -> Option<Message> + 'a,
) -> Self {
self.on_scroll = Some(Box::new(message)); self.on_scroll = Some(Box::new(message));
self self
} }
/// The message to emit when a mouse enters the area. /// The message to emit when a mouse enters the area.
#[must_use] #[must_use]
pub fn on_enter(mut self, message: impl Fn() -> Message + 'a) -> Self { pub fn on_enter(mut self, message: impl OnEnterExit<'a, Message>) -> Self {
self.on_enter = Some(Box::new(message)); self.on_enter = Some(Box::new(message));
self self
} }
/// The message to emit when a mouse exits the area. /// The message to emit when a mouse exits the area.
#[must_use] #[must_use]
pub fn on_exit(mut self, message: impl Fn() -> Message + 'a) -> Self { pub fn on_exit(mut self, message: impl OnEnterExit<'a, Message>) -> Self {
self.on_exit = Some(Box::new(message)); self.on_exit = Some(Box::new(message));
self self
} }
@ -199,6 +193,24 @@ impl<'a, Message> MouseArea<'a, Message> {
} }
} }
pub trait OnMouseButton<'a, Message>: Fn(Option<Point>) -> Message + 'a {}
impl<'a, Message, F> OnMouseButton<'a, Message> for F where F: Fn(Option<Point>) -> Message + 'a {}
pub trait OnDrag<'a, Message>: Fn(Option<Rectangle>) -> Message + 'a {}
impl<'a, Message, F> OnDrag<'a, Message> for F where F: Fn(Option<Rectangle>) -> Message + 'a {}
pub trait OnResize<'a, Message>: Fn(Size) -> Message + 'a {}
impl<'a, Message, F> OnResize<'a, Message> for F where F: Fn(Size) -> Message + 'a {}
pub trait OnScroll<'a, Message>: Fn(mouse::ScrollDelta, Modifiers) -> Option<Message> + 'a {}
impl<'a, Message, F> OnScroll<'a, Message> for F where
F: Fn(mouse::ScrollDelta, Modifiers) -> Option<Message> + 'a
{
}
pub trait OnEnterExit<'a, Message>: Fn() -> Message + 'a {}
impl<'a, Message, F> OnEnterExit<'a, Message> for F where F: Fn() -> Message + 'a {}
/// Local state of the [`MouseArea`]. /// Local state of the [`MouseArea`].
#[derive(Default)] #[derive(Default)]
struct State { struct State {
@ -250,7 +262,7 @@ impl State {
} else { } else {
mouse::Click::new(pos, mouse::Button::Left, None) mouse::Click::new(pos, mouse::Button::Left, None)
}; };
self.prev_click = Some((new.clone(), now)); self.prev_click = Some((new, now));
new new
} }
} }
@ -284,7 +296,7 @@ impl<'a, Message> MouseArea<'a, Message> {
} }
} }
impl<'a, Message> Widget<Message, Theme, Renderer> for MouseArea<'a, Message> impl<Message> Widget<Message, Theme, Renderer> for MouseArea<'_, Message>
where where
Message: Clone, Message: Clone,
{ {
@ -659,7 +671,7 @@ fn update<Message: Clone>(
if let Some(on_scroll) = widget.on_scroll.as_ref() { if let Some(on_scroll) = widget.on_scroll.as_ref() {
if let Event::Mouse(mouse::Event::WheelScrolled { delta }) = event { if let Event::Mouse(mouse::Event::WheelScrolled { delta }) = event {
if let Some(message) = on_scroll(delta.clone(), state.modifiers) { if let Some(message) = on_scroll(*delta, state.modifiers) {
shell.publish(message); shell.publish(message);
return event::Status::Captured; return event::Status::Captured;
} }

6
src/operation/controller.rs
View file

@ -22,8 +22,8 @@ pub struct Controller {
inner: Arc<ControllerInner>, inner: Arc<ControllerInner>,
} }
impl Controller { impl Default for Controller {
pub fn new() -> Self { fn default() -> Self {
Self { Self {
primary: true, primary: true,
inner: Arc::new(ControllerInner { inner: Arc::new(ControllerInner {
@ -33,7 +33,9 @@ impl Controller {
}), }),
} }
} }
}
impl Controller {
pub fn check(&self) -> Result<(), String> { pub fn check(&self) -> Result<(), String> {
let mut state = self.inner.state.lock().unwrap(); let mut state = self.inner.state.lock().unwrap();
loop { loop {

39
src/operation/mod.rs
View file

@ -67,11 +67,20 @@ fn handle_replace(
} }
fn get_directory_name(file_name: &str) -> &str { fn get_directory_name(file_name: &str) -> &str {
const SUPPORTED_EXTENSIONS: [&str; 4] = [".tar.gz", ".tgz", ".tar", ".zip"]; // TODO: Chain with COMPOUND_EXTENSIONS once more formats are supported
const SUPPORTED_EXTENSIONS: &[&str] = &[
".tar.bz2",
".tar.gz",
".tar.lzma",
".tar.xz",
".tgz",
".tar",
".zip",
];
for ext in &SUPPORTED_EXTENSIONS { for ext in SUPPORTED_EXTENSIONS {
if file_name.ends_with(ext) { if let Some(stripped) = file_name.strip_suffix(ext) {
return &file_name[..file_name.len() - ext.len()]; return stripped;
} }
} }
file_name file_name
@ -245,7 +254,7 @@ async fn copy_or_move(
if matches!(from.parent(), Some(parent) if parent == to) && !moving { if matches!(from.parent(), Some(parent) if parent == to) && !moving {
// `from`'s parent is equal to `to` which means we're copying to the same // `from`'s parent is equal to `to` which means we're copying to the same
// directory (duplicating files) // directory (duplicating files)
let to = copy_unique_path(&from, &to); let to = copy_unique_path(&from, to);
Some((from, to)) Some((from, to))
} else if let Some(name) = from.file_name() { } else if let Some(name) = from.file_name() {
let to = to.join(name); let to = to.join(name);
@ -361,12 +370,12 @@ fn copy_unique_path(from: &Path, to: &Path) -> PathBuf {
to to
} }
fn file_name<'a>(path: &'a Path) -> Cow<'a, str> { fn file_name(path: &Path) -> Cow<'_, str> {
path.file_name() path.file_name()
.map_or_else(|| fl!("unknown-folder").into(), |x| x.to_string_lossy()) .map_or_else(|| fl!("unknown-folder").into(), |x| x.to_string_lossy())
} }
fn parent_name<'a>(path: &'a Path) -> Cow<'a, str> { fn parent_name(path: &Path) -> Cow<'_, str> {
let Some(parent) = path.parent() else { let Some(parent) = path.parent() else {
return fl!("unknown-folder").into(); return fl!("unknown-folder").into();
}; };
@ -374,7 +383,7 @@ fn parent_name<'a>(path: &'a Path) -> Cow<'a, str> {
file_name(parent) file_name(parent)
} }
fn paths_parent_name<'a>(paths: &'a Vec<PathBuf>) -> Cow<'a, str> { fn paths_parent_name(paths: &[PathBuf]) -> Cow<'_, str> {
let Some(first_path) = paths.first() else { let Some(first_path) = paths.first() else {
return fl!("unknown-folder").into(); return fl!("unknown-folder").into();
}; };
@ -674,7 +683,7 @@ impl Operation {
path.strip_prefix(relative_root).map_err(err_str)?.to_str() path.strip_prefix(relative_root).map_err(err_str)?.to_str()
{ {
if path.is_file() { if path.is_file() {
let mut file = fs::File::open(&path).map_err(err_str)?; let mut file = fs::File::open(path).map_err(err_str)?;
let metadata = file.metadata().map_err(err_str)?; let metadata = file.metadata().map_err(err_str)?;
let total = metadata.len(); let total = metadata.len();
if total >= 4 * 1024 * 1024 * 1024 { if total >= 4 * 1024 * 1024 * 1024 {
@ -777,8 +786,6 @@ impl Operation {
controller.set_progress((i as f32) / total_paths as f32); controller.set_progress((i as f32) / total_paths as f32);
let to = to.to_owned();
if let Some(file_name) = path.file_name().and_then(|f| f.to_str()) { if let Some(file_name) = path.file_name().and_then(|f| f.to_str()) {
let dir_name = get_directory_name(file_name); let dir_name = get_directory_name(file_name);
let mut new_dir = to.join(dir_name); let mut new_dir = to.join(dir_name);
@ -793,7 +800,7 @@ impl Operation {
op_sel.selected.push(new_dir.clone()); op_sel.selected.push(new_dir.clone());
let controller = controller.clone(); let controller = controller.clone();
let mime = mime_for_path(&path); let mime = mime_for_path(path);
match mime.essence_str() { match mime.essence_str() {
"application/gzip" | "application/x-compressed-tar" => { "application/gzip" | "application/x-compressed-tar" => {
OpReader::new(path, controller) OpReader::new(path, controller)
@ -953,7 +960,7 @@ mod tests {
}; };
use cosmic::iced::futures::{channel::mpsc, StreamExt}; use cosmic::iced::futures::{channel::mpsc, StreamExt};
use log::{debug, trace}; use log::debug;
use test_log::test; use test_log::test;
use tokio::sync; use tokio::sync;
@ -961,8 +968,8 @@ mod tests {
use crate::{ use crate::{
app::{ app::{
test_utils::{ test_utils::{
empty_fs, filter_dirs, filter_files, read_dir_sorted, simple_fs, NAME_LEN, empty_fs, filter_dirs, filter_files, simple_fs, NAME_LEN, NUM_DIRS, NUM_FILES,
NUM_DIRS, NUM_FILES, NUM_HIDDEN, NUM_NESTED, NUM_HIDDEN, NUM_NESTED,
}, },
DialogPage, Message, DialogPage, Message,
}, },
@ -986,7 +993,7 @@ mod tests {
paths: paths_clone, paths: paths_clone,
to: to_clone, to: to_clone,
} }
.perform(&sync::Mutex::new(tx).into(), Controller::new()) .perform(&sync::Mutex::new(tx).into(), Controller::default())
.await .await
}); });

44
src/operation/recursive.rs
View file

@ -12,12 +12,18 @@ use super::{copy_unique_path, Controller, OperationSelection, ReplaceResult};
pub struct Context { pub struct Context {
buf: Vec<u8>, buf: Vec<u8>,
controller: Controller, controller: Controller,
on_progress: Box<dyn Fn(&Op, &Progress) + 'static>, on_progress: Box<dyn OnProgress>,
on_replace: Box<dyn Fn(&Op) -> ReplaceResult + 'static>, on_replace: Box<dyn OnReplace>,
pub(crate) op_sel: OperationSelection, pub(crate) op_sel: OperationSelection,
replace_result_opt: Option<ReplaceResult>, replace_result_opt: Option<ReplaceResult>,
} }
pub trait OnProgress: Fn(&Op, &Progress) + 'static {}
impl<F> OnProgress for F where F: Fn(&Op, &Progress) + 'static {}
pub trait OnReplace: Fn(&Op) -> ReplaceResult + 'static {}
impl<F> OnReplace for F where F: Fn(&Op) -> ReplaceResult + 'static {}
impl Context { impl Context {
pub fn new(controller: Controller) -> Self { pub fn new(controller: Controller) -> Self {
Self { Self {
@ -67,7 +73,7 @@ impl Context {
OpKind::Symlink { target } OpKind::Symlink { target }
} else { } else {
//TODO: present dialog and allow continue //TODO: present dialog and allow continue
return Err(format!("{} is not a known file type", from.display()).into()); return Err(format!("{} is not a known file type", from.display()));
}; };
let to = if from == from_parent { let to = if from == from_parent {
// When copying a file, from matches from_parent, and to_parent must be used // When copying a file, from matches from_parent, and to_parent must be used
@ -130,12 +136,12 @@ impl Context {
Ok(true) Ok(true)
} }
pub fn on_progress<F: Fn(&Op, &Progress) + 'static>(mut self, f: F) -> Self { pub fn on_progress<F: OnProgress>(mut self, f: F) -> Self {
self.on_progress = Box::new(f); self.on_progress = Box::new(f);
self self
} }
pub fn on_replace<F: Fn(&Op) -> ReplaceResult + 'static>(mut self, f: F) -> Self { pub fn on_replace<F: OnReplace>(mut self, f: F) -> Self {
self.on_replace = Box::new(f); self.on_replace = Box::new(f);
self self
} }
@ -153,9 +159,7 @@ impl Context {
Ok(ControlFlow::Continue(op.to.clone())) Ok(ControlFlow::Continue(op.to.clone()))
} }
ReplaceResult::KeepBoth => match op.to.parent() { ReplaceResult::KeepBoth => match op.to.parent() {
Some(to_parent) => Ok(ControlFlow::Continue(copy_unique_path( Some(to_parent) => Ok(ControlFlow::Continue(copy_unique_path(&op.from, to_parent))),
&op.from, &to_parent,
))),
None => Err(format!("failed to get parent of {:?}", op.to).into()), None => Err(format!("failed to get parent of {:?}", op.to).into()),
}, },
ReplaceResult::Skip(apply_to_all) => { ReplaceResult::Skip(apply_to_all) => {
@ -216,7 +220,7 @@ impl Op {
let metadata = from_file.metadata()?; let metadata = from_file.metadata()?;
// Remove `to` if overwriting and it is an existing file // Remove `to` if overwriting and it is an existing file
if self.to.is_file() { if self.to.is_file() {
match ctx.replace(&self)? { match ctx.replace(self)? {
ControlFlow::Continue(to) => { ControlFlow::Continue(to) => {
self.to = to; self.to = to;
} }
@ -226,7 +230,7 @@ impl Op {
} }
} }
progress.total_bytes = Some(metadata.len()); progress.total_bytes = Some(metadata.len());
(ctx.on_progress)(&self, &progress); (ctx.on_progress)(self, &progress);
// This is atomic and ensures `to` is not created by any other process // This is atomic and ensures `to` is not created by any other process
let mut to_file = fs::OpenOptions::new() let mut to_file = fs::OpenOptions::new()
.create_new(true) .create_new(true)
@ -242,14 +246,14 @@ impl Op {
} }
to_file.write_all(&ctx.buf[..count])?; to_file.write_all(&ctx.buf[..count])?;
progress.current_bytes += count as u64; progress.current_bytes += count as u64;
(ctx.on_progress)(&self, &progress); (ctx.on_progress)(self, &progress);
} }
to_file.sync_all()?; to_file.sync_all()?;
} }
OpKind::Move => { OpKind::Move => {
// Remove `to` if overwriting and it is an existing file // Remove `to` if overwriting and it is an existing file
if self.to.is_file() { if self.to.is_file() {
match ctx.replace(&self)? { match ctx.replace(self)? {
ControlFlow::Continue(to) => { ControlFlow::Continue(to) => {
self.to = to; self.to = to;
} }
@ -289,7 +293,7 @@ impl Op {
OpKind::Symlink { ref target } => { OpKind::Symlink { ref target } => {
// Remove `to` if overwriting and it is an existing file // Remove `to` if overwriting and it is an existing file
if self.to.is_file() { if self.to.is_file() {
match ctx.replace(&self)? { match ctx.replace(self)? {
ControlFlow::Continue(to) => { ControlFlow::Continue(to) => {
self.to = to; self.to = to;
} }
@ -298,8 +302,18 @@ impl Op {
} }
} }
} }
//TODO: use OS-specific function #[cfg(unix)]
fs::soft_link(&target, &self.to)?; {
std::os::unix::fs::symlink(target, &self.to)?;
}
#[cfg(windows)]
{
if target.is_dir() {
std::os::windows::fs::symlink_dir(target, &self.to)?;
} else {
std::os::windows::fs::symlink_file(target, &self.to)?;
}
}
} }
} }
Ok(true) Ok(true)

52
src/tab.rs
View file

@ -475,7 +475,7 @@ pub fn item_from_entry(
}; };
let dir_size = if metadata.is_dir() { let dir_size = if metadata.is_dir() {
DirSize::Calculating(Controller::new()) DirSize::Calculating(Controller::default())
} else { } else {
DirSize::NotDirectory DirSize::NotDirectory
}; };
@ -1071,6 +1071,8 @@ pub enum Message {
SearchContext(Location, SearchContextWrapper), SearchContext(Location, SearchContextWrapper),
SearchReady(bool), SearchReady(bool),
SelectAll, SelectAll,
SelectFirst,
SelectLast,
SetSort(HeadingOptions, bool), SetSort(HeadingOptions, bool),
Thumbnail(PathBuf, ItemThumbnail), Thumbnail(PathBuf, ItemThumbnail),
ToggleShowHidden, ToggleShowHidden,
@ -2243,8 +2245,8 @@ impl Tab {
if !item.selected { if !item.selected {
self.clicked = click_i_opt; self.clicked = click_i_opt;
item.selected = true; item.selected = true;
self.select_range = Some((i, i));
} }
self.select_range = Some((i, i));
self.select_focus = click_i_opt; self.select_focus = click_i_opt;
self.selected_clicked = true; self.selected_clicked = true;
} else if !dont_unset && item.selected { } else if !dont_unset && item.selected {
@ -2752,9 +2754,7 @@ impl Tab {
if let Some(items) = &mut self.items_opt { if let Some(items) = &mut self.items_opt {
if finished || context.ready.swap(false, atomic::Ordering::SeqCst) { if finished || context.ready.swap(false, atomic::Ordering::SeqCst) {
let duration = Instant::now(); let duration = Instant::now();
while let Some((path, name, metadata)) = while let Ok((path, name, metadata)) = context.results_rx.try_recv() {
context.results_rx.blocking_recv()
{
//TODO: combine this with column_sort logic, they must match! //TODO: combine this with column_sort logic, they must match!
let item_modified = metadata.modified().ok(); let item_modified = metadata.modified().ok();
let index = match items.binary_search_by(|other| { let index = match items.binary_search_by(|other| {
@ -2801,6 +2801,36 @@ impl Tab {
)); ));
} }
} }
Message::SelectFirst => {
if self.select_position(0, 0, mod_shift) {
if let Some(offset) = self.select_focus_scroll() {
commands.push(Command::Iced(
scrollable::scroll_to(self.scrollable_id.clone(), offset).into(),
));
}
if let Some(id) = self.select_focus_id() {
commands.push(Command::Iced(widget::button::focus(id).into()));
}
}
}
Message::SelectLast => {
if let Some(ref items) = self.items_opt {
if let Some(last_pos) = items.iter().filter_map(|item| item.pos_opt.get()).max()
{
if self.select_position(last_pos.0, last_pos.1, mod_shift) {
if let Some(offset) = self.select_focus_scroll() {
commands.push(Command::Iced(
scrollable::scroll_to(self.scrollable_id.clone(), offset)
.into(),
));
}
if let Some(id) = self.select_focus_id() {
commands.push(Command::Iced(widget::button::focus(id).into()));
}
}
}
}
}
Message::SetSort(heading_option, dir) => { Message::SetSort(heading_option, dir) => {
if !matches!(self.location, Location::Search(..)) { if !matches!(self.location, Location::Search(..)) {
self.sort_name = heading_option; self.sort_name = heading_option;
@ -2865,7 +2895,7 @@ impl Tab {
Message::Drop(Some((to, mut from))) => { Message::Drop(Some((to, mut from))) => {
self.dnd_hovered = None; self.dnd_hovered = None;
match to { match to {
Location::Path(to) => { Location::Desktop(to, ..) | Location::Path(to) => {
if let Ok(entries) = fs::read_dir(&to) { if let Ok(entries) = fs::read_dir(&to) {
for i in entries.into_iter().filter_map(|e| e.ok()) { for i in entries.into_iter().filter_map(|e| e.ok()) {
let i = i.path(); let i = i.path();
@ -3581,8 +3611,7 @@ impl Tab {
pub fn empty_view(&self, has_hidden: bool) -> Element<Message> { pub fn empty_view(&self, has_hidden: bool) -> Element<Message> {
let cosmic_theme::Spacing { space_xxs, .. } = theme::active().cosmic().spacing; let cosmic_theme::Spacing { space_xxs, .. } = theme::active().cosmic().spacing;
//TODO: left clicking on an empty folder does not clear context menu mouse_area::MouseArea::new(widget::column::with_children(vec![widget::container(
widget::column::with_children(vec![widget::container(
widget::column::with_children(match self.mode { widget::column::with_children(match self.mode {
Mode::App | Mode::Dialog(_) => vec![ Mode::App | Mode::Dialog(_) => vec![
widget::icon::from_name("folder-symbolic") widget::icon::from_name("folder-symbolic")
@ -3604,7 +3633,8 @@ impl Tab {
.spacing(space_xxs), .spacing(space_xxs),
) )
.center(Length::Fill) .center(Length::Fill)
.into()]) .into()]))
.on_press(|_| Message::Click(None))
.into() .into()
} }
@ -4285,9 +4315,9 @@ impl Tab {
.drag_content(move || { .drag_content(move || {
ClipboardCopy::new(crate::clipboard::ClipboardKind::Copy, &files) ClipboardCopy::new(crate::clipboard::ClipboardKind::Copy, &files)
}) })
.drag_icon(move || { .drag_icon(move |v| {
let state: tree::State = Widget::<Message, _, _>::state(&drag_list); let state: tree::State = Widget::<Message, _, _>::state(&drag_list);
(Element::from(drag_list.clone()).map(|_m| ()), state) (Element::from(drag_list.clone()).map(|_m| ()), state, v)
}) })
} }
_ => item_view, _ => item_view,

4
src/thumbnailer.rs
View file

@ -144,9 +144,7 @@ impl ThumbnailerCache {
} }
pub fn get(&self, key: &Mime) -> Vec<Thumbnailer> { pub fn get(&self, key: &Mime) -> Vec<Thumbnailer> {
self.cache self.cache.get(key).map_or_else(Vec::new, |x| x.clone())
.get(&key)
.map_or_else(|| Vec::new(), |x| x.clone())
} }
} }