Changeset 31446 in osm for applications/editors/josm

Timestamp:

2015-08-04T11:35:27+02:00 (9 years ago)

Author:

nokutu

Message:

Updted build.gradle, .gitignore and uploads are now processed in a different thread.

Location:

applications/editors/josm/plugins/mapillary

Files:

• .gitignore (modified) (1 diff)
• build.gradle (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryUploadAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthUtils.java (modified) (5 diffs)

applications/editors/josm/plugins/mapillary/.gitignore

@@ -4 +4 @@
 /build/
 /.gradle/
-
+/.settings
 /test/data/preferences/

applications/editors/josm/plugins/mapillary/build.gradle

@@ -33 +33 @@
 
   packIntoJar 'com.amazonaws:aws-java-sdk-s3:1.10.8'
+  packIntoJar 'org.apache.httpcomponents:httpmime:4.5'
 
   testCompile 'junit:junit:4.12'

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryUploadAction.java

@@ -56 +56 @@
         && (int) pane.getValue() == JOptionPane.OK_OPTION) {
       if (dialog.sequence.isSelected()) {
-        try {
-          OAuthUtils.uploadSequence(MapillaryData.getInstance().getSelectedImage().getSequence());
-        } catch (InvalidKeyException e) {
-          Main.error(e);
-        } catch (UnsupportedEncodingException e) {
-          Main.error(e);
-        } catch (NoSuchAlgorithmException e) {
-          Main.error(e);
-        }
+        OAuthUtils.uploadSequence(MapillaryData.getInstance()
+            .getSelectedImage().getSequence());
       }
     }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthUtils.java

@@ -15 +15 @@
 import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 import javax.imageio.ImageIO;
@@ -155 +159 @@
       entityBuilder.addPart(key, new StringBody(hash.get(key),
           ContentType.TEXT_PLAIN));
-      System.out.println(key + " => " + hash.get(key));
     }
     entityBuilder.addPart("file", new FileBody(file));
@@ -162 +165 @@
     httpPost.setEntity(entity);
 
-    System.out.println(httpPost);
     HttpResponse response = httpClient.execute(httpPost);
-    System.out.println(response.toString());
+    if (response.getStatusLine().toString().contains("204"))
+      System.out.println("Succesfully uploaded image");
+    file.delete();
   }
 
@@ -177 +181 @@
    * @throws InvalidKeyException
    */
-  public static void uploadSequence(MapillarySequence sequence)
-      throws InvalidKeyException, UnsupportedEncodingException,
-      NoSuchAlgorithmException {
-    UUID uuid = UUID.randomUUID();
-
-    for (MapillaryAbstractImage img : sequence.getImages()) {
-      if (!(img instanceof MapillaryImportedImage))
-        throw new IllegalArgumentException(
-            "The sequence contains downloaded images.");
+  public static void uploadSequence(MapillarySequence sequence) {
+    new SequenceUploadThread(sequence.getImages()).start();
+  }
+
+  private static class SequenceUploadThread extends Thread {
+    private List<MapillaryAbstractImage> images;
+    private UUID uuid;
+    ThreadPoolExecutor ex;
+
+    private SequenceUploadThread(List<MapillaryAbstractImage> images) {
+      this.images = images;
+      this.uuid = UUID.randomUUID();
+      this.ex = new ThreadPoolExecutor(3, 5, 25, TimeUnit.SECONDS,
+          new ArrayBlockingQueue<Runnable>(5));
+    }
+
+    @Override
+    public void run() {
+      for (MapillaryAbstractImage img : this.images) {
+        if (!(img instanceof MapillaryImportedImage))
+          throw new IllegalArgumentException(
+              "The sequence contains downloaded images.");
+        this.ex.execute(new SingleUploadThread((MapillaryImportedImage) img,
+            this.uuid));
+      }
+    }
+  }
+
+  private static class SingleUploadThread extends Thread {
+
+    private MapillaryImportedImage image;
+    private UUID uuid;
+
+    private SingleUploadThread(MapillaryImportedImage image, UUID uuid) {
+      this.image = image;
+      this.uuid = uuid;
+    }
+
+    @Override
+    public void run() {
       try {
-        upload((MapillaryImportedImage) img, uuid);
-      } catch (IOException e) {
+        OAuthUtils.upload(this.image, this.uuid);
+      } catch (InvalidKeyException | NoSuchAlgorithmException | IOException e) {
         Main.error(e);
       }
@@ -226 +261 @@
     outputSet.setGPSInDegrees(image.getLatLon().lon(), image.getLatLon().lat());
     File tempFile = new File(c + ".tmp");
+    c++;
     OutputStream os = new BufferedOutputStream(new FileOutputStream(tempFile));