Local logfiles implementation (draft) and FTP

app/src/main/assets/defaults.properties

@@ -1,3 +1,8 @@
+# filenames (TODO: use just prefixes)
+filename_data=sensors.csv
+filename_frame=frame.jpg
+
+
 # milliseconds between one sample and the other (frequency in Hz = 1 / (default_logging_rate/1000))
 pref_logging_rate=100
 

app/src/main/java/it/francescogabbrielli/apps/sensorlogger/CameraPreview.java

@@ -9,6 +9,10 @@
 
 import java.io.IOException;
 
+/**
+ * XXX: all callbacks moved to activty...
+ * TODO: refactor
+ */
 public class CameraPreview extends SurfaceView {
 
     public CameraPreview(MainActivity activity) {

app/src/main/java/it/francescogabbrielli/apps/sensorlogger/FTPUploader.java → app/src/main/java/it/francescogabbrielli/apps/sensorlogger/LogFTPUploader.java

@@ -12,9 +12,9 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-public class FTPUploader {
+public class LogFTPUploader extends LogTarget {
 
-    private final static String TAG = FTPUploader.class.getSimpleName();
+    private final static String TAG = LogFTPUploader.class.getSimpleName();
 
     private ExecutorService exec;
 
@@ -26,12 +26,10 @@ public class FTPUploader {
      * Creates a new FTP uploader, that is a wrapper around Apache Commons FTPClient with threading
      * support and configuration linked to application settings
      *
-     * TODO: add a kind of listener interface support instead of single callbacks
-     *
      * @param context
      *              the application context
      */
-    public FTPUploader(Context context) {
+    public LogFTPUploader(Context context) {
         client = new FTPClient();
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         address = prefs.getString(Util.PREF_FTP_ADDRESS, "");
@@ -71,6 +69,7 @@ public void execute(final Runnable command) {
     /**
      * Closes current connection
      */
+    @Override
     public void close() {
         if (client!=null && client.isConnected()) {
             exec.execute(new Runnable() {
@@ -107,6 +106,7 @@ public void run() {
      * @param filename
      *          the filename to write to
      */
+    @Override
     public void send(final byte[] data, final String filename, final Runnable callback) {
         if (client.isConnected())
             exec.execute(new Runnable() {
@@ -120,13 +120,13 @@ public void run() {
                             callback.run();
                         Log.d(TAG, "Data written to "+filename);
                     } catch (Exception e) {
-                        Log.e(FTPUploader.class.getSimpleName(), "Transfer Error", e);
+                        Log.e(TAG, "Transfer Error", e);
                     } finally {
                         try {
                             out.close();
                             client.completePendingCommand();
                         } catch (Exception e) {
-                            Log.e(FTPUploader.class.getSimpleName(), "Unexpected error", e);
+                            Log.e(LogFTPUploader.class.getSimpleName(), "Unexpected error", e);
                         }
                     }
                 }

app/src/main/java/it/francescogabbrielli/apps/sensorlogger/LogFileWriter.java

@@ -0,0 +1,68 @@
+package it.francescogabbrielli.apps.sensorlogger;
+
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class LogFileWriter extends LogTarget {
+
+    private final static String TAG = LogFTPUploader.class.getSimpleName();
+
+    private File folder;
+    private ExecutorService exec;
+
+    public LogFileWriter(File folder) {
+        this.folder = folder;
+        exec = Executors.newSingleThreadExecutor();
+    }
+
+    @Override
+    public void send(final byte[] data, final String filename, final Runnable callback) {
+        exec.execute(new Runnable() {
+            @Override
+            public void run() {
+                FileOutputStream out = null;
+                try {
+                    out = new FileOutputStream(new File(folder, filename));
+                    out.write(data);
+                    if (callback!=null)
+                        callback.run();
+                    Log.d(TAG, "Data written to " + filename);
+                } catch (Exception e) {
+                    Log.e(TAG, "Error writing file", e);
+                } finally {
+                    try {
+                        out.close();
+                    } catch (Exception e) {
+
+                    }
+                }
+            }
+        });
+    }
+
+    @Override
+    public void close() {
+        exec.execute(new Runnable() {
+            @Override
+            public void run() {
+                new Thread() {
+                    @Override
+                    public void run() {
+                        try {
+                            exec.awaitTermination(5, TimeUnit.SECONDS);
+                            exec.shutdown();
+                        } catch(InterruptedException e) {
+                            Log.e(TAG, "Unexpected interruption", e);
+                        }
+                    }
+                }.start();
+            }
+        });
+    }
+
+}

app/src/main/java/it/francescogabbrielli/apps/sensorlogger/LogTarget.java

@@ -0,0 +1,22 @@
+package it.francescogabbrielli.apps.sensorlogger;
+
+/**
+ * Generic target where to log data
+ *
+ * TODO: move executor framework here
+ */
+public abstract class LogTarget {
+
+    /**
+     * Send data to the target
+     *
+     * TODO: add a kind of listener interface support instead of single callbacks
+     */
+    public abstract void send(final byte[] data, final String filename, final Runnable callback);
+
+    /**
+     * Implement final cleanup
+     */
+    public abstract void close();
+
+}