Filenames for aligned images, with tests.

Author: pnuu

bin/halostack_cli.py

@@ -26,7 +26,7 @@
 from halostack.image import Image
 from halostack.align import Align
 from halostack.helpers import (get_filenames, parse_enhancements,
-                               get_two_points, read_config)
+                               get_two_points, read_config, intermediate_fname)
 import argparse
 import logging
 import platform
@@ -126,8 +126,7 @@ def halostack_cli(args):
         LOGGER.debug("Alignment initialized.")
 
     if args['save_prefix'] is not None:
-        fname = args['save_prefix'] + '_' + \
-            os.path.splitext(base_img_fname)[0] + '.png'
+        fname = intermediate_fname(args['save_prefix'], base_img_fname)
         base_img.save(fname)
 
     if len(args['enhance_images']) > 0:
@@ -153,8 +152,7 @@ def halostack_cli(args):
             continue
 
         if args['save_prefix'] is not None:
-            fname = args['save_prefix'] + '_' + \
-                os.path.splitext(img_fname)[0] + '.png'
+            fname = intermediate_fname(args['save_prefix'], img_fname)
             img.save(fname)
 
         if len(args['enhance_images']) > 0:

halostack/helpers.py

@@ -29,6 +29,7 @@
 import ConfigParser
 from collections import OrderedDict as od
 import warnings
+import os.path
 
 LOGGER = logging.getLogger(__name__)
 
@@ -176,3 +177,22 @@ def read_config(args):
                             args[key] = cfg[key]
 
     return args
+
+
+def intermediate_fname(prefix, fname):
+    '''Form filename for the aligned image files.
+
+    :param prefix: prefix to prepend to the basename of the file.
+    :type prefix: str
+    :param fname: filename, with of without the path
+    :type fname: str
+    :rtype: new filename as a string
+    '''
+
+    basename = os.path.basename(fname)
+    barename = os.path.splitext(basename)[0]
+    dirname = os.path.dirname(fname)
+    parts = [prefix, '_', barename, '.png']
+    fname = ''.join(parts)
+
+    return os.path.join(dirname, fname)

tests/unittests/test_helpers.py

@@ -1,6 +1,8 @@
 import unittest
 import os
-from halostack.helpers import get_filenames, parse_enhancements
+from halostack.helpers import get_filenames, parse_enhancements, \
+    intermediate_fname
+import platform
 
 class TestHelpers(unittest.TestCase):
 
@@ -37,6 +39,18 @@ def test_parse_enhancements(self):
         result = parse_enhancements(self.enh2)
         self.assertDictEqual(result, {'usm': [25., 5.], 'gradient': None})
 
+    def test_intermediate_fname(self):
+        result = intermediate_fname('foo', 'img.png')
+        self.assertEqual(result, 'foo_img.png')
+        if platform.system() == 'Windows':
+            result = intermediate_fname('foo', 'C:\temp\img.png')
+            self.assertEqual(result, 'C:\temp\foo_img.png')
+            result = intermediate_fname('foo', 'C:\temp\bar\img.png')
+            self.assertEqual(result, 'C:\temp\bar\foo_img.png')
+        else:
+            result = intermediate_fname('foo', '/tmp/bar/img.png')
+            self.assertEqual(result, '/tmp/bar/foo_img.png')
+
     def assertItemsEqual(self, a, b):
         for i in range(len(a)):
             if isinstance(a[i], dict):