added all new api and params in v1 without testing now

grossopaforever@gmail.com · grossopaforever@gmail.com · commit 556122c7df6b · 2011-12-04T16:11:19.000Z
diff --git a/HsDropbox/.actionScriptProperties b/HsDropbox/.actionScriptProperties
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="HsDropbox.as" projectUUID="a25a4239-2a71-45e2-80ba-22963fba4ac9" version="6">
-  <compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="true" copyDependentFiles="false" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
+<actionScriptProperties analytics="false" mainApplicationPath="HsDropbox.as" projectUUID="a25a4239-2a71-45e2-80ba-22963fba4ac9" version="10">
+  <compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="true" copyDependentFiles="false" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin" removeUnusedRSL="true" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
     <compilerSourcePath/>
     <libraryPath defaultLinkType="0">
       <libraryPathEntry kind="4" path="">
         <excludedEntries>
-          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/flex.swc" useDefaultLinkType="false"/>
+          <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/core.swc" useDefaultLinkType="false"/>
         </excludedEntries>
       </libraryPathEntry>
       <libraryPathEntry kind="1" linkType="1" path="libs"/>
@@ -17,4 +17,5 @@
   </applications>
   <modules/>
   <buildCSSFiles/>
+  <flashCatalyst validateFlashCatalystCompatibility="false"/>
 </actionScriptProperties>
diff --git a/HsDropbox/.flexLibProperties b/HsDropbox/.flexLibProperties
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<flexLibProperties includeAllClasses="true" version="3">
-  <includeClasses/>
+<flexLibProperties includeAllClasses="true" useMultiPlatformConfig="false" version="3">
+  <includeClasses>
+    <classEntry path="org.hamster.dropbox.models.SharesInfo"/>
+  </includeClasses>
   <includeResources/>
   <namespaceManifests/>
 </flexLibProperties>
diff --git a/HsDropbox/src/org/hamster/dropbox/DropboxClient.as b/HsDropbox/src/org/hamster/dropbox/DropboxClient.as
@@ -21,6 +21,7 @@ package org.hamster.dropbox
 	
 	import org.hamster.dropbox.models.AccountInfo;
 	import org.hamster.dropbox.models.DropboxFile;
+	import org.hamster.dropbox.models.SharesInfo;
 	import org.hamster.dropbox.utils.OAuthHelper;
 	
 	import ru.inspirit.net.MultipartURLLoader;
@@ -51,6 +52,16 @@ package org.hamster.dropbox
 	[Event(name="getFileFault",  type="org.hamster.dropbox.DropboxEvent")]
 	[Event(name="metadataResult", type="org.hamster.dropbox.DropboxEvent")]
 	[Event(name="metadataFault",  type="org.hamster.dropbox.DropboxEvent")]
+	[Event(name="revisionResult", type="org.hamster.dropbox.DropboxEvent")]
+	[Event(name="revisionFault",  type="org.hamster.dropbox.DropboxEvent")]
+	[Event(name="restoreResult", type="org.hamster.dropbox.DropboxEvent")]
+	[Event(name="restoreFault",  type="org.hamster.dropbox.DropboxEvent")]
+	[Event(name="searchResult", type="org.hamster.dropbox.DropboxEvent")]
+	[Event(name="searchFault",  type="org.hamster.dropbox.DropboxEvent")]
+	[Event(name="sharesResult", type="org.hamster.dropbox.DropboxEvent")]
+	[Event(name="sharesFault",  type="org.hamster.dropbox.DropboxEvent")]
+	[Event(name="mediaResult", type="org.hamster.dropbox.DropboxEvent")]
+	[Event(name="mediaFault",  type="org.hamster.dropbox.DropboxEvent")]
 	
 	/**
 	 * Dropbox client class, in order to use, you should build an instance of
@@ -82,6 +93,8 @@ package org.hamster.dropbox
 		protected static const ACCESS_TOKEN:String = 'access_token';
 		protected static const ACCOUNT_INFO:String = 'account_info';
 		protected static const DROPBOX_FILE:String = 'dropbox_file';
+		protected static const DROPBOX_FILE_LIST:String = 'dropbox_file_list';
+		protected static const SHARES_INFO:String = 'shares_info';
 		
 		/**
 		 * xperiments UPDATE 
@@ -381,20 +394,34 @@ package org.hamster.dropbox
 		 * @param hash pass a hash value to perform better performance
 		 * @param list if query a directory, true to show sub list.
 		 * @param root, optional, default is "dropbox" 2011/01/22
+		 * @param include_deleted optional, added in v1
+		 * @param rev optional, added in v1
+		 * @param locale optional, added in v1
 		 * @return urlLoader
 		 */
 		public function metadata(path:String, 
-			fileLimit:int, hash:String, list:Boolean,
-			root:String = DropboxConfig.DROPBOX):URLLoader
+								 fileLimit:int, 
+								 hash:String, 
+								 list:Boolean,
+								 include_deleted:Boolean = false,
+								 rev:String = "",
+								 locale:String = "",
+								 root:String = DropboxConfig.DROPBOX):URLLoader
 		{
 			var params:Object = {
 				"file_limit" : fileLimit,
 				"hash": hash,
 				"list": list
 			};
 			
+			// added in v1
+			if (include_deleted == true)
+				buildOptionalParameters(params, 'include_deleted', include_deleted);
+			buildOptionalParameters(params, 'rev', rev);
+			buildOptionalParameters(params, 'locale', locale);
+			
 			var urlRequest:URLRequest = buildURLRequest(
-				config.server, "/metadata/" + root + '/' + buildFilePath(path), params);
+				config.server, '/metadata/' + root + '/' + buildFilePath(path), params);
 			return this.load(urlRequest, DropboxEvent.METADATA_RESULT, 
 				DropboxEvent.METADATA_FAULT, DROPBOX_FILE);
 		}
