Merge pull request #8 from EMCECS/feature-folder-download

Feature completed
EMCECS · Oct 18, 2018 · 48466be · 48466be
2 parents 1408a9b + 6a6ddcf
commit 48466be
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -18,6 +18,6 @@ FROM openjdk:8
 EXPOSE 8080
 
 WORKDIR /usr/src/app
-COPY build/libs/ecs-browser-0.9.1.jar ./
+COPY build/libs/ecs-browser-1.0.0rc1.jar ./
 
-CMD [ "java", "-jar", "ecs-browser-0.9.1.jar" ]
+CMD [ "java", "-jar", "ecs-browser-1.0.0rc1.jar" ]
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 description = "ECS browser website"
 group = 'com.emc.ecs'
-version = '0.9.1'
+version = '1.0.0rc1'
 
 ext.licenseName = ''
 ext.licenseUrl = ''
@@ -30,7 +30,7 @@ defaultTasks 'build'
 
 jar {
     baseName = 'ecs-browser'
-    version =  '0.9.1'
+    version =  '1.0.0rc1'
     into('META-INF/dependency-license') {
         from 'build/reports/dependency-license'
     }

diff --git a/src/main/java/com/emc/ecs/browser/spring/ServiceController.java b/src/main/java/com/emc/ecs/browser/spring/ServiceController.java
@@ -205,15 +205,33 @@ public ResponseEntity<?> postProxy(HttpServletRequest request) throws Exception
             RequestEntity<byte[]> requestEntity = new RequestEntity<byte[]>(data, newHeaders, method, new URI(resource));
             RestTemplate client = new RestTemplate();
             try {
-                dataToReturn = client.exchange(requestEntity, ListObjectsResult.class);
+                dataToReturn = new WrappedResponseEntity( client.exchange(requestEntity, ListObjectsResult.class) );
                 if ( ((ResponseEntity<ListObjectsResult>) dataToReturn).getStatusCode().is2xxSuccessful() ) {
                     ListObjectsResult objectsToDownload = ((ResponseEntity<ListObjectsResult>) dataToReturn).getBody();
                     downloadObjects( downloadFolder, objectsToDownload.getBucketName(), objectsToDownload.getObjects(), s3Config );
+                    String separator = resource.indexOf("?") < 0 ? "?" : "&";
+                    while ( objectsToDownload.isTruncated() ) {
+                        String marker = objectsToDownload.getNextMarker();
+                        if ( ( marker == null ) || marker.isEmpty() ) {
+                            marker = objectsToDownload.getObjects().get( objectsToDownload.getObjects().size() - 1 ).getKey();
+                        }
+                        String newUrl = resource + separator + "marker=" + marker;
+                        System.out.println("Another page after " + marker + " using " + newUrl );
+                        requestEntity = new RequestEntity<byte[]>(data, newHeaders, method, new URI(newUrl));
+                        dataToReturn = new WrappedResponseEntity( client.exchange(requestEntity, ListObjectsResult.class) );
+                        if ( !((ResponseEntity<ListObjectsResult>) dataToReturn).getStatusCode().is2xxSuccessful() ) {
+                            break;
+                        }
+                        objectsToDownload = ((ResponseEntity<ListObjectsResult>) dataToReturn).getBody();
+                        downloadObjects( downloadFolder, objectsToDownload.getBucketName(), objectsToDownload.getObjects(), s3Config );
+                    }
                 }
             } catch (HttpClientErrorException e) {
                 dataToReturn = new ErrorData(e); // handle and display on the other end
+                e.printStackTrace(System.out);
             } catch (Exception e) {
                 dataToReturn = new ErrorData(e); // handle and display on the other end
+                e.printStackTrace(System.out);
             }
         } else {
             sign(method.toString(), resource, parameters, headers, s3Config);
@@ -289,7 +307,7 @@ private void downloadObjects(String downloadFolder, String bucketName, List<S3Ob
             if ( !downloadBucket.mkdirs() ) {
                 throw new Exception( "Download location cannot be created: " + downloadBucket.getAbsolutePath() );
             }
-        } else if ( downloadBucket.isDirectory() ) {
+        } else if ( !downloadBucket.isDirectory() ) {
             throw new Exception( "Download location is not a folder: " + downloadBucket.getAbsolutePath() );
         }
 

diff --git a/src/main/resources/static/javascript/MetadataSearchPage.js b/src/main/resources/static/javascript/MetadataSearchPage.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, EMC Corporation. All rights reserved.
+ * Copyright (c) 2017-2018, EMC Corporation. All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -64,6 +64,7 @@ MetadataSearchPage.prototype.getMetadataSearchParameters = function() {
             separator = '&';
         }
     } );
+    metadataSearchParameters = metadataSearchParameters + separator + 'attributes=ALL_SMD';
     if ( metadataSearchParameters.indexOf( 'query=' ) < 0 ) {
         metadataSearchParameters = '';
     }

diff --git a/src/main/resources/static/javascript/ecs-sdk.js b/src/main/resources/static/javascript/ecs-sdk.js
@@ -41,7 +41,7 @@ function combineWithDelimiter( part1, part2 ) {
 
 function handleData( data, callback, dataProcessor ) {
   if ( ( data.status && ( ( data.status >= 200 ) && ( data.status < 300 ) ) ) 
-    || ( data.statusCode && data.statusCode == 'OK' ) ) {
+    || ( data.statusCode && data.statusCode == 'OK') ) {
     if (dataProcessor) {
       data = dataProcessor( data );
     }