Merge pull request #277 from arfath-gwl/release-2.7.0

Release 2.7.0
Sunbird-Ed · Jan 24, 2020 · a8d37cd · a8d37cd
2 parents 033164b + fca496e
commit a8d37cd
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 14 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sunbird-sdk",
-  "version": "2.7.13",
+  "version": "2.7.14",
   "description": "Heart of the sunbird mobile app.",
   "main": "dist/index.js",
   "scripts": {

diff --git a/src/content/handlers/delete-content-handler.ts b/src/content/handlers/delete-content-handler.ts
@@ -126,10 +126,12 @@ export class DeleteContentHandler {
                 const localData = contentInDb[ContentEntry.COLUMN_NAME_LOCAL_DATA];
                 const localContentData: ContentData = localData && JSON.parse(localData);
                 let appIcon = '';
+                let itemSetPreviewUrl = '';
                 if (localData) {
-                    appIcon = localContentData.appIcon;
+                    appIcon = localContentData.appIcon ? FileUtil.getFileName(localContentData.appIcon) : '';
+                    itemSetPreviewUrl = localContentData.itemSetPreviewUrl ? FileUtil.getFileName(localContentData.itemSetPreviewUrl) : '';
                 }
-                this.rm(ContentUtil.getBasePath(path), appIcon ? FileUtil.getFileName(appIcon) : '');
+                this.rm(ContentUtil.getBasePath(path), [appIcon, itemSetPreviewUrl].join(':'));
             }
             contentInDb[ContentEntry.COLUMN_NAME_VISIBILITY] = visibility;
             contentInDb[ContentEntry.COLUMN_NAME_REF_COUNT] = ContentUtil.addOrUpdateRefCount(refCount);

diff --git a/src/content/handlers/export/copy-asset.ts b/src/content/handlers/export/copy-asset.ts
@@ -19,11 +19,19 @@ export class CopyAsset {
                 const contentInDb = element as ContentEntry.SchemaMap;
                 const contentData = exportContentContext.items![i];
                 const appIcon = contentData['appIcon'];
-                if (appIcon) {
-                    try {
-                        await this.copyFile(contentInDb[ContentEntry.COLUMN_NAME_PATH]!, exportContentContext.tmpLocationPath!, appIcon);
-                    } catch (e) {
-                        console.error(e);
+                const setPreviewUrl = contentData['itemSetPreviewUrl'];
+
+                for (const item of [appIcon, setPreviewUrl]) {
+                    if (item && !item.startsWith('https:')) {
+                        try {
+                            await this.copyFile(
+                                contentInDb[ContentEntry.COLUMN_NAME_PATH]!,
+                                exportContentContext.tmpLocationPath!,
+                                item
+                            );
+                        } catch (e) {
+                            console.error(e);
+                        }
                     }
                 }
 

diff --git a/src/content/handlers/import/extract-payloads.ts b/src/content/handlers/import/extract-payloads.ts
@@ -90,6 +90,7 @@ export class ExtractPayloads {
             const pkgVersion = item.pkgVersion;
             const artifactUrl = item.artifactUrl;
             const appIcon = item.appIcon;
+            const itemSetPreviewUrl = item.itemSetPreviewUrl;
             const board = item.board;
             const medium = item.medium;
             const grade = item.gradeLevel;
@@ -170,6 +171,13 @@ export class ExtractPayloads {
                     } catch (e) {
                     }
                 }
+
+                try {
+                    if (!itemSetPreviewUrl.startsWith('https:')) {
+                        this.copyAssets(importContext.tmpLocation!, itemSetPreviewUrl, payloadDestination!, false);
+                    }
+                } catch (e) {
+                }
             }
             const basePath = this.getBasePath(payloadDestination, doesContentExist, existingContentPath);
             if (visibility === Visibility.DEFAULT.valueOf()) {