Added: Music library stub for JSON-RPC

Added: Gesture mode GFX

git-svn-id: http://android-xbmcremote.googlecode.com/svn/trunk/XBMC Remote@584 677bec2c-7919-11de-bdc7-1f637afd43b1

AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.xbmc.android.remote"
-	android:versionName="0.6.7+" android:versionCode="583">
+	android:versionName="0.6.7+" android:versionCode="584">
 	<application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false" >
 		<activity android:name=".presentation.activity.HomeActivity"
 			android:label="@string/app_name"

src/org/xbmc/android/remote/business/Command.java

@@ -16,14 +16,20 @@
 public abstract class Command<T> implements Runnable {
 
 	public int mRetryCount = 0;
+	public long mStarted = 0;
 	public final INotifiableManager mManager;
-	public final DataResponse<T> response;
+	public final DataResponse<T> mResponse;
+
+	// TODO Disable this when not needed anymore
+	public final StackTraceElement mCaller;
 
 	public static final int MAX_RETRY = 5;
 
 	public Command(DataResponse<T> response, INotifiableManager manager) {
-		this.mManager = manager;
-		this.response = response;
+		mManager = manager;
+		mResponse = response;
+		mStarted = System.currentTimeMillis();
+		mCaller = new Throwable().fillInStackTrace().getStackTrace()[2];
 	}
 
 	public void run() {
@@ -32,7 +38,9 @@ public void run() {
 			Log.d("Command", "Running command counter: " + mRetryCount);
 			if(mRetryCount > MAX_RETRY) return;
 			doRun();
-			mManager.onFinish(response);
+			Log.i(mCaller.getClassName(), "*** " + mCaller.getMethodName() + ": " + (System.currentTimeMillis() - mStarted) + "ms");
+
+			mManager.onFinish(mResponse);
 		}catch (WifiStateException e) {
 			mManager.onWrongConnectionState(e.getState(), this);
 		}catch (Exception e) {

src/org/xbmc/android/remote/business/MusicManager.java

@@ -79,13 +79,7 @@ public void doRun() throws Exception {
 	 * @param response Response object
 	 */
 	public void getAlbums(final DataResponse<ArrayList<Album>> response, final Context context) {
-//		mHandler.post(new Runnable() {
-//			public void run() { 
-//				response.value = music(context).getAlbums(MusicManager.this, getSortBy(SortType.ALBUM), getSortOrder());
-//				onFinish(response);
-//			}
-//		});
-		mHandler.post(new Command<ArrayList<Album>>(response, this){
+		mHandler.post(new Command<ArrayList<Album>>(response, this) {
 			@Override
 			public void doRun() throws Exception {
 				response.value = music(context).getAlbums(MusicManager.this, getSortBy(SortType.ALBUM), getSortOrder());

src/org/xbmc/android/remote/business/TvShowManager.java

@@ -69,7 +69,7 @@ public void getTvShows(DataResponse<ArrayList<TvShow>> response, final Actor act
 		mHandler.post(new Command<ArrayList<TvShow>>(response, this) {
 			@Override
 			public void doRun() throws Exception {
-				response.value = shows(context).getTvShows(TvShowManager.this, actor);
+				mResponse.value = shows(context).getTvShows(TvShowManager.this, actor);
 			}
 		});
 	}
@@ -79,7 +79,7 @@ public void getEpisodes(DataResponse<ArrayList<Episode>> response,
 		mHandler.post(new Command<ArrayList<Episode>>(response, this) {
 			@Override
 			public void doRun() throws Exception {
-				response.value = shows(context).getEpisodes(TvShowManager.this, show);
+				mResponse.value = shows(context).getEpisodes(TvShowManager.this, show);
 			}
 		});
 	}
@@ -89,7 +89,7 @@ public void getSeasons(DataResponse<ArrayList<Season>> response,
 		mHandler.post(new Command<ArrayList<Season>>(response, this) {
 			@Override
 			public void doRun() throws Exception {
-				response.value = shows(context).getSeasons(TvShowManager.this, show);
+				mResponse.value = shows(context).getSeasons(TvShowManager.this, show);
 			}
 		});
 	}
@@ -99,7 +99,7 @@ public void getEpisodes(DataResponse<ArrayList<Episode>> response,
 		mHandler.post(new Command<ArrayList<Episode>>(response, this) {
 			@Override
 			public void doRun() throws Exception {
-				response.value = shows(context).getEpisodes(TvShowManager.this, show, season);
+				mResponse.value = shows(context).getEpisodes(TvShowManager.this, show, season);
 			}
 		});
 
@@ -110,7 +110,7 @@ public void getEpisodes(DataResponse<ArrayList<Episode>> response,
 		mHandler.post(new Command<ArrayList<Episode>>(response, this) {
 			@Override
 			public void doRun() throws Exception {
-				response.value = shows(context).getEpisodes(TvShowManager.this, season);
+				mResponse.value = shows(context).getEpisodes(TvShowManager.this, season);
 			}
 		});
 	}

src/org/xbmc/android/remote/business/VideoManager.java

@@ -246,7 +246,7 @@ public void getTvShowGenres(DataResponse<ArrayList<Genre>> response,
 		mHandler.post(new Command<ArrayList<Genre>>(response, this) {
 			@Override
 			public void doRun() throws Exception { 
-				response.value = video(context).getTvShowGenres(VideoManager.this);
+				mResponse.value = video(context).getTvShowGenres(VideoManager.this);
 			}
 		});
 	}

src/org/xbmc/android/remote/presentation/controller/FileListController.java

@@ -26,7 +26,7 @@
 
 import org.xbmc.android.remote.R;
 import org.xbmc.android.remote.business.ManagerFactory;
-import org.xbmc.android.remote.presentation.activity.AbsListActivity;
+import org.xbmc.android.remote.presentation.activity.ListActivity;
 import org.xbmc.android.remote.presentation.activity.NowPlayingActivity;
 import org.xbmc.android.remote.presentation.widget.OneLabelItemView;
 import org.xbmc.api.business.DataResponse;
@@ -100,7 +100,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
 
 					FileLocation item = mFileItems.get(((FileLocation)parent.getAdapter().getItem(position)).name);
 					if (item.isDirectory) {
-						Intent nextActivity = new Intent(mActivity, AbsListActivity.class);
+						Intent nextActivity = new Intent(mActivity, ListActivity.class);
 						nextActivity.putExtra(ListController.EXTRA_LIST_CONTROLLER, new FileListController());
 						nextActivity.putExtra(ListController.EXTRA_SHARE_TYPE, mMediaType);
 						nextActivity.putExtra(ListController.EXTRA_PATH, item.path);

src/org/xbmc/android/util/ClientFactory.java

@@ -85,7 +85,15 @@ public static IVideoClient getVideoClient(INotifiableManager manager, Context co
 
 	public static IMusicClient getMusicClient(INotifiableManager manager, Context context) throws WifiStateException {
 		assertWifiState(context);
-		return createHttpClient(manager).music;
+		probeQueryApiType(manager);
+		switch (sApiType) {
+			case API_TYPE_JSONRPC:
+//				return createJsonClient(manager).music;
+			case API_TYPE_UNSET:
+			case API_TYPE_HTTPIAPI:
+			default:
+				return createHttpClient(manager).music;
+		}
 	}
 
 	public static ITvShowClient getTvShowClient(INotifiableManager manager, Context context) throws WifiStateException {
@@ -204,7 +212,8 @@ private static void probeQueryApiType(final INotifiableManager manager) {
 			sApiType = API_TYPE_UNSET;
 		}
 	}
-
+
+
 	/**
 	 * Returns an instance of the Event Server Client. Instantiation takes
 	 * place only once, otherwise the first instance is returned.

src/org/xbmc/api/data/IMusicClient.java

@@ -39,6 +39,18 @@
  * @author Team XBMC
  */
 public interface IMusicClient extends IClient {
+
+	// those are the musicdb://n/ keys.
+	public static final int MUSICDB_GENRE           = 1;
+	public static final int MUSICDB_ARTIST          = 2;
+	public static final int MUSICDB_ALBUM           = 3;
+	public static final int MUSICDB_SONG            = 4;
+	public static final int MUSICDB_TOP100          = 5;
+	public static final int MUSICDB_RECENTLY_ADDED  = 6;
+	public static final int MUSICDB_RECENTLY_PLAYED = 7;
+	public static final int MUSICDB_COMPILATION     = 8;
+	public static final int MUSICDB_YEARS           = 9;
+	public static final int MUSICDB_SINGLES         = 10;
 
 	/**
 	 * Adds an album to the current playlist.

src/org/xbmc/httpapi/Connection.java

@@ -1,3 +1,24 @@
+/*
+ *      Copyright (C) 2005-2010 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC Remote; see the file license.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 package org.xbmc.httpapi;
 
 import java.io.BufferedReader;

src/org/xbmc/httpapi/client/Client.java

@@ -45,9 +45,9 @@
  * 
  * @author Team XBMC
  */
-public abstract class Client {
+abstract class Client {
 
-	public static final String TAG = "Client";
+	public static final String TAG = "Client-HTTPAPI";
 
 	protected final Connection mConnection;
 

src/org/xbmc/httpapi/client/MusicClient.java

@@ -50,18 +50,6 @@ public class MusicClient extends Client implements IMusicClient {
 
 	public static final String TAG = "MusicClient";
 
-	// those are the musicdb://n/ keys.
-	public static final int MUSICDB_GENRE           = 1;
-	public static final int MUSICDB_ARTIST          = 2;
-	public static final int MUSICDB_ALBUM           = 3;
-	public static final int MUSICDB_SONG            = 4;
-	public static final int MUSICDB_TOP100          = 5;
-	public static final int MUSICDB_RECENTLY_ADDED  = 6;
-	public static final int MUSICDB_RECENTLY_PLAYED = 7;
-	public static final int MUSICDB_COMPILATION     = 8;
-	public static final int MUSICDB_YEARS           = 9;
-	public static final int MUSICDB_SINGLES         = 10;
-
 	public static final int VIEW_ALBUMS = 1;
 	public static final int VIEW_SONGS = 2;
 

src/org/xbmc/jsonrpc/Connection.java

@@ -1,7 +1,29 @@
+/*
+ *      Copyright (C) 2005-2010 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC Remote; see the file license.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
 package org.xbmc.jsonrpc;
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.net.Authenticator;
@@ -135,6 +157,20 @@ public void setTimeout(int timeout) {
 		}
 	}
 
+	public InputStream getInputStream(String url, INotifiableManager manager) {
+		try {
+			final URL u = new URL(url);
+			URLConnection uc;
+			uc = u.openConnection();
+			uc.setConnectTimeout(SOCKET_CONNECTION_TIMEOUT);
+			uc.setReadTimeout(mSocketReadTimeout);
+			return uc.getInputStream();
+		} catch (IOException e) {
+			manager.onError(e);
+		}
+		return null;
+	}
+
 	/**
 	 * Executes a query.
 	 * @param command    Name of the command to execute
@@ -164,6 +200,8 @@ public JSONObject query(String command, JSONObject parameters, INotifiableManage
 				.put("id", "1");
 			if (parameters != null) {
 				data.put("params", parameters);
+			} else {
+				data.put("params", new JSONObject());
 			}
 
 			// POST data

src/org/xbmc/jsonrpc/JSONHelper.java

@@ -0,0 +1,54 @@
+/*
+ *      Copyright (C) 2005-2010 Team XBMC
+ *      http://xbmc.org
+ *
+ *  This Program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This Program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with XBMC Remote; see the file license.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+
+package org.xbmc.jsonrpc;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Wraps some calls in order to avoid JSON exceptions
+ * @author Team XBMC
+ */
+public abstract class JSONHelper {
+
+	public final static String getString(JSONObject obj, String key) {
+		try {
+			return obj.getString(key);
+		} catch (JSONException e) {
+			return null;
+		}
+	}
+	public final static String getString(JSONObject obj, String key, String ifNullResult) {
+		try {
+			return obj.getString(key);
+		} catch (JSONException e) {
+			return ifNullResult;
+		}
+	}
+	public final static int getInt(JSONObject obj, String key) {
+		try {
+			return obj.getInt(key);
+		} catch (JSONException e) {
+			return -1;
+		}
+	}
+}

src/org/xbmc/jsonrpc/JsonRpc.java

@@ -23,6 +23,7 @@
 
 import org.xbmc.api.object.Host;
 import org.xbmc.jsonrpc.client.InfoClient;
+import org.xbmc.jsonrpc.client.MusicClient;
 
 /**
  * Wrapper class for JSON-RPC clients. The idea is to separate the loads of
@@ -33,14 +34,15 @@
  */
 public class JsonRpc {
 
+
 	/**
 	 * Use this client for anything system related
 	 */
 	public final InfoClient info;
 
 	/**
 	 * Use this client for anything music related
-	 *
+	 */
 	public final MusicClient music;
 
 	/**
@@ -73,8 +75,8 @@ public JsonRpc(Host host, int timeout) {
 		}
 		connection.setTimeout(timeout);
 		info = new InfoClient(connection);
-/*		music = new MusicClient(connection);
-		video = new VideoClient(connection);
+		music = new MusicClient(connection);
+/*		video = new VideoClient(connection);
 		control = new ControlClient(connection);
 		shows = new TvShowClient(connection);*/
 	}
@@ -85,8 +87,8 @@ public JsonRpc(Host host, int timeout) {
 	 */
 	public void setHost(Host host) {
 		info.setHost(host);
-/*		music.setHost(host);
-		video.setHost(host);
+		music.setHost(host);
+/*		video.setHost(host);
 		control.setHost(host);
 		shows.setHost(host);*/
 	}