error handling

intranda · Feb 1, 2024 · bea655d · bea655d
1 parent adb0a1c
commit bea655d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/plugin/src/main/java/de/intranda/goobi/plugins/DownloadAndVerifyAssetsStepPlugin.java b/plugin/src/main/java/de/intranda/goobi/plugins/DownloadAndVerifyAssetsStepPlugin.java
@@ -369,7 +369,8 @@ private void processFile(String fileUrl, String hash, String targetFolder) throw
 
         CloseableHttpClient httpclient = null;
         HttpPost method = null;
-
+        String actualHash = "";
+        Path destination = null;
         try {
 
             method = new HttpPost(fileUrl);
@@ -386,29 +387,28 @@ private void processFile(String fileUrl, String hash, String targetFolder) throw
                 extension = "." + contentType.substring(contentType.indexOf("/") + 1);
             }
 
-            Path destination = Paths.get(targetFolder, fileName + extension);
+            destination = Paths.get(targetFolder, fileName + extension);
             StorageProvider.getInstance().createDirectories(destination.getParent());
 
             try (OutputStream out = StorageProvider.getInstance().newOutputStream(destination)) {
                 entity.writeTo(out);
             }
 
             // url is correctly formed, download the file
-            String actualHash = "";
+
             try (InputStream inputStream = StorageProvider.getInstance().newInputStream(destination)) {
                 actualHash = calculateHash(inputStream);
             }
 
-            // check checksum
-            if (!hash.equals(actualHash)) {
-                String message = "checksums do not match, the file might be corrupted: " + destination;
-                // delete the downloaded file
-                Files.delete(destination);
-                throw new IOException(message);
-            }
         } catch (Exception e) {
             log.error("Unable to connect to url " + fileUrl, e);
-
+        }
+        // check checksum
+        if (!hash.equals(actualHash)) {
+            String message = "checksums do not match, the file might be corrupted: " + destination;
+            // delete the downloaded file
+            Files.delete(destination);
+            throw new IOException(message);
         }
 
     }

diff --git a/plugin/src/test/java/de/intranda/goobi/plugins/DownloadAndVerifyAssetsPluginTest.java b/plugin/src/test/java/de/intranda/goobi/plugins/DownloadAndVerifyAssetsPluginTest.java
@@ -25,7 +25,6 @@
 import org.goobi.production.enums.PluginReturnValue;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -92,7 +91,7 @@ public void testInit() {
     }
 
     // does not work without access to BACH server, enable it locally
-    @Ignore
+    //    @Ignore
     @Test
     public void testDownload() throws IOException {
         DownloadAndVerifyAssetsStepPlugin plugin = new DownloadAndVerifyAssetsStepPlugin();
@@ -220,7 +219,7 @@ private void createProcessProperties() {
             property.setId(1);
             property.setProzess(process);
             property.setTitel("AttachmentHashSplitted");
-            property.setWert("1eae07b41cb3323ab370d3ddd78de440ffe6d581d1d3736c086b8949d24b35da");
+            property.setWert("1eae07b41cb3323ab370d3ddd78de440ffe6d581d1d3736c086b8949d24b35da1");
             props.add(property);
         }
 

diff --git a/plugin/src/test/resources/plugin_intranda_step_download_and_verify_assets.xml b/plugin/src/test/resources/plugin_intranda_step_download_and_verify_assets.xml
@@ -14,9 +14,9 @@
         <!-- Configure here how many times shall be maximally tried before reporting final results. OPTIONAL. DEFAULT 1. -->
         <maxTryTimes>3</maxTryTimes>
 
-        <authentication>Bearer 123456</authentication>
+        <authentication>Bearer library_api_testkey_123</authentication>
 
-        <downloadUrl>https://example.com/thesis/{meta.ThesisId}/file/{FILEID}</downloadUrl>
+        <downloadUrl>https://bach.wu.ac.at:12345/thesis-dev/tmg-api/library/thesis/{meta.ThesisId}/file/{FILEID}</downloadUrl>
         <!-- This tag accepts the following three attributes:
               - @urlProperty: name of the property that holds the URL of the file
               - @hashProperty: name of the property that holds the checksum of the file