From ad95b647e5a0191cfb4e33c8fde3fc1920f99600 Mon Sep 17 00:00:00 2001
From: "Roc R. Currius" <roc@ror3d.xyz>
Date: Fri, 2 Feb 2024 13:29:12 +0000
Subject: [PATCH 01/21] Add source URL to the linked files and update it when a
 file is initially downloaded

---
 .../gui/fieldeditors/LinkedFileViewModel.java |  5 +++
 .../gui/linkedfile/LinkedFileEditDialog.fxml  |  4 ++
 .../linkedfile/LinkedFileEditDialogView.java  |  2 +
 .../LinkedFilesEditDialogViewModel.java       | 12 ++++--
 .../jabref/logic/bibtex/FileFieldWriter.java  |  6 ++-
 .../logic/importer/util/FileFieldParser.java  | 21 +++++-----
 .../org/jabref/model/entry/LinkedFile.java    | 38 +++++++++++++++++--
 src/main/resources/l10n/JabRef_ar.properties  |  1 +
 src/main/resources/l10n/JabRef_da.properties  |  1 +
 src/main/resources/l10n/JabRef_de.properties  |  1 +
 src/main/resources/l10n/JabRef_el.properties  |  1 +
 src/main/resources/l10n/JabRef_en.properties  |  1 +
 src/main/resources/l10n/JabRef_es.properties  |  1 +
 src/main/resources/l10n/JabRef_fa.properties  |  1 +
 src/main/resources/l10n/JabRef_fi.properties  |  1 +
 src/main/resources/l10n/JabRef_fr.properties  |  1 +
 src/main/resources/l10n/JabRef_id.properties  |  1 +
 src/main/resources/l10n/JabRef_it.properties  |  1 +
 src/main/resources/l10n/JabRef_ja.properties  |  1 +
 src/main/resources/l10n/JabRef_ko.properties  |  1 +
 src/main/resources/l10n/JabRef_nl.properties  |  1 +
 src/main/resources/l10n/JabRef_no.properties  |  1 +
 src/main/resources/l10n/JabRef_pl.properties  |  1 +
 src/main/resources/l10n/JabRef_pt.properties  |  1 +
 .../resources/l10n/JabRef_pt_BR.properties    |  1 +
 src/main/resources/l10n/JabRef_ru.properties  |  3 +-
 src/main/resources/l10n/JabRef_sv.properties  |  1 +
 src/main/resources/l10n/JabRef_tl.properties  |  1 +
 src/main/resources/l10n/JabRef_tr.properties  |  1 +
 src/main/resources/l10n/JabRef_uk.properties  |  1 +
 src/main/resources/l10n/JabRef_vi.properties  |  1 +
 .../resources/l10n/JabRef_zh_CN.properties    |  1 +
 .../resources/l10n/JabRef_zh_TW.properties    |  1 +
 33 files changed, 97 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index 0b3ce97a36e..6cea809405d 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -421,6 +421,7 @@ public void edit() {
             this.linkedFile.setLink(file.getLink());
             this.linkedFile.setDescription(file.getDescription());
             this.linkedFile.setFileType(file.getFileType());
+            this.linkedFile.setSourceURL(file.getSourceUrl());
         });
     }
 
@@ -456,6 +457,10 @@ public void download() {
                             destination,
                             databaseContext.getFileDirectories(preferencesService.getFilePreferences()),
                             preferencesService.getFilePreferences());
+                    if (newLinkedFile.getDescription().isEmpty() && !linkedFile.getDescription().isEmpty()) {
+                        newLinkedFile.setDescription((linkedFile.getDescription()));
+                    }
+                    newLinkedFile.setSourceURL(linkedFile.getLink());
                     entry.replaceDownloadedFile(linkedFile.getLink(), newLinkedFile);
 
                     // Notify in bar when the file type is HTML.
diff --git a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialog.fxml b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialog.fxml
index 364f3da9214..d644991f741 100644
--- a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialog.fxml
+++ b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialog.fxml
@@ -47,6 +47,10 @@
             <Label text="Filetype" GridPane.rowIndex="2"/>
             <ComboBox fx:id="fileType"
                       GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="2"/>
+
+            <Label text="%Source URL" GridPane.rowIndex="3"/>
+            <TextField fx:id="sourceUrl" prefHeight="25.0"
+                       GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3"/>
         </GridPane>
     </content>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java
