JSON logic error handling in player status update. Printing LMS statu…

…s response in verbose mode. Fixes #13
terba · Oct 14, 2016 · 7397166 · 7397166
1 parent 1bc205a
commit 7397166
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 40 deletions.
diff --git a/Controller.cpp b/Controller.cpp
@@ -117,7 +117,7 @@ void Controller::run()
 	}
 	catch (const jsonrpc::JsonRpcException& e)
 	{
-		cerr << "Startup volume can not be set: " << e.what() << endl;
+		cerr << "[ERROR] Startup volume can not be set: " << e.what() << endl;
 	}
 	ev::default_loop loop;
 	loop.run(0);
@@ -315,7 +315,7 @@ void Controller::handleEvent(const Event event)
 	}
 	catch (const jsonrpc::JsonRpcException& e)
 	{
-		cerr << e.what() << endl;
+		cerr << "[ERROR] " << e.what() << endl;
 	}
 }
 
@@ -357,7 +357,7 @@ void Controller::readInput(ev::io& w, int revents)
 	}
 	if (readSize == -1 && errno != EAGAIN && errno != EINTR)
 	{
-		cerr << "Input device read error" << endl;
+		cerr << "[ERROR] Input device read error" << endl;
 	}
 }
 

diff --git a/Player.cpp b/Player.cpp
@@ -28,41 +28,52 @@ void Player::update(const bool fullPlaylist)
 {
 	Json::Value response = mServer.playerStatus(mId, fullPlaylist);
 
-	string s = response["mode"].asString();
-	if (s == "play")
-		mMode = Play;
-	else if (s == "stop")
-		mMode = Stop;
-	else if (s == "pause")
-		mMode = Pause;
-	else
-		mMode = Unknown;
-
-	mPowered = response["power"].asInt() == 1;
-
-	mPlaylistSize = response["playlist_tracks"].asInt();
-	s = response["playlist_cur_index"].asString();
-	if (s.length() > 0)
-		mPlaylistIndex = stoi(s);
-	else
-		mPlaylistIndex = 0;
-
-	int loopIndex = fullPlaylist ? mPlaylistIndex : 0;
-
-	mRemote = response["playlist_loop"][loopIndex]["remote"].asString() == "1";
-	mRemoteTitle = response["playlist_loop"][loopIndex]["remote_title"].asString();
-	mArtist = response["playlist_loop"][loopIndex]["artist"].asString();
-	mAlbum = response["playlist_loop"][loopIndex]["album"].asString();
-	mTitle = response["playlist_loop"][loopIndex]["title"].asString();
-	mDuration = response["duration"].asFloat();
-	mTime = response["time"].asFloat();
-
-	mVolume = response["mixer volume"].asInt();
-	mRepeat = response["playlist repeat"].asInt();
-	mShuffle = response["playlist shuffle"].asInt();
-
-	if (fullPlaylist)
-		mPlaylist = mPlaylistSize == 0 ? Json::arrayValue : response["playlist_loop"];
+	if (Config::verbose())
+		cout << "Status: " << response.toStyledString() << endl;
+
+	try
+	{
+		string s = response["mode"].asString();
+		if (s == "play")
+			mMode = Play;
+		else if (s == "stop")
+			mMode = Stop;
+		else if (s == "pause")
+			mMode = Pause;
+		else
+			mMode = Unknown;
+
+		mPowered = response["power"].asInt() == 1;
+
+		mPlaylistSize = response["playlist_tracks"].asInt();
+		s = response["playlist_cur_index"].asString();
+		if (s.length() > 0)
+			mPlaylistIndex = stoi(s);
+		else
+			mPlaylistIndex = 0;
+
+		int loopIndex = fullPlaylist ? mPlaylistIndex : 0;
+
+		mRemote = response["playlist_loop"][loopIndex]["remote"].asString() == "1";
+		mRemoteTitle = response["playlist_loop"][loopIndex]["remote_title"].asString();
+		mArtist = response["playlist_loop"][loopIndex]["artist"].asString();
+		mAlbum = response["playlist_loop"][loopIndex]["album"].asString();
+		mTitle = response["playlist_loop"][loopIndex]["title"].asString();
+		mDuration = response["duration"].asFloat();
+		mTime = response["time"].asFloat();
+
+		mVolume = response["mixer volume"].asInt();
+		mRepeat = response["playlist repeat"].asInt();
+		mShuffle = response["playlist shuffle"].asInt();
+
+		if (fullPlaylist)
+			mPlaylist = mPlaylistSize == 0 ? Json::arrayValue : response["playlist_loop"];
+	}
+	catch (const Json::LogicError& e)
+	{
+		cerr << "[ERROR] Status: " << response.toStyledString() << endl;
+		cerr << "[ERROR] Invalid JSON response from server: " << e.what() << endl;
+	}
 }
 
 void Player::setVolume(const int volume)

diff --git a/main.cpp b/main.cpp
@@ -35,7 +35,7 @@ int main(int argc, char* argv[])
 	}
 	catch (const TCLAP::ArgException& e)
 	{
-		cerr << "Error: " << e.error() << " " << e.argId() << endl;
+		cerr << "[ERROR] " << e.error() << " " << e.argId() << endl;
 		return EXIT_FAILURE;
 	}
 
@@ -57,7 +57,7 @@ int main(int argc, char* argv[])
 		}
 		catch (const lcdapi::LCDException& e)
 		{
-			cerr << "LCDd communication error: " << e.what() << endl;
+			cerr << "[ERROR] LCDd communication problem: " << e.what() << endl;
 		}
 
 		// Sleeping for some time and retrying initialization