Merge pull request #127 from singerla/mp70_feat_OLEsupport

Mp70 feat ol esupport

Author: singerla

src/classes/has-shapes.ts

@@ -33,6 +33,7 @@ import { ElementType } from '../enums/element-type';
 import { GenericShape } from '../shapes/generic';
 import { XmlSlideHelper } from '../helper/xml-slide-helper';
 import { vd } from '../helper/general-helper';
+import { OLEObject } from '../shapes/ole';
 
 export default class HasShapes {
   /**
@@ -113,7 +114,7 @@ export default class HasShapes {
    */
   unsupportedTags = [
     'p:custDataLst',
-    'p:oleObj',
+    // 'p:oleObj',
     // 'mc:AlternateContent',
     //'a14:imgProps',
   ];
@@ -122,7 +123,7 @@ export default class HasShapes {
    * @internal
    */
   unsupportedRelationTypes = [
-    'http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject',
+  //  'http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject',
     'http://schemas.openxmlformats.org/officeDocument/2006/relationships/vmlDrawing',
     'http://schemas.openxmlformats.org/officeDocument/2006/relationships/tags',
   ];
@@ -387,6 +388,13 @@ export default class HasShapes {
             this.targetType,
           );
           break;
+        case ElementType.OLEObject:
+          await new OLEObject(info, this.targetType, this.sourceArchive)[info.mode](
+            this.targetTemplate,
+            this.targetNumber,
+            this.targetType,
+          );
+          break;
         default:
           break;
       }
@@ -746,7 +754,6 @@ export default class HasShapes {
    */
   async copyRelatedContent(): Promise<void> {
     const charts = await Chart.getAllOnSlide(this.sourceArchive, this.relsPath);
-
     for (const chart of charts) {
       await new Chart(
         {
@@ -755,22 +762,37 @@ export default class HasShapes {
           sourceArchive: this.sourceArchive,
           sourceSlideNumber: this.sourceNumber,
         },
-        this.targetType,
+        this.targetType
       ).modifyOnAddedSlide(this.targetTemplate, this.targetNumber);
     }
 
     const images = await Image.getAllOnSlide(this.sourceArchive, this.relsPath);
     for (const image of images) {
+
       await new Image(
         {
           mode: 'append',
           target: image,
           sourceArchive: this.sourceArchive,
           sourceSlideNumber: this.sourceNumber,
         },
-        this.targetType,
+        this.targetType
       ).modifyOnAddedSlide(this.targetTemplate, this.targetNumber);
     }
+
+    const oleObjects = await OLEObject.getAllOnSlide(this.sourceArchive, this.relsPath);
+    for (const oleObject of oleObjects) {
+      await new OLEObject(
+        {
+          mode: 'append',
+          target: oleObject,
+          sourceArchive: this.sourceArchive,
+          sourceSlideNumber: this.sourceNumber,
+        },
+        this.targetType,
+        this.sourceArchive
+      ).modifyOnAddedSlide(this.targetTemplate, this.targetNumber, oleObjects);
+    }
   }
 
   /**
@@ -829,6 +851,21 @@ export default class HasShapes {
       } as AnalyzedElementType;
     }
 
+    const isOLEObject = sourceElement.getElementsByTagName('p:oleObj');
+    if (isOLEObject.length) {
+      const target = await XmlHelper.getTargetByRelId(
+        sourceArchive,
+        relsPath,
+        sourceElement,
+        'oleObject'
+      );
+
+      return {
+        type: ElementType.OLEObject,
+        target: target,
+      } as AnalyzedElementType;
+    }
+
     return {
       type: ElementType.Shape,
     } as AnalyzedElementType;

src/classes/slide.ts

@@ -13,6 +13,7 @@ import { XmlRelationshipHelper } from '../helper/xml-relationship-helper';
 import { IMaster } from '../interfaces/imaster';
 import HasShapes from './has-shapes';
 import { Master } from './master';
+import { ElementType } from '../enums/element-type';
 
 export class Slide extends HasShapes implements ISlide {
   targetType: ShapeTargetType = 'slide';

src/classes/template.ts

@@ -97,6 +97,7 @@ export class Template implements ITemplate {
         new CountHelper('masters', newTemplate),
         new CountHelper('layouts', newTemplate),
         new CountHelper('themes', newTemplate),
+        new CountHelper('oleObjects', newTemplate),
       ];
       // TODO: refactor content tracker, let root template have an instance
       // newTemplate.content = new ContentTracker();

src/enums/element-type.ts

@@ -2,9 +2,11 @@ export enum ElementType {
   Chart = 'Chart',
   Image = 'Image',
   Shape = 'Generic',
+  OLEObject = 'OLEObject', 
 }
 
 export enum ElementSubtype {
   chart = 'chart',
   chartEx = 'chartEx',
+  oleObject = 'oleObject',  
 }

src/helper/count-helper.ts

@@ -4,6 +4,7 @@ import { ICounter } from '../interfaces/icounter';
 import { RootPresTemplate } from '../interfaces/root-pres-template';
 import { XmlHelper } from './xml-helper';
 import { XmlElement } from '../types/xml-types';
+import { FileHelper } from './file-helper';
 
 export class CountHelper implements ICounter {
   template: RootPresTemplate;
@@ -62,6 +63,9 @@ export class CountHelper implements ICounter {
         return CountHelper.countCharts(presentation);
       case 'images':
         return CountHelper.countImages(presentation);
+        case 'oleObjects':  
+        return CountHelper.countOleObjects(presentation);  
+  
     }
 
     throw new Error(`No way to count ${this.name}.`);
@@ -134,6 +138,24 @@ export class CountHelper implements ICounter {
       ).length;
   }
 
+  private static async countOleObjects(presentation: IArchive): Promise<number> {
+    const contentTypesXml = await XmlHelper.getXmlFromArchive(
+      presentation,
+      '[Content_Types].xml',
+    );
+    const overrides = contentTypesXml.getElementsByTagName('Override');
+  
+    return Object.keys(overrides)
+      .map((key) => overrides[key] as XmlElement)
+      .filter(
+        (o) =>
+          o.getAttribute &&
+          o.getAttribute('ContentType') ===
+            `application/vnd.openxmlformats-officedocument.oleObject`
+      ).length;
+  }
+  
+
   private static async countImages(presentation: IArchive): Promise<number> {
     const mediaFiles = await presentation.folder('ppt/media');
     const count = mediaFiles.filter(

src/helper/xml-helper.ts

@@ -166,9 +166,7 @@ export class XmlHelper {
   }
 
   static async getRelationshipTargetsByPrefix(
-    archive: IArchive,
-    path: string,
-    prefix: string | string[],
+archive: IArchive, path: string, prefix: string | string[]
   ): Promise<Target[]> {
     const prefixes = typeof prefix === 'string' ? [prefix] : prefix;
 

src/helper/xml-slide-helper.ts

@@ -16,6 +16,7 @@ export const mapUriType = {
   'http://schemas.openxmlformats.org/drawingml/2006/table': 'table',
   'http://schemas.openxmlformats.org/drawingml/2006/chart': 'chart',
   'http://schemas.microsoft.com/office/drawing/2014/chartex': 'chartEx',
+  'http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject': 'oleObject',
 };
 
 /**
@@ -202,6 +203,9 @@ export class XmlSlideHelper {
         const uri = graphicData.getAttribute('uri');
         type = mapUriType[uri] ? mapUriType[uri] : type;
         break;
+      case 'oleObj':
+        type = 'OLEObject';
+        break;
     }
 
     return type as ElementType;