Add check for HEIC file attachments

Author: georgweiss

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/Messages.java

@@ -40,6 +40,7 @@ public class Messages
             GroupingFailed,
             GroupSelectedEntries,
             JumpToLogEntry,
+            HeicFilesNotSupported,
             Level,
             Logbook,
             LogbookNotSupported,

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/AttachmentsEditorController.java

@@ -291,11 +291,18 @@ public void setTextArea(TextArea textArea) {
         this.textArea = textArea;
     }
 
+    /**
+     * Add
+     * @param files
+     */
     private void addFiles(List<File> files) {
         Platform.runLater(() -> sizesErrorMessage.set(null));
         if (!checkFileSizes(files)) {
             return;
         }
+        if(!checkForHeicFiles(files)){
+            return;
+        }
         MimetypesFileTypeMap fileTypeMap = new MimetypesFileTypeMap();
         for (File file : files) {
             OlogAttachment ologAttachment = new OlogAttachment();
@@ -403,4 +410,31 @@ private void showTotalSizeExceedsLimit() {
     public void clearAttachments(){
         getAttachments().clear();
     }
+
+    /**
+     * Checks if any of the attached files uses extension heic or heics, which are unsupported. If a heic file
+     * is detected, an error dialog is shown.
+     * @param files List of {@link File}s to check.
+     * @return <code>true</code> if all is well, i.e. no heic files deyected, otherwise <code>false</code>.
+     */
+    private boolean checkForHeicFiles(List<File> files){
+        if(hasHeicFiles(files)){
+            Alert alert = new Alert(AlertType.ERROR);
+            alert.setHeaderText(Messages.HeicFilesNotSupported);
+            DialogHelper.positionDialog(alert, textArea, -200, -100);
+            alert.show();
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Checks for heic(s) file extension. Ideally Apache Tika should be used to detect heic content.
+     * @param files List of {@link File}s to check.
+     * @return <code>true</code> if all is well, i.e. no heic files deyected, otherwise <code>false</code>.
+     */
+    private boolean hasHeicFiles(List<File> files){
+        return files.stream().filter(f ->
+                (f.getName().toLowerCase().endsWith(".heic") || f.getName().toLowerCase().endsWith(".heics"))).findFirst().isPresent();
+    }
 }

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/write/EmbedImageDialogController.java

@@ -45,6 +45,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.util.List;
 import java.util.ResourceBundle;
 import java.util.UUID;
 import java.util.logging.Level;
@@ -55,49 +56,60 @@
  */
 public class EmbedImageDialogController implements Initializable{
 
+    @SuppressWarnings("unused")
     @FXML
     private DialogPane dialogPane;
+    @SuppressWarnings("unused")
     @FXML
     private Label fileLabel;
+    @SuppressWarnings("unused")
     @FXML
     private Label widthLabel;
+    @SuppressWarnings("unused")
     @FXML
     private Label heightLabel;
+    @SuppressWarnings("unused")
     @FXML
     private Button browseButton;
+    @SuppressWarnings("unused")
     @FXML
     private Button clipboardButton;
+    @SuppressWarnings("unused")
     @FXML
     private TextField fileName;
+    @SuppressWarnings("unused")
     @FXML
     private TextField width;
+    @SuppressWarnings("unused")
     @FXML
     private TextField height;
+    @SuppressWarnings("unused")
     @FXML
     private Label scaleLabel;
+    @SuppressWarnings("unused")
     @FXML
     private TextField scale;
 
     /**
      * This is set when image is selected from file or clipboard. It is not bound to
      * a UI component.
      */
-    private IntegerProperty widthProperty = new SimpleIntegerProperty();
+    private final IntegerProperty widthProperty = new SimpleIntegerProperty();
     /**
      * This is the computed width value rendered in the UI component.
      */
-    private IntegerProperty scaledWidthProperty = new SimpleIntegerProperty();
+    private final IntegerProperty scaledWidthProperty = new SimpleIntegerProperty();
     /**
      * This is set when image is selected from file or clipboard. It is not bound to
      * a UI component.
      */
-    private IntegerProperty heightProperty = new SimpleIntegerProperty();
+    private final IntegerProperty heightProperty = new SimpleIntegerProperty();
     /**
      * This is the computed width value rendered in the UI component.
      */
-    private IntegerProperty scaledHeightProperty = new SimpleIntegerProperty();
-    private SimpleStringProperty filenameProperty = new SimpleStringProperty();
-    private DoubleProperty scaleProperty = new SimpleDoubleProperty(1.0);
+    private final IntegerProperty scaledHeightProperty = new SimpleIntegerProperty();
+    private final SimpleStringProperty filenameProperty = new SimpleStringProperty();
+    private final DoubleProperty scaleProperty = new SimpleDoubleProperty(1.0);
 
     private String id;
 
@@ -127,13 +139,14 @@ public void initialize(URL url, ResourceBundle resourceBundle){
         dialogPane.lookupButton(ButtonType.OK).disableProperty().bind(okButtonBinding);
     }
 
+    @SuppressWarnings("unused")
     @FXML
     public void browse(){
         FileChooser fileChooser = new FileChooser();
         fileChooser.setTitle(Messages.SelectFile);
         fileChooser.getExtensionFilters().addAll(
-                new FileChooser.ExtensionFilter("Image files (jpg, png, gif)", "*.jpg", "*.png", "*.gif"),
-                new FileChooser.ExtensionFilter("All files", "*.*")
+                new FileChooser.ExtensionFilter("Image files (jpg, jpeg, png, gif)", "*.jpg", "*.jpeg", "*.png", "*.gif")
+
         );
 
         File file = fileChooser.showOpenDialog(dialogPane.getScene().getWindow());
@@ -152,6 +165,7 @@ public void browse(){
         }
     }
 
+    @SuppressWarnings("unused")
     @FXML
     public void pasteClipboard(){
         image = Clipboard.getSystemClipboard().getImage();

app/logbook/olog/ui/src/main/resources/org/phoebus/logbook/olog/ui/messages.properties

@@ -57,6 +57,7 @@ HitsPerPage=Hits per page:
 ImageWidth=Width
 ImageHeight=Height
 JumpToLogEntry=Jump to Log Entry: 
+HeicFilesNotSupported=HEIC file attachments not supported
 Level=Level
 Logbook=Logbook
 Logbooks=Logbooks: