瀏覽代碼

move api key to config file

Fabian Peter Hammerle 7 年之前
父節點
當前提交
c0c779514e
共有 1 個文件被更改,包括 18 次插入5 次删除
  1. 18 5
      omegalines

+ 18 - 5
omegalines

@@ -1,16 +1,19 @@
 #!/usr/bin/env python
 #!/usr/bin/env python
 
 
-wiener_linien_api_key = "insert here"
-
 import datetime
 import datetime
 import dateutil.parser
 import dateutil.parser
 import json
 import json
-import sys
+import os
 import time
 import time
 import urllib2
 import urllib2
+import yaml
 from OmegaExpansion import oledExp
 from OmegaExpansion import oledExp
 
 
-def run():
+
+def run(config_path):
+    with open(config_path, 'r') as config_file:
+        config = yaml.load(config_file.read())
+    wiener_linien_api_key = config['wiener_linien_api_key']
     assert not oledExp.driverInit()
     assert not oledExp.driverInit()
     assert not oledExp.setDisplayPower(1)
     assert not oledExp.setDisplayPower(1)
 
 
@@ -28,7 +31,8 @@ def run():
             resp = None
             resp = None
         if resp:
         if resp:
             # datetime.datetime.strptime:
             # datetime.datetime.strptime:
-            # ValueError: 'z' is a bad directive in format '%Y-%m-%dT%H:%M:%S.%f%z'
+            # ValueError: 'z' is a bad directive in format
+            # '%Y-%m-%dT%H:%M:%S.%f%z'
             server_time = dateutil.parser.parse(resp['message']['serverTime'])
             server_time = dateutil.parser.parse(resp['message']['serverTime'])
             print(server_time)
             print(server_time)
             monitors = resp['data']['monitors']
             monitors = resp['data']['monitors']
@@ -50,11 +54,19 @@ def run():
                                   (departure['departureTime']['countdown'], line_name, towards))
                                   (departure['departureTime']['countdown'], line_name, towards))
         time.sleep(9.9)
         time.sleep(9.9)
 
 
+
 def _init_argparser():
 def _init_argparser():
     import argparse
     import argparse
     argparser = argparse.ArgumentParser()
     argparser = argparse.ArgumentParser()
+    argparser.add_argument(
+        '-c', '--config-path',
+        dest='config_path',
+        type=str,
+        default=os.path.join(os.path.expanduser('~'), '.omegalines'),
+    )
     return argparser
     return argparser
 
 
+
 def main(argv):
 def main(argv):
     argparser = _init_argparser()
     argparser = _init_argparser()
     args = argparser.parse_args(argv)
     args = argparser.parse_args(argv)
@@ -62,4 +74,5 @@ def main(argv):
     return 0
     return 0
 
 
 if __name__ == "__main__":
 if __name__ == "__main__":
+    import sys
     sys.exit(main(sys.argv[1:]))
     sys.exit(main(sys.argv[1:]))