Save packed project feature

src/appleseed.studio/mainwindow/mainwindow.cpp

@@ -1238,14 +1238,14 @@ void MainWindow::slot_save_project_as()
         get_save_filename(
             this,
             "Save As...",
-            "Project Files (*.appleseed)",
+            "Plain Project Files (*.appleseed);;Packed Project Files (*.appleseedz)",
             m_settings,
             SETTINGS_FILE_DIALOG_PROJECTS);
 
     if (!filepath.isEmpty())
     {
         if (QFileInfo(filepath).suffix().isEmpty())
-            filepath += ".appleseed";
+            filepath += get_extension(m_settings, SETTINGS_FILE_DIALOG_PROJECTS);
 
         filepath = QDir::toNativeSeparators(filepath);
 

src/appleseed.studio/mainwindow/project/projectmanager.cpp

@@ -94,7 +94,10 @@ bool ProjectManager::save_project()
 
 bool ProjectManager::save_project_as(const string& filepath)
 {
-    return do_save_project(filepath, ProjectFileWriter::Defaults);
+    if (ends_with(filepath, ".appleseedz"))
+        return do_save_project(filepath, ProjectFileWriter::PackedProject);
+    else
+        return do_save_project(filepath, ProjectFileWriter::Defaults);
 }
 
 void ProjectManager::close_project()

src/appleseed.studio/utility/miscellaneous.cpp

@@ -183,6 +183,19 @@ namespace
     }
 }
 