@@ -451,17 +478,29 @@ package org.hamster.dropbox
 		 * @param fileName
 		 * @param data
 		 * @param root, optional, default is "dropbox" 2011/01/22
+		 * @param locale optional added in v1
+		 * @param overwrite optional added in v1
+		 * @param parent_rev optional added in v1
 		 * @return multipartURLLoader
 		 */
 		public function putFile(filePath:String, 
 								fileName:String, 
 								data:ByteArray, 
+								locale:String = "",
+								overwrite:Boolean = true,
+								parent_rev:String = "",
 								root:String = DropboxConfig.DROPBOX):MultipartURLLoader
 		{
 			var url:String = this.buildFullURL(config.contentServer, '/files/' + root + '/' + buildFilePath(filePath));
 			var params:Object = { 
 				"file" : fileName
 			};
+			
+			//added in version 1
+			buildOptionalParameters(params, 'locale', locale);
+			params.overwrite = overwrite.toString();
+			buildOptionalParameters(params, 'parent_rev', parent_rev);
+			
 			var urlReqHeader:URLRequestHeader = OAuthHelper.buildURLRequestHeader(url, params, 
 				config.consumerKey, config.consumerSecret, 
 				config.accessTokenKey, config.accessTokenSecret, URLRequestMethod.POST);
@@ -475,6 +514,117 @@ package org.hamster.dropbox
 			return m;
 		}
 		
