#61 : allow initialization from an unzipper instance

Using the unzipper instance directly, callers can either initialize that one from file or from memory buffers, and just pass that one along.

src/combine/combinearchive.cpp

@@ -50,23 +50,15 @@ CombineArchive::initializeFromDirectory(const std::string &directory)
   return true;
 }
 
-bool
+bool 
 CombineArchive::initializeFromArchive(
-    const std::string &archiveFile,
-    bool skipOmex /*= false*/)
+  zipper::Unzipper* pUnzipper,
+  bool skipOmex/*=false*/)
 {
-  cleanUp();
-
-  try 
-  {
-    mpUnzipper = new Unzipper(archiveFile);
-  }
-  catch (const std::exception&)
-  {
-    // invalid COMBINE archive, it should always have a manifest
-    cleanUp();
-    return false;
-  }
+  if (mpUnzipper != NULL && mpUnzipper != pUnzipper)
+    delete mpUnzipper;
+
+  mpUnzipper = pUnzipper;
 
   // now build the map of all files in the archive
   std::vector<zipper::ZipEntry> entries = mpUnzipper->entries();
@@ -147,6 +139,28 @@ CombineArchive::initializeFromArchive(
   return true;
 }
 
+
+bool
+CombineArchive::initializeFromArchive(
+    const std::string &archiveFile,
+    bool skipOmex /*= false*/)
+{  
+  cleanUp();
+
+  try 
+  {
+    mpUnzipper = new Unzipper(archiveFile);
+  }
+  catch (const std::exception&)
+  {
+    // invalid COMBINE archive, it should always have a manifest
+    cleanUp();
+    return false;
+  }
+
+  return initializeFromArchive(mpUnzipper, skipOmex);
+}
+
 bool CombineArchive::cleanUp()
 {
   mMap.clear();

src/combine/combinearchive.h

@@ -198,6 +198,23 @@ class LIBCOMBINE_EXTERN CombineArchive
   bool initializeFromArchive(const std::string& archiveFile,
                              bool skipOmex=false);
 
+  /**
+   * initializes this instance from an unzipper instance of a 
+   * combine archive
+   *
+   * @param unzipper the unzipper instance
+   * @param skipOmex optional flag indicating whether meta data processing 
+   *        should be skipped or not (default). The metadata processing, removes 
+   *        annotations in the restricted 2014 subset of the OMEX Metadata and 
+   *        adds them to the convenience classes.
+   *
+   * @return boolean indicating success or failure
+   */
+  bool initializeFromArchive(zipper::Unzipper* pUnzipper,
+                             bool skipOmex=false);
+
+
+
   /**
    * @return the manifest
    */