From 352d07e5fd3de8353c447da8ceeb62fe7aabaf04 Mon Sep 17 00:00:00 2001
From: Richard Tibbles <richard@learningequality.org>
Date: Fri, 16 Jul 2021 22:03:30 -0700
Subject: [PATCH] Simplify file URL generation. Only reference zipcontent in
 special case.

---
 kolibri/core/assets/src/core-app/urls.js      | 24 +++++---------
 .../views/ContentRenderer/DownloadButton.vue  |  3 +-
 kolibri/core/content/utils/paths.py           | 33 +++++--------------
 .../src/views/Html5AppRendererIndex.vue       |  4 ++-
 4 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/kolibri/core/assets/src/core-app/urls.js b/kolibri/core/assets/src/core-app/urls.js
index e5d9b35bd0a..cc72cae68b7 100644
--- a/kolibri/core/assets/src/core-app/urls.js
+++ b/kolibri/core/assets/src/core-app/urls.js
@@ -48,27 +48,21 @@ const urls = {
     }
     return generateUrl(this.__mediaUrl, { url });
   },
-  storageUrl(fileId, extension, embeddedFilePath = '') {
+  zipContentUrl(fileId, extension, embeddedFilePath = '') {
     const filename = `${fileId}.${extension}`;
-    if (['zip', 'h5p'].includes(extension)) {
-      if (!this.__zipContentUrl) {
-        throw new ReferenceError('Zipcontent Url is not defined');
-      }
-      return generateUrl(this.__zipContentUrl, {
-        url: `${filename}/${embeddedFilePath}`,
-        origin: this.__zipContentOrigin,
-        port: this.__zipContentPort,
-      });
-    }
-    if (!this.__contentUrl) {
+    if (!this.__zipContentUrl) {
       throw new ReferenceError('Zipcontent Url is not defined');
     }
-    return generateUrl(this.__contentUrl, { url: `${filename[0]}/${filename[1]}/${filename}` });
+    return generateUrl(this.__zipContentUrl, {
+      url: `${filename}/${embeddedFilePath}`,
+      origin: this.__zipContentOrigin,
+      port: this.__zipContentPort,
+    });
   },
-  downloadUrl(fileId, extension) {
+  storageUrl(fileId, extension) {
     const filename = `${fileId}.${extension}`;
     if (!this.__contentUrl) {
-      throw new ReferenceError('Content Url is not defined');
+      throw new ReferenceError('Zipcontent Url is not defined');
     }
     return generateUrl(this.__contentUrl, { url: `${filename[0]}/${filename[1]}/${filename}` });
   },
diff --git a/kolibri/core/assets/src/views/ContentRenderer/DownloadButton.vue b/kolibri/core/assets/src/views/ContentRenderer/DownloadButton.vue
index 68e3ad8c772..e04187f096f 100644
--- a/kolibri/core/assets/src/views/ContentRenderer/DownloadButton.vue
+++ b/kolibri/core/assets/src/views/ContentRenderer/DownloadButton.vue
@@ -11,7 +11,6 @@
 
 <script>
 
-  import urls from 'kolibri.urls';
   import { getFilePresetString } from './filePresetStrings';
 
   export default {
@@ -32,7 +31,7 @@
           const label = getFilePresetString(file);
           return {
             label,
-            url: urls.downloadUrl(file.checksum, file.extension),
+            url: file.storage_url,
             fileName: this.$tr('downloadFilename', {
               resourceTitle: this.nodeTitle,
               fileExtension: file.extension,
diff --git a/kolibri/core/content/utils/paths.py b/kolibri/core/content/utils/paths.py
index a7c4298e55f..aa2a2c0208b 100644
--- a/kolibri/core/content/utils/paths.py
+++ b/kolibri/core/content/utils/paths.py
@@ -14,9 +14,6 @@
 # valid storage filenames consist of 32-char hex plus a file extension
 VALID_STORAGE_FILENAME = re.compile(r"[0-9a-f]{32}(-data)?\.[0-9a-z]+")
 
-# set of file extensions that should be considered zip files and allow access to internal files
-POSSIBLE_ZIPPED_FILE_EXTENSIONS = set([".zip"])
-
 
 def _maybe_makedirs(path):
     if not os.path.isdir(path):
@@ -49,7 +46,15 @@ def get_local_content_storage_file_url(obj):
     The same url will also be exposed by the file serializer.
     """
     if get_attribute(obj, "available"):
-        return get_content_storage_file_url(filename=get_content_file_name(obj))
+        filename = get_content_file_name(obj)
+        return "/{}{}/{}/{}".format(
+            get_content_storage_url(
+                conf.OPTIONS["Deployment"]["URL_PATH_PREFIX"]
+            ).lstrip("/"),
+            filename[0],
+            filename[1],
+            filename,
+        )
     else:
         return None
 
@@ -305,23 +310,3 @@ def zip_content_static_root():
 
 def get_hashi_path():
     return "{}{}{}".format(zip_content_static_root(), HASHI, get_hashi_html_filename())
-
-
-def get_content_storage_file_url(filename):
-    """
-    Return the URL at which the specified file can be accessed. For regular files, this is a link to the static
-    file itself, under "/content/storage/". For "zip" files, this points to a dynamically generated view that
-    allows the client-side to index into the files within the zip.
-    """
-    ext = os.path.splitext(filename)[1]
-    if ext in POSSIBLE_ZIPPED_FILE_EXTENSIONS:
-        return "{}{}/".format(get_zip_content_base_path(), filename)
-    else:
-        return "/{}{}/{}/{}".format(
-            get_content_storage_url(
-                conf.OPTIONS["Deployment"]["URL_PATH_PREFIX"]
-            ).lstrip("/"),
-            filename[0],
-            filename[1],
-            filename,
-        )
diff --git a/kolibri/plugins/html5_viewer/assets/src/views/Html5AppRendererIndex.vue b/kolibri/plugins/html5_viewer/assets/src/views/Html5AppRendererIndex.vue
index 67c33157f7f..6809b73a81c 100644
--- a/kolibri/plugins/html5_viewer/assets/src/views/Html5AppRendererIndex.vue
+++ b/kolibri/plugins/html5_viewer/assets/src/views/Html5AppRendererIndex.vue
@@ -157,7 +157,9 @@
       this.hashi.initialize(
         (this.extraFields && this.extraFields.contentState) || {},
         this.userData,
-        this.defaultFile.storage_url,
+        this.defaultFile.extension === 'zip'
+          ? urls.zipContentUrl(this.defaultFile.checksum, this.defaultFile.extension)
+          : this.defaultFile.storage_url,
         this.defaultFile.checksum
       );
       this.$emit('startTracking');