From 7aad5a2f6a93ae3385794f94f8b175c243165532 Mon Sep 17 00:00:00 2001
From: JCTutorius <charlie@tutorius-dev.(none)>
Date: Fri, 06 Nov 2009 02:21:08 +0000
Subject: Made change after Charlie code review.

---
(limited to 'tutorius/vault.py')

diff --git a/tutorius/vault.py b/tutorius/vault.py
index c0409da..fbe9e75 100644
--- a/tutorius/vault.py
+++ b/tutorius/vault.py
@@ -367,8 +367,8 @@ class Vault(object):
                     parser.set(INI_ACTIVITY_SECTION, related_key, related_value)
                     
         # Delete the old metadata file
-        if os.path.isfile(ini_file_path):
-            os.remove(ini_file_path)
+##        if os.path.isfile(ini_file_path):
+##            os.remove(ini_file_path)
         
         # Write the new metadata file to disk
         with open(ini_file_path, 'wb') as configfile:
@@ -391,15 +391,24 @@ class Vault(object):
         bundle_path = bundle.get_tutorial_path(guid)
         
         #Zip the tutorials files in the pkzip file format in a temp file
-        archive_list = [os.path.join(bundle_path, 'meta.ini'), os.path.join(bundle_path, 'tutorial.xml')] #, os.path.join(bundle_path, RESOURCES_FOLDER)]
+        archive_list = [os.path.join(bundle_path, 'meta.ini'), os.path.join(bundle_path, 'tutorial.xml')]
+        
+        # Add all the files in the archive folder
+        for root, dirs, files in os.walk(os.path.join(bundle_path, RESOURCES_FOLDER)):
+            for name in files:
+                archive_list.append(os.path.join(bundle_path, RESOURCES_FOLDER, name))
         
         zfilename = str(guid) + ".zip"
         
         zout = zipfile.ZipFile(os.path.join(bundle_path, zfilename), "w")
         for fname in archive_list:
             fname_splitted = fname.rsplit('/')
-            file_only_name = fname_splitted[fname_splitted.__len__() - 1]
-            zout.write(fname, file_only_name)
+            if fname_splitted[-2] == RESOURCES_FOLDER:
+                ressource_path_and_file = os.path.join(fname_splitted[-2], fname_splitted[-1])
+                zout.write(fname, ressource_path_and_file)
+            else:    
+                file_only_name = fname_splitted[-1]
+                zout.write(fname, file_only_name)
         zout.close()
         
         # test if the temp file is a valid pkzip file
--
cgit v0.9.1