Array of strings on ShellCommand to allow paths with spaces

foryoung2018 · Apr 13, 2015 · 9f06d89 · 9f06d89
1 parent 1372638
commit 9f06d89
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 21 deletions.
diff --git a/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/ShellCommandTest.java b/FFmpegAndroid/src/androidTest/java/com/github/hiteshsondhi88/libffmpeg/ShellCommandTest.java
@@ -14,7 +14,7 @@ public class ShellCommandTest extends CommonTestCase {
 
     public void testRun() throws Exception {
         ShellCommand shellCommand = new ShellCommand();
-        final Process process = shellCommand.run("logcat");
+        final Process process = shellCommand.run(new String[] {"logcat"});
         assertNotNull(process);
         assertEquals(false, Util.isProcessCompleted(process));
 
@@ -44,7 +44,7 @@ public void run() {
 
     public void testRunWaitFor() throws Exception {
         ShellCommand shellCommand = new ShellCommand();
-        CommandResult commandResult = shellCommand.runWaitFor("ls");
+        CommandResult commandResult = shellCommand.runWaitFor(new String[] {"ls"});
         assertNotNull(commandResult);
         assertEquals(true, commandResult.success);
         assertThat(commandResult.output).isNotEmpty();

diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpeg.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpeg.java
@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.text.TextUtils;
 
+import java.lang.reflect.Array;
 import java.util.Map;
 
 import com.github.hiteshsondhi88.libffmpeg.exceptions.FFmpegCommandAlreadyRunningException;
@@ -61,28 +62,41 @@ public void loadBinary(FFmpegLoadBinaryResponseHandler ffmpegLoadBinaryResponseH
     }
 
     @Override
-    public void execute(Map<String, String> environvenmentVars, String cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException {
+    public void execute(Map<String, String> environvenmentVars, String[] cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException {
         if (ffmpegExecuteAsyncTask != null && !ffmpegExecuteAsyncTask.isProcessCompleted()) {
             throw new FFmpegCommandAlreadyRunningException("FFmpeg command is already running, you are only allowed to run single command at a time");
         }
-        if (!TextUtils.isEmpty(cmd)) {
-            String ffmpegCmd = FileUtils.getFFmpeg(context, environvenmentVars) + " "+ cmd;
-            ffmpegExecuteAsyncTask = new FFmpegExecuteAsyncTask(ffmpegCmd, timeout, ffmpegExecuteResponseHandler);
+        if (cmd.length != 0) {
+            String[] ffmpegBinary = new String[] { FileUtils.getFFmpeg(context, environvenmentVars) };
+            String[] command = concatenate(ffmpegBinary, cmd);
+            ffmpegExecuteAsyncTask = new FFmpegExecuteAsyncTask(command , timeout, ffmpegExecuteResponseHandler);
             ffmpegExecuteAsyncTask.execute();
         } else {
             throw new IllegalArgumentException("shell command cannot be empty");
         }
     }
 
+    public <T> T[] concatenate (T[] a, T[] b) {
+        int aLen = a.length;
+        int bLen = b.length;
+
+        @SuppressWarnings("unchecked")
+        T[] c = (T[]) Array.newInstance(a.getClass().getComponentType(), aLen + bLen);
+        System.arraycopy(a, 0, c, 0, aLen);
+        System.arraycopy(b, 0, c, aLen, bLen);
+
+        return c;
+    }
+
     @Override
-    public void execute(String cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException {
+    public void execute(String[] cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException {
         execute(null, cmd, ffmpegExecuteResponseHandler);
     }
 
     @Override
     public String getDeviceFFmpegVersion() throws FFmpegCommandAlreadyRunningException {
         ShellCommand shellCommand = new ShellCommand();
-        CommandResult commandResult = shellCommand.runWaitFor(FileUtils.getFFmpeg(context) + " -version");
+        CommandResult commandResult = shellCommand.runWaitFor(new String[] { FileUtils.getFFmpeg(context), "-version" });
         if (commandResult.success) {
             return commandResult.output.split(" ")[2];
         }

diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteAsyncTask.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegExecuteAsyncTask.java
@@ -9,15 +9,15 @@
 
 class FFmpegExecuteAsyncTask extends AsyncTask<Void, String, CommandResult> {
 
-    private final String cmd;
+    private final String[] cmd;
     private final FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler;
     private final ShellCommand shellCommand;
     private final long timeout;
     private long startTime;
     private Process process;
     private String output = "";
 
-    FFmpegExecuteAsyncTask(String cmd, long timeout, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) {
+    FFmpegExecuteAsyncTask(String[] cmd, long timeout, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) {
         this.cmd = cmd;
         this.timeout = timeout;
         this.ffmpegExecuteResponseHandler = ffmpegExecuteResponseHandler;

diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegInterface.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/FFmpegInterface.java
@@ -22,15 +22,15 @@ interface FFmpegInterface {
      * @param ffmpegExecuteResponseHandler {@link FFmpegExecuteResponseHandler}
      * @throws FFmpegCommandAlreadyRunningException
      */
-    public void execute(Map<String, String> environvenmentVars, String cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException;
+    public void execute(Map<String, String> environvenmentVars, String[] cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException;
 
     /**
      * Executes a command
      * @param cmd command to execute
      * @param ffmpegExecuteResponseHandler {@link FFmpegExecuteResponseHandler}
      * @throws FFmpegCommandAlreadyRunningException
      */
-    public void execute(String cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException;
+    public void execute(String[] cmd, FFmpegExecuteResponseHandler ffmpegExecuteResponseHandler) throws FFmpegCommandAlreadyRunningException;
 
     /**
      * Tells FFmpeg version currently on device

diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ShellCommand.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/ShellCommand.java
@@ -4,7 +4,7 @@
 
 class ShellCommand {
 
-    Process run(String commandString) {
+    Process run(String[] commandString) {
         Process process = null;
         try {
             process = Runtime.getRuntime().exec(commandString);
@@ -14,7 +14,7 @@ Process run(String commandString) {
         return process;
     }
 
-    CommandResult runWaitFor(String s) {
+    CommandResult runWaitFor(String[] s) {
         Process process = run(s);
 
         Integer exitValue = null;

diff --git a/app/src/main/java/com/github/hiteshsondhi88/sampleffmpeg/Home.java b/app/src/main/java/com/github/hiteshsondhi88/sampleffmpeg/Home.java
@@ -75,7 +75,7 @@ public void onFailure() {
         }
     }
 
-    private void execFFmpegBinary(final String command) {
+    private void execFFmpegBinary(final String[] command) {
         try {
             ffmpeg.execute(command, new ExecuteBinaryResponseHandler() {
                 @Override
@@ -142,8 +142,9 @@ public void onClick(DialogInterface dialog, int which) {
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.run_command:
-                String command = commandEditText.getText().toString();
-                if (!TextUtils.isEmpty(command)) {
+                String cmd = commandEditText.getText().toString();
+                String[] command = cmd.split(" ");
+                if (command.length != 0) {
                     execFFmpegBinary(command);
                 } else {
                     Toast.makeText(Home.this, getString(R.string.empty_command_toast), Toast.LENGTH_LONG).show();

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -20,9 +20,9 @@ allprojects {
 
 ext {
     compileSdkVersion = 22
-    buildToolsVersion = '22'
+    buildToolsVersion = '21.1.2'
     targetSdkVersion = 22
     minSdkVersion = 16
     versionCode = 25
-    versionName = "0.2.5"
-}
+    versionName = "0.2.6"
+}