Auto move to log view if diagnostic is empty

Author: tranleduy2000

app/src/main/java/com/duy/ccppcompiler/compiler/CompileSetting.java

@@ -81,7 +81,11 @@ private String getGCCFlags() {
 
         //optimize
         String optimize = mPref.getString(mContext.getString(R.string.pref_option_optimization_level), "");
-        if (!optimize.isEmpty()) builder.addFlags("-O" + optimize);
+        if (!optimize.isEmpty()) {
+            if (optimize.matches("(fast)|(g)|(s)|[0123]")) {
+                builder.addFlags("-O" + optimize);
+            }
+        }
 
         //language standard
         String std = mPref.getString(mContext.getString(R.string.pref_option_language_standard), "");

app/src/main/java/com/duy/ccppcompiler/compiler/compilers/GCCCompiler.java

@@ -98,7 +98,6 @@ protected String buildCommand(File[] sourceFiles) {
         if (Build.VERSION.SDK_INT >= 21) {
             builder.addFlags("-pie");
         }
-
         // builder.addFlags("-std=c99");
         // builder.addFlags("-lz"/*zlib*/, "-ldl", "-lm" /*math*/, "-llog");
         // builder.addFlags("-lncurses");

app/src/main/java/com/duy/ccppcompiler/compiler/shell/Shell.java

@@ -28,6 +28,7 @@
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 
@@ -92,22 +93,22 @@ public void run() {
 
             //parse output
             StringBuilder message = new StringBuilder();
-            int skipLine = 0; //skip echos from two command strings
+            int skipLine = 6; //skip echos from two command strings
             final Pattern patClearNewLine = Pattern.compile("(\\x08)\\1+");
             do {
                 String errstr;
                 try {
                     errstr = input.readLine();
                     // remove escape sequence
-//                    errstr = errstr.replaceAll("\u001b\\[([0-9]|;)*m", "");
+                    errstr = errstr.replaceAll("\u001b\\[([0-9]|;)*m", "");
                     // remove clearing new line
-//                    Matcher m = patClearNewLine.matcher(errstr);
-//                    if (m.find()) {
-//                        int length = m.end() - m.start();
-//                        if (m.start() > length) {
-//                            errstr = errstr.substring(0, m.start() - length) + errstr.substring(m.end());
-//                        }
-//                    }
+                    Matcher m = patClearNewLine.matcher(errstr);
+                    if (m.find()) {
+                        int length = m.end() - m.start();
+                        if (m.start() > length) {
+                            errstr = errstr.substring(0, m.start() - length) + errstr.substring(m.end());
+                        }
+                    }
                 } catch (IOException e) {
                     break;
                 }

app/src/main/java/com/duy/ccppcompiler/diagnostic/ui/DiagnosticFragment.java

@@ -35,6 +35,7 @@
 import com.duy.ccppcompiler.diagnostic.DiagnosticClickListener;
 import com.duy.ccppcompiler.diagnostic.DiagnosticContract;
 import com.duy.ccppcompiler.diagnostic.suggestion.ISuggestion;
+import com.duy.common.DLog;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -46,10 +47,9 @@
 public class DiagnosticFragment extends Fragment implements DiagnosticContract.View, DiagnosticClickListener {
     private static final String KEY_LIST_DIAGNOSTIC = "KEY_LIST_DIAGNOSTIC";
     private static final String KEY_LOG = "KEY_LOG";
-
+    private static final String TAG = "DiagnosticFragment";
     private DiagnosticContract.Presenter mPresenter;
     private DiagnosticsAdapter mAdapter;
-
     private RecyclerView mDiagnosticView;
     private TextView mLogView;
     private ViewPager mViewPager;
@@ -107,12 +107,21 @@ public void onSaveInstanceState(@NonNull Bundle outState) {
 
     @Override
     public void showDiagnostic(List<Diagnostic> diagnostics) {
+        if (DLog.DEBUG) {
+            DLog.d(TAG, "showDiagnostic() called with: diagnostics = [" + diagnostics + "]");
+        }
         mAdapter.setData(diagnostics);
+        if (!diagnostics.isEmpty()) {
+            mViewPager.setCurrentItem(0);
+        }
     }
 
     @Override
     public void showLog(CharSequence log) {
         mLogView.setText(log);
+        if (mAdapter.getDiagnostics().isEmpty()) {
+            mViewPager.setCurrentItem(1);
+        }
     }
 
     @Override

app/src/main/java/com/duy/ccppcompiler/filemanager/install/InstallActivity.java

@@ -34,7 +34,6 @@
 import android.widget.TextView;
 
 import com.duy.ccppcompiler.R;
-import com.duy.ccppcompiler.compiler.CompileSetting;
 import com.duy.ccppcompiler.compiler.compilers.GCCCompiler;
 import com.duy.ccppcompiler.compiler.compilers.GPlusPlusCompiler;
 import com.duy.ccppcompiler.compiler.shell.GccCommandResult;
@@ -193,7 +192,7 @@ protected Boolean doInBackground(Void... voids) {
                 IOUtils.write(/*"#include <stdio.h>\n" +*/ "int main(){ return 0; }", output);
                 output.close();
 
-                GCCCompiler compiler = new GCCCompiler(context, new CompileSetting(context));
+                GCCCompiler compiler = new GCCCompiler(context, null);
                 GccCommandResult result = compiler.compile(new File[]{file});
                 if (result == null || result.getResultCode() != 0) {
                     publishProgress("Could not exec C compiler, please install compiler");
@@ -205,7 +204,7 @@ protected Boolean doInBackground(Void... voids) {
                 output = new FileOutputStream(file);
                 IOUtils.write(/*"#include <iostream>\n" + "using namespace std;\n" +*/ "int main() { return 0; }", output);
                 output.close();
-                compiler = new GPlusPlusCompiler(context, new CompileSetting(context));
+                compiler = new GPlusPlusCompiler(context, null);
                 result = compiler.compile(new File[]{file});
                 if (result == null || result.getResultCode() != 0) {
                     publishProgress("Could not exec C++ compiler, please install compiler");