@radicalimaging/static-wado-creator 1.2.0 → 1.2.2

package/lib/StaticWado.js

@@ -73,7 +73,7 @@ class StaticWado {
       setStudyData,
       rawDicomWriter: RawDicomWriter(this.options),
       notificationService: new NotificationService(this.options.notificationDir),
-      internalGenerateImage
+      internalGenerateImage,
     };
   }
 
@@ -115,6 +115,7 @@ class StaticWado {
           Stats.StudyStats.add("DICOM P10", "Parse DICOM P10 file");
         } catch (e) {
           console.error("Couldn't process", file);
+          console.verbose("Error", e);
         }
       },
     });
@@ -206,11 +207,11 @@ class StaticWado {
   }
 
   static async getDataSet(dataSet, generator, params) {
-    return await getDataSet(dataSet, generator, params);
+    return getDataSet(dataSet, generator, params);
   }
 
   static internalGenerateImage(originalImageFrame, dataSet, metadata, transferSyntaxUid, doneCallback) {
-      return internalGenerateImage(originalImageFrame, dataSet, metadata, transferSyntaxUid, doneCallback)
+    return internalGenerateImage(originalImageFrame, dataSet, metadata, transferSyntaxUid, doneCallback);
   }
 
   /**

package/lib/mkdicomwebConfig.js

@@ -88,6 +88,11 @@ const { mkdicomwebConfig } = ConfigPoint.register({
         defaultValue: ["uncompressed"],
         choices: ["uncompressed", "jpeg", "jp2", "jpeglossless", "rle", "jph", "jls", "true", "none"],
       },
+      {
+        key: "-f, --force",
+        description: "Force the update even if the SOP exists",
+        defaultValue: false,
+      },
       {
         key: "--recompress-thumb <listvalue...>",
         description: "List of types to recompress thumb separated by space",

package/lib/operation/InstanceDeduplicate.js

@@ -18,7 +18,7 @@ const extractors = {
  * and then collects the deduplicate data into a list.
  * Whenever the study UID changes, a new event is fired to indicate the deduplicated data is ready.
  */
-async function deduplicateSingleInstance(id, imageFrame) {
+async function deduplicateSingleInstance(id, imageFrame, { force }) {
   if (!imageFrame) return {};
   const studyData = await this.completeStudy.getCurrentStudyData(this, id);
   const seriesUID = getValue(imageFrame, Tags.SeriesInstanceUID);
@@ -27,7 +27,7 @@ async function deduplicateSingleInstance(id, imageFrame) {
     console.warn("No sop instance UID in", imageFrame);
     return {};
   }
-  if (studyData.sopExists(sopUID)) {
+  if (!force && studyData.sopExists(sopUID)) {
     if (this.verbose) console.log("SOP Instance UID", sopUID, "already exists, skipping");
     // TODO - allow replace as an option
     // Null value means skip writing this instance
@@ -90,7 +90,7 @@ const InstanceDeduplicate = (options) =>
       this.verbose = options.verbose;
     }
 
-    const deduppedInstance = await this.deduplicateSingleInstance(id, imageFrame);
+    const deduppedInstance = await this.deduplicateSingleInstance(id, imageFrame, options);
     if (deduppedInstance) {
       // this refers to callee
       await this.deduplicated(id, deduppedInstance);

package/lib/operation/StudyData.js

@@ -364,7 +364,7 @@ class StudyData {
         index: false,
       });
       // Write out a series singleton that has just the series response for a single series.
-      await JSONWriter(seriesPath, "series-singleton.json", [seriesQuery], {gzip:true, index:false});
+      await JSONWriter(seriesPath, "series-singleton.json", [seriesQuery], { gzip: true, index: false });
       await JSONWriter(seriesPath, "instances", instancesQuery);
     }
 

package/lib/operation/ThumbnailService.js

@@ -96,7 +96,7 @@ class ThumbnailService {
       if (pixelData) {
         const { BulkDataURI } = pixelData;
         if (BulkDataURI?.indexOf("mp4")) {
-          const mp4Path = path.join(itemId.sopInstanceRootPath, "pixeldata.mp4");
+          const mp4Path = path.join(itemId.sopInstanceRootPath, "rendered/index.mp4");
           // Generate as rendered, as more back ends support that.
           const thumbPath = path.join(itemId.sopInstanceRootPath, "rendered");
           console.log("MP4 - converting video format", mp4Path);

package/lib/operation/adapter/transcodeImage.js

@@ -109,7 +109,7 @@ function getDestinationTranscoder(id) {
  * @returns
  */
 function getTranscoder(transferSyntaxUid, { contentType: greyContentType, colorContentType }, samplesPerPixel) {
-  const contentType = samplesPerPixel===3 ? colorContentType : greyContentType;
+  const contentType = samplesPerPixel === 3 ? colorContentType : greyContentType;
   const sourceTranscoder = transcodeSourceMap[transferSyntaxUid];
   const destinationTranscoder = getDestinationTranscoder(contentType);
   if (!sourceTranscoder || !destinationTranscoder) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@radicalimaging/static-wado-creator",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Library to convert DICOMP10 to DICOMweb format. Original upstream: https://github.com/chafey/dicomp10-to-dicomweb-js",
   "publishConfig": {
     "access": "public"
@@ -56,8 +56,8 @@
   },
   "dependencies": {
     "@cornerstonejs/dicom-codec": ">=0.1.6",
-    "@radicalimaging/static-cs-lite": ">=1.2.0",
-    "@radicalimaging/static-wado-util": ">=1.2.0",
+    "@radicalimaging/static-cs-lite": ">=1.2.1",
+    "@radicalimaging/static-wado-util": ">=1.2.1",
     "canvas": "^2.11.0",
     "config-point": ">=0.5.1",
     "dcmjs": "^0.29.5",