+QString get_extension(ParamArray& settings, const QString& target_dialog)
+{
+    QString filter = get_value(settings, target_dialog + SETTINGS_SELECTED_FILTER);
+
+    const int ext_start = filter.lastIndexOf('(') + 2;
+    const int ext_end = filter.lastIndexOf(')');
+
+    if (ext_start != string::npos && ext_end != string::npos && ext_start < ext_end)
+        return filter.mid(ext_start, ext_end - ext_start);
+    else
+        return QString("");
+}
+
 QString get_open_filename(
     QWidget*                parent,
     const QString&          caption,

src/appleseed.studio/utility/miscellaneous.h

@@ -65,6 +65,8 @@ bool file_exists(const QString& path);
 // Load an icon and its variants (hover, disabled...) from the application's icons directory.
 QIcon load_icons(const QString& base_name);
 
+QString get_extension(renderer::ParamArray& settings, const QString& target_dialog);
+
 QString get_open_filename(
     QWidget*                parent,
     const QString&          caption,

src/appleseed/CMakeLists.txt

@@ -454,11 +454,11 @@ set (foundation_meta_tests_sources
     foundation/meta/tests/test_transform.cpp
     foundation/meta/tests/test_triangulator.cpp
     foundation/meta/tests/test_typetraits.cpp
-    foundation/meta/tests/test_unzipper.cpp
     foundation/meta/tests/test_utility_filter.cpp
     foundation/meta/tests/test_vector.cpp
     foundation/meta/tests/test_voxelgrid.cpp
     foundation/meta/tests/test_windows.cpp
+    foundation/meta/tests/test_zipper.cpp
 )
 if (WITH_DISNEY_MATERIAL)
     list (APPEND foundation_meta_tests_sources
@@ -703,10 +703,13 @@ source_group ("foundation\\utility\\test" FILES
 )
 
 set (foundation_utility_minizip_sources
+    foundation/utility/minizip/crypt.h
     foundation/utility/minizip/ioapi.c
     foundation/utility/minizip/ioapi.h
     foundation/utility/minizip/unzip.c
     foundation/utility/minizip/unzip.h
+    foundation/utility/minizip/zip.c
+    foundation/utility/minizip/zip.h
 )
 list (APPEND appleseed_sources
     ${foundation_utility_minizip_sources}
@@ -772,14 +775,14 @@ set (foundation_utility_sources
     foundation/utility/typetraits.h
     foundation/utility/uid.cpp
     foundation/utility/uid.h
-    foundation/utility/unzipper.cpp
-    foundation/utility/unzipper.h
     foundation/utility/version.h
     foundation/utility/vpythonfile.cpp
     foundation/utility/vpythonfile.h
     foundation/utility/xercesc.cpp
     foundation/utility/xercesc.h
     foundation/utility/xmlelement.h
+    foundation/utility/zipper.cpp
+    foundation/utility/zipper.h
 )
 if (WITH_DISNEY_MATERIAL)
     list (APPEND foundation_utility_sources

src/appleseed/foundation/meta/tests/test_unzipper.cpp → src/appleseed/foundation/meta/tests/test_zipper.cpp

@@ -28,7 +28,7 @@
 
 // appleseed.foundation headers.
 #include "foundation/utility/test.h"
-#include "foundation/utility/unzipper.h"
+#include "foundation/utility/zipper.h"
 
 // Boost headers
 #include "boost/filesystem.hpp"
@@ -46,31 +46,6 @@ TEST_SUITE(Foundation_Utility_Unzipper)
     const string valid_project = "unit tests/inputs/test_packed_project_valid.appleseedz";
     const string invalid_project = "unit tests/inputs/test_packed_project_invalid.appleseedz";
 
-    set<string> recursive_ls(bf::path dir) 
-    {
-        set<string> files;
-
-        // A default constructed directory_iterator acts as the end iterator
-        bf::directory_iterator end_iter;
-        for (bf::directory_iterator dir_itr(dir); dir_itr != end_iter; ++dir_itr) 
-        {
-            const bf::path current_path = dir_itr->path();
-
-            if (bf::is_directory(current_path))
-            {
-                const string dirname = current_path.filename().string();
-                const set<string> files_in_subdir = recursive_ls(current_path);
-
-                for (set<string>::iterator it = files_in_subdir.begin(); it != files_in_subdir.end(); ++it)
-                    files.insert(dirname + "/" + *it);
-            }
-            else
-                files.insert(current_path.filename().string());
-        }
-
-        return files;
-    }
-
     TEST_CASE(UnzipTest) 
     {
         const string unpacked_dir = valid_project + ".unpacked";
@@ -79,8 +54,8 @@ TEST_SUITE(Foundation_Utility_Unzipper)
         {
             unzip(valid_project, unpacked_dir);
 
-            EXPECT_TRUE(bf::exists(bf::path(unpacked_dir)));
-            EXPECT_FALSE(bf::is_empty(bf::path(unpacked_dir)));
+            EXPECT_TRUE(bf::exists(unpacked_dir));
+            EXPECT_FALSE(bf::is_empty(unpacked_dir));
 
             const string expected_files[] = 
             {
@@ -97,18 +72,18 @@ TEST_SUITE(Foundation_Utility_Unzipper)
                 "geometry/Plane001.binarymesh"
             };
 
-            const set<string> actual_files = recursive_ls(bf::path(unpacked_dir));
+            const set<string> actual_files = recursive_ls(unpacked_dir);
 
             for (size_t i = 0; i < 11; ++i) 
             {
                 EXPECT_EQ(1, actual_files.count(expected_files[i]));
             }
 
-            bf::remove_all(bf::path(unpacked_dir));
+            bf::remove_all(unpacked_dir);
         } 
         catch (exception e) 
         {
-            bf::remove_all(bf::path(unpacked_dir));
+            bf::remove_all(unpacked_dir);
             throw e;
         }
     }

src/appleseed/foundation/utility/minizip/crypt.h

@@ -0,0 +1,131 @@
+/* crypt.h -- base code for crypt/uncrypt ZIPfile
+
+
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+
+   This code is a modified version of crypting code in Infozip distribution
+
+   The encryption/decryption parts of this source code (as opposed to the
+   non-echoing password parts) were originally written in Europe.  The
+   whole source package can be freely distributed, including from the USA.
+   (Prior to January 2000, re-export from the US was a violation of US law.)
+
+   This encryption code is a direct transcription of the algorithm from
+   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
+   file (appnote.txt) is distributed with the PKZIP program (even in the
+   version without encryption capabilities).
+
+   If you don't need crypting in your application, just define symbols
+   NOCRYPT and NOUNCRYPT.
+
+   This code support the "Traditional PKWARE Encryption".
+
+   The new AES encryption added on Zip format by Winzip (see the page
+   http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
+   Encryption is not supported.
+*/
+
+#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
+
+/***********************************************************************
+ * Return the next byte in the pseudo-random sequence
+ */
+static int decrypt_byte(unsigned long* pkeys, const z_crc_t* pcrc_32_tab)
+{
+    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
+                     * unpredictable manner on 16-bit systems; not a problem
+                     * with any known compiler so far, though */
+
+    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
+    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
+}
+
+/***********************************************************************
+ * Update the encryption keys with the next byte of plain text
+ */
+static int update_keys(unsigned long* pkeys,const z_crc_t* pcrc_32_tab,int c)
+{
+    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
+    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
+    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
+    {
+      register int keyshift = (int)((*(pkeys+1)) >> 24);
+      (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
+    }
+    return c;
+}
+
+
+/***********************************************************************
+ * Initialize the encryption keys and the random header according to
+ * the given password.
+ */
+static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcrc_32_tab)
+{
+    *(pkeys+0) = 305419896L;
+    *(pkeys+1) = 591751049L;
+    *(pkeys+2) = 878082192L;
+    while (*passwd != '\0') {
+        update_keys(pkeys,pcrc_32_tab,(int)*passwd);
+        passwd++;
+    }
+}
+
+#define zdecode(pkeys,pcrc_32_tab,c) \
+    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
+
+#define zencode(pkeys,pcrc_32_tab,c,t) \
+    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
+
+#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
+
+#define RAND_HEAD_LEN  12
+   /* "last resort" source for second part of crypt seed pattern */
+#  ifndef ZCR_SEED2
+#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
+#  endif
+
+static int crypthead(const char* passwd,      /* password string */
+                     unsigned char* buf,      /* where to write header */
+                     int bufSize,
+                     unsigned long* pkeys,
+                     const z_crc_t* pcrc_32_tab,
+                     unsigned long crcForCrypting)
+{
+    int n;                       /* index in random header */
+    int t;                       /* temporary */
+    int c;                       /* random byte */
+    unsigned char header[RAND_HEAD_LEN-2]; /* random header */
+    static unsigned calls = 0;   /* ensure different random header each time */
+
+    if (bufSize<RAND_HEAD_LEN)
+      return 0;
+
+    /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
+     * output of rand() to get less predictability, since rand() is
+     * often poorly implemented.
+     */
+    if (++calls == 1)
+    {
+        srand((unsigned)(time(NULL) ^ ZCR_SEED2));
+    }
+    init_keys(passwd, pkeys, pcrc_32_tab);
+    for (n = 0; n < RAND_HEAD_LEN-2; n++)
+    {
+        c = (rand() >> 7) & 0xff;
+        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
+    }
+    /* Encrypt random header (last two bytes is high word of crc) */
+    init_keys(passwd, pkeys, pcrc_32_tab);
+    for (n = 0; n < RAND_HEAD_LEN-2; n++)
+    {
+        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
+    }
+    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
+    buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
+    return n;
+}
+
+#endif