simon
/
domoboard
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://github.com/wez3/domoboard into develop

This commit is contained in:
wez3 2017-01-22 19:23:54 +01:00
parent aa62b266a1 c6410e21f2
commit d9ce30a1e3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example.conf
View File

@ -10,7 +10,7 @@
[[domoboard]] [[domoboard]]
time = False # True/False: show time in top bar time = False # True/False: show time in top bar
date = False # True/False: show date in top bar date = False # True/False: show date in top bar
language = "gb" # Change this to display date/time in local language and format language = "gb" # Change this to display date/time in local language and format
google_maps_api_key = X # Google Maps Embed API key google_maps_api_key = X # Google Maps Embed API key
# Add Navbar items here. The key is the navbar link name. The first value is the URI name, second value can be any font awesome logo to be displayed. # Add Navbar items here. The key is the navbar link name. The first value is the URI name, second value can be any font awesome logo to be displayed.

5
modules/plugins.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/python #!/usr/bin/python
# This file contains the functions regarding the plugin manager. # This file contains the functions regarding the plugin manager.
import git, shutil, os, imp import git, shutil, os, imp, sys
import security, api import security, api
import re import re
@ -17,7 +17,8 @@ def loadPlugins():
plugin[name] = imp.load_source(name, plugin_dir + i) plugin[name] = imp.load_source(name, plugin_dir + i)
plugin[name].init() plugin[name].init()
except ImportError as msg: except ImportError as msg:
sys.exit("Error occured during loading imports for the plugin {}: {}. Install it with 'easy_install {}' or 'pip install {}'".format(name, msg, msg , msg)) moduleName = str(msg).split(' ')[len(str(msg).split(' ')) -1]
sys.exit("Error occured during loading imports for the plugin {}: {}. Install it with 'easy_install {}' or 'pip install {}'".format(name, msg, moduleName , moduleName))
return plugin return plugin
def getPluginDict(): def getPluginDict():