Added odoo start command

openerp/cli/__init__.py

@@ -37,6 +37,7 @@ class Help(Command):
 import server
 import deploy
 import scaffold
+import start
 
 def main():
     args = sys.argv[1:]

openerp/cli/deploy.py

@@ -64,7 +64,7 @@ class Deploy(Command):
             os.remove(temp)
             raise
 
-    def run(self, args):
+    def run(self, cmdargs):
         parser = argparse.ArgumentParser(
             prog="%s deploy" % sys.argv[0].split(os.path.sep)[-1],
             description=self.__doc__
@@ -75,10 +75,10 @@ class Deploy(Command):
         parser.add_argument('--login', dest='login', default="admin", help='Login (default=admin)')
         parser.add_argument('--password', dest='password', default="admin", help='Password (default=admin)')
         parser.add_argument('--no-ssl-check', dest='no_ssl_check', action='store_true', help='Do not check ssl cert')
-        if not args:
+        if not cmdargs:
             sys.exit(parser.print_help())
 
-        args = parser.parse_args(args=args)
+        args = parser.parse_args(args=cmdargs)
 
         if args.no_ssl_check:
             self.session.verify = False

openerp/cli/scaffold.py

@@ -21,7 +21,7 @@ from openerp.modules.module import (get_module_root, MANIFEST,
 class Scaffold(Command):
     "Generate an Odoo module skeleton."
 
-    def run(self, args):
+    def run(self, cmdargs):
         # TODO: bash completion file
         parser = argparse.ArgumentParser(
             prog="%s scaffold" % sys.argv[0].split(os.path.sep)[-1],
@@ -42,9 +42,9 @@ class Scaffold(Command):
         parser.add_argument('--theme', action='store_true', default=False,
                          help="Generate structure for a Website theme")
 
-        if not args:
+        if not cmdargs:
             sys.exit(parser.print_help())
-        args = parser.parse_args(args=args)
+        args = parser.parse_args(args=cmdargs)
 
         dest = directory(args.dest)
         if args.init:

openerp/cli/start.py

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+import argparse
+import glob
+import os
+import sys
+
+from . import Command
+from .server import main
+from openerp.modules.module import get_module_root, MANIFEST
+from openerp.service.db import _create_empty_database, DatabaseExists
+
+
+class Start(Command):
+    """Quick start the Odoo server for your project"""
+
+    def get_module_list(self, path):
+        mods = glob.glob(os.path.join(path, '*/%s' % MANIFEST))
+        return [mod.split(os.path.sep)[-2] for mod in mods]
+
+
+    def run(self, cmdargs):
+        parser = argparse.ArgumentParser(
+            prog="%s start" % sys.argv[0].split(os.path.sep)[-1],
+            description=self.__doc__
+        )
+        parser.add_argument('--path', default=".",
+            help="Directory where your project's modules are stored (will autodetect from current dir)")
+        parser.add_argument("-d", "--database", dest="db_name", default=None,
+                         help="Specify the database name (default to project's directory name")
+
+
+        #openerp.tools.config.parse_config(args)
+        args, unknown = parser.parse_known_args(args=cmdargs)
+
+        project_path = os.path.abspath(os.path.expanduser(os.path.expandvars(args.path)))
+        module_root = get_module_root(project_path)
+        if module_root:
+            # go to the parent's directory of the module root if any
+            project_path = os.path.abspath(os.path.join(project_path, os.pardir))
+
+        # check if one of the subfolders has at least one module
+        mods = self.get_module_list(project_path)
+        if not mods:
+            die("Directory `%s` does not contain any Odoo module.\nPlease start this command "
+                "in your project's directory or use `--path` argument" % project_path)
+
+        if not args.db_name:
+            # Use the module's name if only one module found else the name of parent folder
+            args.db_name = mods[0] if len(mods) == 1 else project_path.split(os.path.sep)[-1]
+            # TODO: forbid some database names ? eg template1, ...
+            try:
+                _create_empty_database(args.db_name)
+            except DatabaseExists, e:
+                pass
+            except Exception, e:
+                die("Could not create database `%s`. (%s)" % (args.db_name, e))
+            cmdargs.extend(('-d', args.db_name))
+
+        if '--addons-path' not in cmdargs:
+            cmdargs.append('--addons-path=%s' % project_path)
+        if '--db-filter' not in cmdargs:
+            cmdargs.append('--db-filter=^%s$' % args.db_name)
+        # if '-i' not in cmdargs and '--init' not in cmdargs:
+        #     # Install all modules of projects even if already installed
+        #     cmdargs.extend(('-i', ','.join(mods)))
+
+        # FIXME: how to redo config ?
+        main(cmdargs)
+
+def die(message, code=1):
+    print >>sys.stderr, message
+    sys.exit(code)

openerp/service/db.py

@@ -13,6 +13,7 @@ import psycopg2
 
 import openerp
 from openerp import SUPERUSER_ID
+from openerp.exceptions import Warning
 import openerp.release
 import openerp.sql_db
 import openerp.tools
@@ -25,6 +26,9 @@ self_actions = {}
 self_id = 0
 self_id_protect = threading.Semaphore()
 
+class DatabaseExists(Warning):
+    pass
+
 # This should be moved to openerp.modules.db, along side initialize().
 def _initialize_db(id, db_name, demo, lang, user_password):
     try:
@@ -81,7 +85,7 @@ def _create_empty_database(name):
         cr.execute("SELECT datname FROM pg_database WHERE datname = %s",
                    (name,))
         if cr.fetchall():
-            raise openerp.exceptions.Warning("database %r already exists!" % (name,))
+            raise DatabaseExists("database %r already exists!" % (name,))
         else:
             cr.autocommit(True)     # avoid transaction block
             cr.execute("""CREATE DATABASE "%s" ENCODING 'unicode' TEMPLATE "%s" """ % (name, chosen_template))