+		/**
+		 * added in v1, get revisions of a file.
+		 * https://api.dropbox.com/1/revisions/<root>/<path>
+		 * 
+		 * @param filePathWithName
+		 * @root optional, default is dropbox.  
+		 */
+		public function revisions(filePathWithName:String,
+								  root:String = DropboxConfig.DROPBOX):URLLoader
+		{
+			var urlRequest:URLRequest = buildURLRequest(
+				config.server, '/revisions/' + root + '/' +  buildFilePath(filePathWithName), null);
+			return this.load(urlRequest, DropboxEvent.REVISION_RESULT, 
+				DropboxEvent.REVISION_FAULT, DROPBOX_FILE_LIST, URLLoaderDataFormat.TEXT);
+		}
+		
+		/**
+		 * added in v1, restore file by rev. 
+		 * https://api.dropbox.com/1/restore/<root>/<path>
+		 * 
+		 * @param filePathWithName
+		 * @param rev revision to restore
+		 * @locale optional
+		 * @root optional, default is dropbox.
+		 * 
+		 */
+		public function restore(filePathWithName:String,
+								rev:String,
+								locale:String="",
+								root:String = DropboxConfig.DROPBOX):URLLoader
+		{
+			var params:Object = {
+				rev : rev
+			};
+			
+			buildOptionalParameters(params, 'locale', locale);
+			
+			var urlRequest:URLRequest = buildURLRequest(
+				config.server, '/restore/' + root + '/' +  buildFilePath(filePathWithName), params, URLRequestMethod.POST);
+			return this.load(urlRequest, DropboxEvent.RESTORE_RESULT, 
+				DropboxEvent.RESTORE_FAULT, DROPBOX_FILE, URLLoaderDataFormat.TEXT);			
+		}
+		
+		/**
+		 * added in v1, search by query.
+		 * https://api.dropbox.com/1/search/<root>/<path>
+		 * 
+		 * @param filePathWithName
+		 * @param rev revision to restore
+		 * @locale optional
+		 * @root optional, default is dropbox.
+		 * 
+		 */
+		public function search(filePath:String, 
+							   query:String,
+							   file_limit:int = 1000,
+							   include_deleted:Boolean = false,
+							   root:String = DropboxConfig.DROPBOX):URLLoader
+		{
+			var params:Object = {
+				query : query
+			};
+			
+			buildOptionalParameters(params, 'file_limit', file_limit);
+			buildOptionalParameters(params, 'include_deleted', include_deleted);
+			
+			var urlRequest:URLRequest = buildURLRequest(
+				config.server, '/search/' + root + '/' +  buildFilePath(filePath), params, URLRequestMethod.POST);
+			return this.load(urlRequest, DropboxEvent.SEARCH_RESULT, 
+				DropboxEvent.SEARCH_FAULT, DROPBOX_FILE_LIST, URLLoaderDataFormat.TEXT);
+		}
+		
+		/**
+		 * 
+		 * https://api.dropbox.com/1/shares/<root>/<path>
+		 * 
+		 * @param filePathWithName
+		 * @root optional, default is dropbox.
+		 */
+		public function shares(filePathWithName:String,
+							   root:String = DropboxConfig.DROPBOX):URLLoader
+		{
+			var urlRequest:URLRequest = buildURLRequest(
+				config.server, '/shares/' + root + '/' +  buildFilePath(filePathWithName), null);
+			return this.load(urlRequest, DropboxEvent.SHARES_RESULT, 
+				DropboxEvent.SHARES_FAULT, SHARES_INFO, URLLoaderDataFormat.TEXT);
+		}
+		
+		/**
+		 * 
+		 * https://api.dropbox.com/1/media/<root>/<path>
+		 * 
+		 * @param filePathWithName
+		 * @root optional, default is dropbox.
+		 */
+		public function media(filePathWithName:String,
+							  locale:String = "",
+							  root:String = DropboxConfig.DROPBOX):URLLoader
+		{
+			var params:Object;
+			if (locale != null && locale != "") {
+				params = new Object();
+				buildOptionalParameters(params, 'locale', locale);
+			}
+			
+			var urlRequest:URLRequest = buildURLRequest(
+				config.server, '/media/' + root + '/' +  buildFilePath(filePathWithName), params, URLRequestMethod.POST);
+			return this.load(urlRequest, DropboxEvent.MEDIA_RESULT, 
+				DropboxEvent.MEDIA_FAULT, SHARES_INFO, URLLoaderDataFormat.TEXT);
+		}
+		
 		/**
 		 * Build a OAuth URL request.
 		 *  
@@ -565,6 +715,19 @@ package org.hamster.dropbox
 					var dropboxFile:DropboxFile = new DropboxFile();
 					dropboxFile.decode(JSON.decode(urlLoader.data));
 					resultObject = dropboxFile;
+				} else if (urlLoader.resultType == DROPBOX_FILE_LIST) {
+					var array:Array = new Array();
+					var resultArray:* = JSON.decode(urlLoader.data);
+					for each (var ro:Object in resultArray) {
+						var df:DropboxFile = new DropboxFile();
+						df.decode(ro);
+						array.push(df);
+					}
+					resultObject = array;
+				} else if (urlLoader.resultType == SHARES_INFO) {
+					var sharesInfo:SharesInfo = new SharesInfo();
+					sharesInfo.decode(JSON.decode(urlLoader.data));
+					resultObject = sharesInfo;
 				} else {
 					resultObject = urlLoader.data;
 				}
@@ -685,12 +848,22 @@ package org.hamster.dropbox
 		 */
 		private static function buildFilePath(filePath:String):String
 		{
+			if (filePath.indexOf('/') < 0) {
+				return filePath;
+			}
 			var filePaths:Array = filePath.split('/');
 			for (var i:int = 0; i < filePaths.length; i++) {
 				filePaths[i] = encodeURIComponent(filePaths[i]);
 			}
 			return filePaths.join('/');
 		}
+		
+		private static function buildOptionalParameters(paramTarget:Object, paramName:String, paramValue:*):void
+		{
+			if (paramName != null && paramName != "" && paramValue != null && paramValue != "") {
+				paramTarget[paramName] = paramValue.toString();
+			}
+		}
 	}
 }
 
@@ -711,6 +884,7 @@ internal class DropboxURLLoader extends URLLoader
 	 * REQUEST_TOKEN & ACCESS_TOKEN : set to DropboxConfig when type is requestToken & accessToken.
 	 * ACCOUNT_INFO : return an AccountInfo object
 	 * DROPBOX_FILE : return an DropboxFile object
+	 * DROPBOX_FILE_LIST : return an array of DropboxFile object
 	 * others : return response string.
 	 */
 	public var resultType:String;
diff --git a/HsDropbox/src/org/hamster/dropbox/DropboxEvent.as b/HsDropbox/src/org/hamster/dropbox/DropboxEvent.as
@@ -39,6 +39,19 @@ package org.hamster.dropbox
 		 */		
 		public static const ACCOUNT_CREATE_RESULT:String = 'DropboxEvent_AccountCreateResult';
 		public static const ACCOUNT_CREATE_FAULT:String = 'DropboxEvent_AccountCreateFault';
