chore: clean code

Author: gavinliu

app/build.gradle

@@ -37,6 +37,7 @@ dependencies {
     implementation "androidx.appcompat:appcompat:1.0.0-beta01"
     implementation "androidx.constraintlayout:constraintlayout:1.1.2"
     implementation "io.reactivex.rxjava2:rxjava:2.2.0"
+    implementation "io.reactivex.rxjava2:rxandroid:2.0.2"
 
     implementation project(":library")
 }

app/src/main/java/cn/gavinliu/ffmpegbox/MainActivity.kt

@@ -4,6 +4,9 @@ import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
 import cn.quickits.ffmpeg.box.FFmpegBox
+import cn.quickits.ffmpeg.box.data.Success
+import cn.quickits.ffmpeg.box.util.FileUtils
+import io.reactivex.android.schedulers.AndroidSchedulers
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
@@ -12,14 +15,21 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        load.setOnClickListener {
-            FFmpegBox.get().loadBinary()
-        }
-
         execute.setOnClickListener {
-            FFmpegBox.get().version().subscribe { version ->
-                Log.d("MainActivity", version)
-            }
+            FFmpegBox.get().version()
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe { version ->
+                        msg.text = version
+                    }
+
+//            FFmpegBox.get().exec(arrayOf(FileUtils.getFFmpegFilePath(),
+//                    "-i", "/sdcard/screenshots.mp4",
+//                    "-vcodec", "copy",
+//                    "/sdcard/screenshots.avi"
+//            )).subscribe { status ->
+//                Log.d("MainActivity", "${status.msg} ${status is Success}")
+//            }
+
         }
     }
 }

app/src/main/res/layout/activity_main.xml

@@ -6,25 +6,24 @@
                                                    android:layout_height="match_parent"
                                                    tools:context=".MainActivity">
 
-    <TextView
-        android:id="@+id/load"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Load Binary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
+    <Button
         android:id="@+id/execute"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:text="execute"
+        android:text="Version" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/load" />
+        app:layout_constraintTop_toBottomOf="@+id/execute">
+
+        <TextView
+            android:id="@+id/msg"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </ScrollView>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

library/src/main/java/cn/quickits/ffmpeg/box/FFmpegBinaryLoader.kt

@@ -10,15 +10,14 @@ import io.reactivex.Flowable
 
 class FFmpegBox {
 
-    fun loadBinary() {
-        FFmpegBinaryLoader().execute()
+    fun exec(cmd: Array<String>): Flowable<Status> {
+        var newCmd = arrayOf(FileUtils.getFFmpegFilePath())
+        newCmd = newCmd.plus(cmd)
+        return FFmpegBoxSpec.instance().commanderBox.exec(newCmd)
     }
 
-    fun exec(cmd: Array<String>): Flowable<Status> = FFmpegBoxSpec.instance().commanderBox.exec(cmd)
-
     fun version(): Flowable<String> {
-        val cmd = arrayOf(FileUtils.getFFmpegFilePath(), "-version")
-        return exec(cmd).filter { it is Success }.map { it.msg }
+        return exec(arrayOf("-version")).filter { it is Success }.map { it.msg }
     }
 
     companion object {

library/src/main/java/cn/quickits/ffmpeg/box/FFmpegBox.kt

@@ -1,5 +1,6 @@
 package cn.quickits.ffmpeg.box.data
 
+import cn.quickits.ffmpeg.box.util.FileUtils
 import cn.quickits.ffmpeg.box.util.ProcessUtils
 import io.reactivex.Flowable
 import io.reactivex.disposables.Disposable
@@ -20,6 +21,12 @@ class Commander(val cmd: Array<String>) {
     fun exec() {
         if (disposable == null) {
             disposable = Flowable.just(cmd)
+                    .map {
+                        if (!loadBinary()) {
+                            throw RuntimeException()
+                        }
+                        it
+                    }
                     .map { Runtime.getRuntime().exec(it) }
                     .map { process ->
                         checkAndUpdate(process)
@@ -37,7 +44,7 @@ class Commander(val cmd: Array<String>) {
 
                     }
                     .doFinally {
-                        
+                        disposable = null
                     }
                     .subscribe({ emitStatus(it) }, {
                         emitStatus(Failed(it.message ?: ""))
@@ -71,4 +78,18 @@ class Commander(val cmd: Array<String>) {
         }
     }
 
+    private fun loadBinary(): Boolean {
+        val ffmpegFile = FileUtils.getFFmpegFile()
+
+        if (!ffmpegFile.exists()) {
+            if (FileUtils.copyBinaryFromAssetsToData()) {
+                if (ffmpegFile.canExecute() || ffmpegFile.setExecutable(true)) {
+                    return true
+                }
+            }
+        }
+
+        return ffmpegFile.exists() && ffmpegFile.canExecute()
+    }
+
 }