@radicalimaging/static-wado-creator 0.6.5 → 1.2.0

package/CHANGELOG.md

@@ -0,0 +1,67 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [0.6.4](https://github.com/OHIF/static-wado/compare/@radicalimaging/static-wado-creator@0.6.3...@radicalimaging/static-wado-creator@0.6.4) (2022-04-04)
+
+**Note:** Version bump only for package @radicalimaging/static-wado-creator
+
+
+
+
+
+## [0.6.3](https://github.com/OHIF/static-wado/compare/@radicalimaging/static-wado-creator@0.6.2...@radicalimaging/static-wado-creator@0.6.3) (2022-03-14)
+
+**Note:** Version bump only for package @radicalimaging/static-wado-creator
+
+
+
+
+
+## [0.6.2](https://github.com/OHIF/static-wado/compare/@radicalimaging/static-wado-creator@0.6.1...@radicalimaging/static-wado-creator@0.6.2) (2022-03-04)
+
+**Note:** Version bump only for package @radicalimaging/static-wado-creator
+
+
+
+
+
+## [0.6.1](https://github.com/OHIF/static-wado/compare/@radicalimaging/static-wado-creator@0.6.0...@radicalimaging/static-wado-creator@0.6.1) (2022-03-04)
+
+**Note:** Version bump only for package @radicalimaging/static-wado-creator
+
+
+
+
+
+# [0.6.0](https://github.com/OHIF/static-wado/compare/@radicalimaging/static-wado-creator@0.5.1...@radicalimaging/static-wado-creator@0.6.0) (2022-03-03)
+
+
+### Bug Fixes
+
+* **static-wado:** make the various constructors use a straight configuration without using the program data ([1997d9f](https://github.com/OHIF/static-wado/commit/1997d9f0fe2e0a084d31edeb475494bcec78fd77))
+
+
+### Features
+
+* **static-wado:** qido series fallback to retrieve from proxyAe ([#8](https://github.com/OHIF/static-wado/issues/8)) ([47b5550](https://github.com/OHIF/static-wado/commit/47b55503732e25be08b215bdc201593f64de52e6))
+
+
+
+
+
+## 0.5.1 (2022-02-16)
+
+
+### Bug Fixes
+
+* **pencil:** add more files to lint, increase test config and README ([89b667c](https://github.com/OHIF/static-wado/commit/89b667c83d324ab9fa540cda0c037af8fe088f72))
+* **pencil:** adding must package and minor test changes ([9194f3f](https://github.com/OHIF/static-wado/commit/9194f3f1bb52da57e20bb8bb9f07262bcebdffbf))
+* **pencil:** code review.lint ([fa1a58a](https://github.com/OHIF/static-wado/commit/fa1a58a0c62015503575fbeb172b71810c6833de))
+* **pencil:** fix format ([68fbc9b](https://github.com/OHIF/static-wado/commit/68fbc9bf5a3e9bf85e3fbcddfb3e0759e79b769d))
+* **pencil:** fix lint and add pre-commit restr ([deec345](https://github.com/OHIF/static-wado/commit/deec34524531d5a8595a775bac414f63f60e9f23))
+* **pencil:** lint/prettier ([d6ecbc6](https://github.com/OHIF/static-wado/commit/d6ecbc6b5961e03e8a557f4fcc78af53549132cd))
+* **pencil:** moving from wado-js to wado repo ([5916aec](https://github.com/OHIF/static-wado/commit/5916aecd7c77dbc4882681877e2b51210976427f))
+* **pencil:** readme link name ([40408ab](https://github.com/OHIF/static-wado/commit/40408ab6b4e97c8656e30b1dd2c30b92440b9f90))
+* **pencil:** unit tests migration ([d9d56dd](https://github.com/OHIF/static-wado/commit/d9d56dd619fb1f41ed1d5ad85f7f804e013c6527))

package/README.md

@@ -158,11 +158,13 @@ There is currently no notification of what studies have been updated between sta
 ### To Serve Instances As a Web Server
 ```
 cd ~/dicomweb
-npx http-server -p 5000 -g --cors
+npx http-server -p 5000 -g --cors -e json
 ```
 
 The -g option serves up compressed files ending in .gz as compressed http streams.
 
+The -e option will mark json files as the default extension, so when requesting `GET dicomweb/studies/` the `./studies/index.json.gz` file will be served.
+
 ### To Create DICOM part 10 from DICOMweb files
 TODO
 

package/bin/mkdicomweb.js

@@ -5,5 +5,5 @@ const { configureProgram } = require("../lib/program");
 
 // Configure program commander
 configureProgram(mkdicomwebConfig).then(() => {
-  console.log("done");
+  console.verbose("done");
 });

package/lib/DeleteStudy.js

@@ -1,6 +1,6 @@
 const { JSONReader } = require("@radicalimaging/static-wado-util");
-const JSONWriter = require("./writer/JSONWriter");
-const Tags = require("./dictionary/Tags");
+const { JSONWriter } = require("@radicalimaging/static-wado-util");
+const { Tags } = require("@radicalimaging/static-wado-util");
 
 module.exports = (options) =>
   async function (studyInstanceUid) {

package/lib/RejectInstance.js

@@ -1,16 +1,23 @@
-const dataExtractor = /^(.*studies)?[\\/]?([^/\\]+)[\\/](series[\\/])?([^/\\]+)([\\/]instances[\\/]([^/\\]*))?$/;
+const dataExtractor = /^(.*studies)?[\\/]?([0-9.a-zA-Z]+)[\\/](series[\\/])?([0-9.a-zA-Z]+)([\\/]instances[\\/]([0-9.a-zA-Z]*))?$/;
 
-module.exports = (options) =>
-  async function (rejectPath, reason) {
-    console.log("Reject instance", rejectPath, reason);
-    const extracted = rejectPath.match(dataExtractor);
-    if (!extracted) {
-      console.log("Unable to reject", rejectPath, "because it isn't in the format studies/<studyUID>/series/<seriesUID>");
-      return;
+module.exports = () =>
+  async function rejectInstanceWithOptions(args) {
+    let studyInstanceUid = args[0];
+    let seriesInstanceUid;
+    let sopInstanceUid;
+    const reason = args[2] || "REJECT";
+    const extracted = args[0].match(dataExtractor);
+    if (extracted) {
+      studyInstanceUid = extracted[2];
+      seriesInstanceUid = extracted[4];
+      sopInstanceUid = extracted[6];
+      console.log("Extracted", studyInstanceUid, seriesInstanceUid, sopInstanceUid, reason);
+    } else {
+      console.log("Not extracting from URL", studyInstanceUid, seriesInstanceUid, reason);
+      seriesInstanceUid = args[1];
     }
-    const [, , studyInstanceUid, , seriesInstanceUid, , sopInstanceUid] = extracted;
-    const studyData = await this.scanStudy("studies", studyInstanceUid);
-    if (options.verbose) console.log("Trying to reject", seriesInstanceUid, "because", reason);
+    const studyData = await this.scanStudy(studyInstanceUid);
+    console.verbose("Trying to reject", seriesInstanceUid, "because", reason);
     await studyData.reject(seriesInstanceUid, sopInstanceUid, reason);
     await studyData.writeDeduplicatedGroup();
     return studyData.writeMetadata();

package/lib/StaticWado.js

@@ -1,11 +1,10 @@
 const dicomCodec = require("@cornerstonejs/dicom-codec");
-const { Stats, handleHomeRelative } = require("@radicalimaging/static-wado-util");
+const staticCS = require("@radicalimaging/static-cs-lite");
+const { Stats, handleHomeRelative, dirScanner, JSONReader, JSONWriter, asyncIterableToBuffer, Tags } = require("@radicalimaging/static-wado-util");
 const dicomParser = require("dicom-parser");
 const fs = require("fs");
 const path = require("path");
-const { dirScanner } = require("@radicalimaging/static-wado-util");
-const { JSONReader } = require("@radicalimaging/static-wado-util");
-const asyncIterableToBuffer = require("@radicalimaging/static-wado-util/lib/asyncIterableToBuffer");
+const { NotificationService } = require("@radicalimaging/static-wado-util");
 const getDataSet = require("./operation/getDataSet");
 const InstanceDeduplicate = require("./operation/InstanceDeduplicate");
 const DeduplicateWriter = require("./writer/DeduplicateWriter");
@@ -17,15 +16,33 @@ const HashDataWriter = require("./writer/HashDataWriter");
 const VideoWriter = require("./writer/VideoWriter");
 const { transcodeImageFrame, transcodeId, transcodeMetadata } = require("./operation/adapter/transcodeImage");
 const ThumbnailWriter = require("./writer/ThumbnailWriter");
+const decodeImage = require("./operation/adapter/decodeImage");
 const ThumbnailService = require("./operation/ThumbnailService");
 const DeleteStudy = require("./DeleteStudy");
 const RejectInstance = require("./RejectInstance");
-const JSONWriter = require("./writer/JSONWriter");
+const RawDicomWriter = require("./writer/RawDicomWriter");
+const { isVideo } = require("./writer/VideoWriter");
 
 function setStudyData(studyData) {
   this.studyData = studyData;
 }
 
+function internalGenerateImage(originalImageFrame, dataset, metadata, transferSyntaxUid, doneCallback) {
+  decodeImage(originalImageFrame, dataset, transferSyntaxUid)
+    .then((decodeResult = {}) => {
+      if (isVideo(transferSyntaxUid)) {
+        console.log("Video data - no thumbnail generator yet");
+      } else {
+        const { imageFrame, imageInfo } = decodeResult;
+        const pixelData = dicomCodec.getPixelData(imageFrame, imageInfo, transferSyntaxUid);
+        staticCS.getRenderedBuffer(transferSyntaxUid, pixelData, metadata, doneCallback);
+      }
+    })
+    .catch((error) => {
+      console.log(`Error while generating thumbnail:: ${error}`);
+    });
+}
+
 class StaticWado {
   constructor(configuration) {
     const { rootDir = "~/dicomweb", pathDeduplicated = "deduplicated", pathInstances = "instances", verbose } = configuration;
@@ -38,7 +55,8 @@ class StaticWado {
       directoryName,
       deduplicatedRoot: path.join(directoryName, pathDeduplicated),
       deduplicatedInstancesRoot: path.join(directoryName, pathInstances),
-      TransferSyntaxUID: "1.2.840.10008.1.2",
+      // TODO - make this configurable and auto-detect by updating the parseDicom library
+      TransferSyntaxUID: "1.2.840.10008.1.2.1",
     };
     this.callback = {
       uids: IdCreator(this.options),
@@ -53,6 +71,9 @@ class StaticWado {
       reject: RejectInstance(this.options),
       delete: DeleteStudy(this.options),
       setStudyData,
+      rawDicomWriter: RawDicomWriter(this.options),
+      notificationService: new NotificationService(this.options.notificationDir),
+      internalGenerateImage
     };
   }
 
@@ -62,10 +83,8 @@ class StaticWado {
    *
    * @param {string} args listing the instances to remove (may remove entire series)
    */
-  async reject(args) {
-    args.forEach((removal) => {
-      this.callback.reject(removal);
-    });
+  async reject(studyUID, seriesUID, reason) {
+    this.callback.reject(studyUID, seriesUID, reason);
   }
 
   /**
@@ -95,7 +114,7 @@ class StaticWado {
           await this.importBinaryDicom(dicomp10stream, { ...params, file });
           Stats.StudyStats.add("DICOM P10", "Parse DICOM P10 file");
         } catch (e) {
-          console.error("Couldn't process", file, e);
+          console.error("Couldn't process", file);
         }
       },
     });
@@ -104,14 +123,13 @@ class StaticWado {
   /**
    * Processes a study directory, matching up study instance UIDs.  Either processes the
    * deduplicated group directory or the instances directory, or the notifications directory.
-   * @param {*} params
+   * @param {*} options
    */
-  async processStudyDir(studyUids, params) {
-    return dirScanner(params[params.scanStudies], {
-      ...params,
-      recursive: false,
-      callback: (dir, name) => this.callback.scanStudy(dir, name),
-    });
+  async processStudyDir(studyUids /* , options */) {
+    for (const studyUid of studyUids) {
+      const study = await this.callback.scanStudy(studyUid);
+      console.log("Processed study", study.studyInstanceUid);
+    }
   }
 
   async importBinaryDicom(dicomp10stream, params) {
@@ -124,7 +142,7 @@ class StaticWado {
     const studyInstanceUid = dataSet.string("x0020000d");
 
     if (!studyInstanceUid) {
-      console.log(`Can't import file ${params.file}`);
+      console.log("No study UID, can't import file", params.file, dataSet.elements);
       return undefined;
     }
 
@@ -139,7 +157,7 @@ class StaticWado {
       params.file
     );
 
-    const targetId = transcodeId(id, this.options);
+    const targetId = transcodeId(id, this.options, dataSet.uint16(Tags.RawSamplesPerPixel));
 
     let bulkDataIndex = 0;
     let imageFrameIndex = 0;
@@ -176,8 +194,10 @@ class StaticWado {
     // convert to DICOMweb MetaData and BulkData
     const result = await getDataSet(dataSet, generator, this.options);
 
+    await this.callback.rawDicomWriter?.(id, result, buffer);
+
     const transcodedMeta = transcodeMetadata(result.metadata, id, this.options);
-    thumbnailService.generateThumbnails(id, dataSet, transcodedMeta, this.callback);
+    await thumbnailService.generateThumbnails(id, dataSet, transcodedMeta, this.callback);
 
     await this.callback.metadata(targetId, transcodedMeta);
 
@@ -185,6 +205,14 @@ class StaticWado {
     return {};
   }
 
+  static async getDataSet(dataSet, generator, params) {
+    return await getDataSet(dataSet, generator, params);
+  }
+
+  static internalGenerateImage(originalImageFrame, dataSet, metadata, transferSyntaxUid, doneCallback) {
+      return internalGenerateImage(originalImageFrame, dataSet, metadata, transferSyntaxUid, doneCallback)
+  }
+
   /**
    * The mkdicomweb command first runs mkdicomwebinstances, writing out the deduplicated data, and then runs the
    * mkdicomwebstudy command, creating the deduplicated data set.  This version, however, keeps the deduplicated
@@ -192,16 +220,18 @@ class StaticWado {
    */
   async executeCommand(input) {
     if (this.options.scanStudies) {
+      console.log("Scanning study dir", input);
       // Scan one of the study directories - in this case, files is a set of study directories
       await this.processStudyDir(input, this.options);
     } else {
+      console.log("Scanning files", input);
       await this.processFiles(input, this.options);
     }
     await this.close();
   }
 
   async close() {
-    await this.callback.completeStudy();
+    await this.callback.completeStudy(this.callback);
     Stats.OverallStats.summarize("Completed Study Processing");
   }
 

package/lib/createMain.js

@@ -4,10 +4,14 @@ const adaptProgramOpts = require("./util/adaptProgramOpts");
 module.exports = function createMain(options, program) {
   const finalOptions = adaptProgramOpts(options, {
     ...this,
-    isInstance: false,
+    // Instance metadata is the instances/<sopUID>/metadata.gz files
+    isInstance: true,
+    // Deduplicated data is single instance deduplicated data
+    isDeduplicate: false,
+    // Group data is the group file directories
     isGroup: true,
-    isDeduplicate: true,
     isStudyData: true,
+    isDeleteInstances: true,
   });
   const importer = new StaticWado(finalOptions);
   return importer.executeCommand(program.args);

package/lib/groupMain.js

@@ -5,8 +5,11 @@ module.exports = function createMain(options, program) {
   const finalOptions = adaptProgramOpts(options, {
     ...this,
     isInstance: false,
+    isDeduplicate: true,
     isGroup: true,
     isStudyData: false,
+    scanStudies: true,
+    isDeleteInstances: true,
   });
   const importer = new StaticWado(finalOptions);
   // Either do a scan or on specified studies

package/lib/index.js

@@ -4,5 +4,6 @@ const StaticWado = require("./StaticWado");
 StaticWado.mkdicomwebConfig = mkdicomwebConfig;
 StaticWado.createMain = require("./createMain");
 StaticWado.deleteMain = require("./deleteMain");
+StaticWado.adaptProgramOpts = require("./util/adaptProgramOpts");
 
 module.exports = StaticWado;

package/lib/instanceMain.js

@@ -5,6 +5,8 @@ module.exports = function createMain(options, program) {
   const finalOptions = adaptProgramOpts(options, {
     ...this,
     isInstance: true,
+    // Deduplicated data is single instance deduplicated data
+    isDeduplicate: true,
     isGroup: false,
     isStudyData: false,
   });

package/lib/metadataMain.js

@@ -5,8 +5,9 @@ module.exports = function createMain(options, program) {
   const finalOptions = adaptProgramOpts(options, {
     ...this,
     isInstance: false,
-    isGroup: false,
-    isStudyData: false,
+    isGroup: true,
+    isStudyData: true,
+    scanStudies: true,
   });
   const importer = new StaticWado(finalOptions);
   // Either do a scan or on specified studies

package/lib/mkdicomwebConfig.js

@@ -25,6 +25,20 @@ const { mkdicomwebConfig } = ConfigPoint.register({
         description: "Clean the outputs before generating/starting to write new values.",
         defaultValue: false,
       },
+      {
+        key: "-d, --deployments <listvalue...>",
+        description: "List of deployments from configuration to deploy to. Separated by space.",
+        defaultValue: undefined,
+      },
+      {
+        key: "--no-notifications",
+        description: "Turns off notifications",
+      },
+      {
+        key: "--delete",
+        description: "Delete the imported instances",
+        defaultValue: false,
+      },
       {
         key: "-v, --verbose",
         description: "Write verbose output",
@@ -32,10 +46,26 @@ const { mkdicomwebConfig } = ConfigPoint.register({
       },
       {
         key: "-t, --content-type <type>",
-        description: 'Destination type to compress to (choices: "jls", "lei", "jls-lossy" or DICOM Transfer Syntax UID - default: "jls")',
+        description: 'Destination type to compress to (choices: "jpeg", "jls", "lei", "jls-lossy", "jhc", "jxl" or DICOM Transfer Syntax UID - default: "jls")',
         defaultValue: "jls",
         customParser: compressionOptionParser,
       },
+      {
+        key: "--encapsulated-image",
+        description: "Avoid encapsulating the image frame.  Writes with the extension and without multipart",
+      },
+      {
+        key: "-e, --no-encapsulated-image",
+        description: "Avoid encapsulating the image frame.  Writes with the extension and without multipart",
+      },
+      {
+        key: "--single-part-image",
+        description: "Writes single part image data",
+      },
+      {
+        key: "--no-single-part-image",
+        description: "Writes single part image data",
+      },
       {
         key: "-m, --maximum-inline-public-length <value>",
         description: "Maximum length of public binary data",
@@ -49,8 +79,14 @@ const { mkdicomwebConfig } = ConfigPoint.register({
       {
         key: "-r, --recompress <listvalue...>",
         description: "List of types to recompress separated by space",
-        defaultValue: ["uncompressed", "jp2"],
-        choices: ["uncompressed", "jp2", "jpeglossless", "rle", "none"],
+        defaultValue: ["uncompressed", "jp2", "jls", "jll"],
+        choices: ["uncompressed", "jp2", "jpeg", "jpeglossless", "rle", "jph", "jls", "true", "none"],
+      },
+      {
+        key: "--recompress-color <listvalue...>",
+        description: "List of types to recompress for color images, separated by space",
+        defaultValue: ["uncompressed"],
+        choices: ["uncompressed", "jpeg", "jp2", "jpeglossless", "rle", "jph", "jls", "true", "none"],
       },
       {
         key: "--recompress-thumb <listvalue...>",
@@ -69,9 +105,9 @@ const { mkdicomwebConfig } = ConfigPoint.register({
         defaultValue: false,
       },
       {
-        key: "-T, --colour-content-type <value>",
+        key: "-T, --color-content-type <value>",
         description: "Colour content type",
-        defaultValue: null,
+        defaultValue: "jpeg",
       },
       {
         key: "--path-deduplicated <path>",
@@ -136,7 +172,7 @@ const { mkdicomwebConfig } = ConfigPoint.register({
         command: "metadata",
         arguments: ["input"],
         main: metadataMain,
-        helpDescription: "Write the metadata object (series and study details) from the deduplicated data.",
+        helpDescription: "Write the metadata object (series and study details) from the grouped deduplicated data.",
       },
       {
         command: "delete",
@@ -144,9 +180,9 @@ const { mkdicomwebConfig } = ConfigPoint.register({
         helpDescription: "Delete the given study, series or instance (not yet implemented)",
       },
       {
-        command: "reject",
+        command: "reject <studyUID...>",
         main: rejectMain,
-        helpDescription: "Reject the specified series, specified as studies/<studyUID>/series/<seriesUID>",
+        helpDescription: "Reject the specified series",
       },
     ],
   },

package/lib/model/TagLists.js

@@ -1,5 +1,5 @@
 const hashFactory = require("node-object-hash");
-const Tags = require("../dictionary/Tags");
+const { Tags } = require("@radicalimaging/static-wado-util");
 
 /* eslint "no-param-reassign": "off" */
 

package/lib/model/uids.js

@@ -12,7 +12,7 @@ const jpeg = "image/jpeg";
 const jls = "image/jls";
 const jll = "image/jll";
 const jxl = "image/x-jxl";
-const htj2k = "image/x-htj2k";
+const htj2k = "image/jphc";
 const jp2 = "image/jp2";
 const rle = "image/dicom-rle";
 
@@ -21,20 +21,19 @@ const uids = {
   "1.2.840.10008.1.2.1": uncompressed,
   "1.2.840.10008.1.2.1.99": uncompressed,
   "1.2.840.10008.1.2.2": uncompressed,
-  "1.2.840.10008.1.2.4.50": { contentType: jpeg, lossy: true },
+  "1.2.840.10008.1.2.4.50": { contentType: jpeg, lossy: true, extension: ".jpeg" },
   "1.2.840.10008.1.2.4.51": { contentType: jpeg, lossy: true },
   "1.2.840.10008.1.2.4.57": { contentType: jpeg },
-  "1.2.840.10008.1.2.4.70": { contentType: jll },
-  "1.2.840.10008.1.2.4.140": { contentType: jxl },
+  "1.2.840.10008.1.2.4.70": { contentType: jll, extension: ".jll" },
+  "1.2.840.10008.1.2.4.140": { contentType: jxl, extension: ".jxl" },
+  // Lossy, original JPEG reconstruction mode
   "1.2.840.10008.1.2.4.141": { contentType: jxl, lossy: true },
-  "1.2.840.10008.1.2.4.80": { contentType: jls },
+  "1.2.840.10008.1.2.4.142": { contentType: jxl, lossy: true },
+  "1.2.840.10008.1.2.4.80": { contentType: jls, extension: ".jls" },
   "1.2.840.10008.1.2.4.81": { contentType: jls, lossy: true },
-  "1.2.840.10008.1.2.4.90": { contentType: jp2 },
+  "1.2.840.10008.1.2.4.90": { contentType: jp2, extension: ".jp2" },
   "1.2.840.10008.1.2.4.91": { contentType: jp2 },
-  // From JPEG original data, lossless to JXL
-  "1.2.840.10008.1.2.4.142": { contentType: jxl, lossy: true },
-  "1.2.840.10008.1.2.4.150": { contentType: htj2k },
-  // **
+  "3.2.840.10008.1.2.4.96": { contentType: htj2k, extension: ".jhc" },
   "1.2.840.10008.1.2.5": { contentType: rle },
   default: {},
 };

package/lib/operation/InstanceDeduplicate.js

@@ -1,7 +1,7 @@
 // TODO review returning type of some methods
-const JSONWriter = require("../writer/JSONWriter");
+const { JSONWriter } = require("@radicalimaging/static-wado-util");
+const { Tags } = require("@radicalimaging/static-wado-util");
 const TagLists = require("../model/TagLists");
-const Tags = require("../dictionary/Tags");
 
 const { getValue, setValue } = Tags;
 
@@ -77,8 +77,8 @@ const InstanceDeduplicate = (options) =>
   async function run(id, sourceImageFrame) {
     // Notify the existing listeners, if any
     const imageFrame = canonicalize(sourceImageFrame);
-    if (options.isInstanceMetadata) {
-      // console.log("Writing instance metadata");
+    if (options.isInstance) {
+      if (options.verbose) console.log("Writing instance metadata");
       await JSONWriter(id.sopInstanceRootPath, "metadata", imageFrame);
     }
     if (!options.isDeduplicate && !options.isGroup) {

package/lib/operation/ScanStudy.js

@@ -3,11 +3,12 @@ const path = require("path");
 function ScanStudy(options) {
   const { directoryName, deduplicatedRoot, deduplicatedInstancesRoot } = options;
 
-  return function run(dir, studyInstanceUid) {
+  return function scanStudy(studyInstanceUid) {
+    console.verbose("scanStudy", studyInstanceUid);
     const studyPath = path.join(directoryName, "studies", studyInstanceUid);
-    const deduplicatedPath = path.join(deduplicatedRoot, studyInstanceUid);
     const deduplicatedInstancesPath = path.join(deduplicatedInstancesRoot, studyInstanceUid);
-    console.log("Scanning", dir, studyInstanceUid);
+    const deduplicatedPath = path.join(deduplicatedRoot, studyInstanceUid);
+    console.verbose("Importing", studyInstanceUid, studyPath, deduplicatedInstancesPath, deduplicatedPath);
     return this.completeStudy.getCurrentStudyData(this, {
       studyPath,
       deduplicatedPath,