+		/**
+		 * added in v1
+		 */
+		public static const REVISION_RESULT:String 	= "DropboxEvent_RevisionResult";
+		public static const REVISION_FAULT:String 	= "DropboxEvent_RevisionFault";
+		public static const RESTORE_RESULT:String 	= "DropboxEvent_RestoreResult";
+		public static const RESTORE_FAULT:String 	= "DropboxEvent_RestoreFault";
+		public static const SEARCH_RESULT:String	= 'DropboxEvent_SearchResult';
+		public static const SEARCH_FAULT:String		= 'DropboxEvent_SearchFault';
+		public static const SHARES_RESULT:String	= 'DropboxEvent_SharesResult';
+		public static const SHARES_FAULT:String		= 'DropboxEvent_SharesFault';
+		public static const MEDIA_RESULT:String		= 'DropboxEvent_MediaResult';
+		public static const MEDIA_FAULT:String		= 'DropboxEvent_MediaFault';
 		
 		/**
 		 * related URLLoader Event. 
diff --git a/HsDropbox/src/org/hamster/dropbox/models/AccountInfo.as b/HsDropbox/src/org/hamster/dropbox/models/AccountInfo.as
@@ -8,12 +8,16 @@ package org.hamster.dropbox.models
 	 */
 	public class AccountInfo extends DropboxModelSupport
 	{
-		[Bindable] public var uid:int;
-		[Bindable] public var country:String;
-		[Bindable] public var displayName:String;
-		[Bindable] public var quotaInfo_shared:Number;
-		[Bindable] public var quotaInfo_quota:Number;
-		[Bindable] public var quotaInfo_normal:Number;
+		public var uid:int;
+		public var country:String;
+		public var displayName:String;
+		public var quotaInfo_shared:Number;
+		public var quotaInfo_quota:Number;
+		public var quotaInfo_normal:Number;
+		
+		// added in version 1
+		public var referral_link:String;
+		public var email:String;
 		
 		public function AccountInfo()
 		{
@@ -31,12 +35,17 @@ package org.hamster.dropbox.models
 			this.quotaInfo_normal = quotaInfo['normal'];
 			this.quotaInfo_quota = quotaInfo['quota'];
 			this.quotaInfo_shared = quotaInfo['shared'];
+			this.referral_link = result['referral_link'];
+			this.email = result['email'];
 		}
 		
 		override public function toString():String 
 		{
-			return "AccountInfo [country=" + country + ", displayName="
-				+ displayName + ", quotaInfo_normal=" + quotaInfo_normal
+			return "AccountInfo [referral_link=" + referral_link 
+				+ ", email=" + email
+				+ ", country=" + country
+				+ ", displayName=" + displayName 
+				+ ", quotaInfo_normal=" + quotaInfo_normal
 				+ ", quotaInfo_quota=" + quotaInfo_quota
 				+ ", quotaInfo_shared=" + quotaInfo_shared + ", uid=" + uid
 				+ "]";
diff --git a/HsDropbox/src/org/hamster/dropbox/models/DropboxFile.as b/HsDropbox/src/org/hamster/dropbox/models/DropboxFile.as
@@ -16,6 +16,10 @@ package org.hamster.dropbox.models
 		public var mimeType:String;
 		public var size:String;
 		public var path:String;
+		// added in version 1
+		public var rev:String;
+		public var revision:String;
+		public var isDeleted:Boolean;
 		
 		public var hash:String;
 		public var contents:Array;
@@ -42,6 +46,9 @@ package org.hamster.dropbox.models
 			this.mimeType = result['mime_type'];
 			this.size = result['size'];
 			this.path = result['path'];
+			this.rev = result['rev'];
+			this.revision = result['revision'];
+			this.isDeleted = result['is_deleted'];
 			
 			this.hash = result['hash'];
 			
@@ -57,6 +64,9 @@ package org.hamster.dropbox.models
 		{
 			var s:String = "DropboxFile [bytes=" + bytes
 			s	+=  ", hash=" + (hash == null ? "null" : hash) 
+			s	+=  ", rev=" + (rev == null ? "null" : rev) 
+			s	+=  ", revision=" + (revision == null ? "null" : revision) 
+			s	+=  ", isDeleted=" + isDeleted
 			s	+=  ", icon=" + (icon == null ? "null" : icon)
 			s	+=  ", isDir=" + isDir == null
 			s	+=  ", mimeType=" + (mimeType == null ? "null" : mimeType)
diff --git a/HsDropbox/src/org/hamster/dropbox/models/SharesInfo.as b/HsDropbox/src/org/hamster/dropbox/models/SharesInfo.as
