Merge remote-tracking branch 'gnuradio-wg-grc/grc_block_and_prefs_path'

Author: jmcorgan

grc/base/Platform.py

@@ -196,6 +196,7 @@ def get_key(self): return self._key
     def get_license(self): return self._license
     def get_website(self): return self._website
     def get_colors(self): return self._colors
+    def get_block_paths(self): return self._block_paths
 
     ##############################################
     # Constructors

grc/gui/Messages.py

@@ -48,7 +48,16 @@ def send(message):
 # Special functions for specific program functionalities
 ###########################################################################
 def send_init(platform):
-    send("""<<< Welcome to %s %s >>>\n"""%(platform.get_name(), platform.get_version()))
+    p = platform
+    send('\n'.join([
+        "<<< Welcome to %s %s >>>" % (p.get_name(), p.get_version()),
+        "",
+        "Preferences file: " + p.get_prefs_file(),
+        "Block paths:"
+    ] + [
+        "\t%s" % path + (" (%s)" % opath if opath != path else "")
+            for path, opath in p.get_block_paths().iteritems()
+    ]) + "\n")
 
 def send_page_switch(file_path):
     send('\nShowing: "%s"\n'%file_path)

grc/gui/Platform.py

@@ -20,4 +20,9 @@
 from Element import Element
 
 class Platform(Element):
-    def __init__(self): Element.__init__(self)
+    def __init__(self, prefs_file):
+        Element.__init__(self)
+
+        self._prefs_file = prefs_file
+
+    def get_prefs_file(self): return self._prefs_file

grc/gui/Preferences.py

@@ -24,18 +24,17 @@
 _config_parser = ConfigParser.ConfigParser()
 
 def file_extension(): return '.'+_platform.get_key()
-def _prefs_file(): return os.path.join(os.path.expanduser('~'), file_extension())
 
 def load(platform):
     global _platform
     _platform = platform
     #create sections
     _config_parser.add_section('main')
     _config_parser.add_section('files_open')
-    try: _config_parser.read(_prefs_file())
+    try: _config_parser.read(_platform.get_prefs_file())
     except: pass
 def save():
-    try: _config_parser.write(open(_prefs_file(), 'w'))
+    try: _config_parser.write(open(_platform.get_prefs_file(), 'w'))
     except: pass
 
 ###########################################################################

grc/python/Constants.py

@@ -25,7 +25,10 @@
 
 #setup paths
 PATH_SEP = {'/':':', '\\':';'}[os.path.sep]
-HIER_BLOCKS_LIB_DIR = os.path.join(os.path.expanduser('~'), '.grc_gnuradio')
+HIER_BLOCKS_LIB_DIR = os.environ.get('GRC_HIER_PATH',
+                                     os.path.expanduser('~/.grc_gnuradio'))
+PREFS_FILE = os.environ.get('GRC_PREFS_PATH',
+                            os.path.join(os.path.expanduser('~/.grc')))
 BLOCKS_DIRS = filter( #filter blank strings
     lambda x: x, PATH_SEP.join([
         os.environ.get('GRC_BLOCKS_PATH', ''),

grc/python/Platform.py

@@ -18,6 +18,7 @@
 """
 
 import os
+from collections import OrderedDict
 from gnuradio import gr
 from .. base.Platform import Platform as _Platform
 from .. gui.Platform import Platform as _GUIPlatform
@@ -29,7 +30,7 @@
 from Generator import Generator
 from Constants import \
     HIER_BLOCKS_LIB_DIR, BLOCK_DTD, \
-    DEFAULT_FLOW_GRAPH, BLOCKS_DIRS
+    DEFAULT_FLOW_GRAPH, BLOCKS_DIRS, PREFS_FILE
 import Constants
 
 COLORS = [(name, color) for name, key, sizeof, color in Constants.CORE_TYPES]
@@ -42,8 +43,10 @@ def __init__(self):
         """
         #ensure hier dir
         if not os.path.exists(HIER_BLOCKS_LIB_DIR): os.mkdir(HIER_BLOCKS_LIB_DIR)
-        #convert block paths to absolute paths
-        block_paths = set(map(os.path.abspath, BLOCKS_DIRS))
+        # Convert block paths to absolute paths:
+        # - Create a mapping from the absolute path to what was passed in
+        # - Keep each unique absolute path and maintain order
+        block_paths = OrderedDict(map(lambda x: (os.path.abspath(x), x), BLOCKS_DIRS))
         #init
         _Platform.__init__(
             self,
@@ -58,7 +61,11 @@ def __init__(self):
             generator=Generator,
             colors=COLORS,
         )
-        _GUIPlatform.__init__(self)
+
+        _GUIPlatform.__init__(
+            self,
+            prefs_file=PREFS_FILE
+        )
 
     ##############################################
     # Constructors