Added driver and fixed error case with oauth.json being corrupt

mrworf · Jun 20, 2018 · ac80e8a · ac80e8a
1 parent 60e4e4f
commit ac80e8a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/display-drivers/waveshare35b/manifest.json b/display-drivers/waveshare35b/manifest.json
@@ -0,0 +1 @@
+{"driver": "waveshare35b", "options": {"dtoverlay": "waveshare35b"}, "install": [{"src": "waveshare35b-overlay.dtb", "dst": "/boot/overlays/waveshare35b.dtbo"}, {"src": "waveshare35b-overlay.dtb", "dst": "/boot/overlays/waveshare35b-overlay.dtb"}]}
diff --git a/display-drivers/waveshare35b/waveshare35b-overlay.dtb b/display-drivers/waveshare35b/waveshare35b-overlay.dtb
diff --git a/frame.py b/frame.py
@@ -376,11 +376,14 @@ def oauthSetToken(token):
 oauth = OAuth(settings.get('local-ip'), oauthSetToken, oauthGetToken)
 
 if os.path.exists('/root/photoframe_config/oauth.json'):
-	with open('/root/photoframe_config/oauth.json') as f:
-		data = json.load(f)
-	if 'web' in data: # if someone added it via command-line
-		data = data['web']
-	oauth.setOAuth(data)
+	try:
+		with open('/root/photoframe_config/oauth.json') as f:
+			data = json.load(f)
+		if 'web' in data: # if someone added it via command-line
+			data = data['web']
+		oauth.setOAuth(data)
+	except:
+		logging.exception('OAuth file is corrupt, do not use')
 
 # Prep random
 random.seed(long(time.clock()))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"driver": "waveshare35b", "options": {"dtoverlay": "waveshare35b"}, "install": [{"src": "waveshare35b-overlay.dtb", "dst": "/boot/overlays/waveshare35b.dtbo"}, {"src": "waveshare35b-overlay.dtb", "dst": "/boot/overlays/waveshare35b-overlay.dtb"}]}