Merge lp:~ben-hutchings/ensoft-sextant/upload-default-name into lp:ensoft-sextant

[Ben Hutchings]

Change default program name format to include user name; tidy up some logging messages.

Tidied up some logging messages.

[Robert (rjwills)]

review: Needs Fixing

[Robert (rjwills)]

review: Approve

=== modified file 'src/sextant/__main__.py'
--- src/sextant/__main__.py	2014-09-26 11:25:09 +0000
+++ src/sextant/__main__.py	2014-09-29 14:08:47 +0000
@@ -17,6 +17,7 @@
 import requests
 import contextlib
 import subprocess
+import getpass
 
 try:
     from urllib import parse
@@ -102,7 +103,8 @@
     # unsupplied
 
     try:
-        update_db.upload_program(file_path=args.input_file,
+        update_db.upload_program(user_name=getpass.getuser(),
+                                 file_path=args.input_file,
                                  db_url=args.remote_neo4j,
                                  alternative_name=alternative_name,
                                  not_object_file=not_object_file,

=== modified file 'src/sextant/update_db.py'
--- src/sextant/update_db.py	2014-08-26 16:33:20 +0000
+++ src/sextant/update_db.py	2014-09-29 14:08:47 +0000
@@ -9,13 +9,13 @@
 
 from .db_api import SextantConnection, Validator
 from .objdump_parser import get_parsed_objects
+from os import path
 
 import logging
 
 
-def upload_program(file_path, db_url, display_url='',
-                   alternative_name=None,
-                   not_object_file=False):
+def upload_program(user_name, file_path, db_url, display_url='',
+                   alternative_name=None, not_object_file=False):
     """
     Uploads a program to the remote database.
 
@@ -34,19 +34,16 @@
     if not display_url:
         display_url = db_url
 
+    # if no name is specified, use the form "<username>-<binary name>"
+    name = alternative_name or (user_name + '-' + path.split(file_path)[-1])
+
     connection = SextantConnection(db_url)
 
     program_names = connection.get_program_names()
-    if alternative_name is None:
-        if Validator.sanitise(file_path) in program_names:
-            raise ValueError("There is already a program under this name; "
-                             "please delete the previous one with the same name"
-                             " and retry, or rename the input file.")
-    else:
-        if Validator.sanitise(alternative_name) in program_names:
-            raise ValueError("There is already a program under this name; "
-                             "please delete the previous one with the same name"
-                             " and retry, or rename the input file.")
+    if Validator.sanitise(name) in program_names:
+        raise ValueError("There is already a program with name {}; "
+                         "please delete the previous one with the same name "
+                         "and retry, or rename the input file.".format(name))
 
     parsed_objects = get_parsed_objects(filepath=file_path,
                                         sections_to_view=['.text'],
@@ -55,12 +52,7 @@
 
     logging.info('Objdump has parsed!')
 
-    if alternative_name is None:
-        program_representation = connection.new_program(
-                                     Validator.sanitise(file_path))
-    else:
-        program_representation = connection.new_program(
-                                     Validator.sanitise(alternative_name))
+    program_representation = connection.new_program(Validator.sanitise(name))
 
     for obj in parsed_objects:
         for called in obj.what_do_i_call:
@@ -69,7 +61,7 @@
 
     logging.info('Sending {} named objects to server {}...'.format(len(parsed_objects), display_url))
     program_representation.commit()
-    logging.info('Sending complete! Exiting.')
+    logging.info('Successfully added {}.'.format(name))
 
 
 def delete_program(program_name, db_url):
@@ -81,4 +73,4 @@
     """
     connection = SextantConnection(db_url)
     connection.delete_program(program_name)
-    print('Deleted {} successfully.'.format(program_name))
+    print('Successfully deleted {}.'.format(program_name))