Merge pull request #65 from kaulketh/develop

minor changes at imports

Author: kaulketh

bot/conf/__init__.py

@@ -2,3 +2,4 @@
 from .lib_english import *
 from .lib_ext_greenhouse import *
 from .greenhouse_config import *
+from .lib_global import *

bot/conf/lib_global.py

@@ -5,6 +5,8 @@
 author: Thomas Kaulke, [email protected]
 """
 
+import sys
+
 empty = ''
 space = ' '
 colon_space = ': '
@@ -33,17 +35,31 @@
 time_units_sign = ('s', 'm', 'h')
 time_conversion = time_units_conversion[time_units_index]
 
+file_paths = {
+        'file_log_greenhouse': '/greenhouse.log',
+        'file_log_debug': '/greenhouse_console.log',
+        'file_log_update': '/update_bot.log',
+        'latest_release': '/greenhouseLatestRelease.id',
+        'commit_id': '/greenhouseRepoCommit.id',
+        'cloned_branch': '/greenhouseRepoBranch.name',
+        'bot_dir': '/home/pi/scripts/TelegramBot/',
+        'bot_backup': '/home/pi/backups/greenhouse.tgz'
+    }
+
+file_log_greenhouse = file_paths['file_log_greenhouse']
+file_log_debug = file_paths['file_log_debug']
+file_log_update = file_paths['file_log_update']
+latest_release = file_paths['latest_release']
+commit_id = file_paths['commit_id']
+cloned_branch = file_paths['cloned_branch']
+bot_dir = file_paths['bot_dir']
+bot_backup = file_paths['bot_backup']
+
 
-# TODO: make accessible in bash and vice versa!!!!
-file_log_greenhouse = '/greenhouse.log'
-file_log_debug = '/greenhouse_console.log'
-file_log_update = '/update_bot.log'
-latest_release = '/greenhouseLatestRelease.id'
-commit_id = '/greenhouseRepoCommit.id'
-cloned_branch = '/greenhouseRepoBranch.name'
-bot_dir = '/home/pi/scripts/TelegramBot/'
-bot_backup = '/home/pi/backups/greenhouse.tgz'
+def get_path(var):
+    if file_paths.__contains__(var):
+        print(file_paths[var])
 
 
 if __name__ == '__main__':
-    pass
+    get_path(sys.argv[1])

bot/ext_greenhouse.py

@@ -149,7 +149,7 @@ def __init_and_start():
     apiToken = conf.token
     chat_id = sys.argv[1]
 
-   # kill the still running greenhouse bot script.
+    """ kill the still running greenhouse bot script """
     pid1 = utils.read_cmd(lib.get_pid1, lib.tmp_file)
     utils.read_cmd('kill -9 {0}'.format(str(pid1)), lib.tmp_file)
 

bot/greenhouse.py

@@ -360,9 +360,12 @@ def __job_stop_and_restart(bot, job):
 # error
 def __error(bot, update, e):
     logger.error('Update "{0}" caused error "{1}"'.format(update, e))
-    display.show_error()
-    __cam_off()
-    utils.GPIO.cleanup()
+    try:
+        display.show_error()
+        __cam_off()
+        utils.GPIO.cleanup()
+    except Exception:
+        logging.warning('Any error occurs!')
     return ConversationHandler.END
 
 

bot/peripherals/oled/display.py

@@ -5,20 +5,19 @@
 author: Thomas Kaulke, [email protected]
 """
 
-# TODO: improve and fix imports, load vars from global lib!!!
-# from __future__ import absolute_import
-# import conf.lib_global as lib
+from __future__ import absolute_import
+from conf import get_path
 import subprocess
 from time import sleep
 from PIL import Image, ImageFont, ImageDraw
 from smbus import SMBus
 from lib_oled96 import Ssd1306
 
 
-latest_release = '/greenhouseLatestRelease.id'
-commit_id = '/greenhouseRepoCommit.id'
-cloned_branch = '/greenhouseRepoBranch.name'
-bot_dir = '/home/pi/scripts/TelegramBot/'
+latest_release = get_path('latest_release')
+commit_id = get_path('commit_id')
+cloned_branch = get_path('cloned_branch')
+bot_dir = get_path('bot_dir')
 
 
 # Display setup, methods and members

bot/test_bot.py

@@ -8,18 +8,21 @@ bot=$1
 chat=$2
 project=greenhouse
 owner=kaulketh
-log='/update_bot.log'
-### Ensure same file names in peripherals/oled/display.py! ###
-### Ensure same file names in conf/ext_greenhouse.py! ###
-commit_id='/greenhouseRepoCommit.id'
-cloned_branch='/greenhouseRepoBranch.name'
-bot_dir='/home/pi/scripts/TelegramBot/'
-latest_release='/greenhouseLatestRelease.id'
+
+# path to main config library
+config='/home/pi/scripts/TelegramBot/conf/lib_global.py'
+
+log=$(python $config file_log_update)
+commit_id=$(python $config commit_id)
+cloned_branch=$(python $config cloned_branch)
+bot_dir=$(python $config bot_dir)
+latest_release=$(python $config latest_release)
+
 wait=3
 
 # function display usage
 display_usage() {
-echo "Failed! Paremeter is missing."
+echo "Failed! Parameter is missing."
 echo "Usage only possible at least with Telegram bot API token and Chat ID!"
 }
 
@@ -48,7 +51,7 @@ fi
 commit=$(curl -s https://api.github.com/repos/${owner}/${project}/commits/${branch} --insecure | grep -Po '(?<="sha":)(.*?)(?=,)' -m 1 | sed "s/\"//g" | sed -e 's/^[[:space:]]*//' | sed -e 's/[.]*$//')
 # get saved commit
 last_commit=$(cat ${commit_id})
-#get latest release
+# get latest release
 release=$(curl -s https://api.github.com/repos/${owner}/${project}/releases/latest --insecure| grep -Po '"tag_name": "\K.*?(?=")')
 echo ${release} > ${latest_release}