Add task reconciler class, refactor Task.java

learningequality · Jan 9, 2024 · cb69f18 · cb69f18
1 parent e1f8fb5
commit cb69f18
Show file tree

Hide file tree

Showing 17 changed files with 939 additions and 381 deletions.
diff --git a/.python-version b/.python-version
@@ -0,0 +1 @@
+3.9.13
diff --git a/python-for-android/dists/kolibri/src/main/java/org/learningequality/Kolibri/App.java b/python-for-android/dists/kolibri/src/main/java/org/learningequality/Kolibri/App.java
@@ -72,13 +72,11 @@ private void createNotificationChannels() {
 
     private void reconcileTasks() {
         // Reconcile tasks on startup, in this main thread (blocking!)
-        CompletableFuture<Boolean> f = Task.reconcile(this, null);
-        f.whenCompleteAsync((result, throwable) -> {
-            if (throwable != null) {
-                Log.e("Kolibri", "Main thread task reconciliation failed", throwable);
-            } else {
-                Log.i("Kolibri", "Main thread task reconciliation completed");
-            }
-        });
+        boolean result = Task.reconcile(this, null);
+        if (result) {
+            Log.i("Kolibri", "Main thread task reconciliation completed");
+        } else {
+            Log.d("Kolibri", "Main thread task reconciliation no-op");
+        }
     }
 }
diff --git a/...for-android/dists/kolibri/src/main/java/org/learningequality/Kolibri/ReconcileWorker.java b/...for-android/dists/kolibri/src/main/java/org/learningequality/Kolibri/ReconcileWorker.java
@@ -30,18 +30,13 @@ public ListenableFuture<Result> startWork() {
         SettableFuture<Result> future = SettableFuture.create();
         Executor executor = getBackgroundExecutor();
 
-        CompletableFuture<Boolean> f = Task.reconcile(getApplicationContext(), executor);
-
-        f.whenCompleteAsync((result, throwable) -> {
-            if (throwable != null) {
-                Log.e(TAG, "Reconcile task failed", throwable);
-                future.setException(throwable);
-            } else {
-                Log.i(TAG, "Reconcile task completed: " + (result ? "success" : "failure"));
-                future.set(result ? Result.success() : Result.failure());
-            }
-        }, executor);
-
+        boolean result = Task.reconcile(getApplicationContext(), executor);
+        if (!result) {
+            Log.e(TAG, "Failed to reconcile tasks");
+            future.set(Result.failure());
+            return future;
+        }
+        future.set(Result.success());
         return future;
     }
 }
diff --git a/...or-android/dists/kolibri/src/main/java/org/learningequality/Kolibri/TaskworkerWorker.java b/...or-android/dists/kolibri/src/main/java/org/learningequality/Kolibri/TaskworkerWorker.java
@@ -27,18 +27,6 @@ public TaskworkerWorker(
         mWorker = this;
     }
 
-    public static Data buildInputData(String workerArgument) {
-        String dataArgument = workerArgument == null ? "" : workerArgument;
-        Data data = new Data.Builder()
-            .putString(ARGUMENT_WORKER_ARGUMENT, dataArgument)
-            .putString(ARGUMENT_PACKAGE_NAME, "org.learningequality.Kolibri")
-            .putString(ARGUMENT_CLASS_NAME,
-                       TaskworkerWorkerService.class.getName())
-            .build();
-        Log.v(TAG, "Request data: " + data.toString());
-        return data;
-    }
-
     protected void cleanup() {
         hideNotification();
         mWorker = null;
@@ -80,4 +68,16 @@ public static void clearNotification() {
             mWorker.hideNotification();
         }
     }
+
+    public static Data buildInputData(String workerArgument) {
+        String dataArgument = workerArgument == null ? "" : workerArgument;
+        Data data = new Data.Builder()
+                .putString(ARGUMENT_WORKER_ARGUMENT, dataArgument)
+                .putString(ARGUMENT_PACKAGE_NAME, "org.learningequality.Kolibri")
+                .putString(ARGUMENT_CLASS_NAME,
+                        TaskworkerWorkerService.class.getName())
+                .build();
+        Log.v(TAG, "Request data: " + data.toString());
+        return data;
+    }
 }
diff --git a/...oid/dists/kolibri/src/main/java/org/learningequality/Kolibri/TaskworkerWorkerService.java b/...oid/dists/kolibri/src/main/java/org/learningequality/Kolibri/TaskworkerWorkerService.java
@@ -28,7 +28,7 @@ public void onCreate() {
         );
         // Initialize the work manager
         WorkManager.getInstance(getApplicationContext());
-        enqueueTaskReconciliation();
+//        enqueueTaskReconciliation();
         super.onCreate();
         // We could potentially remove this and leave the notification up to long-running workers
         // bound to the service

diff --git a/...r-android/dists/kolibri/src/main/java/org/learningequality/Kolibri/sqlite/JobStorage.java b/...r-android/dists/kolibri/src/main/java/org/learningequality/Kolibri/sqlite/JobStorage.java
@@ -1,8 +1,14 @@
 package org.learningequality.Kolibri.sqlite;
 
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+
 import org.learningequality.sqlite.schema.DatabaseTable;
+import org.learningequality.sqlite.Database;
+
+import java.io.File;
 
-public class JobStorage {
+public class JobStorage extends Database {
     public static final String DATABASE_NAME = "job_storage.sqlite3";
 
     public static class Jobs implements DatabaseTable {
@@ -13,13 +19,15 @@ public String getTableName() {
         }
 
         public static final StringColumn id = new StringColumn("id");
+        public static final StringColumn func = new StringColumn("func");
+        public static final IntegerColumn priority = new IntegerColumn("priority");
         public static final StringColumn worker_process = new StringColumn("worker_process");
         public static final StringColumn worker_thread = new StringColumn("worker_thread");
         public static final StringColumn worker_extra = new StringColumn("worker_extra");
         public static final StringColumn time_updated = new StringColumn("time_updated");
         public static final StringColumn state = new StringColumn("state");
 
-        public enum State implements ColumnEnum<String> {
+        public enum State implements StringChoiceEnum {
             PENDING,
             QUEUED,
             SCHEDULED,
@@ -35,5 +43,40 @@ public StringColumn getColumn() {
                 return state;
             }
         }
+
+        public enum Priority implements ColumnEnum<Integer> {
+            LOW(15),
+            REGULAR(10),
+            HIGH(5)
+            ;
+
+            private final int value;
+
+            Priority(int val) {
+                this.value = val;
+            }
+
+            public Integer getValue() {
+                return this.value;
+            }
+
+            public IntegerColumn getColumn() {
+                return priority;
+            }
+
+
+        }
+    }
+
+    protected JobStorage(String path, int flags) {
+        super(DATABASE_NAME, path, flags);
+    }
+
+    public static JobStorage readwrite(Context context) {
+        File f = getDatabasePath(context, DATABASE_NAME);
+
+        return f != null
+            ? new JobStorage(f.getPath(), SQLiteDatabase.OPEN_READWRITE)
+            : null;
     }
 }