Merge pull request #216 from ozer550/update-failed-task-state-in-database

synchornize database when a TaskRequest is failed

Author: bjester

python-for-android/dists/kolibri/src/main/java/org/kivy/android/PythonWorker.java

@@ -6,6 +6,9 @@
 
 import androidx.annotation.NonNull;
 
+import org.learningequality.Kolibri.sqlite.JobStorage;
+import org.learningequality.sqlite.query.UpdateQuery;
+
 /**
  * Ideally this would be called `PythonWorkerImpl` but the name is used in the native code.
  */
@@ -19,11 +22,11 @@ public class PythonWorker {
     private final String pythonHome;
     private final String pythonPath;
 
+
     public PythonWorker(@NonNull Context context, String pythonName, String workerEntrypoint) {
         PythonLoader.doLoad(context);
         this.pythonName = pythonName;
         this.workerEntrypoint = workerEntrypoint;
-
         String appRoot = PythonUtil.getAppRoot(context);
         androidPrivate = appRoot;
         androidArgument = appRoot;
@@ -61,11 +64,18 @@ public boolean execute(String id, String arg) {
                     serializedArg
             );
             Log.d(TAG, id + " Finished executing python work: " + res);
+            if (res == 0) {
+                // If the result is 0, execution was successful
+                return true;
+            } else {
+                // For any result other than 0, log and treat as a failure
+                Log.e(TAG, "Python work execution failed with result code: " + res);
+                return false;
+            }
         } catch (Exception e) {
+            // Catch and log any exceptions, treating them as execution failures
             Log.e(TAG, "Error executing python work", e);
             return false;
         }
-
-        return res == 0;
     }
 }

python-for-android/dists/kolibri/src/main/java/org/learningequality/task/Worker.java

@@ -9,9 +9,11 @@
 import androidx.work.WorkerParameters;
 
 import org.kivy.android.PythonProvider;
+import org.learningequality.Kolibri.sqlite.JobStorage;
 import org.learningequality.Kolibri.task.TaskWorkerImpl;
 import org.learningequality.notification.Notifier;
 import org.learningequality.notification.NotificationRef;
+import org.learningequality.sqlite.query.UpdateQuery;
 
 import java.util.UUID;
 import java.util.zip.CRC32;
@@ -25,6 +27,7 @@ abstract public class Worker extends androidx.work.Worker implements Notifier {
     private int lastProgressUpdateHash;
     private Notification lastNotification;
 
+
     public Worker(
             @NonNull Context context, @NonNull WorkerParameters workerParams
     ) {
@@ -46,7 +49,6 @@ public Result doWork() {
         final String id = getId().toString();
         final String arg = getArgument();
         Result r;
-
         Log.d(TAG, "Executing task implementation: " + getId());
         try (WorkerImpl<TaskWorkerImpl.Message> workerImpl = getWorkerImpl()) {
             workerImpl.addObserver(new Observer<TaskWorkerImpl.Message>() {
@@ -57,23 +59,51 @@ public void update(TaskWorkerImpl.Message message) {
             });
             // Provide context to PythonProvider
             try (PythonProvider ignored = PythonProvider.create(getApplicationContext())) {
-                r = workerImpl.execute(id, arg) ? Result.success() : Result.failure();
+                boolean result = workerImpl.execute(id,arg);
+                if (!result) {
+                    if (updateTaskStatus(getArgument(), JobStorage.Jobs.State.FAILED.toString()) == 0) {
+                        Log.e(TAG, "Failed to update TaskStatus for remote Task " + getId());
+                    }
+                }
+                r = result ? Result.success() : Result.failure();
             }
         } catch (Exception e) {
             Log.e(TAG, "Error executing task implementation: " + getId(), e);
             r = Result.failure();
         }
         hideNotification();
-        return r;
+      return r;
     }
 
     @Override
     public void onStopped() {
         Log.d(TAG, "Stopping background remote task " + getId());
+        // Here we need to update the task in the database to be marked as failed
+        if (updateTaskStatus(getArgument(), JobStorage.Jobs.State.CANCELED.toString()) == 0) {
+            Log.e(TAG, "Failed to update TaskStatus for remote Task " + getId());
+        }
         hideNotification();
         super.onStopped();
     }
 
+    protected int updateTaskStatus(String id, String stateToBeUpdatedTo) {
+        int result = 0;
+        try (JobStorage db = JobStorage.readwrite(getApplicationContext())) {
+            if (db!=null) {
+                Log.d(TAG, "Updating Task Status for job " + id);
+                UpdateQuery q = new UpdateQuery(JobStorage.Jobs.TABLE_NAME)
+                        .where(JobStorage.Jobs.id, id)
+                        .set(JobStorage.Jobs.state, stateToBeUpdatedTo);
+                result = q.execute(db);
+            }
+            Log.e(TAG, "Failed to initialize JobStorage");
+        }catch (Exception e) {
+            Log.e(TAG, "Error managing JobStorage", e);
+        }
+        return result;
+    }
+
+
     protected Notification getLastNotification() {
         return lastNotification;
     }