diff --git a/light8/Patch.py b/light8/Patch.py --- a/light8/Patch.py +++ b/light8/Patch.py @@ -1,12 +1,4 @@ -def resolve_name(channelname): - "Ensure that we're talking about the primary name of the light." - return get_channel_name(get_dmx_channel(channelname)) - -def get_all_channels(): - """returns primary names for all channels (sorted)""" - prinames = reverse_patch.values()[:] - prinames.sort() - return prinames +from types import TupleType def get_dmx_channel(name): if name in patch: @@ -16,7 +8,7 @@ def get_dmx_channel(name): i = int(name) return i except ValueError: - raise ValueError("Invalid channel name: %s" % name) + raise "Invalid channel name:", name def get_channel_name(dmxnum): try: @@ -24,23 +16,22 @@ def get_channel_name(dmxnum): except KeyError: return str(dmxnum) -def reload_data(): +def reload_data(dummy): global patch, reverse_patch - import patchdata + if dummy: + import ConfigDummy as Config + else: + import Config - reload(patchdata) - loadedpatch = patchdata.patch + reload(Config) + loadedpatch = Config.patch patch = {} reverse_patch = {} for k, v in loadedpatch.items(): - if type(k) is tuple: + if type(k) == TupleType: for name in k: patch[name] = v reverse_patch[v] = k[0] else: patch[k] = v reverse_patch[v] = k - -# importing patch will load initial data -reload_data() -