added shell meyectl command

diff --git a/motioneye/__init__.py b/motioneye/__init__.py
index f376915300dee1ae075b6eceb6143748aeaa5c5b..8f08c3892d2e145521e0689c4d33f4a681b70c73 100644 (file)
--- a/motioneye/__init__.py
+++ b/motioneye/__init__.py
@@ -1,2 +1,2 @@
 
-VERSION = "0.29.1"
+VERSION = "0.29.2-git"

diff --git a/motioneye/meyectl.py b/motioneye/meyectl.py
index ed0f2980f9d60a911d791bdca352ea3feae677b5..a388d0cfe445bcd7910618c1d8369323783e39d0 100755 (executable)
--- a/motioneye/meyectl.py
+++ b/motioneye/meyectl.py
@@ -194,7 +194,8 @@ def make_arg_parser(command=None):
         description += '  stopserver\n'
         description += '  relayevent\n'
         description += '  sendmail\n'
-        description += '  webhook\n\n'
+        description += '  webhook\n'
+        description += '  shell\n\n'
 
         epilog = 'type "%(prog)s [command] -h" for help on a specific command\n\n'
         
@@ -260,6 +261,10 @@ def main():
         import webhook
         webhook.main(arg_parser, sys.argv[2:])
 
+    elif command == 'shell':
+        import shell
+        shell.main(arg_parser, sys.argv[2:])
+
     else:
         sys.stderr.write('unknown command "%s"\n\n' % command)
         print_usage_and_exit(-1)

diff --git a/motioneye/shell.py b/motioneye/shell.py
new file mode 100644 (file)
index 0000000..5cfa87e
--- /dev/null
+++ b/motioneye/shell.py
@@ -0,0 +1,38 @@
+
+# Copyright (c) 2013 Calin Crisan
+# This file is part of motionEye.
+#
+# motionEye is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+
+import code
+import logging
+
+
+def parse_options(parser, args):
+    return parser.parse_args(args)
+
+
+def main(parser, args):
+    import meyectl
+    
+    options = parse_options(parser, args)
+    
+    meyectl.configure_logging('shell', options.log_to_file)
+    meyectl.configure_tornado()
+
+    logging.debug('hello!')
+    
+    code.interact(local=locals())
+
+    logging.debug('bye!')