Some fixing of importing and exporting

Author: totokaka

mcman/commands/export.py

@@ -41,6 +41,9 @@ def __init__(self, args):
 
         args.types = args.types.split(',')
 
+        if args.quiet:
+            self.printer = lambda *a, **b: None
+
         self.run()
 
     def run(self):

mcman/commands/import_cmd.py

@@ -24,6 +24,8 @@
 import json
 
 import os
+from sys import stdin
+
 import mcman.logic.servers as s_backend
 from mcman.logic.plugins import plugins as p_backend
 from mcman.logic import common
@@ -45,7 +47,9 @@ def __init__(self, args):
 
     def run(self):
         """ Run the command. """
-        self.p_main('Parsing file and finding plugins and servers')
+        if self.args.input is not stdin:
+            self.p_main('Parsing file and finding plugins and servers')
+
         document = json.loads('\n'.join(self.args.input))
 
         plugins = document['plugins']
@@ -59,13 +63,15 @@ def run(self):
         self.parse_plugins(plugins, remote_plugins)
         self.parse_servers(servers, remote_servers)
 
-        self.p_main('Downloading servers and plugins')
+        self.p_main('Downloading servers and plugins'
+                    + ' to {}'.format(self.args.destination)
+                      if self.args.destination != './' else '')
         prefix = '({{part:>{}}}/{}) '.format(
             len(str(len(self.to_download))), len(self.to_download))
         for i in range(len(self.to_download)):
             jar = self.to_download[i]
             this_prefix = prefix.format(part=i+1)
-            destination = jar[0]
+            destination = self.args.destination + '/' + jar[0]
             if jar[1].endswith('.zip'):
                 destination = jar[1].split('/')[-1]
             common.download(jar[1], destination=destination, checksum=jar[2],

mcman/logic/plugins/plugins.py

@@ -19,7 +19,7 @@
 import os
 import threading
 from queue import Queue
-from zipfile import ZipFile
+from zipfile import ZipFile, BadZipFile
 
 import bukget
 import yaml
@@ -305,16 +305,19 @@ def parse_installed_plugins_worker(jar_queue, result_queue):
 
         checksum = common.checksum_file(jar)
 
-        with ZipFile(jar, 'r') as zipped:
-            if 'plugin.yml' not in zipped.namelist():
-                continue
+        try:
+            with ZipFile(jar, 'r') as zipped:
+                if 'plugin.yml' not in zipped.namelist():
+                    continue
 
-            yml = yaml.load(zipped.read('plugin.yml').decode())
-            plugin_name = yml['name']
-            main = yml['main']
-            version = str(yml['version'])
+                yml = yaml.load(zipped.read('plugin.yml').decode())
+                plugin_name = yml['name']
+                main = yml['main']
+                version = str(yml['version'])
 
-            result_queue.put((checksum, main, plugin_name, version, jar))
+                result_queue.put((checksum, main, plugin_name, version, jar))
+        except BadZipFile:
+            print("    Could not read '{}'.".format(jar))
 
         jar_queue.task_done()
 

mcman/mcman.py

@@ -46,6 +46,10 @@ def setup_import_command(sub_parsers, parent):
         help=('the json file contating the server and plugin information. '
               '"-" may be used to mark stdin'))
 
+    parser.add_argument(
+        'destination', default='./', nargs='?',
+        help='the destination folder. defaults to ./')
+
     return parser
 
 
@@ -68,6 +72,10 @@ def setup_export_command(sub_parsers, parent):
         '--types', default='plugins,servers',
         help='what to save. A comma separated list of "servers" and "plugins"')
 
+    parser.add_argument(
+        '--quiet', action='store_true',
+        help="don't print anything other than the result")
+
     return parser