addons/Twitter/source/.gitsidumb addons/VertexDB/source/.gitisdumb @@ -1,11 +1,10 @@ AddonBuilder clone do( if(platform == "darwin", - //appendHeaderSearchPath("/opt/local/include/mysql5/mysql") - //appendLibSearchPath("/opt/local/lib/mysql5/mysql"), - - - appendHeaderSearchPath("/usr/local//mysql/include") - appendLibSearchPath("/usr/local/mysql/lib"), + appendHeaderSearchPath("/opt/local/include/mysql5/mysql") + appendHeaderSearchPath("/usr/local/mysql/include") + //appendLibSearchPath("/usr/local/mysql/lib") + appendLibSearchPath("/opt/local/lib/mysql5/mysql") + , headerSearchPaths foreach(headerSearchPath, appendHeaderSearchPath(headerSearchPath .. "/mysql")) ) addons/MySQL/build.io @@ -26,6 +26,8 @@ MySQL do( SqlTable := Object clone do( db ::= nil name ::= nil +where ::= "" +//TODO: Refactor where fetchColumnNames := method( self columnNames := db query("SHOW columns FROM " .. name) map(first) flatten @@ -46,7 +48,8 @@ SqlTable := Object clone do( increment := foreachCacheSize loop( write(" <sql"); File standardOutput flush - rows := db queryThenMap("SELECT * FROM " .. name .. " LIMIT " .. start .. ", " .. increment) + writeln("SELECT * FROM " .. name .. where .. " LIMIT " .. start .. ", " .. increment) + rows := db queryThenMap("SELECT * FROM " .. name .. where .. " LIMIT " .. start .. ", " .. increment) write(">"); File standardOutput flush if(rows size == 0, break) rows foreach(row, addons/MySQL/io/MySQL_extras.io @@ -28,6 +28,8 @@ TwitterAccount := Object clone do( TwitterException clone setIsRateLimited(true) raise ) request execute + debugWriteln(request response body) + debugWriteln(request response statusCode) if(request response rateLimitRemaining, setRateLimitRemaining(request response rateLimitRemaining asNumber) @@ -59,7 +61,7 @@ TwitterAccount := Object clone do( ) hasProtectedUpdates := method(aScreenName, - show(aScreenName) at("protected") + showUser(aScreenName) at("protected") ) /* for testing @@ -74,8 +76,7 @@ TwitterAccount := Object clone do( //Could not follow user: You have been blocked from following this account at the request of the user. //Could not follow user: This account is currently suspended and is being investigated due to strange activity //raiseFollowException for testing - resultsFor(request asCreateFriendship setScreenName(aScreenName)) - self + resultsFor(request asCreateFriendship setScreenName(aScreenName)) at("protected") ) unfollow := method(aScreenName, @@ -85,14 +86,26 @@ TwitterAccount := Object clone do( self ) - followerIds := method( + followerIdsCursor ::= "-1" + resetFollowerIdsCursor := method( + setFollowerIdsCursor("-1") + ) + followerIds := method(aScreenName, //"Not authorized" - resultsFor(request asFollowerIds setScreenName(screenName)) + result := resultsFor(request asFollowerIds dontAuthenticate setScreenName(aScreenName) setCursor(followerIdsCursor)) + setFollowerIdsCursor(result at("next_cursor")) + result at("ids") ) - friendIds := method( + friendIdsCursor ::= "-1" + resetFriendIdsCursor := method( + setFriendIdsCursor("-1") + ) + friendIds := method(aScreenName, //"Not authorized" - resultsFor(request asFriendIds setScreenName(screenName)) + result := resultsFor(request asFriendIds dontAuthenticate setScreenName(aScreenName) setCursor(friendIdsCursor)) + setFriendIdsCursor(result at("next_cursor")) + result at("ids") ) updateStatus := method(message, @@ -107,6 +120,18 @@ TwitterAccount := Object clone do( resultsFor(request asShow setScreenName(aScreenName)) ) + showUserWithId := method(anId, + resultsFor(request asShow setUserId(anId)) + ) + + isSuspended := method(aScreenName, + handleErrors(showUser(aScreenName)) ifIsSuspended( + return(true) + ) else( + return(false) + ) + ) + ExceptionConditional := Object clone do( exception ::= nil result ::= nil @@ -162,13 +187,17 @@ TwitterAccount := Object clone do( if(e isOverloaded or e isDown or e isInternalError, attempts = attempts + 1 , - return(ExceptionConditional clone setException(e)) + return(TwitterAccount ExceptionConditional clone setException(e)) ) , - e pass + if(list("Connection reset by peer", "Timeout") detect(m, e error containsSeq(m)), + attempts = attempts + 1 + , + e pass + ) ) , - return(ExceptionConditional clone setResult(result) setDone(true)) + return(TwitterAccount ExceptionConditional clone setResult(result) setDone(true)) ) ) addons/Twitter/io/TwitterAccount.io @@ -17,40 +17,33 @@ TwitterAccountProfile := Object clone do( tilesBackgroundImage ::= nil update := method( - account request asUpdateAccountProfile\ + account resultsFor(account request asUpdateAccountProfile\ setName(name)\ setUrl(url)\ setLocation(location)\ - setDescription(description)\ - resultsOrError returnIfError - + setDescription(description)) self ) updateColors := method( - account request asUpdateAccountProfileColors\ + account resultsFor(account request asUpdateAccountProfileColors\ setProfileBackgroundColor(backgroundColor)\ setProfileTextColor(textColor)\ setProfileLinkColor(linkColor)\ setProfileSidebarFillColor(sidebarFillColor)\ - setProfileSidebarBorderColor(sidebarBorderColor)\ - resultsOrError returnIfError - + setProfileSidebarBorderColor(sidebarBorderColor)) self ) updateImage := method( - account request asUpdateAccountProfileImage\ - setImage(imageFile)\ - resultsOrError returnIfError + account resultsFor(account request asUpdateAccountProfileImage setImage(imageFile)) self ) updateBackgroundImage := method( - account request asUpdateAccountProfileBackgroundImage\ + account resultsFor(account request asUpdateAccountProfileBackgroundImage\ setImage(backgroundImageFile)\ - setTile(tilesBackgroundImage)\ - resultsOrError returnIfError + setTile(tilesBackgroundImage)) self ) ) \ No newline at end of file addons/Twitter/io/TwitterAccountProfile.io @@ -51,7 +51,7 @@ TwitterRequest := Object clone do( url := URL with("http://" .. host .. path .. ".json" .. queryString) setFollowRedirects(false) - //writeln(url asString) + debugWriteln(url asString) if(username and password, url setUsesBasicAuthentication(true) @@ -62,7 +62,7 @@ TwitterRequest := Object clone do( headers := Map clone if(fileParamName and file := self perform(fileParamName), - ext := file path pathExtension + ext := file path pathExtension asLowercase if(ext == "jpg") then( type := "image/jpg" ) elseif(ext == "gif") then( @@ -126,6 +126,10 @@ TwitterRequest := Object clone do( self ) + dontAuthenticate := method( + setUsername(nil) setPassword(nil) + ) + asShowFriendship := method( setPath("/friendships/show") addQuerySlots("source_id source_screen_name target_id target_screen_name") @@ -156,12 +160,12 @@ TwitterRequest := Object clone do( asFriendIds := method( setPath("/friends/ids") - addQuerySlots("user_id screen_name") + addQuerySlots("user_id screen_name cursor") ) asFollowerIds := method( setPath("/followers/ids") - addQuerySlots("user_id screen_name") + addQuerySlots("user_id screen_name cursor") ) asUpdateAccountProfile := method( addons/Twitter/io/TwitterRequest.io @@ -18,6 +18,7 @@ TwitterResponse := Object clone do( Exception raise(e message) ) + //Could not find both specified users if(statusCode == 400) then( TwitterException clone setIsBadRequest(true) raise(body) ) elseif(statusCode == 401) then( @@ -30,13 +31,15 @@ TwitterResponse := Object clone do( ) elseif(errorMessage containsSeq("You have been blocked")) then( e setIsBlocked(true) ) elseif(errorMessage containsSeq("You do not have permission to retrieve following status for both specified users")) then( - setIsBlockedOrSuspendedOrProtected(true) + e setIsBlockedOrSuspendedOrProtected(true) ) elseif(errorMessage containsSeq("This account is currently suspended")) then( e setIsSuspended(true) ) elseif(errorMessage containsSeq("You are not friends with the specified user")) then( e setWasntFriend(true) ) elseif(errorMessage containsSeq("You are unable to follow more people at this time")) then( e setIsFollowLimit(true) + ) elseif(errorMessage containsSeq("Could not find both specified users")) then( + e setUserIsMissing(true) ) , errorMessage := body addons/Twitter/io/TwitterResponse.io @@ -21,4 +21,34 @@ TwitterSearch := Object clone do( cursor := method( TwitterSearchCursor clone setSearch(self clone setPage(0)) ) + + handleErrors := method( //TODO: Unify this with account + attempts := 0 + + while(attempts < 3, + e := try( + result := self doMessage(call message arguments at(0), call sender) + ) + + if(e, + if(e hasProto(TwitterException), + if(e isOverloaded or e isDown or e isInternalError, + attempts = attempts + 1 + , + return(TwitterAccount ExceptionConditional clone setException(e)) + ) + , + if(list("Connection reset by peer", "Timeout") detect(m, e error containsSeq(m)), + attempts = attempts + 1 + , + e pass + ) + ) + , + return(TwitterAccount ExceptionConditional clone setResult(result) setDone(true)) + ) + ) + + e pass + ) ) \ No newline at end of file addons/Twitter/io/TwitterSearch.io @@ -24,7 +24,7 @@ TwitterSearchCursor := Object clone do( ) fetchNext := method( - results appendSeq(search setPage(search page + 1) results) + search setPage(search page + 1) handleErrors(results) else(searchResults, results appendSeq(searchResults)) self ) ) \ No newline at end of file addons/Twitter/io/TwitterSearchCursor.io @@ -7,9 +7,12 @@ VertexDB Queue := Object clone do( target ::= nil messageName ::= nil expiresActive ::= true - concurrency ::= 10 + concurrency ::= 1 node ::= nil qNodes ::= nil + itemsPerProcess ::= nil //if non nil then process at most itemsPerProcess + jobs ::= nil + processedCount ::= 0 waitingNode ::= method(node nodeAt("waiting")) activeNode ::= method(node nodeAt("active")) @@ -52,12 +55,17 @@ VertexDB Queue := Object clone do( jobError ::= nil + processCountLimited := method( + if(itemsPerProcess, processedCount >= itemsPerProcess, false) + ) + process := method( setJobError(nil) if(expiresActive, expireActive) processedOne := false - self jobs := List clone - while(k := waitingNode queueToNode(activeNode), + setJobs(List clone) + setProcessedCount(0) + while(processCountLimited not and (k := waitingNode queueToNode(activeNode)), debugWriteln("waitingNode<", waitingNode path, "> queueToNode(<", activeNode path, ">) == <", k, ">") if(k == nil, break) debugWriteln("jobs size: ", jobs size) @@ -113,6 +121,7 @@ VertexDB Queue := Object clone do( ) finishedJob := method(job, + setProcessedCount(processedCount + 1) self jobs remove(job) ) @@ -120,4 +129,8 @@ VertexDB Queue := Object clone do( count := activeNode queueExpireToNode(waitingNode) count ) + + hasKey := method(k, + qNodes detect(hasKey(k)) + ) ) addons/VertexDB/io/protos/Queue.io @@ -40,6 +40,11 @@ VertexDB Request := Object clone do( execute := method( url := URL with("http://" .. host .. ":" .. port asString .. resource) setFollowRedirects(false) + if(VertexDB Settings username, + url setUsername(VertexDB Settings username) + url setPassword(VertexDB Settings password) + url setUsesBasicAuthentication(true) + ) debugWriteln(url url) if(body size > 0, addons/VertexDB/io/protos/Request.io @@ -1,5 +1,7 @@ VertexDB Settings := Object clone do( host ::= "localhost" port ::= 8080 + username ::= nil + password ::= nil raisesOnError ::= true ) \ No newline at end of file addons/VertexDB/io/protos/Settings.io a6672c1d1c8d94f72eb021c8d9cc81a3a85b7f1c 1a80de3bc5e0ef53e8e4cb4bdd601ada2b7d3b40 Steve Dekorte steve@StevesLaptop-7.local http://github.com/stevedekorte/io/commit/e8b4edef6cb9eb21f0de279bd761bee0b89f5ecb e8b4edef6cb9eb21f0de279bd761bee0b89f5ecb 2009-11-04T18:19:25-08:00 2009-11-04T18:19:25-08:00 Merge branch 'master' of git://github.com/richcollins/io 19f5ba06c78f7917153d33519c77e96988ee9532 Steve Dekorte steve@StevesLaptop-7.local