Unify DICOM import UX: handle ZIP drag-and-drop and consolidate into the "Local Device" dialog #793

Author: nroduit

weasis-core/src/main/java/org/weasis/core/api/media/data/MediaReader.java

@@ -27,6 +27,10 @@ public interface MediaReader<E extends MediaElement> extends Taggable {
 
   boolean delegate(DataExplorerModel explorerModel);
 
+  default boolean isOnlyDelegate() {
+    return false;
+  }
+
   MediaElement getPreview();
 
   PlanarImage getImageFragment(MediaElement media) throws Exception;

weasis-core/src/main/resources/mime-types.properties

@@ -136,7 +136,7 @@ xwd=image/x-xwindowdump
 gz=application/x-gzip,application/x-compressed
 gzip=application/x-gzip,multipart/x-gzip
 z=application/x-compress,application/x-compressed
-zip=application/zip,application/x-compressed
+zip=application/x-zip,application/x-compressed
 bz=application/x-bzip
 bz2=application/x-bzip2
 lzh=application/x-lzh
@@ -156,4 +156,4 @@ ppt=application/mspowerpoint
 pptx=application/vnd.openxmlformats-officedocument.presentationml.presentation
 rtf=text/rtf
 xls=application/vndms-excel
-xlsx=application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+xlsx=application/vnd.openxmlformats-officedocument.spreadsheetml.sheet

weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/DicomModel.java

@@ -94,7 +94,7 @@
 import org.weasis.dicom.explorer.HangingProtocols.OpeningViewer;
 import org.weasis.dicom.explorer.imp.DicomDirImport;
 import org.weasis.dicom.explorer.imp.DicomDirLoader;
-import org.weasis.dicom.explorer.imp.DicomZipImport;
+import org.weasis.dicom.explorer.imp.DicomZipMediaIO;
 import org.weasis.dicom.explorer.imp.LocalImport;
 import org.weasis.dicom.explorer.main.SeriesPane;
 import org.weasis.dicom.explorer.rs.RsQueryParams;
@@ -161,7 +161,8 @@ public List<Codec<MediaElement>> getCodecPlugins() {
       for (Codec<MediaElement> codec : codecs) {
         if (codec != null
             && !"JDK ImageIO".equals(codec.getCodecName()) // NON-NLS
-            && codec.isMimeTypeSupported(DicomMediaIO.DICOM_MIMETYPE)
+            && (codec.isMimeTypeSupported(DicomMediaIO.DICOM_MIMETYPE)
+                || codec.isMimeTypeSupported(DicomZipMediaIO.MIME_TYPE))
             && !codecPlugins.contains(codec)) {
           codecPlugins.add(codec);
         }
@@ -1172,7 +1173,7 @@ private void getCommand(
 
     if (opt.isSet("zip")) {
       for (String zip : zargs) {
-        DicomZipImport.loadDicomZip(zip, DicomModel.this);
+        DicomZipMediaIO.loadDicomZip(zip, DicomModel.this);
       }
     }
 

weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/LoadLocalDicom.java

@@ -25,6 +25,8 @@
 import org.weasis.dicom.codec.*;
 import org.weasis.dicom.codec.DicomMediaIO.Reading;
 import org.weasis.dicom.explorer.HangingProtocols.OpeningViewer;
+import org.weasis.dicom.explorer.imp.DicomZipCodec;
+import org.weasis.dicom.explorer.imp.DicomZipMediaIO;
 
 public class LoadLocalDicom extends LoadDicom {
 
@@ -67,16 +69,15 @@ protected void addSelectionAndNotify(File[] file, boolean firstLevel) {
       if (isCancelled()) {
         return;
       }
-      if (value == null) {
+      if (value == null || !value.canRead()) {
         continue;
       }
 
       if (value.isDirectory()) {
         if (firstLevel || recursive) {
           folders.add(value);
         }
-      } else if (value.canRead()
-              && FileUtil.isFileExtensionMatching(value.toPath(), DicomCodec.FILE_EXTENSIONS)
+      } else if (FileUtil.isFileExtensionMatching(value.toPath(), DicomCodec.FILE_EXTENSIONS)
           || MimeInspector.isMatchingMimeTypeFromMagicNumber(value, DicomMediaIO.DICOM_MIMETYPE)) {
         DicomMediaIO loader = new DicomMediaIO(value);
         Reading reading = loader.getReadingStatus();
@@ -94,6 +95,9 @@ protected void addSelectionAndNotify(File[] file, boolean firstLevel) {
         } else if (reading == Reading.ERROR) {
           errors.incrementAndGet();
         }
+      } else if (FileUtil.isFileExtensionMatching(value.toPath(), DicomZipCodec.FILE_EXTENSIONS)
+          || MimeInspector.isMatchingMimeTypeFromMagicNumber(value, DicomZipMediaIO.MIME_TYPE)) {
+        new DicomZipMediaIO(value.toURI(), null).delegate(dicomModel);
       }
     }
 

weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/imp/DicomImport.java

@@ -75,7 +75,6 @@ public DicomImport(Window parent, final DicomModel dicomModel) {
   protected void initializePages() {
     ArrayList<AbstractItemDialogPage> list = new ArrayList<>();
     list.add(new LocalImport());
-    list.add(new DicomZipImport());
     list.add(new DicomDirImport());
 
     BundleContext context = AppProperties.getBundleContext(this.getClass());

weasis-dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/imp/DicomZipCodec.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2009-2020 Weasis Team and other contributors.
+ *
+ * This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License 2.0 which is available at https://www.eclipse.org/legal/epl-2.0, or the Apache
+ * License, Version 2.0 which is available at https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+ */
+package org.weasis.dicom.explorer.imp;
+
+import java.net.URI;
+import java.util.Hashtable;
+import org.osgi.service.component.annotations.Component;
+import org.weasis.core.api.media.data.Codec;
+import org.weasis.core.api.media.data.MediaElement;
+import org.weasis.core.api.media.data.MediaReader;
+
+/** An OSGi {@link Codec} service that handles {@code .zip} files containing DICOM data. */
+@Component(service = Codec.class)
+public class DicomZipCodec implements Codec<MediaElement> {
+
+  public static final String NAME = "DICOM-ZIP"; // NON-NLS
+  public static final String MIME_TYPE = DicomZipMediaIO.MIME_TYPE;
+  public static final String[] FILE_EXTENSIONS = {"zip"}; // NON-NLS
+
+  @Override
+  public String getCodecName() {
+    return NAME;
+  }
+
+  @Override
+  public String[] getReaderMIMETypes() {
+    return new String[] {MIME_TYPE};
+  }
+
+  @Override
+  public String[] getReaderExtensions() {
+    return FILE_EXTENSIONS;
+  }
+
+  @Override
+  public String[] getWriterMIMETypes() {
+    return new String[0];
+  }
+
+  @Override
+  public String[] getWriterExtensions() {
+    return new String[0];
+  }
+
+  @Override
+  public boolean isMimeTypeSupported(String mimeType) {
+    return MIME_TYPE.equals(mimeType);
+  }
+
+  @Override
+  public MediaReader<MediaElement> getMediaIO(
+      URI media, String mimeType, Hashtable<String, Object> properties) {
+    if (isMimeTypeSupported(mimeType)) {
+      return new DicomZipMediaIO(media, this);
+    }
+    return null;
+  }
+}