Helper methods to simplify conversions

Author: jonas-jasas

src/com/convertapi/ConvertApi.java

@@ -108,39 +108,39 @@ public static User getUser(Config config) {
     }
 
     @SuppressWarnings("unused")
-    public static CompletableFuture<ConversionResult> convert(Path fromFile, String toFormat, Param... params) throws IOException {
-        return convert(fromFile, toFormat, Config.defaults().getSecret(), params);
+    public static CompletableFuture<ConversionResult> convertFile(Path fromFile, String toFormat, Param... params) throws IOException {
+        return convertFile(fromFile, toFormat, Config.defaults().getSecret(), params);
     }
 
-    public static CompletableFuture<ConversionResult> convert(Path fromFile, String toFormat, String secret, Param... params) throws IOException {
+    public static CompletableFuture<ConversionResult> convertFile(Path fromFile, String toFormat, String secret, Param... params) throws IOException {
         Param[] fileParam = new Param[]{new Param("file", fromFile)};
         return convert(getFileExtension(fromFile), toFormat, Param.concat(fileParam, params), Config.defaults(secret));
     }
 
     @SuppressWarnings("unused")
-    public static void convert(String fromPathToFile, String toPathToFile) {
-        convert(fromPathToFile, toPathToFile, Config.defaults().getSecret());
+    public static void convertFile(String fromPathToFile, String toPathToFile) {
+        convertFile(fromPathToFile, toPathToFile, Config.defaults().getSecret());
     }
 
-    public static void convert(String fromPathToFile, String toPathToFile, String secret, Param... params) {
+    public static void convertFile(String fromPathToFile, String toPathToFile, String secret, Param... params) {
         try {
             Path fromPath = Paths.get(fromPathToFile);
             Path toPath = Paths.get(toPathToFile);
-            convert(fromPath, getFileExtension(toPath), secret, params).get().saveFile(toPath).get();
+            convertFile(fromPath, getFileExtension(toPath), secret, params).get().saveFile(toPath).get();
         } catch (IOException | ExecutionException | InterruptedException e) {
             throw new RuntimeException(e);
         }
     }
 
-    public static List<Path> convertFile(String fromPathToFile, String toFormat, String outputDirectory, Param... params) {
-        return convertFile(fromPathToFile, toFormat, outputDirectory, Config.defaults().getSecret(), params);
+    public static List<Path> convertFileToDir(String fromPathToFile, String toFormat, String outputDirectory, Param... params) {
+        return convertFileToDir(fromPathToFile, toFormat, outputDirectory, Config.defaults().getSecret(), params);
     }
 
-    public static List<Path> convertFile(String fromPathToFile, String toFormat, String outputDirectory, String secret, Param... params) {
+    public static List<Path> convertFileToDir(String fromPathToFile, String toFormat, String outputDirectory, String secret, Param... params) {
         try {
             Path fromPath = Paths.get(fromPathToFile);
             Path toPath = Paths.get(outputDirectory);
-            return convert(fromPath, toFormat, secret).get().saveFilesSync(toPath);
+            return convertFile(fromPath, toFormat, secret, params).get().saveFilesSync(toPath);
         } catch (IOException | ExecutionException | InterruptedException e) {
             throw new RuntimeException(e);
         }
@@ -176,6 +176,21 @@ public static Path convertRemoteFile(String url, String toPathToFile, String sec
         }
     }
 
+    public static List<Path> convertRemoteFileToDir(String url, String toFormat, String outputDirectory, Param... params) {
+        return convertRemoteFileToDir(url, toFormat, outputDirectory, Config.defaults().getSecret(), params);
+    }
+
+    public static List<Path> convertRemoteFileToDir(String url, String toFormat, String outputDirectory, String secret, Param... params) {
+        RemoteUploadResponse response = Http.remoteUpload(url, Config.defaults(secret));
+        try {
+            Path toPath = Paths.get(outputDirectory);
+            Param[] fileParam = new Param[]{new Param("file", response.FileId)};
+            return convert(response.FileExt, toFormat, Param.concat(fileParam, params), Config.defaults(secret)).get().saveFilesSync(toPath);
+        } catch (ExecutionException | InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     private static String getFileExtension(Path path) {
         String name = path.getFileName().toString();
         return name.substring(name.lastIndexOf(".") + 1);

src/com/convertapi/examples/SimpleConversion.java

@@ -14,15 +14,18 @@ public static void main(String[] args) {
         Config.setDefaultSecret(getenv("CONVERTAPI_SECRET"));    //Get your secret at https://www.convertapi.com/a
 
         // Simplified file to file conversion example
-        ConvertApi.convert("test-files/test.docx", "/tmp/result.pdf");
+        ConvertApi.convertFile("test-files/test.docx", "/tmp/result.pdf");
 
         // Simplified file to multiple files conversion example
-        ConvertApi.convertFile("test-files/test.docx", "jpg", "/tmp");
+        ConvertApi.convertFileToDir("test-files/test.docx", "jpg", "/tmp");
 
         // Simplified web site to pdf conversion example
         ConvertApi.convertUrl("http://example.com", "/tmp/example.pdf");
 
         // Simplified remote file to local file conversion example
-        ConvertApi.convertRemoteFile("http://www.pdf995.com/samples/pdf.pdf", "/tmp/example.jpg");
+        ConvertApi.convertRemoteFile("https://calibre-ebook.com/downloads/demos/demo.docx", "/tmp/demo.pdf");
+
+        // Simplified remote file to local file conversion example
+        ConvertApi.convertRemoteFileToDir("http://www.pdf995.com/samples/pdf.pdf", "jpg", "/tmp");
     }
 }