folder fix

2 files changed, 3 insertions, 9 deletions

diff --git a/module/PluginThread.py b/module/PluginThread.py
index eb2b568d8..8b8ab4025 100644
--- a/module/PluginThread.py
+++ b/module/PluginThread.py
@@ -65,10 +65,7 @@ class PluginThread(Thread):
             for key, value in frame.f_locals.items():
                 dump += "\t%20s = " % key
                 try:
-                    if hasattr(value, "__iter__"):
-                        dump += pformat(value) + ":" + pformat(list(value))
-                    else:
-                        dump += pformat(value) + "\n"
+                    dump += pformat(value) + "\n"
                 except:
                     dump += "<ERROR WHILE PRINTING VALUE>\n"
                                    
diff --git a/module/plugins/Crypter.py b/module/plugins/Crypter.py
index 6d42b9d2c..77dc34990 100644
--- a/module/plugins/Crypter.py
+++ b/module/plugins/Crypter.py
@@ -50,15 +50,14 @@ class Crypter(Plugin):
     #----------------------------------------------------------------------
     def createPackages(self):
         """ create new packages from self.packages """
-        i = 0
-        for pack in self.packages:
+        for i, pack in enumerate(self.packages):
 
             self.log.info(_("Parsed package %s with %s links") % (pack[0], len(pack[1]) ) )
             
             if i == 0:
                 # replace current package with new one
                 self.pyfile.package().name = pack[0]
-                self.pyfile.package().folder = pack[2]
+                self.pyfile.package().folder = pack[2] if self.core.config["general"]["folder_per_package"] else ""
                 self.pyfile.package().notifyChange()
                 
                 self.core.files.addLinks(pack[1], self.pyfile.package().id)
@@ -67,5 +66,3 @@ class Crypter(Plugin):
             else:
                 self.core.server_methods.add_package(pack[0], pack[1])
             
-            i += 1
-