index 7a9c333d0a2..0ef81305267 100644
--- a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java
+++ b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java
@@ -23,6 +23,7 @@ public class LinkedFileEditDialogView extends BaseDialog<LinkedFile> {
     @FXML private TextField link;
     @FXML private TextField description;
     @FXML private ComboBox<ExternalFileType> fileType;
+    @FXML private TextField sourceUrl;
 
     @Inject private DialogService dialogService;
     @Inject private StateManager stateManager;
@@ -65,6 +66,7 @@ private void initialize() {
         description.textProperty().bindBidirectional(viewModel.descriptionProperty());
         link.textProperty().bindBidirectional(viewModel.linkProperty());
         fileType.valueProperty().bindBidirectional(viewModel.selectedExternalFileTypeProperty());
+        sourceUrl.textProperty().bindBidirectional(viewModel.sourceUrlProperty());
     }
 
     @FXML
diff --git a/src/main/java/org/jabref/gui/linkedfile/LinkedFilesEditDialogViewModel.java b/src/main/java/org/jabref/gui/linkedfile/LinkedFilesEditDialogViewModel.java
index 646d1b64c93..e945e4660d6 100644
--- a/src/main/java/org/jabref/gui/linkedfile/LinkedFilesEditDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/linkedfile/LinkedFilesEditDialogViewModel.java
@@ -34,6 +34,7 @@ public class LinkedFilesEditDialogViewModel extends AbstractViewModel {
     private static final Pattern REMOTE_LINK_PATTERN = Pattern.compile("[a-z]+://.*");
     private final StringProperty link = new SimpleStringProperty("");
     private final StringProperty description = new SimpleStringProperty("");
+    private final StringProperty sourceUrl = new SimpleStringProperty("");
     private final ListProperty<ExternalFileType> allExternalFileTypes = new SimpleListProperty<>(FXCollections.emptyObservableList());
     private final ObjectProperty<ExternalFileType> selectedExternalFileType = new SimpleObjectProperty<>();
     private final ObservableOptionalValue<ExternalFileType> monadicSelectedExternalFileType;
@@ -93,6 +94,7 @@ public void openBrowseDialog() {
 
     public void setValues(LinkedFile linkedFile) {
         description.set(linkedFile.getDescription());
+        sourceUrl.set(linkedFile.getSourceUrl());
 
         if (linkedFile.isOnlineLink()) {
             link.setValue(linkedFile.getLink()); // Might be an URL
@@ -119,6 +121,10 @@ public StringProperty descriptionProperty() {
         return description;
     }
 
+    public StringProperty sourceUrlProperty() {
+        return sourceUrl;
+    }
+
     public ListProperty<ExternalFileType> externalFileTypeProperty() {
         return allExternalFileTypes;
     }
@@ -132,12 +138,12 @@ public LinkedFile getNewLinkedFile() {
 
         if (LinkedFile.isOnlineLink(link.getValue())) {
             try {
-                return new LinkedFile(description.getValue(), new URL(link.getValue()), fileType);
+                return new LinkedFile(description.getValue(), new URL(link.getValue()), fileType, sourceUrl.getValue());
             } catch (MalformedURLException e) {
-                return new LinkedFile(description.getValue(), link.getValue(), fileType);
+                return new LinkedFile(description.getValue(), link.getValue(), fileType, sourceUrl.getValue());
             }
         }
-        return new LinkedFile(description.getValue(), Path.of(link.getValue()), fileType);
+        return new LinkedFile(description.getValue(), Path.of(link.getValue()), fileType, sourceUrl.getValue());
     }
 
     private String relativize(Path filePath) {
diff --git a/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java b/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
index 237e160dfb9..9824f177e94 100644
--- a/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
@@ -16,7 +16,11 @@ public static String getStringRepresentation(List<LinkedFile> fields) {
         String[][] array = new String[fields.size()][];
         int i = 0;
         for (LinkedFile entry : fields) {
-            array[i] = new String[] {entry.getDescription(), entry.getLink(), entry.getFileType()};
+            if (entry.getSourceUrl() == null || entry.getSourceUrl().isEmpty()) {
+                array[i] = new String[] {entry.getDescription(), entry.getLink(), entry.getFileType()};
+            } else {
+                array[i] = new String[] {entry.getDescription(), entry.getLink(), entry.getFileType(), entry.getSourceUrl()};
+            }
             i++;
         }
         return encodeStringArray(array);
diff --git a/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
index 9703fc25c8c..83ce4b08035 100644
--- a/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
@@ -149,32 +149,33 @@ static LinkedFile convert(List<String> entry) {
         LinkedFile field = null;
         if (LinkedFile.isOnlineLink(entry.get(1))) {
             try {
-                field = new LinkedFile(entry.getFirst(), new URL(entry.get(1)), entry.get(2));
+                field = new LinkedFile(entry.get(0), new URL(entry.get(1)), entry.get(2));
             } catch (MalformedURLException e) {
                 // in case the URL is malformed, store it nevertheless
-                field = new LinkedFile(entry.getFirst(), entry.get(1), entry.get(2));
+                field = new LinkedFile(entry.get(0), entry.get(1), entry.get(2));
             }
-        }
-
-        if (field == null) {
+        } else {
             String pathStr = entry.get(1);
             if (pathStr.contains("//")) {
                 // In case the path contains //, we assume it is a malformed URL, not a malformed path.
                 // On linux, the double slash would be converted to a single slash.
-                field = new LinkedFile(entry.getFirst(), pathStr, entry.get(2));
+                field = new LinkedFile(entry.get(0), pathStr, entry.get(2));
             } else {
                 try {
                     // there is no Path.isValidPath(String) method
-                    Path path = Path.of(pathStr);
-                    field = new LinkedFile(entry.getFirst(), path, entry.get(2));
+                    field = new LinkedFile(entry.get(0), Path.of(pathStr), entry.get(2));
                 } catch (InvalidPathException e) {
                     // Ignored
-                    LOGGER.debug("Invalid path object, continueing with string", e);
-                    field = new LinkedFile(entry.getFirst(), pathStr, entry.get(2));
+                    LOGGER.debug("Invalid path object, continuing with string", e);
+                    field = new LinkedFile(entry.get(0), pathStr, entry.get(2));
                 }
             }
         }
 
+        if (entry.size() > 3) {
+            field.setSourceURL(entry.get(3));
+        }
+
         // link is the only mandatory field
         if (field.getDescription().isEmpty() && field.getLink().isEmpty() && !field.getFileType().isEmpty()) {
             field = new LinkedFile("", Path.of(field.getFileType()), "");
diff --git a/src/main/java/org/jabref/model/entry/LinkedFile.java b/src/main/java/org/jabref/model/entry/LinkedFile.java
index 0eeb1c60bc0..07e115a90db 100644
--- a/src/main/java/org/jabref/model/entry/LinkedFile.java
+++ b/src/main/java/org/jabref/model/entry/LinkedFile.java
@@ -43,11 +43,16 @@ public class LinkedFile implements Serializable {
     private transient StringProperty description = new SimpleStringProperty();
     private transient StringProperty link = new SimpleStringProperty();
     private transient StringProperty fileType = new SimpleStringProperty();
+    private transient StringProperty sourceURL = new SimpleStringProperty();
 
     public LinkedFile(String description, Path link, String fileType) {
         this(Objects.requireNonNull(description), Objects.requireNonNull(link).toString(), Objects.requireNonNull(fileType));
     }
 
+    public LinkedFile(String description, Path link, String fileType, String sourceUrl) {
+        this(Objects.requireNonNull(description), Objects.requireNonNull(link).toString(), Objects.requireNonNull(fileType), Objects.requireNonNull(sourceUrl));
+    }
+
     public LinkedFile(String description, String link, FileType fileType) {
         this(description, link, fileType.getName());
     }
@@ -55,10 +60,15 @@ public LinkedFile(String description, String link, FileType fileType) {
     /**
      * Constructor can also be used for non-valid paths. We need to parse them, because the GUI needs to render it.
      */
-    public LinkedFile(String description, String link, String fileType) {
+    public LinkedFile(String description, String link, String fileType, String sourceUrl) {
         this.description.setValue(Objects.requireNonNull(description));
         setLink(link);
         this.fileType.setValue(Objects.requireNonNull(fileType));
+        this.sourceURL.setValue(sourceUrl);
+    }
+
+    public LinkedFile(String description, String link, String fileType) {
+        this(description, link, fileType, "");
     }
 
     public LinkedFile(URL link, String fileType) {
@@ -69,6 +79,10 @@ public LinkedFile(String description, URL link, String fileType) {
         this(description, Objects.requireNonNull(link).toString(), Objects.requireNonNull(fileType));
     }
 
+    public LinkedFile(String description, URL link, String fileType, String sourceUrl) {
+        this(description, Objects.requireNonNull(link).toString(), Objects.requireNonNull(fileType), Objects.requireNonNull(sourceUrl));
+    }
+
     public StringProperty descriptionProperty() {
         return description;
     }
@@ -81,6 +95,10 @@ public StringProperty fileTypeProperty() {
         return fileType;
     }
 
+    public StringProperty sourceUrlProperty() {
+        return sourceURL;
+    }
+
     public String getFileType() {
         return fileType.get();
     }
@@ -113,8 +131,16 @@ public void setLink(String link) {
         }
     }
 
+    public String getSourceUrl() {
+        return sourceURL.get();
+    }
+
+    public void setSourceURL(String url) {
+        this.sourceURL.setValue(url);
+    }
+
     public Observable[] getObservables() {
-        return new Observable[] {this.link, this.description, this.fileType};
+        return new Observable[] {this.link, this.description, this.fileType, this.sourceURL};
     }
 
     @Override
@@ -125,7 +151,8 @@ public boolean equals(@Nullable Object o) {
         if (o instanceof LinkedFile that) {
             return Objects.equals(description.get(), that.description.get())
                     && Objects.equals(link.get(), that.link.get())
-                    && Objects.equals(fileType.get(), that.fileType.get());
+                    && Objects.equals(fileType.get(), that.fileType.get())
+                    && Objects.equals(sourceURL.get(), that.sourceURL.get());
         }
         return false;
     }
@@ -137,6 +164,7 @@ private void writeObject(ObjectOutputStream out) throws IOException {
         out.writeUTF(getFileType());
         out.writeUTF(getLink());
         out.writeUTF(getDescription());
+        out.writeUTF(getSourceUrl());
         out.flush();
     }
 
@@ -147,6 +175,7 @@ private void readObject(ObjectInputStream in) throws IOException {
         fileType = new SimpleStringProperty(in.readUTF());
         link = new SimpleStringProperty(in.readUTF());
         description = new SimpleStringProperty(in.readUTF());
+        sourceURL = new SimpleStringProperty(in.readUTF());
     }
 
     /**
@@ -162,7 +191,7 @@ public static boolean isOnlineLink(String toCheck) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(description.get(), link.get(), fileType.get());
+        return Objects.hash(description.get(), link.get(), fileType.get(), sourceURL.get());
     }
 
     @Override
@@ -171,6 +200,7 @@ public String toString() {
                 "description='" + description.get() + '\'' +
                 ", link='" + link.get() + '\'' +
                 ", fileType='" + fileType.get() + '\'' +
+                ", sourceUrl='" + sourceURL.get() + '\'' +
                 '}';
     }
 
diff --git a/src/main/resources/l10n/JabRef_ar.properties b/src/main/resources/l10n/JabRef_ar.properties
index fe50ef76cab..2fb45b56139 100644
--- a/src/main/resources/l10n/JabRef_ar.properties
+++ b/src/main/resources/l10n/JabRef_ar.properties
@@ -720,6 +720,7 @@ Copy\ content=نسخ المحتوى
 Move\ content=نقل المحتوى
 Swap\ content=مبادلة المحتوى
 Copy\ or\ move\ the\ content\ of\ one\ field\ to\ another=نسخ أو نقل محتوى حقل إلى آخر
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
index 042f435f82e..9f0ffc26e90 100644
--- a/src/main/resources/l10n/JabRef_da.properties
+++ b/src/main/resources/l10n/JabRef_da.properties
@@ -978,6 +978,7 @@ Find\ and\ replace=Søg og erstat
 
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Tilføj altid bogstav (a, b, ...) til genererede nøgler
 Default\ pattern=Standardmønster
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
index a540673fdbe..285fd0c19dd 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -2636,3 +2636,4 @@ Hide\ user\ comments=Benutzerkommentare ausblenden
 Show\ user\ comments\ field=Benutzerkommentarfeld anzeigen
 
 More\ options...=Weitere Optionen...
+Source\ URL=Source URL
diff --git a/src/main/resources/l10n/JabRef_el.properties b/src/main/resources/l10n/JabRef_el.properties
index 8b1e418848f..51618ddd504 100644
--- a/src/main/resources/l10n/JabRef_el.properties
+++ b/src/main/resources/l10n/JabRef_el.properties
@@ -1863,6 +1863,7 @@ Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Θέλετε
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Αυτό ίσως υποδεικνύει πως το JabRef δεν τερματίστηκε σωστά την τελευταία φορά που χρησιμοποιήθηκε το αρχείο.
 
 Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbreviations\ in\ the\ entry=Χρησιμοποιήστε το πεδίο FJournal για να αποθηκεύσετε το πλήρες όνομα του περιοδικού στην καταχώρηση, στην περίπτωση (μη) συντομογραφιών
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 46c4789916a..4050ed02365 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2637,3 +2637,4 @@ Treat\ all\ duplicates\ entries\ the\ same\ way=Treat all duplicates entries the
 Ask\ every\ time=Ask every time
 
 Group\ icons=Group icons
+Source\ URL=Source URL
diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
index 8be3bf81603..fe258ca564f 100644
--- a/src/main/resources/l10n/JabRef_es.properties
+++ b/src/main/resources/l10n/JabRef_es.properties
@@ -2531,6 +2531,7 @@ Error\ while\ fetching\ citing\ entries\:\ %0=Error al recuperar las entradas de
 Jump\ to\ entry\ in\ database=Saltar a entrada en base de datos
 Help\ on\ external\ applications=Ayuda sobre aplicaciones externas
 Identifier-based\ Web\ Search=Búsqueda en la web basada en identificadores
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
index 16679d6e938..e7bd0525d43 100644
--- a/src/main/resources/l10n/JabRef_fa.properties
+++ b/src/main/resources/l10n/JabRef_fa.properties
@@ -611,6 +611,7 @@ String\ constants=ثابت های رشته
 
 Auto\ complete\ disabled.=تکمیل خودکار غیرفعال شد.
 Auto\ complete\ enabled.=تکمیل خودکار غیرفعال شد.
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_fi.properties b/src/main/resources/l10n/JabRef_fi.properties
index 9df2bd6d5d2..54b9f42c7a1 100644
--- a/src/main/resources/l10n/JabRef_fi.properties
+++ b/src/main/resources/l10n/JabRef_fi.properties
@@ -17,6 +17,7 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 
 About\ JabRef=Tietoja JabRef
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
index c6af7ef60be..a6d5363a9ea 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -2636,3 +2636,4 @@ Hide\ user\ comments=Masquer les commentaires de l'utilisateur
 Show\ user\ comments\ field=Afficher le champ des commentaires de l'utilisateur
 
 More\ options...=Plus d'options...
+Source\ URL=Source URL
diff --git a/src/main/resources/l10n/JabRef_id.properties b/src/main/resources/l10n/JabRef_id.properties
index 30863d1822c..0d071d495a8 100644
--- a/src/main/resources/l10n/JabRef_id.properties
+++ b/src/main/resources/l10n/JabRef_id.properties
@@ -1610,6 +1610,7 @@ plain\ text=teks biasa
 
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Apakah Anda ingin memulihkan perpustakaan dari file cadangan?
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Ini bisa menunjukkan bahwa JabRef tidak dimatikan secara bersih terakhir kali file tersebut digunakan.
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
index 7cec81fef68..d7d27f5d96b 100644
--- a/src/main/resources/l10n/JabRef_it.properties
+++ b/src/main/resources/l10n/JabRef_it.properties
@@ -2636,3 +2636,4 @@ Hide\ user\ comments=Nascondi commenti utente
 Show\ user\ comments\ field=Mostra il campo commenti utente
 
 More\ options...=Altre opzioni...
+Source\ URL=Source URL
diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
index a28aaafbe24..87d6348ff56 100644
--- a/src/main/resources/l10n/JabRef_ja.properties
+++ b/src/main/resources/l10n/JabRef_ja.properties
@@ -2454,6 +2454,7 @@ Failed\ to\ download\ from\ URL=URLからダウンロードできませんでし
 
 Finished=完了
 Processing...=処理中...
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_ko.properties b/src/main/resources/l10n/JabRef_ko.properties
index 6c3d70168f3..07e72114ea2 100644
--- a/src/main/resources/l10n/JabRef_ko.properties
+++ b/src/main/resources/l10n/JabRef_ko.properties
@@ -2276,6 +2276,7 @@ plain\ text=일반 텍스트
 
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=백업 파일에서 라이브러리를 복구하시겠습니까?
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=이것은 JabRef가 파일이 마지막으로 사용되었을 때 완전히 종료되지 않았음을 나타낼 수 있습니다.
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
index 05141702e2a..6154fcb1996 100644
--- a/src/main/resources/l10n/JabRef_nl.properties
+++ b/src/main/resources/l10n/JabRef_nl.properties
@@ -2568,6 +2568,7 @@ Failed\ to\ download\ from\ URL=Downloaden van URL mislukt
 Finished=Voltooid
 Finished\ writing\ metadata\ for\ library\ %0\ (%1\ succeeded,\ %2\ skipped,\ %3\ errors).=Metadata schrijven voor bibliotheek %0 voltooid (%1 geslaagd, %2 overgeslagen, %3 fouten).
 Processing...=Verwerken...
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
index 63b50deb7fc..51d38111b81 100644
--- a/src/main/resources/l10n/JabRef_no.properties
+++ b/src/main/resources/l10n/JabRef_no.properties
@@ -1091,6 +1091,7 @@ Import\ BibTeX=Importer BibTeX
 
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Legg alltid til en bokstav (a, b, ...) til genererte nøkler
 Default\ pattern=Standardmønster
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pl.properties b/src/main/resources/l10n/JabRef_pl.properties
index 37353b0716c..cfa61cac686 100644
--- a/src/main/resources/l10n/JabRef_pl.properties
+++ b/src/main/resources/l10n/JabRef_pl.properties
@@ -1751,6 +1751,7 @@ Processing...=Przetwarzanie...
 Cancel\ search=Anuluj wyszukiwanie
 Select\ entry=Wybierz wpis
 Search\ aborted\!=Wyszukiwanie przerwane\!
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pt.properties b/src/main/resources/l10n/JabRef_pt.properties
index eef2cff09e3..282f3b854f9 100644
--- a/src/main/resources/l10n/JabRef_pt.properties
+++ b/src/main/resources/l10n/JabRef_pt.properties
@@ -1421,6 +1421,7 @@ Default\ pattern=Ppadrão predefinido
 
 
 plain\ text=texto sem formatação
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
index 8ab46c8ca1f..f36845dfe0c 100644
--- a/src/main/resources/l10n/JabRef_pt_BR.properties
+++ b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -2605,6 +2605,7 @@ Help\ on\ external\ applications=Ajuda em aplicativos externos
 Identifier-based\ Web\ Search=Pesquisa da Web baseada em identificadores
 
 Pushing\ citations\ to\ TeXShop\ is\ only\ possible\ on\ macOS\!=Só é possível enviar referências para TeXShop no macOS\!
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
index ed338ade0eb..03b4f2c01f3 100644
--- a/src/main/resources/l10n/JabRef_ru.properties
+++ b/src/main/resources/l10n/JabRef_ru.properties
@@ -2182,7 +2182,7 @@ This\ entry\ type\ is\ intended\ for\ sources\ such\ as\ web\ sites\ which\ are\
 A\ single-volume\ work\ of\ reference\ such\ as\ an\ encyclopedia\ or\ a\ dictionary.=Неделимая работа или ссылка, как энциклопедия или словарь.
 A\ technical\ report,\ research\ report,\ or\ white\ paper\ published\ by\ a\ university\ or\ some\ other\ institution.=Технический отчет, исследовательский отчет, или белая книга, выпущенная институтом или другим учреждением.
 An\ entry\ set\ is\ a\ group\ of\ entries\ which\ are\ cited\ as\ a\ single\ reference\ and\ listed\ as\ a\ single\ item\ in\ the\ bibliography.=Набор записей представляет собой группу записей, которые приводятся в виде единой ссылки и перечислены в виде одного элемента в библиографии.
-Supplemental\ material\ in\ a\ "Book".\ This\ type\ is\ provided\ for\ elements\ such\ as\ prefaces,\ introductions,\ forewords,\ afterwords,\ etc.\ which\ often\ have\ a\ generic\ title\ only.=Дополнительный материал в "Книге" предназначен для таких элементов, как предисловия, введения, послесловия и т.д. 
+Supplemental\ material\ in\ a\ "Book".\ This\ type\ is\ provided\ for\ elements\ such\ as\ prefaces,\ introductions,\ forewords,\ afterwords,\ etc.\ which\ often\ have\ a\ generic\ title\ only.=Дополнительный материал в "Книге" предназначен для таких элементов, как предисловия, введения, послесловия и т.д.
 Supplemental\ material\ in\ a\ "Collection".=Дополнительные материалы в "Коллекции".
 Supplemental\ material\ in\ a\ "Periodical".\ This\ type\ may\ be\ useful\ when\ referring\ to\ items\ such\ as\ regular\ columns,\ obituaries,\ letters\ to\ the\ editor,\ etc.\ which\ only\ have\ a\ generic\ title.=Дополнительные материалы в "Периодическом издании". Этот тип может быть полезен при обращении к таким элементам, как обычные колонки, некрологи, письма к редактору и т.д., которые имеют только общее название.
 A\ thesis\ written\ for\ an\ educational\ institution\ to\ satisfy\ the\ requirements\ for\ a\ degree.=Тезис, написанный для учебного заведения с целью удовлетворения требований к степени.
@@ -2374,6 +2374,7 @@ plain\ text=обычный текст
 
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Вы хотите восстановить библиотеку из файла резервной копии?
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Это может означать что JabRef не закрылся правильно при последнем использовании файла.
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
index b6fe1763992..5ed681d1271 100644
--- a/src/main/resources/l10n/JabRef_sv.properties
+++ b/src/main/resources/l10n/JabRef_sv.properties
@@ -1573,6 +1573,7 @@ Writing\ metadata\ to\ %0=Skriver metadata till %0
 
 Select\ entry=Välj post
 Help\ on\ external\ applications=Hjälp med externa program
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_tl.properties b/src/main/resources/l10n/JabRef_tl.properties
index 11236d85373..79d9655bb36 100644
--- a/src/main/resources/l10n/JabRef_tl.properties
+++ b/src/main/resources/l10n/JabRef_tl.properties
@@ -1295,6 +1295,7 @@ Default\ pattern=Default na pattern
 
 
 plain\ text=plain na teksto
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
index 43909d730bf..96442f52449 100644
--- a/src/main/resources/l10n/JabRef_tr.properties
+++ b/src/main/resources/l10n/JabRef_tr.properties
@@ -2542,6 +2542,7 @@ This\ operation\ requires\ selected\ linked\ files.=Bu işlem seçili bağlantı
 
 Create\ backup=Yedek oluştur
 Automatically\ search\ and\ show\ unlinked\ files\ in\ the\ entry\ editor=Bağlantısı olmayan dosyaları otomatikman ara ve girdi düzenleyicisinde göster
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_uk.properties b/src/main/resources/l10n/JabRef_uk.properties
index ee2eee21693..cddcf0e4849 100644
--- a/src/main/resources/l10n/JabRef_uk.properties
+++ b/src/main/resources/l10n/JabRef_uk.properties
@@ -76,6 +76,7 @@ Appearance=Оформлення
 Application=Застосунок
 
 Application\ to\ push\ entries\ to=Заявка на push матеріалів
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
index 0e19694e10a..4d5f5510126 100644
--- a/src/main/resources/l10n/JabRef_vi.properties
+++ b/src/main/resources/l10n/JabRef_vi.properties
@@ -1088,6 +1088,7 @@ Default\ pattern=Kiểu mặc định
 
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Bạn có muốn phục hồi cơ sở dữ liệu từ tập tin lưu dự phòng không?
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Điều này cho thấy là JabRef không được kết thúc hoàn chỉnh khi sử dụng tập tin lần cuối.
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_zh_CN.properties b/src/main/resources/l10n/JabRef_zh_CN.properties
index af03a733d76..626daea5d7e 100644
--- a/src/main/resources/l10n/JabRef_zh_CN.properties
+++ b/src/main/resources/l10n/JabRef_zh_CN.properties
@@ -2551,6 +2551,7 @@ Failed\ to\ download\ from\ URL=从 URL 下载失败
 
 Finished=已完成
 Processing...=处理中...
+Source\ URL=Source URL
 
 
 
diff --git a/src/main/resources/l10n/JabRef_zh_TW.properties b/src/main/resources/l10n/JabRef_zh_TW.properties
index 968b02e35e1..5a2b07b9a60 100644
--- a/src/main/resources/l10n/JabRef_zh_TW.properties
+++ b/src/main/resources/l10n/JabRef_zh_TW.properties
@@ -1056,6 +1056,7 @@ Use\ custom\ DOI\ base\ URI\ for\ article\ access=使用自訂的 DOI 基礎網
 
 Question=問題
 Select\ directory=選擇資料夾
+Source\ URL=Source URL
 
 
 

From a6922715d4c0f2bc42299c77e5a4982874ed2fd8 Mon Sep 17 00:00:00 2001
From: "Roc R. Currius" <roc@ror3d.xyz>
Date: Fri, 2 Feb 2024 13:29:12 +0000
Subject: [PATCH 02/21] Add context menu action to redownload a file

---
 .../jabref/gui/actions/StandardActions.java   |  1 +
 .../gui/fieldeditors/LinkedFileViewModel.java | 74 +++++++++++++++++++
 .../gui/fieldeditors/LinkedFilesEditor.java   |  5 ++
 .../logic/util/io/FileNameUniqueness.java     |  7 ++
 src/main/resources/l10n/JabRef_ar.properties  |  1 +
 src/main/resources/l10n/JabRef_da.properties  |  1 +
 src/main/resources/l10n/JabRef_de.properties  |  1 +
 src/main/resources/l10n/JabRef_el.properties  |  1 +
 src/main/resources/l10n/JabRef_en.properties  |  1 +
 src/main/resources/l10n/JabRef_es.properties  |  1 +
 src/main/resources/l10n/JabRef_fa.properties  |  1 +
 src/main/resources/l10n/JabRef_fi.properties  |  1 +
 src/main/resources/l10n/JabRef_fr.properties  |  1 +
 src/main/resources/l10n/JabRef_id.properties  |  1 +
 src/main/resources/l10n/JabRef_it.properties  |  1 +
 src/main/resources/l10n/JabRef_ja.properties  |  1 +
 src/main/resources/l10n/JabRef_ko.properties  |  1 +
 src/main/resources/l10n/JabRef_nl.properties  |  1 +
 src/main/resources/l10n/JabRef_no.properties  |  1 +
 src/main/resources/l10n/JabRef_pl.properties  |  1 +
 src/main/resources/l10n/JabRef_pt.properties  |  1 +
 .../resources/l10n/JabRef_pt_BR.properties    |  1 +
 src/main/resources/l10n/JabRef_ru.properties  |  1 +
 src/main/resources/l10n/JabRef_sv.properties  |  1 +
 src/main/resources/l10n/JabRef_tl.properties  |  1 +
 src/main/resources/l10n/JabRef_tr.properties  |  1 +
 src/main/resources/l10n/JabRef_uk.properties  |  1 +
 src/main/resources/l10n/JabRef_vi.properties  |  1 +
 .../resources/l10n/JabRef_zh_CN.properties    |  1 +
 .../resources/l10n/JabRef_zh_TW.properties    |  1 +
 30 files changed, 113 insertions(+)

diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index 7c3429d2a4e..ef9c422cc8e 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -149,6 +149,7 @@ public enum StandardActions implements Action {
 
     EDIT_FILE_LINK(Localization.lang("Edit"), IconTheme.JabRefIcons.EDIT, KeyBinding.EDIT_ENTRY),
     DOWNLOAD_FILE(Localization.lang("Download file"), IconTheme.JabRefIcons.DOWNLOAD_FILE),
+    REDOWNLOAD_FILE(Localization.lang("Redownload file"), IconTheme.JabRefIcons.DOWNLOAD_FILE),
     RENAME_FILE_TO_PATTERN(Localization.lang("Rename file to defined pattern"), IconTheme.JabRefIcons.AUTO_RENAME),
     RENAME_FILE_TO_NAME(Localization.lang("Rename file to a given name"), IconTheme.JabRefIcons.RENAME, KeyBinding.REPLACE_STRING),
     MOVE_FILE_TO_FOLDER(Localization.lang("Move file to file directory"), IconTheme.JabRefIcons.MOVE_TO_FOLDER),
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index 6cea809405d..a9e3bbd51e9 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -425,6 +425,80 @@ public void edit() {
         });
     }
 
+    public void redownload() {
+        LOGGER.info("Redownloading file from " + linkedFile.getSourceUrl());
+        if (linkedFile.getSourceUrl().isEmpty() || !LinkedFile.isOnlineLink(linkedFile.getSourceUrl())) {
+            throw new UnsupportedOperationException("In order to download the file, the source url has to be an online link");
+        }
+
+        Optional<Path> targetDirectory = databaseContext.getFirstExistingFileDir(preferencesService.getFilePreferences());
+        if (targetDirectory.isEmpty()) {
+            dialogService.showErrorDialogAndWait(Localization.lang("Download file"), Localization.lang("File directory is not set or does not exist!"));
+            return;
+        }
+
+        try {
+            URLDownload urlDownload = new URLDownload(linkedFile.getSourceUrl());
+            if (!checkSSLHandshake(urlDownload)) {
+                return;
+            }
+
+            BackgroundTask<Path> downloadTask = prepareDownloadTask(targetDirectory.get(), urlDownload);
+            downloadTask.onSuccess(destination -> {
+                boolean isDuplicate;
+                try {
+                    isDuplicate = FileNameUniqueness.isDuplicatedFile(targetDirectory.get(), destination.getFileName(), dialogService);
+                } catch (IOException e) {
+                    LOGGER.error("FileNameUniqueness.isDuplicatedFile failed", e);
+                    return;
+                }
+
+                if (isDuplicate) {
+                    destination = targetDirectory.get().resolve(
+                            FileNameUniqueness.eraseDuplicateMarks(destination.getFileName()));
+                }
+
+                linkedFile.setLink(FileUtil.relativize(destination,
+                        databaseContext.getFileDirectories(preferencesService.getFilePreferences())).toString());
+
+                // Notify in bar when the file type is HTML.
+                if (linkedFile.getFileType().equals(StandardExternalFileType.URL.getName())) {
+                    dialogService.notify(Localization.lang("Downloaded website as an HTML file."));
+                    LOGGER.debug("Downloaded website {} as an HTML file at {}", linkedFile.getLink(), destination);
+                }
+            });
+            downloadProgress.bind(downloadTask.workDonePercentageProperty());
+            downloadTask.titleProperty().set(Localization.lang("Downloading"));
+            downloadTask.messageProperty().set(
+                    Localization.lang("Fulltext for") + ": " + entry.getCitationKey().orElse(Localization.lang("New entry")));
+            downloadTask.showToUser(true);
+            downloadTask.onFailure(ex -> {
+                LOGGER.error("Error downloading from URL: " + urlDownload, ex);
+                String fetcherExceptionMessage = ex.getMessage();
+                int statusCode;
+                if (ex instanceof FetcherClientException clientException) {
+                    statusCode = clientException.getStatusCode();
+                    if (statusCode == 401) {
+                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("401 Unauthorized: Access Denied. You are not authorized to access this resource. Please check your credentials and try again. If you believe you should have access, please contact the administrator for assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+                    } else if (statusCode == 403) {
+                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("403 Forbidden: Access Denied. You do not have permission to access this resource. Please contact the administrator for assistance or try a different action.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+                    } else if (statusCode == 404) {
+                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("404 Not Found Error: The requested resource could not be found. It seems that the file you are trying to download is not available or has been moved. Please verify the URL and try again. If you believe this is an error, please contact the administrator for further assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+                    }
+                } else if (ex instanceof FetcherServerException serverException) {
+                    statusCode = serverException.getStatusCode();
+                    dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"),
+                            Localization.lang("Error downloading from URL. Cause is likely the server side. HTTP Error %0 \n %1 \nURL: %2 \nPlease try again later or contact the server administrator.", statusCode, fetcherExceptionMessage, urlDownload.getSource()));
+                } else {
+                    dialogService.showErrorDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("Error message: %0 \nURL: %1 \nPlease check the URL and try again.", fetcherExceptionMessage, urlDownload.getSource()));
+                }
+            });
+            taskExecutor.execute(downloadTask);
+        } catch (MalformedURLException exception) {
+            dialogService.showErrorDialogAndWait(Localization.lang("Invalid URL"), exception);
+        }
+    }
+
     public void download() {
         if (!linkedFile.isOnlineLink()) {
             throw new UnsupportedOperationException("In order to download the file it has to be an online link");
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
index d7d76eb957c..afec9677e52 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFilesEditor.java
@@ -323,6 +323,7 @@ private ContextMenu createContextMenuForFile(LinkedFileViewModel linkedFile) {
                 factory.createMenuItem(StandardActions.MOVE_FILE_TO_FOLDER, new ContextAction(StandardActions.MOVE_FILE_TO_FOLDER, linkedFile, preferencesService)),
                 factory.createMenuItem(StandardActions.MOVE_FILE_TO_FOLDER_AND_RENAME, new ContextAction(StandardActions.MOVE_FILE_TO_FOLDER_AND_RENAME, linkedFile, preferencesService)),
                 factory.createMenuItem(StandardActions.COPY_FILE_TO_FOLDER, new CopySingleFileAction(linkedFile.getFile(), dialogService, databaseContext, preferencesService.getFilePreferences())),
+                factory.createMenuItem(StandardActions.REDOWNLOAD_FILE, new ContextAction(StandardActions.REDOWNLOAD_FILE, linkedFile, preferencesService)),
                 factory.createMenuItem(StandardActions.REMOVE_LINK, new ContextAction(StandardActions.REMOVE_LINK, linkedFile, preferencesService)),
                 factory.createMenuItem(StandardActions.DELETE_FILE, new ContextAction(StandardActions.DELETE_FILE, linkedFile, preferencesService))
         );
@@ -354,6 +355,9 @@ public ContextAction(StandardActions command, LinkedFileViewModel linkedFile, Pr
                         case DOWNLOAD_FILE -> Bindings.createBooleanBinding(
                                 () -> linkedFile.getFile().isOnlineLink(),
                                 linkedFile.getFile().linkProperty(), bibEntry.getValue().map(BibEntry::getFieldsObservable).orElse(null));
+                        case REDOWNLOAD_FILE -> Bindings.createBooleanBinding(
+                                () -> !linkedFile.getFile().getSourceUrl().isEmpty(),
+                                linkedFile.getFile().sourceUrlProperty(), bibEntry.getValue().map(BibEntry::getFieldsObservable).orElse(null));
                         case OPEN_FILE, OPEN_FOLDER, RENAME_FILE_TO_NAME, DELETE_FILE -> Bindings.createBooleanBinding(
                                 () -> !linkedFile.getFile().isOnlineLink()
                                         && linkedFile.getFile().findIn(databaseContext, preferencesService.getFilePreferences()).isPresent(),
@@ -369,6 +373,7 @@ public void execute() {
                 case OPEN_FILE -> linkedFile.open();
                 case OPEN_FOLDER -> linkedFile.openFolder();
                 case DOWNLOAD_FILE -> linkedFile.download();
+                case REDOWNLOAD_FILE -> linkedFile.redownload();
                 case RENAME_FILE_TO_PATTERN -> linkedFile.renameToSuggestion();
                 case RENAME_FILE_TO_NAME -> linkedFile.askForNameAndRename();
                 case MOVE_FILE_TO_FOLDER -> linkedFile.moveToDefaultDirectory();
diff --git a/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java b/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
index 032a396dec8..7f0dd628fe4 100644
--- a/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
+++ b/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
@@ -117,4 +117,11 @@ public static String eraseDuplicateMarks(String fileName) {
         Matcher m = DUPLICATE_MARK_PATTERN.matcher(fileName);
         return m.find() ? fileName.substring(0, fileName.lastIndexOf('(') - 1) : fileName;
     }
+
+    public static Path eraseDuplicateMarks(Path filePath) {
+        String extensionSuffix = FileUtil.getFileExtension(filePath).orElse("");
+        extensionSuffix = "".equals(extensionSuffix) ? extensionSuffix : "." + extensionSuffix;
+
+        return filePath.resolveSibling(eraseDuplicateMarks(FileUtil.getBaseName(filePath)) + extensionSuffix);
+    }
 }
diff --git a/src/main/resources/l10n/JabRef_ar.properties b/src/main/resources/l10n/JabRef_ar.properties
index 2fb45b56139..6ddfb964a31 100644
--- a/src/main/resources/l10n/JabRef_ar.properties
+++ b/src/main/resources/l10n/JabRef_ar.properties
@@ -721,6 +721,7 @@ Move\ content=نقل المحتوى
 Swap\ content=مبادلة المحتوى
 Copy\ or\ move\ the\ content\ of\ one\ field\ to\ another=نسخ أو نقل محتوى حقل إلى آخر
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
index 9f0ffc26e90..1b841c5f54d 100644
--- a/src/main/resources/l10n/JabRef_da.properties
+++ b/src/main/resources/l10n/JabRef_da.properties
@@ -979,6 +979,7 @@ Find\ and\ replace=Søg og erstat
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Tilføj altid bogstav (a, b, ...) til genererede nøgler
 Default\ pattern=Standardmønster
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
index 285fd0c19dd..437e5c1ff1a 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -2637,3 +2637,4 @@ Show\ user\ comments\ field=Benutzerkommentarfeld anzeigen
 
 More\ options...=Weitere Optionen...
 Source\ URL=Source URL
+Redownload\ file=Redownload file
diff --git a/src/main/resources/l10n/JabRef_el.properties b/src/main/resources/l10n/JabRef_el.properties
index 51618ddd504..13cf6c7a595 100644
--- a/src/main/resources/l10n/JabRef_el.properties
+++ b/src/main/resources/l10n/JabRef_el.properties
@@ -1864,6 +1864,7 @@ This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\
 
 Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbreviations\ in\ the\ entry=Χρησιμοποιήστε το πεδίο FJournal για να αποθηκεύσετε το πλήρες όνομα του περιοδικού στην καταχώρηση, στην περίπτωση (μη) συντομογραφιών
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 4050ed02365..2c538d65d73 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2638,3 +2638,4 @@ Ask\ every\ time=Ask every time
 
 Group\ icons=Group icons
 Source\ URL=Source URL
+Redownload\ file=Redownload file
diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
index fe258ca564f..48d58c0b49c 100644
--- a/src/main/resources/l10n/JabRef_es.properties
+++ b/src/main/resources/l10n/JabRef_es.properties
@@ -2532,6 +2532,7 @@ Jump\ to\ entry\ in\ database=Saltar a entrada en base de datos
 Help\ on\ external\ applications=Ayuda sobre aplicaciones externas
 Identifier-based\ Web\ Search=Búsqueda en la web basada en identificadores
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
index e7bd0525d43..0483c5b2953 100644
--- a/src/main/resources/l10n/JabRef_fa.properties
+++ b/src/main/resources/l10n/JabRef_fa.properties
@@ -612,6 +612,7 @@ String\ constants=ثابت های رشته
 Auto\ complete\ disabled.=تکمیل خودکار غیرفعال شد.
 Auto\ complete\ enabled.=تکمیل خودکار غیرفعال شد.
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_fi.properties b/src/main/resources/l10n/JabRef_fi.properties
index 54b9f42c7a1..1b298b0f836 100644
--- a/src/main/resources/l10n/JabRef_fi.properties
+++ b/src/main/resources/l10n/JabRef_fi.properties
@@ -18,6 +18,7 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 About\ JabRef=Tietoja JabRef
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
index a6d5363a9ea..1950effc522 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -2637,3 +2637,4 @@ Show\ user\ comments\ field=Afficher le champ des commentaires de l'utilisateur
 
 More\ options...=Plus d'options...
 Source\ URL=Source URL
+Redownload\ file=Redownload file
diff --git a/src/main/resources/l10n/JabRef_id.properties b/src/main/resources/l10n/JabRef_id.properties
index 0d071d495a8..4d07ada896f 100644
--- a/src/main/resources/l10n/JabRef_id.properties
+++ b/src/main/resources/l10n/JabRef_id.properties
@@ -1611,6 +1611,7 @@ plain\ text=teks biasa
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Apakah Anda ingin memulihkan perpustakaan dari file cadangan?
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Ini bisa menunjukkan bahwa JabRef tidak dimatikan secara bersih terakhir kali file tersebut digunakan.
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
index d7d27f5d96b..afd176448ea 100644
--- a/src/main/resources/l10n/JabRef_it.properties
+++ b/src/main/resources/l10n/JabRef_it.properties
@@ -2637,3 +2637,4 @@ Show\ user\ comments\ field=Mostra il campo commenti utente
 
 More\ options...=Altre opzioni...
 Source\ URL=Source URL
+Redownload\ file=Redownload file
diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
index 87d6348ff56..b782aebb553 100644
--- a/src/main/resources/l10n/JabRef_ja.properties
+++ b/src/main/resources/l10n/JabRef_ja.properties
@@ -2455,6 +2455,7 @@ Failed\ to\ download\ from\ URL=URLからダウンロードできませんでし
 Finished=完了
 Processing...=処理中...
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_ko.properties b/src/main/resources/l10n/JabRef_ko.properties
index 07e72114ea2..534630467da 100644
--- a/src/main/resources/l10n/JabRef_ko.properties
+++ b/src/main/resources/l10n/JabRef_ko.properties
@@ -2277,6 +2277,7 @@ plain\ text=일반 텍스트
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=백업 파일에서 라이브러리를 복구하시겠습니까?
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=이것은 JabRef가 파일이 마지막으로 사용되었을 때 완전히 종료되지 않았음을 나타낼 수 있습니다.
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
index 6154fcb1996..b90dd3d286c 100644
--- a/src/main/resources/l10n/JabRef_nl.properties
+++ b/src/main/resources/l10n/JabRef_nl.properties
@@ -2569,6 +2569,7 @@ Finished=Voltooid
 Finished\ writing\ metadata\ for\ library\ %0\ (%1\ succeeded,\ %2\ skipped,\ %3\ errors).=Metadata schrijven voor bibliotheek %0 voltooid (%1 geslaagd, %2 overgeslagen, %3 fouten).
 Processing...=Verwerken...
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
index 51d38111b81..30310f0784d 100644
--- a/src/main/resources/l10n/JabRef_no.properties
+++ b/src/main/resources/l10n/JabRef_no.properties
@@ -1092,6 +1092,7 @@ Import\ BibTeX=Importer BibTeX
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Legg alltid til en bokstav (a, b, ...) til genererte nøkler
 Default\ pattern=Standardmønster
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pl.properties b/src/main/resources/l10n/JabRef_pl.properties
index cfa61cac686..b0566127c83 100644
--- a/src/main/resources/l10n/JabRef_pl.properties
+++ b/src/main/resources/l10n/JabRef_pl.properties
@@ -1752,6 +1752,7 @@ Cancel\ search=Anuluj wyszukiwanie
 Select\ entry=Wybierz wpis
 Search\ aborted\!=Wyszukiwanie przerwane\!
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pt.properties b/src/main/resources/l10n/JabRef_pt.properties
index 282f3b854f9..7cb3089fef8 100644
--- a/src/main/resources/l10n/JabRef_pt.properties
+++ b/src/main/resources/l10n/JabRef_pt.properties
@@ -1422,6 +1422,7 @@ Default\ pattern=Ppadrão predefinido
 
 plain\ text=texto sem formatação
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
index f36845dfe0c..85f73db0287 100644
--- a/src/main/resources/l10n/JabRef_pt_BR.properties
+++ b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -2606,6 +2606,7 @@ Identifier-based\ Web\ Search=Pesquisa da Web baseada em identificadores
 
 Pushing\ citations\ to\ TeXShop\ is\ only\ possible\ on\ macOS\!=Só é possível enviar referências para TeXShop no macOS\!
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
index 03b4f2c01f3..8b39687f782 100644
--- a/src/main/resources/l10n/JabRef_ru.properties
+++ b/src/main/resources/l10n/JabRef_ru.properties
@@ -2375,6 +2375,7 @@ plain\ text=обычный текст
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Вы хотите восстановить библиотеку из файла резервной копии?
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Это может означать что JabRef не закрылся правильно при последнем использовании файла.
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
index 5ed681d1271..e3d7beaa443 100644
--- a/src/main/resources/l10n/JabRef_sv.properties
+++ b/src/main/resources/l10n/JabRef_sv.properties
@@ -1574,6 +1574,7 @@ Writing\ metadata\ to\ %0=Skriver metadata till %0
 Select\ entry=Välj post
 Help\ on\ external\ applications=Hjälp med externa program
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_tl.properties b/src/main/resources/l10n/JabRef_tl.properties
index 79d9655bb36..e12195205f8 100644
--- a/src/main/resources/l10n/JabRef_tl.properties
+++ b/src/main/resources/l10n/JabRef_tl.properties
@@ -1296,6 +1296,7 @@ Default\ pattern=Default na pattern
 
 plain\ text=plain na teksto
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
index 96442f52449..85e68af84d6 100644
--- a/src/main/resources/l10n/JabRef_tr.properties
+++ b/src/main/resources/l10n/JabRef_tr.properties
@@ -2543,6 +2543,7 @@ This\ operation\ requires\ selected\ linked\ files.=Bu işlem seçili bağlantı
 Create\ backup=Yedek oluştur
 Automatically\ search\ and\ show\ unlinked\ files\ in\ the\ entry\ editor=Bağlantısı olmayan dosyaları otomatikman ara ve girdi düzenleyicisinde göster
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_uk.properties b/src/main/resources/l10n/JabRef_uk.properties
index cddcf0e4849..0180334a3c8 100644
--- a/src/main/resources/l10n/JabRef_uk.properties
+++ b/src/main/resources/l10n/JabRef_uk.properties
@@ -77,6 +77,7 @@ Application=Застосунок
 
 Application\ to\ push\ entries\ to=Заявка на push матеріалів
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
index 4d5f5510126..1777a74b609 100644
--- a/src/main/resources/l10n/JabRef_vi.properties
+++ b/src/main/resources/l10n/JabRef_vi.properties
@@ -1089,6 +1089,7 @@ Default\ pattern=Kiểu mặc định
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Bạn có muốn phục hồi cơ sở dữ liệu từ tập tin lưu dự phòng không?
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Điều này cho thấy là JabRef không được kết thúc hoàn chỉnh khi sử dụng tập tin lần cuối.
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_zh_CN.properties b/src/main/resources/l10n/JabRef_zh_CN.properties
index 626daea5d7e..24bf001116b 100644
--- a/src/main/resources/l10n/JabRef_zh_CN.properties
+++ b/src/main/resources/l10n/JabRef_zh_CN.properties
@@ -2552,6 +2552,7 @@ Failed\ to\ download\ from\ URL=从 URL 下载失败
 Finished=已完成
 Processing...=处理中...
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 
diff --git a/src/main/resources/l10n/JabRef_zh_TW.properties b/src/main/resources/l10n/JabRef_zh_TW.properties
index 5a2b07b9a60..b6952fab852 100644
--- a/src/main/resources/l10n/JabRef_zh_TW.properties
+++ b/src/main/resources/l10n/JabRef_zh_TW.properties
@@ -1057,6 +1057,7 @@ Use\ custom\ DOI\ base\ URI\ for\ article\ access=使用自訂的 DOI 基礎網
 Question=問題
 Select\ directory=選擇資料夾
 Source\ URL=Source URL
+Redownload\ file=Redownload file
 
 
 

From a241b7c6bf8819899c8ce9f86d900a4a6171816c Mon Sep 17 00:00:00 2001
From: "Roc R. Currius" <roc@ror3d.xyz>
Date: Fri, 2 Feb 2024 13:29:13 +0000
Subject: [PATCH 03/21] Add main menu tools action to redownload missing files
 Refactor redownload code into an action

---
 src/main/java/org/jabref/gui/MainMenu.java    |   7 +-
 .../jabref/gui/actions/StandardActions.java   |   1 +
 .../gui/fieldeditors/LinkedFileViewModel.java |  70 +----
 .../linkedfile/DownloadLinkedFileAction.java  | 241 ++++++++++++++++++
 .../RedownloadMissingFilesAction.java         |  90 +++++++
 src/main/resources/l10n/JabRef_ar.properties  |   2 +
 src/main/resources/l10n/JabRef_da.properties  |   2 +
 src/main/resources/l10n/JabRef_de.properties  |   2 +
 src/main/resources/l10n/JabRef_el.properties  |   2 +
 src/main/resources/l10n/JabRef_en.properties  |   2 +
 src/main/resources/l10n/JabRef_es.properties  |   2 +
 src/main/resources/l10n/JabRef_fa.properties  |   2 +
 src/main/resources/l10n/JabRef_fi.properties  |   2 +
 src/main/resources/l10n/JabRef_fr.properties  |   2 +
 src/main/resources/l10n/JabRef_id.properties  |   2 +
 src/main/resources/l10n/JabRef_it.properties  |   2 +
 src/main/resources/l10n/JabRef_ja.properties  |   2 +
 src/main/resources/l10n/JabRef_ko.properties  |   2 +
 src/main/resources/l10n/JabRef_nl.properties  |   2 +
 src/main/resources/l10n/JabRef_no.properties  |   2 +
 src/main/resources/l10n/JabRef_pl.properties  |   2 +
 src/main/resources/l10n/JabRef_pt.properties  |   2 +
 .../resources/l10n/JabRef_pt_BR.properties    |   2 +
 src/main/resources/l10n/JabRef_ru.properties  |   2 +
 src/main/resources/l10n/JabRef_sv.properties  |   2 +
 src/main/resources/l10n/JabRef_tl.properties  |   2 +
 src/main/resources/l10n/JabRef_tr.properties  |   2 +
 src/main/resources/l10n/JabRef_uk.properties  |   2 +
 src/main/resources/l10n/JabRef_vi.properties  |   2 +
 .../resources/l10n/JabRef_zh_CN.properties    |   2 +
 .../resources/l10n/JabRef_zh_TW.properties    |   2 +
 31 files changed, 394 insertions(+), 67 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
 create mode 100644 src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java

diff --git a/src/main/java/org/jabref/gui/MainMenu.java b/src/main/java/org/jabref/gui/MainMenu.java
index c898417b927..db5c69c7fd2 100644
--- a/src/main/java/org/jabref/gui/MainMenu.java
+++ b/src/main/java/org/jabref/gui/MainMenu.java
@@ -44,6 +44,7 @@
 import org.jabref.gui.integrity.IntegrityCheckAction;
 import org.jabref.gui.journals.AbbreviateAction;
 import org.jabref.gui.libraryproperties.LibraryPropertiesAction;
+import org.jabref.gui.linkedfile.RedownloadMissingFilesAction;
 import org.jabref.gui.mergeentries.MergeEntriesAction;
 import org.jabref.gui.preferences.ShowPreferencesAction;
 import org.jabref.gui.preview.CopyCitationAction;
@@ -287,7 +288,11 @@ private void createMenu() {
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.REBUILD_FULLTEXT_SEARCH_INDEX, new RebuildFulltextSearchIndexAction(stateManager, frame::getCurrentLibraryTab, dialogService, preferencesService.getFilePreferences(), taskExecutor))
+                factory.createMenuItem(StandardActions.REBUILD_FULLTEXT_SEARCH_INDEX, new RebuildFulltextSearchIndexAction(stateManager, frame::getCurrentLibraryTab, dialogService, preferencesService.getFilePreferences(), taskExecutor)),
+
+                new SeparatorMenuItem(),
+
+                factory.createMenuItem(StandardActions.REDOWNLOAD_MISSING_FILES, new RedownloadMissingFilesAction(stateManager, dialogService, preferencesService.getFilePreferences(), taskExecutor))
         );
         SidePaneType webSearchPane = SidePaneType.WEB_SEARCH;
         SidePaneType groupsPane = SidePaneType.GROUPS;
diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index ef9c422cc8e..6f74e2caa1f 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -30,6 +30,7 @@ public enum StandardActions implements Action {
     SEND_AS_EMAIL(Localization.lang("As Email")),
     SEND_TO_KINDLE(Localization.lang("To Kindle")),
     REBUILD_FULLTEXT_SEARCH_INDEX(Localization.lang("Rebuild fulltext search index"), IconTheme.JabRefIcons.FILE),
+    REDOWNLOAD_MISSING_FILES(Localization.lang("Redownload missing files"), IconTheme.JabRefIcons.DOWNLOAD),
     OPEN_EXTERNAL_FILE(Localization.lang("Open file"), IconTheme.JabRefIcons.FILE, KeyBinding.OPEN_FILE),
     OPEN_URL(Localization.lang("Open URL or DOI"), IconTheme.JabRefIcons.WWW, KeyBinding.OPEN_URL_OR_DOI),
     SEARCH_SHORTSCIENCE(Localization.lang("Search ShortScience")),
diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index a9e3bbd51e9..6b8cef9b2b8 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -38,6 +38,7 @@
 import org.jabref.gui.externalfiletype.StandardExternalFileType;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
+import org.jabref.gui.linkedfile.DownloadLinkedFileAction;
 import org.jabref.gui.linkedfile.LinkedFileEditDialogView;
 import org.jabref.gui.mergeentries.MultiMergeEntriesView;
 import org.jabref.gui.util.BackgroundTask;
@@ -431,72 +432,9 @@ public void redownload() {
             throw new UnsupportedOperationException("In order to download the file, the source url has to be an online link");
         }
 
-        Optional<Path> targetDirectory = databaseContext.getFirstExistingFileDir(preferencesService.getFilePreferences());
-        if (targetDirectory.isEmpty()) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Download file"), Localization.lang("File directory is not set or does not exist!"));
-            return;
-        }
-
-        try {
-            URLDownload urlDownload = new URLDownload(linkedFile.getSourceUrl());
-            if (!checkSSLHandshake(urlDownload)) {
-                return;
-            }
-
-            BackgroundTask<Path> downloadTask = prepareDownloadTask(targetDirectory.get(), urlDownload);
-            downloadTask.onSuccess(destination -> {
-                boolean isDuplicate;
-                try {
-                    isDuplicate = FileNameUniqueness.isDuplicatedFile(targetDirectory.get(), destination.getFileName(), dialogService);
-                } catch (IOException e) {
-                    LOGGER.error("FileNameUniqueness.isDuplicatedFile failed", e);
-                    return;
-                }
-
-                if (isDuplicate) {
-                    destination = targetDirectory.get().resolve(
-                            FileNameUniqueness.eraseDuplicateMarks(destination.getFileName()));
-                }
-
-                linkedFile.setLink(FileUtil.relativize(destination,
-                        databaseContext.getFileDirectories(preferencesService.getFilePreferences())).toString());
-
-                // Notify in bar when the file type is HTML.
-                if (linkedFile.getFileType().equals(StandardExternalFileType.URL.getName())) {
-                    dialogService.notify(Localization.lang("Downloaded website as an HTML file."));
-                    LOGGER.debug("Downloaded website {} as an HTML file at {}", linkedFile.getLink(), destination);
-                }
-            });
-            downloadProgress.bind(downloadTask.workDonePercentageProperty());
-            downloadTask.titleProperty().set(Localization.lang("Downloading"));
-            downloadTask.messageProperty().set(
-                    Localization.lang("Fulltext for") + ": " + entry.getCitationKey().orElse(Localization.lang("New entry")));
-            downloadTask.showToUser(true);
-            downloadTask.onFailure(ex -> {
-                LOGGER.error("Error downloading from URL: " + urlDownload, ex);
-                String fetcherExceptionMessage = ex.getMessage();
-                int statusCode;
-                if (ex instanceof FetcherClientException clientException) {
-                    statusCode = clientException.getStatusCode();
-                    if (statusCode == 401) {
-                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("401 Unauthorized: Access Denied. You are not authorized to access this resource. Please check your credentials and try again. If you believe you should have access, please contact the administrator for assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
-                    } else if (statusCode == 403) {
-                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("403 Forbidden: Access Denied. You do not have permission to access this resource. Please contact the administrator for assistance or try a different action.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
-                    } else if (statusCode == 404) {
-                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("404 Not Found Error: The requested resource could not be found. It seems that the file you are trying to download is not available or has been moved. Please verify the URL and try again. If you believe this is an error, please contact the administrator for further assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
-                    }
-                } else if (ex instanceof FetcherServerException serverException) {
-                    statusCode = serverException.getStatusCode();
-                    dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"),
-                            Localization.lang("Error downloading from URL. Cause is likely the server side. HTTP Error %0 \n %1 \nURL: %2 \nPlease try again later or contact the server administrator.", statusCode, fetcherExceptionMessage, urlDownload.getSource()));
-                } else {
-                    dialogService.showErrorDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("Error message: %0 \nURL: %1 \nPlease check the URL and try again.", fetcherExceptionMessage, urlDownload.getSource()));
-                }
-            });
-            taskExecutor.execute(downloadTask);
-        } catch (MalformedURLException exception) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Invalid URL"), exception);
-        }
+        DownloadLinkedFileAction downloadLinkedFileAction = new DownloadLinkedFileAction(databaseContext, entry, linkedFile,
+                linkedFile.getSourceUrl(), dialogService, preferencesService.getFilePreferences(), taskExecutor);
+        downloadLinkedFileAction.execute();
     }
 
     public void download() {
diff --git a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
new file mode 100644
index 00000000000..c143d31a833
--- /dev/null
+++ b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
@@ -0,0 +1,241 @@
+package org.jabref.gui.linkedfile;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.concurrent.Future;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLSocketFactory;
+
+import javafx.beans.property.DoubleProperty;
+import javafx.concurrent.Task;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.LibraryTab;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.externalfiles.FileDownloadTask;
+import org.jabref.gui.externalfiletype.ExternalFileType;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.externalfiletype.StandardExternalFileType;
+import org.jabref.gui.fieldeditors.URLUtil;
+import org.jabref.gui.util.BackgroundTask;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.externalfiles.LinkedFileHandler;
+import org.jabref.logic.importer.FetcherClientException;
+import org.jabref.logic.importer.FetcherServerException;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.net.URLDownload;
+import org.jabref.logic.util.io.FileNameUniqueness;
+import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.preferences.FilePreferences;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DownloadLinkedFileAction extends SimpleCommand {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
+
+    private final DialogService dialogService;
+    private final BibEntry entry;
+    private final LinkedFile linkedFile;
+    private final String downloadUrl;
+    private final FilePreferences filePreferences;
+    private final TaskExecutor taskExecutor;
+
+    private final BibDatabaseContext databaseContext;
+
+    private final DoubleProperty downloadProgress;
+    private final LinkedFileHandler linkedFileHandler;
+
+    public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
+                                    BibEntry entry,
+                                    LinkedFile linkedFile,
+                                    String downloadUrl,
+                                    DialogService dialogService,
+                                    FilePreferences filePreferences,
+                                    TaskExecutor taskExecutor,
+                                    DoubleProperty downloadProgress) {
+        this.databaseContext = databaseContext;
+        this.entry = entry;
+        this.linkedFile = linkedFile;
+        this.downloadUrl = downloadUrl;
+        this.dialogService = dialogService;
+        this.filePreferences = filePreferences;
+        this.taskExecutor = taskExecutor;
+        this.downloadProgress = downloadProgress;
+
+        this.linkedFileHandler = new LinkedFileHandler(linkedFile, entry, databaseContext, filePreferences);
+    }
+
+    public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
+                                    BibEntry entry,
+                                    LinkedFile linkedFile,
+                                    String downloadUrl,
+                                    DialogService dialogService,
+                                    FilePreferences filePreferences,
+                                    TaskExecutor taskExecutor) {
+        this(databaseContext, entry, linkedFile, downloadUrl, dialogService, filePreferences, taskExecutor, null);
+    }
+
+    @Override
+    public void execute() {
+        LOGGER.info("Downloading file from " + downloadUrl);
+        if (downloadUrl.isEmpty() || !LinkedFile.isOnlineLink(downloadUrl)) {
+            throw new UnsupportedOperationException("In order to download the file, the url has to be an online link");
+        }
+
+        Optional<Path> targetDirectory = databaseContext.getFirstExistingFileDir(filePreferences);
+        if (targetDirectory.isEmpty()) {
+            dialogService.showErrorDialogAndWait(Localization.lang("Download file"), Localization.lang("File directory is not set or does not exist!"));
+            return;
+        }
+
+        try {
+            URLDownload urlDownload = new URLDownload(downloadUrl);
+            if (!checkSSLHandshake(urlDownload)) {
+                return;
+            }
+
+            BackgroundTask<Path> downloadTask = prepareDownloadTask(targetDirectory.get(), urlDownload);
+            downloadTask.onSuccess(destination -> {
+                boolean isDuplicate;
+                try {
+                    isDuplicate = FileNameUniqueness.isDuplicatedFile(targetDirectory.get(), destination.getFileName(), dialogService);
+                } catch (IOException e) {
+                    LOGGER.error("FileNameUniqueness.isDuplicatedFile failed", e);
+                    return;
+                }
+
+                if (isDuplicate) {
+                    destination = targetDirectory.get().resolve(
+                            FileNameUniqueness.eraseDuplicateMarks(destination.getFileName()));
+                }
+
+                linkedFile.setLink(FileUtil.relativize(destination,
+                        databaseContext.getFileDirectories(filePreferences)).toString());
+
+                // Notify in bar when the file type is HTML.
+                if (linkedFile.getFileType().equals(StandardExternalFileType.URL.getName())) {
+                    dialogService.notify(Localization.lang("Downloaded website as an HTML file."));
+                    LOGGER.debug("Downloaded website {} as an HTML file at {}", linkedFile.getLink(), destination);
+                }
+            });
+            if (downloadProgress != null) {
+                downloadProgress.bind(downloadTask.workDonePercentageProperty());
+                // If not given, we show it after the task is started
+            }
+
+            downloadTask.titleProperty().set(Localization.lang("Downloading"));
+            downloadTask.messageProperty().set(
+                    Localization.lang("Fulltext for") + ": " + entry.getCitationKey().orElse(Localization.lang("New entry")));
+            downloadTask.showToUser(true);
+            downloadTask.onFailure(ex -> {
+                LOGGER.error("Error downloading from URL: " + urlDownload, ex);
+                String fetcherExceptionMessage = ex.getMessage();
+                int statusCode;
+                if (ex instanceof FetcherClientException clientException) {
+                    statusCode = clientException.getStatusCode();
+                    if (statusCode == 401) {
+                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("401 Unauthorized: Access Denied. You are not authorized to access this resource. Please check your credentials and try again. If you believe you should have access, please contact the administrator for assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+                    } else if (statusCode == 403) {
+                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("403 Forbidden: Access Denied. You do not have permission to access this resource. Please contact the administrator for assistance or try a different action.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+                    } else if (statusCode == 404) {
+                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("404 Not Found Error: The requested resource could not be found. It seems that the file you are trying to download is not available or has been moved. Please verify the URL and try again. If you believe this is an error, please contact the administrator for further assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+                    }
+                } else if (ex instanceof FetcherServerException serverException) {
+                    statusCode = serverException.getStatusCode();
+                    dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"),
+                            Localization.lang("Error downloading from URL. Cause is likely the server side. HTTP Error %0 \n %1 \nURL: %2 \nPlease try again later or contact the server administrator.", statusCode, fetcherExceptionMessage, urlDownload.getSource()));
+                } else {
+                    dialogService.showErrorDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("Error message: %0 \nURL: %1 \nPlease check the URL and try again.", fetcherExceptionMessage, urlDownload.getSource()));
+                }
+            });
+            Future<Path> taskFuture = taskExecutor.execute(downloadTask);
+            if (downloadProgress == null) {
+                Task<Path> task = (Task<Path>) taskFuture;
+                if (task != null) {
+                    dialogService.showProgressDialog(
+                            Localization.lang("Downloading"),
+                            Localization.lang("Looking for full text document..."),
+                            task);
+                }
+            }
+        } catch (MalformedURLException exception) {
+            dialogService.showErrorDialogAndWait(Localization.lang("Invalid URL"), exception);
+        }
+    }
+
+    public boolean checkSSLHandshake(URLDownload urlDownload) {
+        try {
+            urlDownload.canBeReached();
+        } catch (kong.unirest.UnirestException ex) {
+            if (ex.getCause() instanceof SSLHandshakeException) {
+                if (dialogService.showConfirmationDialogAndWait(Localization.lang("Download file"),
+                        Localization.lang("Unable to find valid certification path to requested target(%0), download anyway?",
+                                urlDownload.getSource().toString()))) {
+                    return true;
+                } else {
+                    dialogService.notify(Localization.lang("Download operation canceled."));
+                    return false;
+                }
+            } else {
+                LOGGER.error("Error while checking if the file can be downloaded", ex);
+                dialogService.notify(Localization.lang("Error downloading"));
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public BackgroundTask<Path> prepareDownloadTask(Path targetDirectory, URLDownload urlDownload) {
+        SSLSocketFactory defaultSSLSocketFactory = HttpsURLConnection.getDefaultSSLSocketFactory();
+        HostnameVerifier defaultHostnameVerifier = HttpsURLConnection.getDefaultHostnameVerifier();
+        return BackgroundTask
+                .wrap(() -> {
+                    Optional<ExternalFileType> suggestedType = inferFileType(urlDownload);
+                    ExternalFileType externalFileType = suggestedType.orElse(StandardExternalFileType.PDF);
+
+                    String suggestedName = linkedFileHandler.getSuggestedFileName(externalFileType.getExtension());
+                    String fulltextDir = FileUtil.createDirNameFromPattern(databaseContext.getDatabase(), entry, filePreferences.getFileDirectoryPattern());
+                    suggestedName = FileNameUniqueness.getNonOverWritingFileName(targetDirectory.resolve(fulltextDir), suggestedName);
+                    return targetDirectory.resolve(fulltextDir).resolve(suggestedName);
+                })
+                .then(destination -> new FileDownloadTask(urlDownload.getSource(), destination))
+                .onFailure(ex -> LOGGER.error("Error in download", ex))
+                .onFinished(() -> URLDownload.setSSLVerification(defaultSSLSocketFactory, defaultHostnameVerifier));
+    }
+
+    private Optional<ExternalFileType> inferFileType(URLDownload urlDownload) {
+        Optional<ExternalFileType> suggestedType = inferFileTypeFromMimeType(urlDownload);
+
+        // If we did not find a file type from the MIME type, try based on extension:
+        if (suggestedType.isEmpty()) {
+            suggestedType = inferFileTypeFromURL(urlDownload.getSource().toExternalForm());
+        }
+        return suggestedType;
+    }
+
+    private Optional<ExternalFileType> inferFileTypeFromMimeType(URLDownload urlDownload) {
+        String mimeType = urlDownload.getMimeType();
+
+        if (mimeType != null) {
+            LOGGER.debug("MIME Type suggested: " + mimeType);
+            return ExternalFileTypes.getExternalFileTypeByMimeType(mimeType, filePreferences);
+        } else {
+            return Optional.empty();
+        }
+    }
+
+    private Optional<ExternalFileType> inferFileTypeFromURL(String url) {
+        return URLUtil.getSuffix(url, filePreferences)
+                      .flatMap(extension -> ExternalFileTypes.getExternalFileTypeByExt(extension, filePreferences));
+    }
+}
diff --git a/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java b/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java
new file mode 100644
index 00000000000..64aa3532b00
--- /dev/null
+++ b/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java
@@ -0,0 +1,90 @@
+package org.jabref.gui.linkedfile;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.LibraryTab;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.actions.SimpleCommand;
+import org.jabref.gui.util.TaskExecutor;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.util.io.FileUtil;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.preferences.FilePreferences;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.jabref.gui.actions.ActionHelper.needsDatabase;
+
+public class RedownloadMissingFilesAction extends SimpleCommand {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryTab.class);
+
+    private final StateManager stateManager;
+    private final DialogService dialogService;
+    private final FilePreferences filePreferences;
+    private final TaskExecutor taskExecutor;
+
+    private BibDatabaseContext databaseContext;
+
+    private boolean shouldContinue = true;
+
+    public RedownloadMissingFilesAction(StateManager stateManager,
+                                        DialogService dialogService,
+                                        FilePreferences filePreferences,
+                                        TaskExecutor taskExecutor) {
+        this.stateManager = stateManager;
+        this.dialogService = dialogService;
+        this.filePreferences = filePreferences;
+        this.taskExecutor = taskExecutor;
+
+        this.executable.bind(needsDatabase(stateManager));
+    }
+
+    @Override
+    public void execute() {
+        init();
+        redownloadMissing();
+    }
+
+    public void init() {
+        if (stateManager.getActiveDatabase().isEmpty()) {
+            return;
+        }
+
+        databaseContext = stateManager.getActiveDatabase().get();
+        boolean confirm = dialogService.showConfirmationDialogAndWait(
+                Localization.lang("Redownload missing files"),
+                Localization.lang("Redownload missing files for current library?"));
+        if (!confirm) {
+            shouldContinue = false;
+            return;
+        }
+    }
+
+    private void redownloadMissing() {
+        if (!shouldContinue || stateManager.getActiveDatabase().isEmpty()) {
+            return;
+        }
+        LOGGER.info("Redownloading missing files");
+        stateManager.getActiveDatabase().get().getEntries().forEach(entry -> {
+            entry.getFiles().forEach(linkedFile -> {
+                if (linkedFile.isOnlineLink() || linkedFile.getSourceUrl().isEmpty()) {
+                    return;
+                }
+
+                Optional<Path> path = FileUtil.find(databaseContext, linkedFile.getLink(), filePreferences);
+                if (path.isPresent() && Files.exists(path.get())) {
+                    return;
+                }
+
+                DownloadLinkedFileAction downloadAction = new DownloadLinkedFileAction(databaseContext, entry,
+                        linkedFile, linkedFile.getSourceUrl(), dialogService, filePreferences, taskExecutor);
+                downloadAction.execute();
+            });
+        });
+    }
+}
diff --git a/src/main/resources/l10n/JabRef_ar.properties b/src/main/resources/l10n/JabRef_ar.properties
index 6ddfb964a31..92da4aaae0d 100644
--- a/src/main/resources/l10n/JabRef_ar.properties
+++ b/src/main/resources/l10n/JabRef_ar.properties
@@ -722,6 +722,8 @@ Swap\ content=مبادلة المحتوى
 Copy\ or\ move\ the\ content\ of\ one\ field\ to\ another=نسخ أو نقل محتوى حقل إلى آخر
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
index 1b841c5f54d..3dc6a361d90 100644
--- a/src/main/resources/l10n/JabRef_da.properties
+++ b/src/main/resources/l10n/JabRef_da.properties
@@ -980,6 +980,8 @@ Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Tilføj altid bogstav (a
 Default\ pattern=Standardmønster
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
index 437e5c1ff1a..33453ad5c76 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -2638,3 +2638,5 @@ Show\ user\ comments\ field=Benutzerkommentarfeld anzeigen
 More\ options...=Weitere Optionen...
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
diff --git a/src/main/resources/l10n/JabRef_el.properties b/src/main/resources/l10n/JabRef_el.properties
index 13cf6c7a595..65af46742db 100644
--- a/src/main/resources/l10n/JabRef_el.properties
+++ b/src/main/resources/l10n/JabRef_el.properties
@@ -1865,6 +1865,8 @@ This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\
 Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbreviations\ in\ the\ entry=Χρησιμοποιήστε το πεδίο FJournal για να αποθηκεύσετε το πλήρες όνομα του περιοδικού στην καταχώρηση, στην περίπτωση (μη) συντομογραφιών
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 2c538d65d73..60c4daf21e4 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2639,3 +2639,5 @@ Ask\ every\ time=Ask every time
 Group\ icons=Group icons
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
index 48d58c0b49c..3885afde0ef 100644
--- a/src/main/resources/l10n/JabRef_es.properties
+++ b/src/main/resources/l10n/JabRef_es.properties
@@ -2533,6 +2533,8 @@ Help\ on\ external\ applications=Ayuda sobre aplicaciones externas
 Identifier-based\ Web\ Search=Búsqueda en la web basada en identificadores
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
index 0483c5b2953..45cee02cff1 100644
--- a/src/main/resources/l10n/JabRef_fa.properties
+++ b/src/main/resources/l10n/JabRef_fa.properties
@@ -613,6 +613,8 @@ Auto\ complete\ disabled.=تکمیل خودکار غیرفعال شد.
 Auto\ complete\ enabled.=تکمیل خودکار غیرفعال شد.
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_fi.properties b/src/main/resources/l10n/JabRef_fi.properties
index 1b298b0f836..924d84ff547 100644
--- a/src/main/resources/l10n/JabRef_fi.properties
+++ b/src/main/resources/l10n/JabRef_fi.properties
@@ -19,6 +19,8 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 About\ JabRef=Tietoja JabRef
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
index 1950effc522..7b326f30349 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -2638,3 +2638,5 @@ Show\ user\ comments\ field=Afficher le champ des commentaires de l'utilisateur
 More\ options...=Plus d'options...
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
diff --git a/src/main/resources/l10n/JabRef_id.properties b/src/main/resources/l10n/JabRef_id.properties
index 4d07ada896f..7016a9a2b57 100644
--- a/src/main/resources/l10n/JabRef_id.properties
+++ b/src/main/resources/l10n/JabRef_id.properties
@@ -1612,6 +1612,8 @@ Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Apakah Anda i
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Ini bisa menunjukkan bahwa JabRef tidak dimatikan secara bersih terakhir kali file tersebut digunakan.
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
index afd176448ea..50ea8f7b17e 100644
--- a/src/main/resources/l10n/JabRef_it.properties
+++ b/src/main/resources/l10n/JabRef_it.properties
@@ -2638,3 +2638,5 @@ Show\ user\ comments\ field=Mostra il campo commenti utente
 More\ options...=Altre opzioni...
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
index b782aebb553..27ffee71136 100644
--- a/src/main/resources/l10n/JabRef_ja.properties
+++ b/src/main/resources/l10n/JabRef_ja.properties
@@ -2456,6 +2456,8 @@ Finished=完了
 Processing...=処理中...
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_ko.properties b/src/main/resources/l10n/JabRef_ko.properties
index 534630467da..989b597a415 100644
--- a/src/main/resources/l10n/JabRef_ko.properties
+++ b/src/main/resources/l10n/JabRef_ko.properties
@@ -2278,6 +2278,8 @@ Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=백업 파일
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=이것은 JabRef가 파일이 마지막으로 사용되었을 때 완전히 종료되지 않았음을 나타낼 수 있습니다.
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
index b90dd3d286c..6f76181f81b 100644
--- a/src/main/resources/l10n/JabRef_nl.properties
+++ b/src/main/resources/l10n/JabRef_nl.properties
@@ -2570,6 +2570,8 @@ Finished\ writing\ metadata\ for\ library\ %0\ (%1\ succeeded,\ %2\ skipped,\ %3
 Processing...=Verwerken...
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
index 30310f0784d..9ef8d3becf0 100644
--- a/src/main/resources/l10n/JabRef_no.properties
+++ b/src/main/resources/l10n/JabRef_no.properties
@@ -1093,6 +1093,8 @@ Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Legg alltid til en bokst
 Default\ pattern=Standardmønster
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pl.properties b/src/main/resources/l10n/JabRef_pl.properties
index b0566127c83..c821daac564 100644
--- a/src/main/resources/l10n/JabRef_pl.properties
+++ b/src/main/resources/l10n/JabRef_pl.properties
@@ -1753,6 +1753,8 @@ Select\ entry=Wybierz wpis
 Search\ aborted\!=Wyszukiwanie przerwane\!
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pt.properties b/src/main/resources/l10n/JabRef_pt.properties
index 7cb3089fef8..b877270015f 100644
--- a/src/main/resources/l10n/JabRef_pt.properties
+++ b/src/main/resources/l10n/JabRef_pt.properties
@@ -1423,6 +1423,8 @@ Default\ pattern=Ppadrão predefinido
 plain\ text=texto sem formatação
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
index 85f73db0287..f1905e18fe9 100644
--- a/src/main/resources/l10n/JabRef_pt_BR.properties
+++ b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -2607,6 +2607,8 @@ Identifier-based\ Web\ Search=Pesquisa da Web baseada em identificadores
 Pushing\ citations\ to\ TeXShop\ is\ only\ possible\ on\ macOS\!=Só é possível enviar referências para TeXShop no macOS\!
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
index 8b39687f782..7d4daaa37e7 100644
--- a/src/main/resources/l10n/JabRef_ru.properties
+++ b/src/main/resources/l10n/JabRef_ru.properties
@@ -2376,6 +2376,8 @@ Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Вы хоти
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Это может означать что JabRef не закрылся правильно при последнем использовании файла.
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
index e3d7beaa443..e5ab29a6329 100644
--- a/src/main/resources/l10n/JabRef_sv.properties
+++ b/src/main/resources/l10n/JabRef_sv.properties
@@ -1575,6 +1575,8 @@ Select\ entry=Välj post
 Help\ on\ external\ applications=Hjälp med externa program
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_tl.properties b/src/main/resources/l10n/JabRef_tl.properties
index e12195205f8..978cbc5c41b 100644
--- a/src/main/resources/l10n/JabRef_tl.properties
+++ b/src/main/resources/l10n/JabRef_tl.properties
@@ -1297,6 +1297,8 @@ Default\ pattern=Default na pattern
 plain\ text=plain na teksto
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
index 85e68af84d6..62e77e78ac4 100644
--- a/src/main/resources/l10n/JabRef_tr.properties
+++ b/src/main/resources/l10n/JabRef_tr.properties
@@ -2544,6 +2544,8 @@ Create\ backup=Yedek oluştur
 Automatically\ search\ and\ show\ unlinked\ files\ in\ the\ entry\ editor=Bağlantısı olmayan dosyaları otomatikman ara ve girdi düzenleyicisinde göster
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_uk.properties b/src/main/resources/l10n/JabRef_uk.properties
index 0180334a3c8..629b73ee833 100644
--- a/src/main/resources/l10n/JabRef_uk.properties
+++ b/src/main/resources/l10n/JabRef_uk.properties
@@ -78,6 +78,8 @@ Application=Застосунок
 Application\ to\ push\ entries\ to=Заявка на push матеріалів
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
index 1777a74b609..643442f980a 100644
--- a/src/main/resources/l10n/JabRef_vi.properties
+++ b/src/main/resources/l10n/JabRef_vi.properties
@@ -1090,6 +1090,8 @@ Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Bạn có mu
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Điều này cho thấy là JabRef không được kết thúc hoàn chỉnh khi sử dụng tập tin lần cuối.
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_zh_CN.properties b/src/main/resources/l10n/JabRef_zh_CN.properties
index 24bf001116b..1f0674961d0 100644
--- a/src/main/resources/l10n/JabRef_zh_CN.properties
+++ b/src/main/resources/l10n/JabRef_zh_CN.properties
@@ -2553,6 +2553,8 @@ Finished=已完成
 Processing...=处理中...
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_zh_TW.properties b/src/main/resources/l10n/JabRef_zh_TW.properties
index b6952fab852..72b10993d01 100644
--- a/src/main/resources/l10n/JabRef_zh_TW.properties
+++ b/src/main/resources/l10n/JabRef_zh_TW.properties
@@ -1058,6 +1058,8 @@ Question=問題
 Select\ directory=選擇資料夾
 Source\ URL=Source URL
 Redownload\ file=Redownload file
+Redownload\ missing\ files=Redownload missing files
+Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 

From 6219d01f72a83dff993d60bdd0ecb4e6a7eae8de Mon Sep 17 00:00:00 2001
From: "Roc R. Currius" <roc@ror3d.xyz>
Date: Mon, 5 Feb 2024 10:28:59 +0000
Subject: [PATCH 04/21] Don't change the local link name when redownloading,
 the link should already have an appropriate file name, so use that for the
 downloaded file.

---
 .../gui/fieldeditors/LinkedFileViewModel.java |  4 +-
 .../linkedfile/DownloadLinkedFileAction.java  | 40 ++++++++++++++++---
 .../RedownloadMissingFilesAction.java         |  3 +-
 3 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index 6b8cef9b2b8..a382727ee70 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -432,8 +432,10 @@ public void redownload() {
             throw new UnsupportedOperationException("In order to download the file, the source url has to be an online link");
         }
 
+        String fileName = Path.of(linkedFile.getLink()).getFileName().toString();
+
         DownloadLinkedFileAction downloadLinkedFileAction = new DownloadLinkedFileAction(databaseContext, entry, linkedFile,
-                linkedFile.getSourceUrl(), dialogService, preferencesService.getFilePreferences(), taskExecutor);
+                linkedFile.getSourceUrl(), dialogService, preferencesService.getFilePreferences(), taskExecutor, fileName, downloadProgress);
         downloadLinkedFileAction.execute();
     }
 
diff --git a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
index c143d31a833..496ec71b84d 100644
--- a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
@@ -46,6 +46,7 @@ public class DownloadLinkedFileAction extends SimpleCommand {
     private final DialogService dialogService;
     private final BibEntry entry;
     private final LinkedFile linkedFile;
+    private final String suggestedName;
     private final String downloadUrl;
     private final FilePreferences filePreferences;
     private final TaskExecutor taskExecutor;
@@ -62,10 +63,12 @@ public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
                                     DialogService dialogService,
                                     FilePreferences filePreferences,
                                     TaskExecutor taskExecutor,
+                                    String suggestedName,
                                     DoubleProperty downloadProgress) {
         this.databaseContext = databaseContext;
         this.entry = entry;
         this.linkedFile = linkedFile;
+        this.suggestedName = suggestedName;
         this.downloadUrl = downloadUrl;
         this.dialogService = dialogService;
         this.filePreferences = filePreferences;
@@ -75,6 +78,28 @@ public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
         this.linkedFileHandler = new LinkedFileHandler(linkedFile, entry, databaseContext, filePreferences);
     }
 
+    public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
+                                    BibEntry entry,
+                                    LinkedFile linkedFile,
+                                    String downloadUrl,
+                                    DialogService dialogService,
+                                    FilePreferences filePreferences,
+                                    TaskExecutor taskExecutor,
+                                    String suggestedName) {
+        this(databaseContext, entry, linkedFile, downloadUrl, dialogService, filePreferences, taskExecutor, suggestedName, null);
+    }
+
+    public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
+                                    BibEntry entry,
+                                    LinkedFile linkedFile,
+                                    String downloadUrl,
+                                    DialogService dialogService,
+                                    FilePreferences filePreferences,
+                                    TaskExecutor taskExecutor,
+                                    DoubleProperty downloadProgress) {
+        this(databaseContext, entry, linkedFile, downloadUrl, dialogService, filePreferences, taskExecutor, "", downloadProgress);
+    }
+
     public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
                                     BibEntry entry,
                                     LinkedFile linkedFile,
@@ -82,7 +107,7 @@ public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
                                     DialogService dialogService,
                                     FilePreferences filePreferences,
                                     TaskExecutor taskExecutor) {
-        this(databaseContext, entry, linkedFile, downloadUrl, dialogService, filePreferences, taskExecutor, null);
+        this(databaseContext, entry, linkedFile, downloadUrl, dialogService, filePreferences, taskExecutor, "", null);
     }
 
     @Override
@@ -200,12 +225,17 @@ public BackgroundTask<Path> prepareDownloadTask(Path targetDirectory, URLDownloa
         HostnameVerifier defaultHostnameVerifier = HttpsURLConnection.getDefaultHostnameVerifier();
         return BackgroundTask
                 .wrap(() -> {
-                    Optional<ExternalFileType> suggestedType = inferFileType(urlDownload);
-                    ExternalFileType externalFileType = suggestedType.orElse(StandardExternalFileType.PDF);
-
-                    String suggestedName = linkedFileHandler.getSuggestedFileName(externalFileType.getExtension());
+                    String suggestedName;
+                    if (this.suggestedName.isEmpty()) {
+                        Optional<ExternalFileType> suggestedType = inferFileType(urlDownload);
+                        ExternalFileType externalFileType = suggestedType.orElse(StandardExternalFileType.PDF);
+                        suggestedName = linkedFileHandler.getSuggestedFileName(externalFileType.getExtension());
+                    } else {
+                        suggestedName = this.suggestedName;
+                    }
                     String fulltextDir = FileUtil.createDirNameFromPattern(databaseContext.getDatabase(), entry, filePreferences.getFileDirectoryPattern());
                     suggestedName = FileNameUniqueness.getNonOverWritingFileName(targetDirectory.resolve(fulltextDir), suggestedName);
+
                     return targetDirectory.resolve(fulltextDir).resolve(suggestedName);
                 })
                 .then(destination -> new FileDownloadTask(urlDownload.getSource(), destination))
diff --git a/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java b/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java
index 64aa3532b00..422fd77e099 100644
--- a/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java
@@ -80,9 +80,10 @@ private void redownloadMissing() {
                 if (path.isPresent() && Files.exists(path.get())) {
                     return;
                 }
+                String fileName = Path.of(linkedFile.getLink()).getFileName().toString();
 
                 DownloadLinkedFileAction downloadAction = new DownloadLinkedFileAction(databaseContext, entry,
-                        linkedFile, linkedFile.getSourceUrl(), dialogService, filePreferences, taskExecutor);
+                        linkedFile, linkedFile.getSourceUrl(), dialogService, filePreferences, taskExecutor, fileName);
                 downloadAction.execute();
             });
         });

From 9dc0fb7e3d6b8e10142d4fdddf0b084debfabb8e Mon Sep 17 00:00:00 2001
From: Roc <1844478+ror3d@users.noreply.github.com>
Date: Mon, 5 Feb 2024 10:33:12 +0000
Subject: [PATCH 05/21] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7119a590bb..f04677a676e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We added a new group icon column to the main table showing the icons of the entry's groups. [#10801](https://github.com/JabRef/jabref/pull/10801)
 - We added ability to jump to an entry in the command line using `-j CITATIONKEY`. [koppor#540](https://github.com/koppor/jabref/issues/540)
 - We added a new boolean to the style files for Openoffice/Libreoffice integration to switch between ZERO_WIDTH_SPACE (default) and no space. [#10843](https://github.com/JabRef/jabref/pull/10843)
+- We added the possibility to redownload files that had been present but are no longer in the specified location. [#10848](https://github.com/JabRef/jabref/issues/10848)
 
 ### Changed
 

From c9fb857b3b40f458a0a361205e707b051986984c Mon Sep 17 00:00:00 2001
From: "Roc R. Currius" <roc@ror3d.xyz>
Date: Tue, 6 Feb 2024 17:03:27 +0000
Subject: [PATCH 06/21] revert method change

---
 .../jabref/logic/importer/util/FileFieldParser.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
index 83ce4b08035..80661eb8776 100644
--- a/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
@@ -149,25 +149,25 @@ static LinkedFile convert(List<String> entry) {
         LinkedFile field = null;
         if (LinkedFile.isOnlineLink(entry.get(1))) {
             try {
-                field = new LinkedFile(entry.get(0), new URL(entry.get(1)), entry.get(2));
+                field = new LinkedFile(entry.getFirst(), new URL(entry.get(1)), entry.get(2));
             } catch (MalformedURLException e) {
                 // in case the URL is malformed, store it nevertheless
-                field = new LinkedFile(entry.get(0), entry.get(1), entry.get(2));
+                field = new LinkedFile(entry.getFirst(), entry.get(1), entry.get(2));
             }
         } else {
             String pathStr = entry.get(1);
             if (pathStr.contains("//")) {
                 // In case the path contains //, we assume it is a malformed URL, not a malformed path.
                 // On linux, the double slash would be converted to a single slash.
-                field = new LinkedFile(entry.get(0), pathStr, entry.get(2));
+                field = new LinkedFile(entry.getFirst(), pathStr, entry.get(2));
             } else {
                 try {
                     // there is no Path.isValidPath(String) method
-                    field = new LinkedFile(entry.get(0), Path.of(pathStr), entry.get(2));
+                    field = new LinkedFile(entry.getFirst(), Path.of(pathStr), entry.get(2));
                 } catch (InvalidPathException e) {
                     // Ignored
                     LOGGER.debug("Invalid path object, continuing with string", e);
-                    field = new LinkedFile(entry.get(0), pathStr, entry.get(2));
+                    field = new LinkedFile(entry.getFirst(), pathStr, entry.get(2));
                 }
             }
         }

From bd1810dcbbeecfd7bc61d778cd6aa0942fe17b55 Mon Sep 17 00:00:00 2001
From: "Roc R. Currius" <roc@ror3d.xyz>
Date: Tue, 6 Feb 2024 17:09:44 +0000
Subject: [PATCH 07/21] Revert changes in property files

---
 src/main/resources/l10n/JabRef_ar.properties    | 4 ----
 src/main/resources/l10n/JabRef_da.properties    | 4 ----
 src/main/resources/l10n/JabRef_de.properties    | 4 ----
 src/main/resources/l10n/JabRef_el.properties    | 4 ----
 src/main/resources/l10n/JabRef_es.properties    | 4 ----
 src/main/resources/l10n/JabRef_fa.properties    | 4 ----
 src/main/resources/l10n/JabRef_fi.properties    | 4 ----
 src/main/resources/l10n/JabRef_fr.properties    | 4 ----
 src/main/resources/l10n/JabRef_id.properties    | 4 ----
 src/main/resources/l10n/JabRef_it.properties    | 4 ----
 src/main/resources/l10n/JabRef_ja.properties    | 4 ----
 src/main/resources/l10n/JabRef_ko.properties    | 4 ----
 src/main/resources/l10n/JabRef_nl.properties    | 4 ----
 src/main/resources/l10n/JabRef_no.properties    | 4 ----
 src/main/resources/l10n/JabRef_pl.properties    | 4 ----
 src/main/resources/l10n/JabRef_pt.properties    | 4 ----
 src/main/resources/l10n/JabRef_pt_BR.properties | 4 ----
 src/main/resources/l10n/JabRef_ru.properties    | 6 +-----
 src/main/resources/l10n/JabRef_sv.properties    | 4 ----
 src/main/resources/l10n/JabRef_tl.properties    | 4 ----
 src/main/resources/l10n/JabRef_tr.properties    | 4 ----
 src/main/resources/l10n/JabRef_uk.properties    | 4 ----
 src/main/resources/l10n/JabRef_vi.properties    | 4 ----
 src/main/resources/l10n/JabRef_zh_CN.properties | 4 ----
 src/main/resources/l10n/JabRef_zh_TW.properties | 4 ----
 25 files changed, 1 insertion(+), 101 deletions(-)

diff --git a/src/main/resources/l10n/JabRef_ar.properties b/src/main/resources/l10n/JabRef_ar.properties
index 92da4aaae0d..fe50ef76cab 100644
--- a/src/main/resources/l10n/JabRef_ar.properties
+++ b/src/main/resources/l10n/JabRef_ar.properties
@@ -720,10 +720,6 @@ Copy\ content=نسخ المحتوى
 Move\ content=نقل المحتوى
 Swap\ content=مبادلة المحتوى
 Copy\ or\ move\ the\ content\ of\ one\ field\ to\ another=نسخ أو نقل محتوى حقل إلى آخر
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_da.properties b/src/main/resources/l10n/JabRef_da.properties
index 3dc6a361d90..042f435f82e 100644
--- a/src/main/resources/l10n/JabRef_da.properties
+++ b/src/main/resources/l10n/JabRef_da.properties
@@ -978,10 +978,6 @@ Find\ and\ replace=Søg og erstat
 
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Tilføj altid bogstav (a, b, ...) til genererede nøgler
 Default\ pattern=Standardmønster
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_de.properties b/src/main/resources/l10n/JabRef_de.properties
index 33453ad5c76..a540673fdbe 100644
--- a/src/main/resources/l10n/JabRef_de.properties
+++ b/src/main/resources/l10n/JabRef_de.properties
@@ -2636,7 +2636,3 @@ Hide\ user\ comments=Benutzerkommentare ausblenden
 Show\ user\ comments\ field=Benutzerkommentarfeld anzeigen
 
 More\ options...=Weitere Optionen...
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
diff --git a/src/main/resources/l10n/JabRef_el.properties b/src/main/resources/l10n/JabRef_el.properties
index 65af46742db..8b1e418848f 100644
--- a/src/main/resources/l10n/JabRef_el.properties
+++ b/src/main/resources/l10n/JabRef_el.properties
@@ -1863,10 +1863,6 @@ Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Θέλετε
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Αυτό ίσως υποδεικνύει πως το JabRef δεν τερματίστηκε σωστά την τελευταία φορά που χρησιμοποιήθηκε το αρχείο.
 
 Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbreviations\ in\ the\ entry=Χρησιμοποιήστε το πεδίο FJournal για να αποθηκεύσετε το πλήρες όνομα του περιοδικού στην καταχώρηση, στην περίπτωση (μη) συντομογραφιών
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_es.properties b/src/main/resources/l10n/JabRef_es.properties
index 3885afde0ef..8be3bf81603 100644
--- a/src/main/resources/l10n/JabRef_es.properties
+++ b/src/main/resources/l10n/JabRef_es.properties
@@ -2531,10 +2531,6 @@ Error\ while\ fetching\ citing\ entries\:\ %0=Error al recuperar las entradas de
 Jump\ to\ entry\ in\ database=Saltar a entrada en base de datos
 Help\ on\ external\ applications=Ayuda sobre aplicaciones externas
 Identifier-based\ Web\ Search=Búsqueda en la web basada en identificadores
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_fa.properties b/src/main/resources/l10n/JabRef_fa.properties
index 45cee02cff1..16679d6e938 100644
--- a/src/main/resources/l10n/JabRef_fa.properties
+++ b/src/main/resources/l10n/JabRef_fa.properties
@@ -611,10 +611,6 @@ String\ constants=ثابت های رشته
 
 Auto\ complete\ disabled.=تکمیل خودکار غیرفعال شد.
 Auto\ complete\ enabled.=تکمیل خودکار غیرفعال شد.
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_fi.properties b/src/main/resources/l10n/JabRef_fi.properties
index 924d84ff547..9df2bd6d5d2 100644
--- a/src/main/resources/l10n/JabRef_fi.properties
+++ b/src/main/resources/l10n/JabRef_fi.properties
@@ -17,10 +17,6 @@ Unable\ to\ monitor\ file\ changes.\ Please\ close\ files\ and\ processes\ and\
 
 
 About\ JabRef=Tietoja JabRef
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_fr.properties b/src/main/resources/l10n/JabRef_fr.properties
index 7b326f30349..c6af7ef60be 100644
--- a/src/main/resources/l10n/JabRef_fr.properties
+++ b/src/main/resources/l10n/JabRef_fr.properties
@@ -2636,7 +2636,3 @@ Hide\ user\ comments=Masquer les commentaires de l'utilisateur
 Show\ user\ comments\ field=Afficher le champ des commentaires de l'utilisateur
 
 More\ options...=Plus d'options...
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
diff --git a/src/main/resources/l10n/JabRef_id.properties b/src/main/resources/l10n/JabRef_id.properties
index 7016a9a2b57..30863d1822c 100644
--- a/src/main/resources/l10n/JabRef_id.properties
+++ b/src/main/resources/l10n/JabRef_id.properties
@@ -1610,10 +1610,6 @@ plain\ text=teks biasa
 
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Apakah Anda ingin memulihkan perpustakaan dari file cadangan?
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Ini bisa menunjukkan bahwa JabRef tidak dimatikan secara bersih terakhir kali file tersebut digunakan.
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_it.properties b/src/main/resources/l10n/JabRef_it.properties
index 50ea8f7b17e..7cec81fef68 100644
--- a/src/main/resources/l10n/JabRef_it.properties
+++ b/src/main/resources/l10n/JabRef_it.properties
@@ -2636,7 +2636,3 @@ Hide\ user\ comments=Nascondi commenti utente
 Show\ user\ comments\ field=Mostra il campo commenti utente
 
 More\ options...=Altre opzioni...
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
diff --git a/src/main/resources/l10n/JabRef_ja.properties b/src/main/resources/l10n/JabRef_ja.properties
index 27ffee71136..a28aaafbe24 100644
--- a/src/main/resources/l10n/JabRef_ja.properties
+++ b/src/main/resources/l10n/JabRef_ja.properties
@@ -2454,10 +2454,6 @@ Failed\ to\ download\ from\ URL=URLからダウンロードできませんでし
 
 Finished=完了
 Processing...=処理中...
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_ko.properties b/src/main/resources/l10n/JabRef_ko.properties
index 989b597a415..6c3d70168f3 100644
--- a/src/main/resources/l10n/JabRef_ko.properties
+++ b/src/main/resources/l10n/JabRef_ko.properties
@@ -2276,10 +2276,6 @@ plain\ text=일반 텍스트
 
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=백업 파일에서 라이브러리를 복구하시겠습니까?
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=이것은 JabRef가 파일이 마지막으로 사용되었을 때 완전히 종료되지 않았음을 나타낼 수 있습니다.
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_nl.properties b/src/main/resources/l10n/JabRef_nl.properties
index 6f76181f81b..05141702e2a 100644
--- a/src/main/resources/l10n/JabRef_nl.properties
+++ b/src/main/resources/l10n/JabRef_nl.properties
@@ -2568,10 +2568,6 @@ Failed\ to\ download\ from\ URL=Downloaden van URL mislukt
 Finished=Voltooid
 Finished\ writing\ metadata\ for\ library\ %0\ (%1\ succeeded,\ %2\ skipped,\ %3\ errors).=Metadata schrijven voor bibliotheek %0 voltooid (%1 geslaagd, %2 overgeslagen, %3 fouten).
 Processing...=Verwerken...
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_no.properties b/src/main/resources/l10n/JabRef_no.properties
index 9ef8d3becf0..63b50deb7fc 100644
--- a/src/main/resources/l10n/JabRef_no.properties
+++ b/src/main/resources/l10n/JabRef_no.properties
@@ -1091,10 +1091,6 @@ Import\ BibTeX=Importer BibTeX
 
 Always\ add\ letter\ (a,\ b,\ ...)\ to\ generated\ keys=Legg alltid til en bokstav (a, b, ...) til genererte nøkler
 Default\ pattern=Standardmønster
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pl.properties b/src/main/resources/l10n/JabRef_pl.properties
index c821daac564..37353b0716c 100644
--- a/src/main/resources/l10n/JabRef_pl.properties
+++ b/src/main/resources/l10n/JabRef_pl.properties
@@ -1751,10 +1751,6 @@ Processing...=Przetwarzanie...
 Cancel\ search=Anuluj wyszukiwanie
 Select\ entry=Wybierz wpis
 Search\ aborted\!=Wyszukiwanie przerwane\!
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pt.properties b/src/main/resources/l10n/JabRef_pt.properties
index b877270015f..eef2cff09e3 100644
--- a/src/main/resources/l10n/JabRef_pt.properties
+++ b/src/main/resources/l10n/JabRef_pt.properties
@@ -1421,10 +1421,6 @@ Default\ pattern=Ppadrão predefinido
 
 
 plain\ text=texto sem formatação
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_pt_BR.properties b/src/main/resources/l10n/JabRef_pt_BR.properties
index f1905e18fe9..8ab46c8ca1f 100644
--- a/src/main/resources/l10n/JabRef_pt_BR.properties
+++ b/src/main/resources/l10n/JabRef_pt_BR.properties
@@ -2605,10 +2605,6 @@ Help\ on\ external\ applications=Ajuda em aplicativos externos
 Identifier-based\ Web\ Search=Pesquisa da Web baseada em identificadores
 
 Pushing\ citations\ to\ TeXShop\ is\ only\ possible\ on\ macOS\!=Só é possível enviar referências para TeXShop no macOS\!
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_ru.properties b/src/main/resources/l10n/JabRef_ru.properties
index 7d4daaa37e7..ed338ade0eb 100644
--- a/src/main/resources/l10n/JabRef_ru.properties
+++ b/src/main/resources/l10n/JabRef_ru.properties
@@ -2182,7 +2182,7 @@ This\ entry\ type\ is\ intended\ for\ sources\ such\ as\ web\ sites\ which\ are\
 A\ single-volume\ work\ of\ reference\ such\ as\ an\ encyclopedia\ or\ a\ dictionary.=Неделимая работа или ссылка, как энциклопедия или словарь.
 A\ technical\ report,\ research\ report,\ or\ white\ paper\ published\ by\ a\ university\ or\ some\ other\ institution.=Технический отчет, исследовательский отчет, или белая книга, выпущенная институтом или другим учреждением.
 An\ entry\ set\ is\ a\ group\ of\ entries\ which\ are\ cited\ as\ a\ single\ reference\ and\ listed\ as\ a\ single\ item\ in\ the\ bibliography.=Набор записей представляет собой группу записей, которые приводятся в виде единой ссылки и перечислены в виде одного элемента в библиографии.
-Supplemental\ material\ in\ a\ "Book".\ This\ type\ is\ provided\ for\ elements\ such\ as\ prefaces,\ introductions,\ forewords,\ afterwords,\ etc.\ which\ often\ have\ a\ generic\ title\ only.=Дополнительный материал в "Книге" предназначен для таких элементов, как предисловия, введения, послесловия и т.д.
+Supplemental\ material\ in\ a\ "Book".\ This\ type\ is\ provided\ for\ elements\ such\ as\ prefaces,\ introductions,\ forewords,\ afterwords,\ etc.\ which\ often\ have\ a\ generic\ title\ only.=Дополнительный материал в "Книге" предназначен для таких элементов, как предисловия, введения, послесловия и т.д. 
 Supplemental\ material\ in\ a\ "Collection".=Дополнительные материалы в "Коллекции".
 Supplemental\ material\ in\ a\ "Periodical".\ This\ type\ may\ be\ useful\ when\ referring\ to\ items\ such\ as\ regular\ columns,\ obituaries,\ letters\ to\ the\ editor,\ etc.\ which\ only\ have\ a\ generic\ title.=Дополнительные материалы в "Периодическом издании". Этот тип может быть полезен при обращении к таким элементам, как обычные колонки, некрологи, письма к редактору и т.д., которые имеют только общее название.
 A\ thesis\ written\ for\ an\ educational\ institution\ to\ satisfy\ the\ requirements\ for\ a\ degree.=Тезис, написанный для учебного заведения с целью удовлетворения требований к степени.
@@ -2374,10 +2374,6 @@ plain\ text=обычный текст
 
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Вы хотите восстановить библиотеку из файла резервной копии?
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Это может означать что JabRef не закрылся правильно при последнем использовании файла.
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_sv.properties b/src/main/resources/l10n/JabRef_sv.properties
index e5ab29a6329..b6fe1763992 100644
--- a/src/main/resources/l10n/JabRef_sv.properties
+++ b/src/main/resources/l10n/JabRef_sv.properties
@@ -1573,10 +1573,6 @@ Writing\ metadata\ to\ %0=Skriver metadata till %0
 
 Select\ entry=Välj post
 Help\ on\ external\ applications=Hjälp med externa program
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_tl.properties b/src/main/resources/l10n/JabRef_tl.properties
index 978cbc5c41b..11236d85373 100644
--- a/src/main/resources/l10n/JabRef_tl.properties
+++ b/src/main/resources/l10n/JabRef_tl.properties
@@ -1295,10 +1295,6 @@ Default\ pattern=Default na pattern
 
 
 plain\ text=plain na teksto
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_tr.properties b/src/main/resources/l10n/JabRef_tr.properties
index 62e77e78ac4..43909d730bf 100644
--- a/src/main/resources/l10n/JabRef_tr.properties
+++ b/src/main/resources/l10n/JabRef_tr.properties
@@ -2542,10 +2542,6 @@ This\ operation\ requires\ selected\ linked\ files.=Bu işlem seçili bağlantı
 
 Create\ backup=Yedek oluştur
 Automatically\ search\ and\ show\ unlinked\ files\ in\ the\ entry\ editor=Bağlantısı olmayan dosyaları otomatikman ara ve girdi düzenleyicisinde göster
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_uk.properties b/src/main/resources/l10n/JabRef_uk.properties
index 629b73ee833..ee2eee21693 100644
--- a/src/main/resources/l10n/JabRef_uk.properties
+++ b/src/main/resources/l10n/JabRef_uk.properties
@@ -76,10 +76,6 @@ Appearance=Оформлення
 Application=Застосунок
 
 Application\ to\ push\ entries\ to=Заявка на push матеріалів
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_vi.properties b/src/main/resources/l10n/JabRef_vi.properties
index 643442f980a..0e19694e10a 100644
--- a/src/main/resources/l10n/JabRef_vi.properties
+++ b/src/main/resources/l10n/JabRef_vi.properties
@@ -1088,10 +1088,6 @@ Default\ pattern=Kiểu mặc định
 
 Do\ you\ want\ to\ recover\ the\ library\ from\ the\ backup\ file?=Bạn có muốn phục hồi cơ sở dữ liệu từ tập tin lưu dự phòng không?
 This\ could\ indicate\ that\ JabRef\ did\ not\ shut\ down\ cleanly\ last\ time\ the\ file\ was\ used.=Điều này cho thấy là JabRef không được kết thúc hoàn chỉnh khi sử dụng tập tin lần cuối.
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_zh_CN.properties b/src/main/resources/l10n/JabRef_zh_CN.properties
index 1f0674961d0..af03a733d76 100644
--- a/src/main/resources/l10n/JabRef_zh_CN.properties
+++ b/src/main/resources/l10n/JabRef_zh_CN.properties
@@ -2551,10 +2551,6 @@ Failed\ to\ download\ from\ URL=从 URL 下载失败
 
 Finished=已完成
 Processing...=处理中...
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 
diff --git a/src/main/resources/l10n/JabRef_zh_TW.properties b/src/main/resources/l10n/JabRef_zh_TW.properties
index 72b10993d01..968b02e35e1 100644
--- a/src/main/resources/l10n/JabRef_zh_TW.properties
+++ b/src/main/resources/l10n/JabRef_zh_TW.properties
@@ -1056,10 +1056,6 @@ Use\ custom\ DOI\ base\ URI\ for\ article\ access=使用自訂的 DOI 基礎網
 
 Question=問題
 Select\ directory=選擇資料夾
-Source\ URL=Source URL
-Redownload\ file=Redownload file
-Redownload\ missing\ files=Redownload missing files
-Redownload\ missing\ files\ for\ current\ library?=Redownload missing files for current library?
 
 
 

From 116a516647a9f3c072dd25577aa10fc8d29f59a0 Mon Sep 17 00:00:00 2001
From: "Roc R. Currius" <roc@ror3d.xyz>
Date: Tue, 6 Feb 2024 17:10:03 +0000
Subject: [PATCH 08/21] Improve extension check

---
 src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java b/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
index 7f0dd628fe4..2c1456d13cd 100644
--- a/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
+++ b/src/main/java/org/jabref/logic/util/io/FileNameUniqueness.java
@@ -119,8 +119,7 @@ public static String eraseDuplicateMarks(String fileName) {
     }
 
     public static Path eraseDuplicateMarks(Path filePath) {
-        String extensionSuffix = FileUtil.getFileExtension(filePath).orElse("");
-        extensionSuffix = "".equals(extensionSuffix) ? extensionSuffix : "." + extensionSuffix;
+        String extensionSuffix = FileUtil.getFileExtension(filePath).map(ext -> "." + ext).orElse("");
 
         return filePath.resolveSibling(eraseDuplicateMarks(FileUtil.getBaseName(filePath)) + extensionSuffix);
     }

From 6a7b8f94ebc42162be9b16494167c505dd04a297 Mon Sep 17 00:00:00 2001
From: "Roc R. Currius" <roc@ror3d.xyz>
Date: Tue, 6 Feb 2024 17:32:23 +0000
Subject: [PATCH 09/21] Fix issue where action would only be executed once per
 jabref execution.

---
 .../RedownloadMissingFilesAction.java         | 38 +++++++------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java b/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java
index 422fd77e099..f08933976cb 100644
--- a/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/RedownloadMissingFilesAction.java
@@ -30,8 +30,6 @@ public class RedownloadMissingFilesAction extends SimpleCommand {
 
     private BibDatabaseContext databaseContext;
 
-    private boolean shouldContinue = true;
-
     public RedownloadMissingFilesAction(StateManager stateManager,
                                         DialogService dialogService,
                                         FilePreferences filePreferences,
@@ -46,43 +44,33 @@ public RedownloadMissingFilesAction(StateManager stateManager,
 
     @Override
     public void execute() {
-        init();
-        redownloadMissing();
-    }
-
-    public void init() {
-        if (stateManager.getActiveDatabase().isEmpty()) {
-            return;
-        }
-
-        databaseContext = stateManager.getActiveDatabase().get();
-        boolean confirm = dialogService.showConfirmationDialogAndWait(
-                Localization.lang("Redownload missing files"),
-                Localization.lang("Redownload missing files for current library?"));
-        if (!confirm) {
-            shouldContinue = false;
-            return;
+        if (stateManager.getActiveDatabase().isPresent()) {
+            databaseContext = stateManager.getActiveDatabase().get();
+            boolean confirm = dialogService.showConfirmationDialogAndWait(
+                    Localization.lang("Redownload missing files"),
+                    Localization.lang("Redownload missing files for current library?"));
+            if (!confirm) {
+                return;
+            }
+            redownloadMissing(stateManager.getActiveDatabase().get());
         }
     }
 
-    private void redownloadMissing() {
-        if (!shouldContinue || stateManager.getActiveDatabase().isEmpty()) {
-            return;
-        }
+    private void redownloadMissing(BibDatabaseContext databaseContext) {
         LOGGER.info("Redownloading missing files");
-        stateManager.getActiveDatabase().get().getEntries().forEach(entry -> {
+        databaseContext.getEntries().forEach(entry -> {
             entry.getFiles().forEach(linkedFile -> {
                 if (linkedFile.isOnlineLink() || linkedFile.getSourceUrl().isEmpty()) {
                     return;
                 }
 
-                Optional<Path> path = FileUtil.find(databaseContext, linkedFile.getLink(), filePreferences);
+                Optional<Path> path = FileUtil.find(this.databaseContext, linkedFile.getLink(), filePreferences);
                 if (path.isPresent() && Files.exists(path.get())) {
                     return;
                 }
                 String fileName = Path.of(linkedFile.getLink()).getFileName().toString();
 
-                DownloadLinkedFileAction downloadAction = new DownloadLinkedFileAction(databaseContext, entry,
+                DownloadLinkedFileAction downloadAction = new DownloadLinkedFileAction(this.databaseContext, entry,
                         linkedFile, linkedFile.getSourceUrl(), dialogService, filePreferences, taskExecutor, fileName);
                 downloadAction.execute();
             });

From 52777bf07879131533ab5c956b48681fbf461d1d Mon Sep 17 00:00:00 2001
From: "Roc R. Currius" <roc@ror3d.xyz>
Date: Tue, 6 Feb 2024 17:32:56 +0000
Subject: [PATCH 10/21] Make string empty check more readable

---
 src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java b/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
index 9824f177e94..2a3c9ef665a 100644
--- a/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
@@ -6,6 +6,7 @@
 import java.util.stream.Collectors;
 
 import org.jabref.model.entry.LinkedFile;
+import org.jabref.model.strings.StringUtil;
 
 public class FileFieldWriter {
 
@@ -16,7 +17,7 @@ public static String getStringRepresentation(List<LinkedFile> fields) {
         String[][] array = new String[fields.size()][];
         int i = 0;
         for (LinkedFile entry : fields) {
-            if (entry.getSourceUrl() == null || entry.getSourceUrl().isEmpty()) {
+            if (StringUtil.isNullOrEmpty(entry.getSourceUrl())) {
                 array[i] = new String[] {entry.getDescription(), entry.getLink(), entry.getFileType()};
             } else {
                 array[i] = new String[] {entry.getDescription(), entry.getLink(), entry.getFileType(), entry.getSourceUrl()};

From 90452c8fe574f672d67c69d4a3c0959518263174 Mon Sep 17 00:00:00 2001
From: "Roc R. Currius" <roc@ror3d.xyz>
Date: Tue, 6 Feb 2024 17:58:27 +0000
Subject: [PATCH 11/21] Fix test for FileFieldParser

---
 .../java/org/jabref/model/entry/LinkedFile.java     |  3 ++-
 .../logic/importer/util/FileFieldParserTest.java    | 13 ++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/jabref/model/entry/LinkedFile.java b/src/main/java/org/jabref/model/entry/LinkedFile.java
index 07e115a90db..2271712a203 100644
--- a/src/main/java/org/jabref/model/entry/LinkedFile.java
+++ b/src/main/java/org/jabref/model/entry/LinkedFile.java
@@ -21,6 +21,7 @@
 import org.jabref.logic.util.FileType;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.strings.StringUtil;
 import org.jabref.preferences.FilePreferences;
 
 import org.jspecify.annotations.NullMarked;
@@ -200,7 +201,7 @@ public String toString() {
                 "description='" + description.get() + '\'' +
                 ", link='" + link.get() + '\'' +
                 ", fileType='" + fileType.get() + '\'' +
-                ", sourceUrl='" + sourceURL.get() + '\'' +
+                (StringUtil.isNullOrEmpty(sourceURL.get()) ? "" : (", sourceUrl='" + sourceURL.get() + '\'')) +
                 '}';
     }
 
diff --git a/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java b/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
index 73a391fa355..2157694446a 100644
--- a/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
@@ -150,12 +150,6 @@ private static Stream<Arguments> stringsToParseTest() throws Exception {
                         "::file.pdf"
                 ),
 
-                // tooManySeparators
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile("desc", Path.of("file.pdf"), "PDF")),
-                        "desc:file.pdf:PDF:asdf"
-                ),
-
                 // www inside filename
                 Arguments.of(
                         Collections.singletonList(new LinkedFile("", Path.of("/home/www.google.de.pdf"), "")),
@@ -183,7 +177,12 @@ private static Stream<Arguments> stringsToParseTest() throws Exception {
                 Arguments.of(
                              Collections.singletonList(new LinkedFile("desc", new URL("http://ceur-ws.org/Vol-438"), "URL")),
                              "desc:http\\://ceur-ws.org/Vol-438:URL"
-               )
+                ),
+                // link with source url
+                Arguments.of(
+                        Collections.singletonList(new LinkedFile("arXiv Fulltext PDF", "matheus.ea explicit.pdf", "application/pdf", "https://arxiv.org/pdf/1109.0517.pdf")),
+                        "arXiv Fulltext PDF:matheus.ea explicit.pdf:application/pdf:https\\://arxiv.org/pdf/1109.0517.pdf"
+                )
         );
     }
 

From f3f1b9c8e2eaafa98384e87935d3a15e323c54a7 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sat, 10 Feb 2024 11:29:07 +0100
Subject: [PATCH 12/21] Small refactoring and language fix

---
 .../gui/fieldeditors/LinkedFileViewModel.java |   5 +-
 .../linkedfile/DownloadLinkedFileAction.java  | 131 ++++++++++--------
 src/main/resources/l10n/JabRef_en.properties  |   3 +-
 3 files changed, 76 insertions(+), 63 deletions(-)

diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index a382727ee70..8e115ed8503 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -486,8 +486,9 @@ public void download() {
             });
             downloadProgress.bind(downloadTask.workDonePercentageProperty());
             downloadTask.titleProperty().set(Localization.lang("Downloading"));
-            downloadTask.messageProperty().set(
-                    Localization.lang("Fulltext for") + ": " + entry.getCitationKey().orElse(Localization.lang("New entry")));
+            entry.getCitationKey().ifPresentOrElse(
+                    citationkey -> downloadTask.messageProperty().set(Localization.lang("Fulltext for %0", citationkey)),
+                    () -> downloadTask.messageProperty().set(Localization.lang("Fulltext for a new entry")));
             downloadTask.showToUser(true);
             downloadTask.onFailure(ex -> {
                 LOGGER.error("Error downloading from URL: " + urlDownload, ex);
diff --git a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
index 496ec71b84d..dd111ea10cf 100644
--- a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
@@ -129,72 +129,83 @@ public void execute() {
                 return;
             }
 
-            BackgroundTask<Path> downloadTask = prepareDownloadTask(targetDirectory.get(), urlDownload);
-            downloadTask.onSuccess(destination -> {
-                boolean isDuplicate;
-                try {
-                    isDuplicate = FileNameUniqueness.isDuplicatedFile(targetDirectory.get(), destination.getFileName(), dialogService);
-                } catch (IOException e) {
-                    LOGGER.error("FileNameUniqueness.isDuplicatedFile failed", e);
-                    return;
-                }
+            doDownload(targetDirectory.get(), urlDownload);
+        } catch (MalformedURLException exception) {
+            dialogService.showErrorDialogAndWait(Localization.lang("Invalid URL"), exception);
+        }
+    }
 
-                if (isDuplicate) {
-                    destination = targetDirectory.get().resolve(
-                            FileNameUniqueness.eraseDuplicateMarks(destination.getFileName()));
-                }
+    private void doDownload(Path targetDirectory, URLDownload urlDownload) {
+        BackgroundTask<Path> downloadTask = prepareDownloadTask(targetDirectory, urlDownload);
+        if (downloadProgress != null) {
+            downloadProgress.bind(downloadTask.workDonePercentageProperty());
+            // If not given, we show it after the task is started
+        }
 
-                linkedFile.setLink(FileUtil.relativize(destination,
-                        databaseContext.getFileDirectories(filePreferences)).toString());
+        downloadTask.titleProperty().set(Localization.lang("Downloading"));
+        entry.getCitationKey().ifPresentOrElse(
+                citationkey -> downloadTask.messageProperty().set(Localization.lang("Fulltext for %0", citationkey)),
+                () -> downloadTask.messageProperty().set(Localization.lang("Fulltext for a new entry")));
+        downloadTask.showToUser(true);
 
-                // Notify in bar when the file type is HTML.
-                if (linkedFile.getFileType().equals(StandardExternalFileType.URL.getName())) {
-                    dialogService.notify(Localization.lang("Downloaded website as an HTML file."));
-                    LOGGER.debug("Downloaded website {} as an HTML file at {}", linkedFile.getLink(), destination);
-                }
-            });
-            if (downloadProgress != null) {
-                downloadProgress.bind(downloadTask.workDonePercentageProperty());
-                // If not given, we show it after the task is started
+        downloadTask.onFailure(ex -> onFailure(urlDownload, ex));
+        downloadTask.onSuccess(destination -> onSuccess(targetDirectory, destination));
+
+        Future<Path> taskFuture = taskExecutor.execute(downloadTask);
+        if (downloadProgress == null) {
+            Task<Path> task = (Task<Path>) taskFuture;
+            if (task != null) {
+                dialogService.showProgressDialog(
+                        Localization.lang("Downloading"),
+                        Localization.lang("Looking for full text document..."),
+                        task);
             }
+        }
+    }
 
-            downloadTask.titleProperty().set(Localization.lang("Downloading"));
-            downloadTask.messageProperty().set(
-                    Localization.lang("Fulltext for") + ": " + entry.getCitationKey().orElse(Localization.lang("New entry")));
-            downloadTask.showToUser(true);
-            downloadTask.onFailure(ex -> {
-                LOGGER.error("Error downloading from URL: " + urlDownload, ex);
-                String fetcherExceptionMessage = ex.getMessage();
-                int statusCode;
-                if (ex instanceof FetcherClientException clientException) {
-                    statusCode = clientException.getStatusCode();
-                    if (statusCode == 401) {
-                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("401 Unauthorized: Access Denied. You are not authorized to access this resource. Please check your credentials and try again. If you believe you should have access, please contact the administrator for assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
-                    } else if (statusCode == 403) {
-                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("403 Forbidden: Access Denied. You do not have permission to access this resource. Please contact the administrator for assistance or try a different action.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
-                    } else if (statusCode == 404) {
-                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("404 Not Found Error: The requested resource could not be found. It seems that the file you are trying to download is not available or has been moved. Please verify the URL and try again. If you believe this is an error, please contact the administrator for further assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
-                    }
-                } else if (ex instanceof FetcherServerException serverException) {
-                    statusCode = serverException.getStatusCode();
-                    dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"),
-                            Localization.lang("Error downloading from URL. Cause is likely the server side. HTTP Error %0 \n %1 \nURL: %2 \nPlease try again later or contact the server administrator.", statusCode, fetcherExceptionMessage, urlDownload.getSource()));
-                } else {
-                    dialogService.showErrorDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("Error message: %0 \nURL: %1 \nPlease check the URL and try again.", fetcherExceptionMessage, urlDownload.getSource()));
-                }
-            });
-            Future<Path> taskFuture = taskExecutor.execute(downloadTask);
-            if (downloadProgress == null) {
-                Task<Path> task = (Task<Path>) taskFuture;
-                if (task != null) {
-                    dialogService.showProgressDialog(
-                            Localization.lang("Downloading"),
-                            Localization.lang("Looking for full text document..."),
-                            task);
-                }
+    private void onSuccess(Path targetDirectory, Path destination) {
+        boolean isDuplicate;
+        try {
+            isDuplicate = FileNameUniqueness.isDuplicatedFile(targetDirectory, destination.getFileName(), dialogService);
+        } catch (IOException e) {
+            LOGGER.error("FileNameUniqueness.isDuplicatedFile failed", e);
+            return;
+        }
+
+        if (isDuplicate) {
+            destination = targetDirectory.resolve(
+                    FileNameUniqueness.eraseDuplicateMarks(destination.getFileName()));
+        }
+
+        linkedFile.setLink(FileUtil.relativize(destination,
+                databaseContext.getFileDirectories(filePreferences)).toString());
+
+        // Notify in bar when the file type is HTML.
+        if (linkedFile.getFileType().equals(StandardExternalFileType.URL.getName())) {
+            dialogService.notify(Localization.lang("Downloaded website as an HTML file."));
+            LOGGER.debug("Downloaded website {} as an HTML file at {}", linkedFile.getLink(), destination);
+        }
+    }
+
+    private void onFailure(URLDownload urlDownload, Exception ex) {
+        LOGGER.error("Error downloading from URL: " + urlDownload, ex);
+        String fetcherExceptionMessage = ex.getMessage();
+        int statusCode;
+        if (ex instanceof FetcherClientException clientException) {
+            statusCode = clientException.getStatusCode();
+            if (statusCode == 401) {
+                dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("401 Unauthorized: Access Denied. You are not authorized to access this resource. Please check your credentials and try again. If you believe you should have access, please contact the administrator for assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+            } else if (statusCode == 403) {
+                dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("403 Forbidden: Access Denied. You do not have permission to access this resource. Please contact the administrator for assistance or try a different action.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+            } else if (statusCode == 404) {
+                dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("404 Not Found Error: The requested resource could not be found. It seems that the file you are trying to download is not available or has been moved. Please verify the URL and try again. If you believe this is an error, please contact the administrator for further assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
             }
-        } catch (MalformedURLException exception) {
-            dialogService.showErrorDialogAndWait(Localization.lang("Invalid URL"), exception);
+        } else if (ex instanceof FetcherServerException serverException) {
+            statusCode = serverException.getStatusCode();
+            dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"),
+                    Localization.lang("Error downloading from URL. Cause is likely the server side. HTTP Error %0 \n %1 \nURL: %2 \nPlease try again later or contact the server administrator.", statusCode, fetcherExceptionMessage, urlDownload.getSource()));
+        } else {
+            dialogService.showErrorDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("Error message: %0 \nURL: %1 \nPlease check the URL and try again.", fetcherExceptionMessage, urlDownload.getSource()));
         }
     }
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 65cb0ab7410..a08661150cb 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -392,7 +392,8 @@ Formatter\ name=Formatter name
 
 found\ in\ AUX\ file=found in AUX file
 
-Fulltext\ for=Fulltext for
+Fulltext\ for\ %0=Fulltext for %0
+Fulltext\ for\ a\ new\ entry=Fulltext for a new entry
 
 Further\ information\ about\ Mr.\ DLib\ for\ JabRef\ users.=Further information about Mr. DLib for JabRef users.
 

From c4f390754be5493b18fa388872d6dcfd3bb8fb42 Mon Sep 17 00:00:00 2001
From: "Roc R. Currius" <roc@ror3d.xyz>
Date: Mon, 12 Feb 2024 18:41:24 +0000
Subject: [PATCH 13/21] Refactor LinkedFileViewModel to use the
 DownloadLinkedFileAction for downloading Change test to use that too.

---
 .../gui/fieldeditors/LinkedFileViewModel.java | 153 +-----------------
 .../linkedfile/DownloadLinkedFileAction.java  |  12 ++
 .../fieldeditors/LinkedFileViewModelTest.java |   5 +-
 3 files changed, 18 insertions(+), 152 deletions(-)

diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index 8e115ed8503..7550e2cf1f7 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -1,7 +1,6 @@
 package org.jabref.gui.fieldeditors;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -11,11 +10,6 @@
 import java.util.function.BiPredicate;
 import java.util.function.Supplier;
 
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLHandshakeException;
-import javax.net.ssl.SSLSocketFactory;
-
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
@@ -32,21 +26,16 @@
 import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.gui.desktop.JabRefDesktop;
-import org.jabref.gui.externalfiles.FileDownloadTask;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
-import org.jabref.gui.externalfiletype.StandardExternalFileType;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.linkedfile.DownloadLinkedFileAction;
 import org.jabref.gui.linkedfile.LinkedFileEditDialogView;
 import org.jabref.gui.mergeentries.MultiMergeEntriesView;
-import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.externalfiles.LinkedFileHandler;
-import org.jabref.logic.importer.FetcherClientException;
-import org.jabref.logic.importer.FetcherServerException;
 import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fileformat.PdfContentImporter;
@@ -55,8 +44,6 @@
 import org.jabref.logic.importer.fileformat.PdfVerbatimBibTextImporter;
 import org.jabref.logic.importer.fileformat.PdfXmpImporter;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.net.URLDownload;
-import org.jabref.logic.util.io.FileNameUniqueness;
 import org.jabref.logic.util.io.FileUtil;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -443,144 +430,10 @@ public void download() {
         if (!linkedFile.isOnlineLink()) {
             throw new UnsupportedOperationException("In order to download the file it has to be an online link");
         }
-        try {
-            Optional<Path> targetDirectory = databaseContext.getFirstExistingFileDir(preferencesService.getFilePreferences());
-            if (targetDirectory.isEmpty()) {
-                dialogService.showErrorDialogAndWait(Localization.lang("Download file"), Localization.lang("File directory is not set or does not exist!"));
-                return;
-            }
-
-            URLDownload urlDownload = new URLDownload(linkedFile.getLink());
-            if (!checkSSLHandshake(urlDownload)) {
-                return;
-            }
-
-            BackgroundTask<Path> downloadTask = prepareDownloadTask(targetDirectory.get(), urlDownload);
-            downloadTask.onSuccess(destination -> {
-                boolean isDuplicate;
-                try {
-                    isDuplicate = FileNameUniqueness.isDuplicatedFile(targetDirectory.get(), destination.getFileName(), dialogService);
-                } catch (IOException e) {
-                    LOGGER.error("FileNameUniqueness.isDuplicatedFile failed", e);
-                    return;
-                }
-
-                if (!isDuplicate) {
-                    // we need to call LinkedFileViewModel#fromFile, because we need to make the path relative to the configured directories
-                    LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(
-                            destination,
-                            databaseContext.getFileDirectories(preferencesService.getFilePreferences()),
-                            preferencesService.getFilePreferences());
-                    if (newLinkedFile.getDescription().isEmpty() && !linkedFile.getDescription().isEmpty()) {
-                        newLinkedFile.setDescription((linkedFile.getDescription()));
-                    }
-                    newLinkedFile.setSourceURL(linkedFile.getLink());
-                    entry.replaceDownloadedFile(linkedFile.getLink(), newLinkedFile);
-
-                    // Notify in bar when the file type is HTML.
-                    if (newLinkedFile.getFileType().equals(StandardExternalFileType.URL.getName())) {
-                        dialogService.notify(Localization.lang("Downloaded website as an HTML file."));
-                        LOGGER.debug("Downloaded website {} as an HTML file at {}", linkedFile.getLink(), destination);
-                    }
-                }
-            });
-            downloadProgress.bind(downloadTask.workDonePercentageProperty());
-            downloadTask.titleProperty().set(Localization.lang("Downloading"));
-            entry.getCitationKey().ifPresentOrElse(
-                    citationkey -> downloadTask.messageProperty().set(Localization.lang("Fulltext for %0", citationkey)),
-                    () -> downloadTask.messageProperty().set(Localization.lang("Fulltext for a new entry")));
-            downloadTask.showToUser(true);
-            downloadTask.onFailure(ex -> {
-                LOGGER.error("Error downloading from URL: " + urlDownload, ex);
-                String fetcherExceptionMessage = ex.getMessage();
-                int statusCode;
-                if (ex instanceof FetcherClientException clientException) {
-                    statusCode = clientException.getStatusCode();
-                    if (statusCode == 401) {
-                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("401 Unauthorized: Access Denied. You are not authorized to access this resource. Please check your credentials and try again. If you believe you should have access, please contact the administrator for assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
-                    } else if (statusCode == 403) {
-                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("403 Forbidden: Access Denied. You do not have permission to access this resource. Please contact the administrator for assistance or try a different action.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
-                    } else if (statusCode == 404) {
-                        dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("404 Not Found Error: The requested resource could not be found. It seems that the file you are trying to download is not available or has been moved. Please verify the URL and try again. If you believe this is an error, please contact the administrator for further assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
-                    }
-                } else if (ex instanceof FetcherServerException serverException) {
-                    statusCode = serverException.getStatusCode();
-                    dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"),
-                                Localization.lang("Error downloading from URL. Cause is likely the server side. HTTP Error %0 \n %1 \nURL: %2 \nPlease try again later or contact the server administrator.", statusCode, fetcherExceptionMessage, urlDownload.getSource()));
-                    } else {
-                        dialogService.showErrorDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("Error message: %0 \nURL: %1 \nPlease check the URL and try again.", fetcherExceptionMessage, urlDownload.getSource()));
-                    }
-                });
-                taskExecutor.execute(downloadTask);
-            } catch (MalformedURLException exception) {
-                dialogService.showErrorDialogAndWait(Localization.lang("Invalid URL"), exception);
-            }
-        }
 
-        public boolean checkSSLHandshake(URLDownload urlDownload) {
-            try {
-                urlDownload.canBeReached();
-            } catch (kong.unirest.UnirestException ex) {
-                if (ex.getCause() instanceof SSLHandshakeException) {
-                    if (dialogService.showConfirmationDialogAndWait(Localization.lang("Download file"),
-                            Localization.lang("Unable to find valid certification path to requested target(%0), download anyway?",
-                                    urlDownload.getSource().toString()))) {
-                        return true;
-                    } else {
-                        dialogService.notify(Localization.lang("Download operation canceled."));
-                        return false;
-                    }
-                } else {
-                    LOGGER.error("Error while checking if the file can be downloaded", ex);
-                    dialogService.notify(Localization.lang("Error downloading"));
-                    return false;
-                }
-            }
-            return true;
-        }
-
-    public BackgroundTask<Path> prepareDownloadTask(Path targetDirectory, URLDownload urlDownload) {
-        SSLSocketFactory defaultSSLSocketFactory = HttpsURLConnection.getDefaultSSLSocketFactory();
-        HostnameVerifier defaultHostnameVerifier = HttpsURLConnection.getDefaultHostnameVerifier();
-        return BackgroundTask
-                .wrap(() -> {
-                    Optional<ExternalFileType> suggestedType = inferFileType(urlDownload);
-                    ExternalFileType externalFileType = suggestedType.orElse(StandardExternalFileType.PDF);
-
-                    String suggestedName = linkedFileHandler.getSuggestedFileName(externalFileType.getExtension());
-                    String fulltextDir = FileUtil.createDirNameFromPattern(databaseContext.getDatabase(), entry, preferencesService.getFilePreferences().getFileDirectoryPattern());
-                    suggestedName = FileNameUniqueness.getNonOverWritingFileName(targetDirectory.resolve(fulltextDir), suggestedName);
-                    return targetDirectory.resolve(fulltextDir).resolve(suggestedName);
-                })
-                .then(destination -> new FileDownloadTask(urlDownload.getSource(), destination))
-                .onFailure(ex -> LOGGER.error("Error in download", ex))
-                .onFinished(() -> URLDownload.setSSLVerification(defaultSSLSocketFactory, defaultHostnameVerifier));
-    }
-
-    private Optional<ExternalFileType> inferFileType(URLDownload urlDownload) {
-        Optional<ExternalFileType> suggestedType = inferFileTypeFromMimeType(urlDownload);
-
-        // If we did not find a file type from the MIME type, try based on extension:
-        if (suggestedType.isEmpty()) {
-            suggestedType = inferFileTypeFromURL(urlDownload.getSource().toExternalForm());
-        }
-        return suggestedType;
-    }
-
-    private Optional<ExternalFileType> inferFileTypeFromMimeType(URLDownload urlDownload) {
-        String mimeType = urlDownload.getMimeType();
-
-        if (mimeType != null) {
-            LOGGER.debug("MIME Type suggested: " + mimeType);
-            return ExternalFileTypes.getExternalFileTypeByMimeType(mimeType, preferencesService.getFilePreferences());
-        } else {
-            return Optional.empty();
-        }
-    }
-
-    private Optional<ExternalFileType> inferFileTypeFromURL(String url) {
-        return URLUtil.getSuffix(url, preferencesService.getFilePreferences())
-                      .flatMap(extension -> ExternalFileTypes.getExternalFileTypeByExt(extension, preferencesService.getFilePreferences()));
+        DownloadLinkedFileAction downloadLinkedFileAction = new DownloadLinkedFileAction(databaseContext, entry, linkedFile,
+                linkedFile.getLink(), dialogService, preferencesService.getFilePreferences(), taskExecutor, downloadProgress);
+        downloadLinkedFileAction.execute();
     }
 
     public LinkedFile getFile() {
diff --git a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
index dd111ea10cf..e36a32e8598 100644
--- a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
@@ -21,6 +21,7 @@
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.externalfiletype.StandardExternalFileType;
+import org.jabref.gui.externalfiletype.UnknownExternalFileType;
 import org.jabref.gui.fieldeditors.URLUtil;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
@@ -177,6 +178,17 @@ private void onSuccess(Path targetDirectory, Path destination) {
                     FileNameUniqueness.eraseDuplicateMarks(destination.getFileName()));
         }
 
+        if (linkedFile.getFileType().equals("URL")) {
+            String fileExtension = FileUtil.getFileExtension(destination).orElse("");
+            ExternalFileType suggestedFileType = ExternalFileTypes.getExternalFileTypeByExt(fileExtension, filePreferences)
+                                                                  .orElse(new UnknownExternalFileType(fileExtension));
+            linkedFile.setFileType(suggestedFileType.getName());
+        }
+
+        if (linkedFile.getSourceUrl().isEmpty()) {
+            linkedFile.setSourceURL(linkedFile.getLink());
+        }
+
         linkedFile.setLink(FileUtil.relativize(destination,
                 databaseContext.getFileDirectories(filePreferences)).toString());
 
diff --git a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
index 20839979607..aa2522e5668 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
@@ -22,6 +22,7 @@
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.externalfiletype.StandardExternalFileType;
+import org.jabref.gui.linkedfile.DownloadLinkedFileAction;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.CurrentThreadTaskExecutor;
 import org.jabref.gui.util.TaskExecutor;
@@ -226,9 +227,9 @@ void downloadDoesNotOverwriteFileTypeExtension() throws Exception {
         when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
         when(filePreferences.getFileDirectoryPattern()).thenReturn("");
 
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, new CurrentThreadTaskExecutor(), dialogService, preferences);
+        DownloadLinkedFileAction downloadLinkedFileAction = new DownloadLinkedFileAction(databaseContext, entry, linkedFile, linkedFile.getLink(), dialogService, preferences.getFilePreferences(), new CurrentThreadTaskExecutor());
 
-        BackgroundTask<Path> task = viewModel.prepareDownloadTask(tempFile.getParent(), new URLDownload("http://arxiv.org/pdf/1207.0408v1"));
+        BackgroundTask<Path> task = downloadLinkedFileAction.prepareDownloadTask(tempFile.getParent(), new URLDownload("http://arxiv.org/pdf/1207.0408v1"));
         task.onSuccess(destination -> {
             LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(destination, Collections.singletonList(tempFile.getParent()), filePreferences);
             assertEquals("asdf.pdf", newLinkedFile.getLink());

From 06c81bdcabb0f31a21d5e30a968fb527595338ed Mon Sep 17 00:00:00 2001
From: "Roc R. Currius" <roc@ror3d.xyz>
Date: Tue, 13 Feb 2024 09:30:17 +0000
Subject: [PATCH 14/21] Fix rewrite check

---
 .../org/jabref/gui/linkedfile/DownloadLinkedFileAction.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
index e36a32e8598..23511d8cd23 100644
--- a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
@@ -178,17 +178,20 @@ private void onSuccess(Path targetDirectory, Path destination) {
                     FileNameUniqueness.eraseDuplicateMarks(destination.getFileName()));
         }
 
-        if (linkedFile.getFileType().equals("URL")) {
+        // If the file type was set to URL because it was a link, try to find a more suitable type now
+        if (linkedFile.getFileType().equals(StandardExternalFileType.URL.getName())) {
             String fileExtension = FileUtil.getFileExtension(destination).orElse("");
             ExternalFileType suggestedFileType = ExternalFileTypes.getExternalFileTypeByExt(fileExtension, filePreferences)
                                                                   .orElse(new UnknownExternalFileType(fileExtension));
             linkedFile.setFileType(suggestedFileType.getName());
         }
 
+        // Store the download url to the source URL
         if (linkedFile.getSourceUrl().isEmpty()) {
             linkedFile.setSourceURL(linkedFile.getLink());
         }
 
+        // Set the linked file's link to the downloaded file's path
         linkedFile.setLink(FileUtil.relativize(destination,
                 databaseContext.getFileDirectories(filePreferences)).toString());
 

From 2230310fce66d9c705a3857878f8f33b1bf1030b Mon Sep 17 00:00:00 2001
From: "Roc R. Currius" <roc@ror3d.xyz>
Date: Thu, 15 Feb 2024 16:55:54 +0000
Subject: [PATCH 15/21] Change file field format to be backwards compatible
 with old versions with mediaType. Recover/add tests for the file field.

---
 .../jabref/logic/bibtex/FileFieldWriter.java  |  2 +-
 .../logic/importer/util/FileFieldParser.java  |  7 ++++--
 .../importer/util/FileFieldParserTest.java    | 25 +++++++++++++++++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java b/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
index 2a3c9ef665a..057f31ca194 100644
--- a/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
@@ -20,7 +20,7 @@ public static String getStringRepresentation(List<LinkedFile> fields) {
             if (StringUtil.isNullOrEmpty(entry.getSourceUrl())) {
                 array[i] = new String[] {entry.getDescription(), entry.getLink(), entry.getFileType()};
             } else {
-                array[i] = new String[] {entry.getDescription(), entry.getLink(), entry.getFileType(), entry.getSourceUrl()};
+                array[i] = new String[] {entry.getDescription(), entry.getLink(), entry.getFileType(), "", entry.getSourceUrl()};
             }
             i++;
         }
diff --git a/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
index 80661eb8776..8d23de6e8a4 100644
--- a/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
@@ -137,6 +137,9 @@ private void resetDataStructuresForNextElement() {
      *
      * SIDE EFFECT: The given entry list is cleared upon completion
      *
+     * Expected format is: description:link:fileType:mediaType:sourceURL
+     * mediaType is not currently used, but documented here for reference to backwards compatibility
+     *
      * @param entry the list of elements in the linked file textual representation
      * @return a LinkedFile object
      */
@@ -172,8 +175,8 @@ static LinkedFile convert(List<String> entry) {
             }
         }
 
-        if (entry.size() > 3) {
-            field.setSourceURL(entry.get(3));
+        if (entry.size() > 4) {
+            field.setSourceURL(entry.get(4));
         }
 
         // link is the only mandatory field
diff --git a/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java b/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
index 2157694446a..90a90aa3d7e 100644
--- a/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
@@ -150,6 +150,12 @@ private static Stream<Arguments> stringsToParseTest() throws Exception {
                         "::file.pdf"
                 ),
 
+                // tooManySeparators
+                Arguments.of(
+                        Collections.singletonList(new LinkedFile("desc", Path.of("file.pdf"), "PDF", "asdf")),
+                        "desc:file.pdf:PDF:qwer:asdf:uiop"
+                ),
+
                 // www inside filename
                 Arguments.of(
                         Collections.singletonList(new LinkedFile("", Path.of("/home/www.google.de.pdf"), "")),
@@ -180,8 +186,23 @@ private static Stream<Arguments> stringsToParseTest() throws Exception {
                 ),
                 // link with source url
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("arXiv Fulltext PDF", "matheus.ea explicit.pdf", "application/pdf", "https://arxiv.org/pdf/1109.0517.pdf")),
-                        "arXiv Fulltext PDF:matheus.ea explicit.pdf:application/pdf:https\\://arxiv.org/pdf/1109.0517.pdf"
+                        Collections.singletonList(new LinkedFile("arXiv Fulltext PDF", "matheus.ea explicit.pdf", "PDF", "https://arxiv.org/pdf/1109.0517.pdf")),
+                        "arXiv Fulltext PDF:matheus.ea explicit.pdf:PDF::https\\://arxiv.org/pdf/1109.0517.pdf"
+                ),
+                // link without description and with source url
+                Arguments.of(
+                        Collections.singletonList(new LinkedFile("", "matheus.ea explicit.pdf", "PDF", "https://arxiv.org/pdf/1109.0517.pdf")),
+                        ":matheus.ea explicit.pdf:PDF::https\\://arxiv.org/pdf/1109.0517.pdf"
+                ),
+                // no link but with source url
+                Arguments.of(
+                        Collections.singletonList(new LinkedFile("arXiv Fulltext PDF", "", "PDF", "https://arxiv.org/pdf/1109.0517.pdf")),
+                        "arXiv Fulltext PDF::PDF::https\\://arxiv.org/pdf/1109.0517.pdf"
+                ),
+                // No description or file type but with sourceURL
+                Arguments.of(
+                        Collections.singletonList(new LinkedFile("", "matheus.ea explicit.pdf", "", "https://arxiv.org/pdf/1109.0517.pdf")),
+                        ":matheus.ea explicit.pdf:::https\\://arxiv.org/pdf/1109.0517.pdf"
                 )
         );
     }

From c61d149b27cd7820b60c5ec1289800a82f84c526 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Thu, 15 Feb 2024 23:03:28 +0100
Subject: [PATCH 16/21] Small language fix and reduced public fingerprint

---
 .../gui/linkedfile/DownloadLinkedFileAction.java    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
index 23511d8cd23..a919b588839 100644
--- a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
@@ -205,26 +205,27 @@ private void onSuccess(Path targetDirectory, Path destination) {
     private void onFailure(URLDownload urlDownload, Exception ex) {
         LOGGER.error("Error downloading from URL: " + urlDownload, ex);
         String fetcherExceptionMessage = ex.getMessage();
+        String failedTitle = Localization.lang("Failed to download from URL");
         int statusCode;
         if (ex instanceof FetcherClientException clientException) {
             statusCode = clientException.getStatusCode();
             if (statusCode == 401) {
-                dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("401 Unauthorized: Access Denied. You are not authorized to access this resource. Please check your credentials and try again. If you believe you should have access, please contact the administrator for assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+                dialogService.showInformationDialogAndWait(failedTitle, Localization.lang("401 Unauthorized: Access Denied. You are not authorized to access this resource. Please check your credentials and try again. If you believe you should have access, please contact the administrator for assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
             } else if (statusCode == 403) {
-                dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("403 Forbidden: Access Denied. You do not have permission to access this resource. Please contact the administrator for assistance or try a different action.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+                dialogService.showInformationDialogAndWait(failedTitle, Localization.lang("403 Forbidden: Access Denied. You do not have permission to access this resource. Please contact the administrator for assistance or try a different action.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
             } else if (statusCode == 404) {
-                dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("404 Not Found Error: The requested resource could not be found. It seems that the file you are trying to download is not available or has been moved. Please verify the URL and try again. If you believe this is an error, please contact the administrator for further assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
+                dialogService.showInformationDialogAndWait(failedTitle, Localization.lang("404 Not Found Error: The requested resource could not be found. It seems that the file you are trying to download is not available or has been moved. Please verify the URL and try again. If you believe this is an error, please contact the administrator for further assistance.\nURL: %0 \n %1", urlDownload.getSource(), fetcherExceptionMessage));
             }
         } else if (ex instanceof FetcherServerException serverException) {
             statusCode = serverException.getStatusCode();
-            dialogService.showInformationDialogAndWait(Localization.lang("Failed to download from URL"),
+            dialogService.showInformationDialogAndWait(failedTitle,
                     Localization.lang("Error downloading from URL. Cause is likely the server side. HTTP Error %0 \n %1 \nURL: %2 \nPlease try again later or contact the server administrator.", statusCode, fetcherExceptionMessage, urlDownload.getSource()));
         } else {
-            dialogService.showErrorDialogAndWait(Localization.lang("Failed to download from URL"), Localization.lang("Error message: %0 \nURL: %1 \nPlease check the URL and try again.", fetcherExceptionMessage, urlDownload.getSource()));
+            dialogService.showErrorDialogAndWait(failedTitle, Localization.lang("Error message: %0 \nURL: %1 \nPlease check the URL and try again.", fetcherExceptionMessage, urlDownload.getSource()));
         }
     }
 
-    public boolean checkSSLHandshake(URLDownload urlDownload) {
+    private boolean checkSSLHandshake(URLDownload urlDownload) {
         try {
             urlDownload.canBeReached();
         } catch (kong.unirest.UnirestException ex) {

From 03c80005490fd5596f40d840cc9342898e015ad9 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Thu, 15 Feb 2024 23:14:03 +0100
Subject: [PATCH 17/21] Extract downloadProgress

---
 .../gui/fieldeditors/LinkedFileViewModel.java | 24 +++++++++--
 .../linkedfile/DownloadLinkedFileAction.java  | 43 ++++++++++++++++---
 2 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
index 7550e2cf1f7..5f4d8ef8478 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java
@@ -421,18 +421,34 @@ public void redownload() {
 
         String fileName = Path.of(linkedFile.getLink()).getFileName().toString();
 
-        DownloadLinkedFileAction downloadLinkedFileAction = new DownloadLinkedFileAction(databaseContext, entry, linkedFile,
-                linkedFile.getSourceUrl(), dialogService, preferencesService.getFilePreferences(), taskExecutor, fileName, downloadProgress);
+        DownloadLinkedFileAction downloadLinkedFileAction = new DownloadLinkedFileAction(
+                databaseContext,
+                entry,
+                linkedFile,
+                linkedFile.getSourceUrl(),
+                dialogService,
+                preferencesService.getFilePreferences(),
+                taskExecutor,
+                fileName);
+        downloadProgress.bind(downloadLinkedFileAction.downloadProgress());
         downloadLinkedFileAction.execute();
     }
 
     public void download() {
+        LOGGER.info("Downloading file from " + linkedFile.getSourceUrl());
         if (!linkedFile.isOnlineLink()) {
             throw new UnsupportedOperationException("In order to download the file it has to be an online link");
         }
 
-        DownloadLinkedFileAction downloadLinkedFileAction = new DownloadLinkedFileAction(databaseContext, entry, linkedFile,
-                linkedFile.getLink(), dialogService, preferencesService.getFilePreferences(), taskExecutor, downloadProgress);
+        DownloadLinkedFileAction downloadLinkedFileAction = new DownloadLinkedFileAction(
+                databaseContext,
+                entry,
+                linkedFile,
+                linkedFile.getLink(),
+                dialogService,
+                preferencesService.getFilePreferences(),
+                taskExecutor);
+        downloadProgress.bind(downloadLinkedFileAction.downloadProgress());
         downloadLinkedFileAction.execute();
     }
 
diff --git a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
index a919b588839..05792e9c6d7 100644
--- a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
@@ -12,7 +12,8 @@
 import javax.net.ssl.SSLSocketFactory;
 
 import javafx.beans.property.DoubleProperty;
-import javafx.concurrent.Task;
+import javafx.beans.property.ReadOnlyDoubleProperty;
+import javafx.beans.property.SimpleDoubleProperty;
 
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
@@ -54,7 +55,7 @@ public class DownloadLinkedFileAction extends SimpleCommand {
 
     private final BibDatabaseContext databaseContext;
 
-    private final DoubleProperty downloadProgress;
+    private final DoubleProperty downloadProgress = new SimpleDoubleProperty();
     private final LinkedFileHandler linkedFileHandler;
 
     public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
@@ -64,8 +65,7 @@ public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
                                     DialogService dialogService,
                                     FilePreferences filePreferences,
                                     TaskExecutor taskExecutor,
-                                    String suggestedName,
-                                    DoubleProperty downloadProgress) {
+                                    String suggestedName) {
         this.databaseContext = databaseContext;
         this.entry = entry;
         this.linkedFile = linkedFile;
@@ -74,7 +74,6 @@ public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
         this.dialogService = dialogService;
         this.filePreferences = filePreferences;
         this.taskExecutor = taskExecutor;
-        this.downloadProgress = downloadProgress;
 
         this.linkedFileHandler = new LinkedFileHandler(linkedFile, entry, databaseContext, filePreferences);
     }
@@ -267,7 +266,11 @@ public BackgroundTask<Path> prepareDownloadTask(Path targetDirectory, URLDownloa
                 })
                 .then(destination -> new FileDownloadTask(urlDownload.getSource(), destination))
                 .onFailure(ex -> LOGGER.error("Error in download", ex))
-                .onFinished(() -> URLDownload.setSSLVerification(defaultSSLSocketFactory, defaultHostnameVerifier));
+                .onFinished(() -> {
+                    URLDownload.setSSLVerification(defaultSSLSocketFactory, defaultHostnameVerifier);
+                    downloadProgress.unbind();
+                    downloadProgress.set(1);
+                });
     }
 
     private Optional<ExternalFileType> inferFileType(URLDownload urlDownload) {
@@ -295,4 +298,32 @@ private Optional<ExternalFileType> inferFileTypeFromURL(String url) {
         return URLUtil.getSuffix(url, filePreferences)
                       .flatMap(extension -> ExternalFileTypes.getExternalFileTypeByExt(extension, filePreferences));
     }
+
+    public ReadOnlyDoubleProperty downloadProgress() {
+        return downloadProgress;
+    }
+
+    private static class FileDownloadTask extends BackgroundTask<Path> {
+        private final URL source;
+        private final Path destination;
+
+        public FileDownloadTask(URL source, Path destination) {
+            this.source = source;
+            this.destination = destination;
+        }
+
+        @Override
+        protected Path call() throws Exception {
+            URLDownload download = new URLDownload(source);
+            try (ProgressInputStream inputStream = download.asInputStream()) {
+                EasyBind.subscribe(
+                        inputStream.totalNumBytesReadProperty(),
+                        bytesRead -> updateProgress(bytesRead.longValue(), inputStream.getMaxNumBytes()));
+                // Make sure directory exists since otherwise copy fails
+                Files.createDirectories(destination.getParent());
+                Files.copy(inputStream, destination, StandardCopyOption.REPLACE_EXISTING);
+            }
+            return destination;
+        }
+    }
 }

From 8f3f55bef0622f79dcfc375846ae5802d87b6700 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Thu, 15 Feb 2024 23:14:57 +0100
Subject: [PATCH 18/21] DownloadLinkedFileActionTest

Co-authored-by: Christoph <siedlerkiller@gmail.com>
---
 .../gui/externalfiles/FileDownloadTask.java   | 40 ---------
 .../linkedfile/DownloadLinkedFileAction.java  | 87 +++++++------------
 .../fieldeditors/LinkedFileViewModelTest.java | 45 ----------
 .../DownloadLinkedFileActionTest.java         | 86 ++++++++++++++++++
 4 files changed, 115 insertions(+), 143 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/externalfiles/FileDownloadTask.java
 create mode 100644 src/test/java/org/jabref/gui/linkedfile/DownloadLinkedFileActionTest.java

diff --git a/src/main/java/org/jabref/gui/externalfiles/FileDownloadTask.java b/src/main/java/org/jabref/gui/externalfiles/FileDownloadTask.java
deleted file mode 100644
index cb49f8f7f11..00000000000
--- a/src/main/java/org/jabref/gui/externalfiles/FileDownloadTask.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.jabref.gui.externalfiles;
-
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-
-import org.jabref.gui.util.BackgroundTask;
-import org.jabref.logic.net.ProgressInputStream;
-import org.jabref.logic.net.URLDownload;
-
-import com.tobiasdiez.easybind.EasyBind;
-
-public class FileDownloadTask extends BackgroundTask<Path> {
-
-    private final URL source;
-    private final Path destination;
-
-    public FileDownloadTask(URL source, Path destination) {
-        this.source = source;
-        this.destination = destination;
-    }
-
-    @Override
-    protected Path call() throws Exception {
-        URLDownload download = new URLDownload(source);
-        try (ProgressInputStream inputStream = download.asInputStream()) {
-            EasyBind.subscribe(
-                    inputStream.totalNumBytesReadProperty(),
-                    bytesRead -> updateProgress(bytesRead.longValue(), inputStream.getMaxNumBytes()));
-
-            // Make sure directory exists since otherwise copy fails
-            Files.createDirectories(destination.getParent());
-
-            Files.copy(inputStream, destination, StandardCopyOption.REPLACE_EXISTING);
-        }
-
-        return destination;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
index 05792e9c6d7..e5ac2660ce3 100644
--- a/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
+++ b/src/main/java/org/jabref/gui/linkedfile/DownloadLinkedFileAction.java
@@ -2,9 +2,11 @@
 
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
 import java.util.Optional;
-import java.util.concurrent.Future;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
@@ -18,11 +20,10 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.LibraryTab;
 import org.jabref.gui.actions.SimpleCommand;
-import org.jabref.gui.externalfiles.FileDownloadTask;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.externalfiletype.StandardExternalFileType;
-import org.jabref.gui.externalfiletype.UnknownExternalFileType;
+import org.jabref.gui.fieldeditors.LinkedFilesEditorViewModel;
 import org.jabref.gui.fieldeditors.URLUtil;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.TaskExecutor;
@@ -30,6 +31,7 @@
 import org.jabref.logic.importer.FetcherClientException;
 import org.jabref.logic.importer.FetcherServerException;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.net.ProgressInputStream;
 import org.jabref.logic.net.URLDownload;
 import org.jabref.logic.util.io.FileNameUniqueness;
 import org.jabref.logic.util.io.FileUtil;
@@ -38,6 +40,7 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.preferences.FilePreferences;
 
+import com.tobiasdiez.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -78,28 +81,6 @@ public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
         this.linkedFileHandler = new LinkedFileHandler(linkedFile, entry, databaseContext, filePreferences);
     }
 
-    public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
-                                    BibEntry entry,
-                                    LinkedFile linkedFile,
-                                    String downloadUrl,
-                                    DialogService dialogService,
-                                    FilePreferences filePreferences,
-                                    TaskExecutor taskExecutor,
-                                    String suggestedName) {
-        this(databaseContext, entry, linkedFile, downloadUrl, dialogService, filePreferences, taskExecutor, suggestedName, null);
-    }
-
-    public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
-                                    BibEntry entry,
-                                    LinkedFile linkedFile,
-                                    String downloadUrl,
-                                    DialogService dialogService,
-                                    FilePreferences filePreferences,
-                                    TaskExecutor taskExecutor,
-                                    DoubleProperty downloadProgress) {
-        this(databaseContext, entry, linkedFile, downloadUrl, dialogService, filePreferences, taskExecutor, "", downloadProgress);
-    }
-
     public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
                                     BibEntry entry,
                                     LinkedFile linkedFile,
@@ -107,7 +88,7 @@ public DownloadLinkedFileAction(BibDatabaseContext databaseContext,
                                     DialogService dialogService,
                                     FilePreferences filePreferences,
                                     TaskExecutor taskExecutor) {
-        this(databaseContext, entry, linkedFile, downloadUrl, dialogService, filePreferences, taskExecutor, "", null);
+        this(databaseContext, entry, linkedFile, downloadUrl, dialogService, filePreferences, taskExecutor, "");
     }
 
     @Override
@@ -137,10 +118,7 @@ public void execute() {
 
     private void doDownload(Path targetDirectory, URLDownload urlDownload) {
         BackgroundTask<Path> downloadTask = prepareDownloadTask(targetDirectory, urlDownload);
-        if (downloadProgress != null) {
-            downloadProgress.bind(downloadTask.workDonePercentageProperty());
-            // If not given, we show it after the task is started
-        }
+        downloadProgress.bind(downloadTask.workDonePercentageProperty());
 
         downloadTask.titleProperty().set(Localization.lang("Downloading"));
         entry.getCitationKey().ifPresentOrElse(
@@ -151,23 +129,16 @@ private void doDownload(Path targetDirectory, URLDownload urlDownload) {
         downloadTask.onFailure(ex -> onFailure(urlDownload, ex));
         downloadTask.onSuccess(destination -> onSuccess(targetDirectory, destination));
 
-        Future<Path> taskFuture = taskExecutor.execute(downloadTask);
-        if (downloadProgress == null) {
-            Task<Path> task = (Task<Path>) taskFuture;
-            if (task != null) {
-                dialogService.showProgressDialog(
-                        Localization.lang("Downloading"),
-                        Localization.lang("Looking for full text document..."),
-                        task);
-            }
-        }
+        taskExecutor.execute(downloadTask);
     }
 
     private void onSuccess(Path targetDirectory, Path destination) {
         boolean isDuplicate;
+        boolean isHtml;
         try {
             isDuplicate = FileNameUniqueness.isDuplicatedFile(targetDirectory, destination.getFileName(), dialogService);
-        } catch (IOException e) {
+        } catch (
+                IOException e) {
             LOGGER.error("FileNameUniqueness.isDuplicatedFile failed", e);
             return;
         }
@@ -175,27 +146,27 @@ private void onSuccess(Path targetDirectory, Path destination) {
         if (isDuplicate) {
             destination = targetDirectory.resolve(
                     FileNameUniqueness.eraseDuplicateMarks(destination.getFileName()));
-        }
 
-        // If the file type was set to URL because it was a link, try to find a more suitable type now
-        if (linkedFile.getFileType().equals(StandardExternalFileType.URL.getName())) {
-            String fileExtension = FileUtil.getFileExtension(destination).orElse("");
-            ExternalFileType suggestedFileType = ExternalFileTypes.getExternalFileTypeByExt(fileExtension, filePreferences)
-                                                                  .orElse(new UnknownExternalFileType(fileExtension));
-            linkedFile.setFileType(suggestedFileType.getName());
-        }
+            linkedFile.setLink(FileUtil.relativize(destination,
+                    databaseContext.getFileDirectories(filePreferences)).toString());
 
-        // Store the download url to the source URL
-        if (linkedFile.getSourceUrl().isEmpty()) {
-            linkedFile.setSourceURL(linkedFile.getLink());
+            isHtml = linkedFile.getFileType().equals(StandardExternalFileType.URL.getName());
+        } else {
+            // we need to call LinkedFileViewModel#fromFile, because we need to make the path relative to the configured directories
+            LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(
+                    destination,
+                    databaseContext.getFileDirectories(filePreferences),
+                    filePreferences);
+            if (newLinkedFile.getDescription().isEmpty() && !linkedFile.getDescription().isEmpty()) {
+                newLinkedFile.setDescription((linkedFile.getDescription()));
+            }
+            newLinkedFile.setSourceURL(linkedFile.getLink());
+            entry.replaceDownloadedFile(linkedFile.getLink(), newLinkedFile);
+            isHtml = newLinkedFile.getFileType().equals(StandardExternalFileType.URL.getName());
         }
 
-        // Set the linked file's link to the downloaded file's path
-        linkedFile.setLink(FileUtil.relativize(destination,
-                databaseContext.getFileDirectories(filePreferences)).toString());
-
         // Notify in bar when the file type is HTML.
-        if (linkedFile.getFileType().equals(StandardExternalFileType.URL.getName())) {
+        if (isHtml) {
             dialogService.notify(Localization.lang("Downloaded website as an HTML file."));
             LOGGER.debug("Downloaded website {} as an HTML file at {}", linkedFile.getLink(), destination);
         }
@@ -246,7 +217,7 @@ private boolean checkSSLHandshake(URLDownload urlDownload) {
         return true;
     }
 
-    public BackgroundTask<Path> prepareDownloadTask(Path targetDirectory, URLDownload urlDownload) {
+    private BackgroundTask<Path> prepareDownloadTask(Path targetDirectory, URLDownload urlDownload) {
         SSLSocketFactory defaultSSLSocketFactory = HttpsURLConnection.getDefaultSSLSocketFactory();
         HostnameVerifier defaultHostnameVerifier = HttpsURLConnection.getDefaultHostnameVerifier();
         return BackgroundTask
diff --git a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
index aa2522e5668..65d233257f6 100644
--- a/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
+++ b/src/test/java/org/jabref/gui/fieldeditors/LinkedFileViewModelTest.java
@@ -8,8 +8,6 @@
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.TreeSet;
@@ -22,12 +20,9 @@
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.externalfiletype.StandardExternalFileType;
-import org.jabref.gui.linkedfile.DownloadLinkedFileAction;
-import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.CurrentThreadTaskExecutor;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.externalfiles.LinkedFileHandler;
-import org.jabref.logic.net.URLDownload;
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -37,7 +32,6 @@
 import org.jabref.testutils.category.FetcherTest;
 
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
@@ -200,45 +194,6 @@ void downloadHtmlFileCausesWarningDisplay() throws MalformedURLException {
         verify(dialogService, atLeastOnce()).notify("Downloaded website as an HTML file.");
     }
 
-    @FetcherTest
-    @Test
-    void downloadOfFileReplacesLink(@TempDir Path tempFolder) throws Exception {
-        linkedFile = new LinkedFile(new URL("http://arxiv.org/pdf/1207.0408v1"), "");
-        entry.setFiles(new ArrayList<>(List.of(linkedFile)));
-
-        databaseContext = mock(BibDatabaseContext.class);
-        when(databaseContext.getFirstExistingFileDir(any())).thenReturn(Optional.of(tempFolder));
-
-        when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
-        when(filePreferences.getFileDirectoryPattern()).thenReturn("");
-
-        LinkedFileViewModel viewModel = new LinkedFileViewModel(linkedFile, entry, databaseContext, new CurrentThreadTaskExecutor(), dialogService, preferences);
-        viewModel.download();
-
-        assertEquals(List.of(new LinkedFile("", tempFolder.resolve("asdf.pdf"), "PDF")), entry.getFiles());
-    }
-
-    @FetcherTest
-    @Test
-    void downloadDoesNotOverwriteFileTypeExtension() throws Exception {
-        linkedFile = new LinkedFile(new URL("http://arxiv.org/pdf/1207.0408v1"), "");
-
-        databaseContext = mock(BibDatabaseContext.class);
-        when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
-        when(filePreferences.getFileDirectoryPattern()).thenReturn("");
-
-        DownloadLinkedFileAction downloadLinkedFileAction = new DownloadLinkedFileAction(databaseContext, entry, linkedFile, linkedFile.getLink(), dialogService, preferences.getFilePreferences(), new CurrentThreadTaskExecutor());
-
-        BackgroundTask<Path> task = downloadLinkedFileAction.prepareDownloadTask(tempFile.getParent(), new URLDownload("http://arxiv.org/pdf/1207.0408v1"));
-        task.onSuccess(destination -> {
-            LinkedFile newLinkedFile = LinkedFilesEditorViewModel.fromFile(destination, Collections.singletonList(tempFile.getParent()), filePreferences);
-            assertEquals("asdf.pdf", newLinkedFile.getLink());
-            assertEquals("PDF", newLinkedFile.getFileType());
-        });
-        task.onFailure(Assertions::fail);
-        new CurrentThreadTaskExecutor().execute(task);
-    }
-
     @FetcherTest
     @Test
     void downloadHtmlWhenLinkedFilePointsToHtml() throws MalformedURLException {
diff --git a/src/test/java/org/jabref/gui/linkedfile/DownloadLinkedFileActionTest.java b/src/test/java/org/jabref/gui/linkedfile/DownloadLinkedFileActionTest.java
new file mode 100644
index 00000000000..054c946bf15
--- /dev/null
+++ b/src/test/java/org/jabref/gui/linkedfile/DownloadLinkedFileActionTest.java
@@ -0,0 +1,86 @@
+package org.jabref.gui.linkedfile;
+
+import java.net.CookieHandler;
+import java.net.CookieManager;
+import java.net.CookiePolicy;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Optional;
+import java.util.TreeSet;
+
+import javafx.collections.FXCollections;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.externalfiletype.ExternalFileTypes;
+import org.jabref.gui.util.CurrentThreadTaskExecutor;
+import org.jabref.logic.xmp.XmpPreferences;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.LinkedFile;
+import org.jabref.preferences.FilePreferences;
+import org.jabref.preferences.PreferencesService;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class DownloadLinkedFileActionTest {
+    private BibEntry entry;
+    private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);;
+    private DialogService dialogService;
+    private final FilePreferences filePreferences = mock(FilePreferences.class);
+    private final PreferencesService preferences = mock(PreferencesService.class);
+
+    @BeforeEach
+    void setUp(@TempDir Path tempFolder) throws Exception {
+        entry = new BibEntry()
+                .withCitationKey("asdf");
+
+        dialogService = mock(DialogService.class);
+
+        when(filePreferences.getExternalFileTypes()).thenReturn(FXCollections.observableSet(new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes())));
+        when(preferences.getFilePreferences()).thenReturn(filePreferences);
+        when(preferences.getXmpPreferences()).thenReturn(mock(XmpPreferences.class));
+        Path tempFile = tempFolder.resolve("temporaryFile");
+        Files.createFile(tempFile);
+
+        // Check if there exists a system-wide cookie handler
+        CookieManager cookieManager;
+        if (CookieHandler.getDefault() == null) {
+            cookieManager = new CookieManager();
+            CookieHandler.setDefault(cookieManager);
+        } else {
+            cookieManager = (CookieManager) CookieHandler.getDefault();
+        }
+        cookieManager.setCookiePolicy(CookiePolicy.ACCEPT_ALL);
+    }
+
+    @Test
+    void replacesLinkedFiles(@TempDir Path tempFolder) throws Exception {
+        String url = "http://arxiv.org/pdf/1207.0408v1";
+
+        LinkedFile linkedFile = new LinkedFile(new URL(url), "");
+        when(databaseContext.getFirstExistingFileDir(any())).thenReturn(Optional.of(tempFolder));
+        when(filePreferences.getFileNamePattern()).thenReturn("[citationkey]");
+        when(filePreferences.getFileDirectoryPattern()).thenReturn("");
+
+        DownloadLinkedFileAction downloadLinkedFileAction = new DownloadLinkedFileAction(
+                databaseContext,
+                entry,
+                linkedFile,
+                linkedFile.getLink(),
+                dialogService,
+                preferences.getFilePreferences(),
+                new CurrentThreadTaskExecutor());
+        downloadLinkedFileAction.execute();
+
+        assertEquals(List.of(new LinkedFile("", tempFolder.resolve("asdf.pdf"), "PDF", url)), entry.getFiles());
+    }
+}

From e39c8f5d4ee66dd51216090bab6428ad58cf9afa Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Thu, 15 Feb 2024 23:20:49 +0100
Subject: [PATCH 19/21] Fixed checkstyle

---
 .../gui/linkedfile/DownloadLinkedFileActionTest.java       | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/jabref/gui/linkedfile/DownloadLinkedFileActionTest.java b/src/test/java/org/jabref/gui/linkedfile/DownloadLinkedFileActionTest.java
index 054c946bf15..890c3884730 100644
--- a/src/test/java/org/jabref/gui/linkedfile/DownloadLinkedFileActionTest.java
+++ b/src/test/java/org/jabref/gui/linkedfile/DownloadLinkedFileActionTest.java
@@ -33,8 +33,9 @@
 
 class DownloadLinkedFileActionTest {
     private BibEntry entry;
-    private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);;
-    private DialogService dialogService;
+
+    private final BibDatabaseContext databaseContext = mock(BibDatabaseContext.class);
+    private final DialogService dialogService = mock(DialogService.class);
     private final FilePreferences filePreferences = mock(FilePreferences.class);
     private final PreferencesService preferences = mock(PreferencesService.class);
 
@@ -43,8 +44,6 @@ void setUp(@TempDir Path tempFolder) throws Exception {
         entry = new BibEntry()
                 .withCitationKey("asdf");
 
-        dialogService = mock(DialogService.class);
-
         when(filePreferences.getExternalFileTypes()).thenReturn(FXCollections.observableSet(new TreeSet<>(ExternalFileTypes.getDefaultExternalFileTypes())));
         when(preferences.getFilePreferences()).thenReturn(filePreferences);
         when(preferences.getXmpPreferences()).thenReturn(mock(XmpPreferences.class));

From 7d019ae0e0b262082da01e2d15d8567b57cc3832 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sun, 18 Feb 2024 21:43:01 +0100
Subject: [PATCH 20/21] Revert "Change file field format to be backwards
 compatible with old versions with mediaType."

This reverts commit 2230310fce66d9c705a3857878f8f33b1bf1030b.
---
 .../jabref/logic/bibtex/FileFieldWriter.java  |  2 +-
 .../logic/importer/util/FileFieldParser.java  |  7 ++----
 .../importer/util/FileFieldParserTest.java    | 25 ++-----------------
 3 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java b/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
index 057f31ca194..2a3c9ef665a 100644
--- a/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
+++ b/src/main/java/org/jabref/logic/bibtex/FileFieldWriter.java
@@ -20,7 +20,7 @@ public static String getStringRepresentation(List<LinkedFile> fields) {
             if (StringUtil.isNullOrEmpty(entry.getSourceUrl())) {
                 array[i] = new String[] {entry.getDescription(), entry.getLink(), entry.getFileType()};
             } else {
-                array[i] = new String[] {entry.getDescription(), entry.getLink(), entry.getFileType(), "", entry.getSourceUrl()};
+                array[i] = new String[] {entry.getDescription(), entry.getLink(), entry.getFileType(), entry.getSourceUrl()};
             }
             i++;
         }
diff --git a/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
index 8d23de6e8a4..80661eb8776 100644
--- a/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
@@ -137,9 +137,6 @@ private void resetDataStructuresForNextElement() {
      *
      * SIDE EFFECT: The given entry list is cleared upon completion
      *
-     * Expected format is: description:link:fileType:mediaType:sourceURL
-     * mediaType is not currently used, but documented here for reference to backwards compatibility
-     *
      * @param entry the list of elements in the linked file textual representation
      * @return a LinkedFile object
      */
@@ -175,8 +172,8 @@ static LinkedFile convert(List<String> entry) {
             }
         }
 
-        if (entry.size() > 4) {
-            field.setSourceURL(entry.get(4));
+        if (entry.size() > 3) {
+            field.setSourceURL(entry.get(3));
         }
 
         // link is the only mandatory field
diff --git a/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java b/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
index 90a90aa3d7e..2157694446a 100644
--- a/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
@@ -150,12 +150,6 @@ private static Stream<Arguments> stringsToParseTest() throws Exception {
                         "::file.pdf"
                 ),
 
-                // tooManySeparators
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile("desc", Path.of("file.pdf"), "PDF", "asdf")),
-                        "desc:file.pdf:PDF:qwer:asdf:uiop"
-                ),
-
                 // www inside filename
                 Arguments.of(
                         Collections.singletonList(new LinkedFile("", Path.of("/home/www.google.de.pdf"), "")),
@@ -186,23 +180,8 @@ private static Stream<Arguments> stringsToParseTest() throws Exception {
                 ),
                 // link with source url
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("arXiv Fulltext PDF", "matheus.ea explicit.pdf", "PDF", "https://arxiv.org/pdf/1109.0517.pdf")),
-                        "arXiv Fulltext PDF:matheus.ea explicit.pdf:PDF::https\\://arxiv.org/pdf/1109.0517.pdf"
-                ),
-                // link without description and with source url
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile("", "matheus.ea explicit.pdf", "PDF", "https://arxiv.org/pdf/1109.0517.pdf")),
-                        ":matheus.ea explicit.pdf:PDF::https\\://arxiv.org/pdf/1109.0517.pdf"
-                ),
-                // no link but with source url
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile("arXiv Fulltext PDF", "", "PDF", "https://arxiv.org/pdf/1109.0517.pdf")),
-                        "arXiv Fulltext PDF::PDF::https\\://arxiv.org/pdf/1109.0517.pdf"
-                ),
-                // No description or file type but with sourceURL
-                Arguments.of(
-                        Collections.singletonList(new LinkedFile("", "matheus.ea explicit.pdf", "", "https://arxiv.org/pdf/1109.0517.pdf")),
-                        ":matheus.ea explicit.pdf:::https\\://arxiv.org/pdf/1109.0517.pdf"
+                        Collections.singletonList(new LinkedFile("arXiv Fulltext PDF", "matheus.ea explicit.pdf", "application/pdf", "https://arxiv.org/pdf/1109.0517.pdf")),
+                        "arXiv Fulltext PDF:matheus.ea explicit.pdf:application/pdf:https\\://arxiv.org/pdf/1109.0517.pdf"
                 )
         );
     }

From d0c7bbf835d2217a5ec1d2385dca0b3a2bbc58dc Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sun, 18 Feb 2024 21:46:25 +0100
Subject: [PATCH 21/21] Reapply and modify good tests

---
 .../logic/importer/util/FileFieldParser.java  |  3 +++
 .../importer/util/FileFieldParserTest.java    | 25 +++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
index 80661eb8776..a180e51c9ad 100644
--- a/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
+++ b/src/main/java/org/jabref/logic/importer/util/FileFieldParser.java
@@ -137,6 +137,9 @@ private void resetDataStructuresForNextElement() {
      *
      * SIDE EFFECT: The given entry list is cleared upon completion
      *
+     * Expected format is: description:link:fileType:sourceURL
+     * fileType is an {@link org.jabref.gui.externalfiletype.ExternalFileType}, which contains a name and a mime type
+     *
      * @param entry the list of elements in the linked file textual representation
      * @return a LinkedFile object
      */
diff --git a/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java b/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
index 2157694446a..1f5e1b17a43 100644
--- a/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
+++ b/src/test/java/org/jabref/logic/importer/util/FileFieldParserTest.java
@@ -150,6 +150,12 @@ private static Stream<Arguments> stringsToParseTest() throws Exception {
                         "::file.pdf"
                 ),
 
+                // tooManySeparators
+                Arguments.of(
+                        Collections.singletonList(new LinkedFile("desc", Path.of("file.pdf"), "PDF", "qwer")),
+                        "desc:file.pdf:PDF:qwer:asdf:uiop"
+                ),
+
                 // www inside filename
                 Arguments.of(
                         Collections.singletonList(new LinkedFile("", Path.of("/home/www.google.de.pdf"), "")),
@@ -180,8 +186,23 @@ private static Stream<Arguments> stringsToParseTest() throws Exception {
                 ),
                 // link with source url
                 Arguments.of(
-                        Collections.singletonList(new LinkedFile("arXiv Fulltext PDF", "matheus.ea explicit.pdf", "application/pdf", "https://arxiv.org/pdf/1109.0517.pdf")),
-                        "arXiv Fulltext PDF:matheus.ea explicit.pdf:application/pdf:https\\://arxiv.org/pdf/1109.0517.pdf"
+                        Collections.singletonList(new LinkedFile("arXiv Fulltext PDF", "matheus.ea explicit.pdf", "PDF", "https://arxiv.org/pdf/1109.0517.pdf")),
+                        "arXiv Fulltext PDF:matheus.ea explicit.pdf:PDF:https\\://arxiv.org/pdf/1109.0517.pdf"
+                ),
+                // link without description and with source url
+                Arguments.of(
+                        Collections.singletonList(new LinkedFile("", "matheus.ea explicit.pdf", "PDF", "https://arxiv.org/pdf/1109.0517.pdf")),
+                        ":matheus.ea explicit.pdf:PDF:https\\://arxiv.org/pdf/1109.0517.pdf"
+                ),
+                // no link but with source url
+                Arguments.of(
+                        Collections.singletonList(new LinkedFile("arXiv Fulltext PDF", "", "PDF", "https://arxiv.org/pdf/1109.0517.pdf")),
+                        "arXiv Fulltext PDF::PDF:https\\://arxiv.org/pdf/1109.0517.pdf"
+                ),
+                // No description or file type but with sourceURL
+                Arguments.of(
+                        Collections.singletonList(new LinkedFile("", "matheus.ea explicit.pdf", "", "https://arxiv.org/pdf/1109.0517.pdf")),
+                        ":matheus.ea explicit.pdf::https\\://arxiv.org/pdf/1109.0517.pdf"
                 )
         );
     }