premisces to media support in overview, for the future

2 files changed, 22 insertions, 7 deletions

diff --git a/lib/Controller/NoteController.php b/lib/Controller/NoteController.php
index 82c9a9b..59644aa 100755
--- a/lib/Controller/NoteController.php
+++ b/lib/Controller/NoteController.php
@@ -812,10 +812,15 @@ public function getOpusEncoder(){
         $zipFile = new MyZipFile();
         $meta = array();
         $meta["previews"] = array();
-        $previews = $this->addFolderContentToArchive($folder,$zipFile,"");
-        foreach($previews as $preview){
+        $meta["media"] = array();
+
+        $res = $this->addFolderContentToArchive($folder,$zipFile,"");
+        foreach($res['previews'] as $preview){
             array_push($meta['previews'], "./note/getmedia?note=".$path."&media=".$preview);
         }
+        foreach($res['media'] as $media){
+            array_push($meta['media'], "./note/getmedia?note=".$path."&media=".$media);
+        }
         $file = $this->CarnetFolder->newFile($path);
         //tried to do with a direct fopen on $file but lead to bad size on nextcloud
         $tmppath = tempnam(sys_get_temp_dir(), uniqid().".sqd");
@@ -846,21 +851,29 @@ public function getOpusEncoder(){
      */
      private function addFolderContentToArchive($folder, $archive, $relativePath){
          $previews = array();
+         $media = array();
+
         foreach($folder->getDirectoryListing() as $in){
             $inf = $in->getFileInfo();
             $path = $relativePath.$inf->getName();
             if($inf->getType() === "dir"){
                 $archive->addEmptyDir($path);
-                $previews = array_merge($previews, $this->addFolderContentToArchive($in, $archive, $path."/"));
+                $res = $this->addFolderContentToArchive($in, $archive, $path."/");
+                $previews = array_merge($previews, $res['previews']);
+                $media = array_merge($media, $res['media']);
+
             }else {
                 $archive->addFromStream($in->fopen("r"), $path, \PhpZip\ZipFile::METHOD_DEFLATED);
                 if(substr($path,0,strlen("data/preview_")) === "data/preview_"){
                     array_push($previews, $path);
+                } else if(substr($path,0,strlen("data/")) === "data/"){
+                    array_push($media, $path);
                 }
             }
 
         }
-        return $previews;
+       
+        return array("previews" => $previews, "media" => $media);
      }
 
      private function getCurrentnoteDir(){
diff --git a/lib/Misc/NoteUtils.php b/lib/Misc/NoteUtils.php
index b3b0929..80921f4 100644
--- a/lib/Misc/NoteUtils.php
+++ b/lib/Misc/NoteUtils.php
@@ -22,15 +22,17 @@ class NoteUtils{
             try{
             
             $meta['shorttext'] = self::getShortTextFromHTML($zipFile->getEntryContents("index.html"));
+            $meta['media'] = array();
+            $meta['previews'] = array();
+
             $i=0;
             try{
                 foreach($zipFile->getListFiles() as $f){
                     if(substr($f, 0, strlen("data/preview")) === "data/preview"){
-
                         $meta['previews'][$i] = "./note/getmedia?note=".$path."&media=".$f;
                         $i++;
-                        if($i>2)
-                            break;
+                    } else if(substr($f, 0, strlen("data/")) === "data/") {
+                        $meta['media'][$i] = "./note/getmedia?note=".$path."&media=".$f;
                     }
                     
                 }