Skip to content

Commit

Permalink
Bit os a clumbsy botch, but serach_config can now be loaded from proj…
Browse files Browse the repository at this point in the history
…ect path
  • Loading branch information
calaldees committed Feb 19, 2014
1 parent 75bcbc5 commit cbc6d85
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
3 changes: 2 additions & 1 deletion website/development.ini
Expand Up @@ -14,6 +14,7 @@ pyramid.includes =
pyramid_beaker
#pyramid_debugtoolbar


# Karaoke settings -------------------------------------------------------------
karakara.server.mode = development

Expand Down Expand Up @@ -47,7 +48,7 @@ karakara.template.menu.disable =
karakara.websocket.port = 9873 -> int
karakara.tcp.port = -> None

karakara.search.view.config = search_config.json -> jsonfile
karakara.search.view.config = %(here)s/search_config.json
karakara.search.tag.silent_forced = []
karakara.search.tag.silent_hidden = []
karakara.search.template.button.list_tracks.threshold = 100 -> int
Expand Down
9 changes: 2 additions & 7 deletions website/karakara/__init__.py
Expand Up @@ -12,10 +12,9 @@

# Other imports
import re
import os

# Package Imports
from externals.lib.misc import convert_str_with_type
from externals.lib.misc import convert_str_with_type, read_json
from externals.lib.pyramid.auto_format import registered_formats
from .templates import helpers as template_helpers
from externals.lib.socket.auth_echo_server import AuthEchoServerManager
Expand Down Expand Up @@ -49,14 +48,10 @@ def main(global_config, **settings):
# Parse/Convert setting keys that have specifyed datatypes
for key in config.registry.settings.keys():
config.registry.settings[key] = convert_str_with_type(config.registry.settings[key])

# Project Path -------------------------------------------------------------
# because the project can be run from a varity of paths, we need a way of storing this rather than using cwd (which may be incorrect)
config.registry.settings['project.path'] = os.path.abspath(os.path.join(os.path.dirname( __file__ ), '..'))

# Search Config ------------------------------------------------------------
import karakara.views.search
karakara.views.search.search_config = config.registry.settings['karakara.search.view.config']
karakara.views.search.search_config = read_json(config.registry.settings['karakara.search.view.config'])

# WebSocket ----------------------------------------------------------------

Expand Down

0 comments on commit cbc6d85

Please sign in to comment.