Optimized CSV parsing

Signed-off-by: hibo98 <niklasmerkelt@mail.de>

Author: hibo98

app/app.iml

@@ -125,6 +125,7 @@
     <orderEntry type="library" name="com.journeyapps:zxing-android-embedded-3.6.0" level="project" />
     <orderEntry type="library" name="android.arch.lifecycle:viewmodel-1.1.0" level="project" />
     <orderEntry type="library" name="com.android.support:support-core-ui-27.1.0" level="project" />
+    <orderEntry type="library" name="org.apache.commons:commons-csv:1.5@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-annotations:27.1.0@jar" level="project" />
     <orderEntry type="library" name="com.android.support:recyclerview-v7-27.1.0" level="project" />
     <orderEntry type="library" name="android.arch.lifecycle:livedata-core-1.1.0" level="project" />

app/build.gradle

@@ -4,11 +4,11 @@ android {
     compileSdkVersion 27
 
     defaultConfig {
-        applicationId "de.schkola.kitchenscanner2"
+        applicationId "de.schkola.kitchenscanner"
         minSdkVersion 19
         targetSdkVersion 27
-        versionCode 1
-        versionName "1.0.0"
+        versionCode 2
+        versionName "1.1.0"
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -27,4 +27,5 @@ dependencies {
     implementation 'com.android.support:design:27.1.0'
     implementation 'com.android.support:support-fragment:27.1.0'
     implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
+    implementation 'org.apache.commons:commons-csv:1.5'
 }

app/src/main/java/de/schkola/kitchenscanner/activity/SettingsActivity.java

@@ -115,7 +115,7 @@ private void startCopy(boolean allergy) {
         int text = allergy ? R.string.choose_allergy : R.string.choose_day;
         Toast.makeText(this, text, Toast.LENGTH_LONG).show();
         Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.setType("text/*");
+        intent.setType("text/csv");
         startActivityForResult(intent, allergy ? REQUEST_CODE_ALLERGY : REQUEST_CODE_DAY);
     }
 

app/src/main/java/de/schkola/kitchenscanner/task/JsonScanTask.java

@@ -28,15 +28,16 @@
 import android.os.AsyncTask;
 import android.util.JsonWriter;
 
-import java.io.BufferedReader;
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
 
 public class JsonScanTask extends AsyncTask<InputStream, Void, Boolean> {
 
@@ -58,15 +59,22 @@ protected void onPreExecute() {
     @Override
     protected Boolean doInBackground(InputStream... inputStreams) {
         try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(inputStreams[0], "ISO-8859-1"));
+            CSVFormat format = CSVFormat.DEFAULT;
+            if (!allergy) {
+                format.withDelimiter(';')
+                        .withSkipHeaderRecord()
+                        .withHeader("WT", "KW", "Klasse", "XBA", "Name", "Gericht");
+            }
+
+            CSVParser csvParser = CSVParser.parse(inputStreams[0], Charset.forName("ISO-8859-1"), format);
             File json = new File(jsonFolder, allergy ? "allergy.json" : "day.json");
             JsonWriter writer = new JsonWriter(new OutputStreamWriter(new FileOutputStream(json), "ISO-8859-1"));
             if (allergy) {
-                scanAllergy(reader, writer);
+                scanAllergy(csvParser, writer);
             } else {
-                scanDay(reader, writer);
+                scanDay(csvParser, writer);
             }
-        } catch (UnsupportedEncodingException | FileNotFoundException e) {
+        } catch (IOException e) {
             e.printStackTrace();
         } finally {
             try {
@@ -83,51 +91,16 @@ protected void onPostExecute(Boolean aBoolean) {
         dialog.cancel();
     }
 
-    private void scanDay(BufferedReader reader, JsonWriter writer) {
-        int clazz = 2;
-        int xba = 3;
-        int name = 4;
-        int lunch = 5;
+    private void scanDay(CSVParser csvParser, JsonWriter writer) {
         try {
             writer.beginArray();
-            String csvLine;
-            boolean first = true;
-            boolean headline = false;
-            while ((csvLine = reader.readLine()) != null) {
-                String[] line = csvLine.split(csvLine.split(",").length > 2 ? "," : ";");
-                if (first) {
-                    for (int i = 0; i < line.length; i++) {
-                        if (line[i].replace("\"", "").equalsIgnoreCase("Klasse")) {
-                            clazz = i;
-                            headline = true;
-                        } else if (line[i].replace("\"", "").equalsIgnoreCase("XBA")) {
-                            xba = i;
-                            headline = true;
-                        } else if (line[i].replace("\"", "").equalsIgnoreCase("Name")) {
-                            name = i;
-                            headline = true;
-                        } else if (line[i].replace("\"", "").equalsIgnoreCase("Gericht")) {
-                            lunch = i;
-                            headline = true;
-                        }
-                    }
-                    if (!headline) {
-                        writer.beginObject();
-                        writer.name("class").value(line[clazz].replace("\"", ""));
-                        writer.name("xba").value(Integer.parseInt(line[xba].replace("\"", "")));
-                        writer.name("name").value(line[name].replace("\"", ""));
-                        writer.name("lunch").value(line[lunch].replace("\"", ""));
-                        writer.endObject();
-                    }
-                    first = false;
-                } else {
-                    writer.beginObject();
-                    writer.name("class").value(line[clazz].replace("\"", ""));
-                    writer.name("xba").value(Integer.parseInt(line[xba].replace("\"", "")));
-                    writer.name("name").value(line[name].replace("\"", ""));
-                    writer.name("lunch").value(line[lunch].replace("\"", ""));
-                    writer.endObject();
-                }
+            for (CSVRecord record : csvParser) {
+                writer.beginObject();
+                writer.name("class").value(record.get("Klasse"));
+                writer.name("xba").value(Integer.parseInt(record.get("XBA")));
+                writer.name("name").value(record.get("Name"));
+                writer.name("lunch").value(record.get("Gericht"));
+                writer.endObject();
             }
             writer.endArray();
             writer.close();
@@ -136,17 +109,15 @@ private void scanDay(BufferedReader reader, JsonWriter writer) {
         }
     }
 
-    private void scanAllergy(BufferedReader reader, JsonWriter writer) {
+    private void scanAllergy(CSVParser csvParser, JsonWriter writer) {
         int xba = 0;
         int allergy = 1;
         try {
             writer.beginArray();
-            String csvLine;
-            while ((csvLine = reader.readLine()) != null) {
-                String[] line = csvLine.split(",");
+            for (CSVRecord record : csvParser) {
                 writer.beginObject();
-                writer.name("xba").value(Integer.parseInt(line[xba]));
-                writer.name("allergy").value(line[allergy]);
+                writer.name("xba").value(Integer.parseInt(record.get(xba)));
+                writer.name("allergy").value(record.get(allergy));
                 writer.endObject();
             }
             writer.endArray();