Some more code quality

Author: totokaka

mcman/backend/common.py

@@ -247,3 +247,43 @@ def ask(question, default=True, skip=False):
             return default
         else:
             return 'y' in answer.lower()
+
+
+def type_fits(has, requires):
+    """ Return whether the `has` version is compatible with the `requires`. """
+    has = has.lower()
+    requires = requires.lower()
+    if requires == 'latest' or has == 'release':
+        return True
+    elif has == requires:
+        return True
+    elif requires == 'release':
+        return False
+    elif requires == 'alpha' and has == 'beta':
+        return True
+    return False
+
+
+def format_name(name):
+    """ Format the name.
+
+    If the name consists of multiple words they will be capitalized and put
+    together without spaces.
+
+    """
+    if ' ' in name:
+        words = name.split(' ')
+        name = ''.join([w.capitalize() for w in words])
+    return name
+
+
+def find_plugins_folder():
+    """ Find the plugins folder.
+
+    This will return the relative path to the plugins folder.
+    Currently either '.' or 'plugins' is returend.
+
+    """
+    if 'plugins' in os.listdir('.'):
+        return 'plugins'
+    return '.'

mcman/backend/plugins.py

@@ -22,6 +22,7 @@
 import yaml
 from queue import Queue
 from zipfile import ZipFile
+from mcman.backend.common import type_fits, format_name, find_plugins_folder
 from mcman.backend import common as utils
 
 
@@ -399,18 +400,6 @@ def list_plugins(workers=4):
     return results
 
 
-def find_plugins_folder():
-    """ Find the plugins folder.
-
-    This will return the relative path to the plugins folder.
-    Currently either '.' or 'plugins' is returend.
-
-    """
-    if 'plugins' in os.listdir('.'):
-        return 'plugins'
-    return '.'
-
-
 def select_newest_version(plugin, v_type="Release"):
     """ Return the newest version in plugin which is compatible `v_type`. """
     for version in plugin['versions']:
@@ -432,34 +421,6 @@ def select_installed_version(plugin):
             return version
 
 
-def type_fits(has, requires):
-    """ Return whether the `has` version is compatible with the `requires`. """
-    has = has.lower()
-    requires = requires.lower()
-    if requires == 'latest' or has == 'release':
-        return True
-    elif has == requires:
-        return True
-    elif requires == 'release':
-        return False
-    elif requires == 'alpha' and has == 'beta':
-        return True
-    return False
-
-
-def format_name(name):
-    """ Format the name.
-
-    If the name consists of multiple words they will be capitalized and put
-    together without spaces.
-
-    """
-    if ' ' in name:
-        words = name.split(' ')
-        name = ''.join([w.capitalize() for w in words])
-    return name
-
-
 def remove_duplicate_plugins(plugins, field='slug'):
     """ Return a new list without duplicates.
 

mcman/mcman.py

@@ -286,22 +286,19 @@ def main():
 
     if args.show_version:
         print('Version: {}'.format(mcman.__version__))
-    # If there no command or subcommand is specified we print the help
-    if not 'command' in args:
+    elif not 'command' in args:
         parser.print_help()
-        return
-    if not 'subcommand' in args:
+    elif not 'subcommand' in args:
         if args.command is PluginsCommand:
             plugin_parser.print_help()
         elif args.command is ServersCommand:
             server_parser.print_help()
-        return
+    else:
+        if 'ignored' in args and args.ignored is None:
+            args.ignored = []
 
-    if 'ignored' in args and args.ignored is None:
-        args.ignored = []
-
-    try:
-        args.command(args)
-    except KeyboardInterrupt:
-        print()
-        return
+        try:
+            args.command(args)
+        except KeyboardInterrupt:
+            print()
+            return