Merge branch 'feature-cache' into feature-content-tracker

Author: singerla

src/classes/template.ts

@@ -12,6 +12,7 @@ import { SlideInfo } from '../types/xml-types';
 import { XmlHelper } from '../helper/xml-helper';
 import { vd } from '../helper/general-helper';
 import { ContentTracker } from '../helper/content-tracker';
+import CacheHelper from '../helper/cache-helper';
 
 export class Template implements ITemplate {
   /**
@@ -53,23 +54,26 @@ export class Template implements ITemplate {
   creationIds: SlideInfo[];
   existingSlides: number;
 
-  constructor(location: string) {
+  constructor(location: string, cache?: CacheHelper) {
     this.location = location;
     const file = FileHelper.readFile(location);
-    this.archive = FileHelper.extractFileContent(file as unknown as Buffer);
+    this.archive = FileHelper.extractFileContent(
+      file as unknown as Buffer,
+      cache?.setLocation(location),
+    );
   }
 
   static import(
     location: string,
     name?: string,
+    cache?: CacheHelper,
   ): PresTemplate | RootPresTemplate {
     let newTemplate: PresTemplate | RootPresTemplate;
-
     if (name) {
-      newTemplate = new Template(location) as PresTemplate;
+      newTemplate = new Template(location, cache) as PresTemplate;
       newTemplate.name = name;
     } else {
-      newTemplate = new Template(location) as RootPresTemplate;
+      newTemplate = new Template(location, cache) as RootPresTemplate;
       newTemplate.slides = [];
       newTemplate.counter = [
         new CountHelper('slides', newTemplate),

src/helper/cache-helper.ts

@@ -0,0 +1,29 @@
+import path from 'path';
+import fs from 'fs';
+import JSZip from 'jszip';
+import { vd } from './general-helper';
+const extract = require('extract-zip');
+
+export default class CacheHelper {
+  dir: string;
+  currentLocation: string;
+  currentSubDir: string;
+
+  constructor(dir: string) {
+    this.dir = dir;
+  }
+
+  setLocation(location: string) {
+    this.currentLocation = location;
+    const baseName = path.basename(this.currentLocation);
+    this.currentSubDir = this.dir + '/' + baseName;
+    return this;
+  }
+
+  store() {
+    extract(this.currentLocation, { dir: this.currentSubDir }).catch((err) => {
+      throw err;
+    });
+    return this;
+  }
+}

src/helper/file-helper.ts

@@ -5,6 +5,7 @@ import JSZip, { InputType, JSZipObject, OutputType } from 'jszip';
 import { AutomizerSummary, FileInfo } from '../types/types';
 import { IPresentationProps } from '../interfaces/ipresentation-props';
 import { contentTracker } from './content-tracker';
+import CacheHelper from './cache-helper';
 import { vd } from './general-helper';
 
 export class FileHelper {
@@ -19,6 +20,7 @@ export class FileHelper {
     archive: JSZip,
     file: string,
     type?: OutputType,
+    cache?: CacheHelper,
   ): Promise<string | number[] | Uint8Array | ArrayBuffer | Blob | Buffer> {
     const exists = FileHelper.check(archive, file);
 
@@ -50,7 +52,8 @@ export class FileHelper {
     return archive.remove(file);
   }
 
-  static extractFileContent(file: Buffer): Promise<JSZip> {
+  static extractFileContent(file: Buffer, cache?: CacheHelper): Promise<JSZip> {
+    cache?.store();
     const zip = new JSZip();
     return zip.loadAsync(file as unknown as InputType);
   }