disable smugmug from demo server (dtinit#386)

handle empty albums in smugmug export fix url in smugmug upload request
osamahan999 · Apr 19, 2018 · a85b637 · a85b637
1 parent 4bc6f69
commit a85b637
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/distributions/demo-server/build.gradle b/distributions/demo-server/build.gradle
@@ -69,14 +69,12 @@ dependencies {
  compile project(':extensions:auth:portability-auth-instagram')
  compile project(':extensions:auth:portability-auth-microsoft')
  compile project(':extensions:auth:portability-auth-rememberthemilk')
- compile project(':extensions:auth:portability-auth-smugmug')
 
  compile project(':extensions:data-transfer:portability-data-transfer-flickr')
  compile project(':extensions:data-transfer:portability-data-transfer-google')
  compile project(':extensions:data-transfer:portability-data-transfer-instagram')
  compile project(':extensions:data-transfer:portability-data-transfer-microsoft')
  compile project(':extensions:data-transfer:portability-data-transfer-rememberthemilk')
- compile project(':extensions:data-transfer:portability-data-transfer-smugmug')
 }
 
 addCloudExtensionDependency(project)

diff --git a/...ug/src/main/java/org/dataportabilityproject/transfer/smugmug/photos/SmugMugInterface.java b/...ug/src/main/java/org/dataportabilityproject/transfer/smugmug/photos/SmugMugInterface.java
@@ -27,7 +27,6 @@
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.graph.ImmutableGraph;
 import com.google.common.net.HttpHeaders;
 import org.dataportabilityproject.transfer.smugmug.photos.model.*;
 import org.dataportabilityproject.types.transfer.auth.AppCredentials;
@@ -134,7 +133,7 @@ ImageUploadResponse uploadImage(String photoUrl, String albumId) throws IOExcept
 
  // Upload photo
  return postRequest(
- "http:https://upload.smugmug.com/",
+ "https:https://upload.smugmug.com/",
  ImmutableMap.of(), // No content params for photo upload
  content,
  // Headers from: https://api.smugmug.com/api/v2/doc/reference/upload.html
@@ -195,7 +194,7 @@ private <T> T postRequest(
  ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
  content.writeTo(outputStream);
 
- request.addPayload(outputStream.toString("UTF-8"));
+ request.addPayload(outputStream.toByteArray());
  }
 
  for (Entry<String, String> param : contentParams.entrySet()) {

diff --git a/...c/main/java/org/dataportabilityproject/transfer/smugmug/photos/SmugMugPhotosExporter.java b/...c/main/java/org/dataportabilityproject/transfer/smugmug/photos/SmugMugPhotosExporter.java
@@ -21,10 +21,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import com.google.common.collect.ImmutableList;
 import org.dataportabilityproject.spi.transfer.provider.ExportResult;
 import org.dataportabilityproject.spi.transfer.provider.ExportResult.ResultType;
 import org.dataportabilityproject.spi.transfer.provider.Exporter;
@@ -44,6 +41,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
 public class SmugMugPhotosExporter
  implements Exporter<TokenSecretAuthData, PhotosContainerResource> {
 
@@ -186,8 +188,11 @@ private ExportResult<PhotosContainerResource> exportPhotos(
  }
  ContinuationData continuationData = new ContinuationData(pageToken);
 
- // Make list of photos
- for (SmugMugAlbumImage image : albumInfoResponse.getImages()) {
+ // Make list of photos - images may be empty if the album provided is empty
+ List<SmugMugAlbumImage> images =
+ albumInfoResponse.getImages() == null ? ImmutableList.of() : albumInfoResponse.getImages();
+
+ for (SmugMugAlbumImage image : images) {
  String title = image.getTitle();
  if (Strings.isNullOrEmpty(title)) {
  title = image.getFileName();
@@ -202,6 +207,7 @@ private ExportResult<PhotosContainerResource> exportPhotos(
  getMimeType(image.getFormat()),
  containerResource.getId()));
  }
+
  PhotosContainerResource resource = new PhotosContainerResource(null, photoList);
 
  // Get result type