Ran update_copyright.py, updating all the copyright blurbs and adding AUTHORS.

[hooke.git] / hooke / hooke.py

diff --git a/hooke/hooke.py b/hooke/hooke.py
index 4142a5f2a4ff5385ea09e369805990a9b88ecf60..e84ba88f481525863a7d86197ec4488f84babec9 100644 (file)
--- a/hooke/hooke.py
+++ b/hooke/hooke.py
@@ -1,14 +1,32 @@
-#!/usr/bin/env python
+# Copyright (C) 2008-2010 Fabrizio Benedetti
+#                         Massimo Sandal <devicerandom@gmail.com>
+#                         Rolf Schmidt <rschmidt@alcor.concordia.ca>
+#                         W. Trevor King <wking@drexel.edu>
+#
+# This file is part of Hooke.
+#
+# Hooke is free software: you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation, either
+# version 3 of the License, or (at your option) any later version.
+#
+# Hooke 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with Hooke.  If not, see
+# <http://www.gnu.org/licenses/>.
 
-'''
-Hooke - A force spectroscopy review & analysis tool.
-
-A free, open source data analysis platform
-
-COPYRIGHT
-'''
+"""Hooke - A force spectroscopy review & analysis tool.
+"""
 
 import multiprocessing
+import optparse
+import os.path
+import unittest
+import sys
 
 from . import engine as engine
 from . import config as config_mod
@@ -17,6 +35,7 @@ from . import plugin as plugin_mod
 from . import driver as driver_mod
 from . import ui as ui
 
+
 class Hooke (object):
     def __init__(self, config=None, debug=0):
         self.debug = debug
@@ -35,7 +54,7 @@ class Hooke (object):
         self.load_ui()
         self.command = engine.CommandEngine()
 
-        self.playlists = playlist.PlaylistManager()
+        self.playlists = playlist.NoteIndexList()
 
     def load_plugins(self):
         self.plugins = plugin_mod.load_graph(
@@ -72,8 +91,51 @@ class Hooke (object):
             ui_to_command.put(ui.CloseEngine())
             command.join()
 
+    def run_lines(self, lines):
+        """Run the pre-set commands `lines` with the "command line" UI.
+
+        Allows for non-interactive sessions that are otherwise
+        equivalent to :meth:'.run'.
+        """
+        cmdline = ui.load_ui(self.config, 'command line')
+        ui_to_command = multiprocessing.Queue()
+        command_to_ui = multiprocessing.Queue()
+        command = multiprocessing.Process(
+            target=self.command.run, args=(self, ui_to_command, command_to_ui))
+        command.start()
+        try:
+            cmdline.run_lines(
+                self.commands, ui_to_command, command_to_ui, lines)
+        finally:
+            ui_to_command.put(ui.CloseEngine())
+            command.join()
+
 def main():
+    p = optparse.OptionParser()
+    p.add_option(
+        '-s', '--script', dest='script', metavar='FILE',
+        help='Script of command line Hooke commands to run.')
+    p.add_option(
+        '-c', '--command', dest='commands', metavar='COMMAND',
+        action='append', default=[],
+        help='Add a command line Hooke command to run.')
+    options,arguments = p.parse_args()
+    if len(arguments) > 0:
+        print >> sys.stderr, 'Too many arguments to %s: %d > 0' \
+            % (sys.argv[0], len(arguments))
+        print >> sys.stderr, p.help()
+        sys.exit(1)
+
     app = Hooke(debug=__debug__)
+
+    if options.script != None:
+        f = open(os.path.expanduser(options.script), 'r')
+        options.commands.extend(f.readlines())
+        f.close
+    if len(options.commands) > 0:
+        app.run_lines(options.commands)
+        sys.exit(0)
+
     try:
         app.run()
     finally: