corrupted ccz handling

dimagi · Nov 6, 2020 · 617de50 · 617de50
1 parent ee6f3f6
commit 617de50
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/libs/commcare b/libs/commcare
diff --git a/src/main/java/org/commcare/formplayer/engine/FormplayerArchiveFileRoot.java b/src/main/java/org/commcare/formplayer/engine/FormplayerArchiveFileRoot.java
@@ -47,4 +47,11 @@ public Reference derive(String guidPath) throws InvalidReferenceException {
             throw new InvalidReferenceException(String.format("Error deriving reference with exception %s.", guidPath), guidPath);
         }
     }
+
+    @Override
+    public String removeArchiveFile(String appId) {
+        String mGUID = super.removeArchiveFile(appId);
+        redisTemplate.delete(String.format("formplayer:archive:%s", mGUID));
+        return mGUID;
+    }
 }
diff --git a/src/main/java/org/commcare/formplayer/engine/FormplayerConfigEngine.java b/src/main/java/org/commcare/formplayer/engine/FormplayerConfigEngine.java
@@ -53,7 +53,7 @@ public FormplayerConfigEngine(IStorageIndexedFactory storageFactory,
         ReferenceManager.instance().addReferenceFactory(formplayerArchiveFileRoot);
     }
 
-    private String parseAppId(String url) {
+    public static String parseAppId(String url) {
         String appId = null;
         try {
             List<NameValuePair> params = new URIBuilder(url).getQueryParams();
@@ -105,6 +105,11 @@ public void initFromArchive(String archiveURL, boolean preview) throws InstallCa
         init("jr://archive/" + archiveGUID + "/profile.ccpr");
     }
 
+    public void removeArchive(String archiveURL) {
+       String appId = parseAppId(archiveURL);
+       mArchiveRoot.removeArchiveFile(appId);
+    }
+
     @Override
     protected String downloadToTemp(String resource) {
         FileOutputStream fos = null;

diff --git a/src/main/java/org/commcare/formplayer/services/InstallService.java b/src/main/java/org/commcare/formplayer/services/InstallService.java
@@ -18,6 +18,7 @@
 import org.commcare.formplayer.util.Constants;
 import org.commcare.formplayer.util.SimpleTimer;
 
+
 /**
  * The InstallService handles configuring the application,
  * either from a .ccz or .ccpr reference or existing dbs.
@@ -84,10 +85,12 @@ public Pair<FormplayerConfigEngine, Boolean> configureApplication(String referen
             return new Pair<>(engine, newInstall);
         } catch (UnresolvedResourceException e) {
             log.error("Got exception " + e + " while installing reference " + reference + " at path " + sqliteDB.getDatabaseFileForDebugPurposes());
+            formplayerArchiveFileRoot.removeArchiveFile(FormplayerConfigEngine.parseAppId(reference));
             throw new UnresolvedResourceRuntimeException(e);
         } catch (Exception e) {
             log.error("Got exception " + e + " while installing reference " + reference + " at path " + sqliteDB.getDatabaseFileForDebugPurposes());
             sqliteDB.deleteDatabaseFile();
+            formplayerArchiveFileRoot.removeArchiveFile(FormplayerConfigEngine.parseAppId(reference));
             throw e;
         }
     }