1.67.6.23 dmc sessionApi "api_urls"→"urls"対応

Saccubus · Jun 20, 2017 · 87c96a6 · 87c96a6 · orz- · Jun 20, 2017
1 parent 10a7a04
commit 87c96a6
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/frontend/src/saccubus/MainFrame_AboutBox.java b/frontend/src/saccubus/MainFrame_AboutBox.java
@@ -52,8 +52,8 @@ public class MainFrame_AboutBox extends JDialog implements ActionListener {
 
 //	String version = "ver1.22r(2008/04/27)";
 
-	public static final String rev = "1.67.6.22";
-	private static final String modefied = " (2017/06/19)";
+	public static final String rev = "1.67.6.23";
+	private static final String modefied = " (2017/06/20)";
 
 	String productHTML =
 		"<html>" +

diff --git a/frontend/src/saccubus/json/Mson.java b/frontend/src/saccubus/json/Mson.java
@@ -20,7 +20,7 @@ public class Mson {
 
 //	private final static boolean DEBUG = false;
 	private JsonElement json;
-	private static final Mson MSON_NULL = new Mson("null");
+	public static final Mson MSON_NULL = new Mson("null");
 	public Mson(JsonElement je) {
 		setJson(je);
 	}

diff --git a/frontend/src/saccubus/net/NicoClient.java b/frontend/src/saccubus/net/NicoClient.java
@@ -2851,7 +2851,7 @@ public boolean isEco() {
 	private String apiUrls;
 	private String sessionData;
 	private String player_id;
-	private String apiSessionUrl;
+	private String apiSessionUrl = "http://api.dmc.nico:2805/api/sessions";
 	private String videoTag;
 	private String recipe_id;
 //	private String t_created_time;
@@ -3497,9 +3497,32 @@ private void setFromSessionApi(Mson m_sessionApi){
 			audiolist.add(m_audios.getAsString(i));
 		}
 		debug("\n■audiolist: "+audiolist);
-		apiUrls = m_sessionApi.getAsString("api_urls");
-		debug("\n■apiUrls: "+apiUrls);
-		apiSessionUrl = m_sessionApi.get("api_urls").getAsString(0);
+		Mson m_apiUrls;
+		Mson m_apiUrls0;
+		m_apiUrls = m_sessionApi.get("api_urls");
+		if(m_apiUrls.isNull()){
+			m_apiUrls = m_sessionApi.get("urls");
+		}
+		if(!m_apiUrls.isNull()){
+			apiUrls = m_apiUrls.getAsString();
+			debug("\n■apiUrls: "+apiUrls);
+			m_apiUrls0 = m_apiUrls.get(0);
+			if(!m_apiUrls0.isNull()){
+				debug("\n■apiUrls[0]: "+m_apiUrls0);
+				apiSessionUrl = m_apiUrls0.getAsString("url");
+			}
+		}else{
+			m_apiUrls0 = m_sessionApi.get("url");
+			debug("\n■apiUrls[0]: "+m_apiUrls0);
+			if(!m_apiUrls0.isNull()){
+				apiSessionUrl = m_apiUrls0.getAsString();
+			}
+		}
+		if(apiSessionUrl==null
+		 ||(!apiSessionUrl.toLowerCase().contains("session")
+		  &&!apiSessionUrl.toLowerCase().contains("api"))){
+			apiSessionUrl = "http://api.dmc.nico:2805/api/sessions";
+		}
 		debug("\n■apiSessionUrl: "+apiSessionUrl);
 		player_id = m_sessionApi.getAsString("player_id");
 		debug("\n■player_id: "+player_id);