prep for ship.

git-svn-id: https://jerakeen.org/svn/tomi/Projects/Shelf@3839 ab05c693-d3d1-0310-8e8b-e1346d90d6a5

Cache.py

@@ -112,7 +112,7 @@ def start(self):
             req.setValue_forHTTPHeaderField_("Basic %s"%base64string, "Authorization")
 
         # Send the right User-Agent. TODO - get the bundle version properly, don't hard-code
-        req.setValue_forHTTPHeaderField_("Shelf/0.0.11.9 +http://jerakeen.org/code/shelf/", "User-Agent")
+        req.setValue_forHTTPHeaderField_("Shelf/0.0.12 +http://jerakeen.org/code/shelf/", "User-Agent")
 
         downloader = NSURLDownload.alloc().initWithRequest_delegate_( req, self )
         downloader.setDestination_allowOverwrite_( filename, True )

ChangeLog

@@ -114,8 +114,13 @@ The feedprovider de-dupes its blocks based on the feed url, rather than
 the page url. No more repeated flickr photos blocks because they have more than
 one different url to their photos.
 
-Blocks that have come from the Google Social Graph now have a little 'G'
-in their title bar. Ugly, but I want a way of distinguishing them a little.
+If there are rel="me" links in the current page, and you're using Safari,
+I can use them directly to resolve context rather than relying on google
+to have spidered the page.
+
+Blocks that have come from the Google Social Graph or have otherwise been
+guessed now have a little 'G' in their title bar. Ugly, but I want a way of
+distinguishing them a little.
 
 Shelf now sends a proper User-Agent to remote servers when fetching feeds.
 

TODO

@@ -12,8 +12,5 @@ rename 'atom' to 'block' everywhere
 
 blocks maybe want a little 'refresh' icon on them?
 
-blocks from google need to indicate that they're not primary, and should offer to add themselves
-
-dedupe feeds based on url uniqueness.
-
-under safari, parse rel="me" lnks for more urls for the clue
+Guessed blocks have the 'G' symbol. clicking this symbol should offer to add
+it to the address book card.

extractors/Extractor.py

@@ -194,7 +194,7 @@ def getSocialGraphFor( self, url, more_urls = [] ):
             self.addClues( Extractor.SOCIAL_GRAPH_CACHE[url], more_urls )
             return
         api = "http://socialgraph.apis.google.com/lookup?pretty=1&fme=1&edo=1&edi=1"
-        api += "&q=" + quote( url )
+        api += "&q=" + quote( url, '' )
         print_info("Social graph API call to " + api )
         # TODO _ respect more_urls here
         Cache.getContentOfUrlAndCallback( callback = self.gotSocialGraphData, url = api, timeout = 3600 * 48 ) # huge timeout here

providers/BasicProvider.py

@@ -12,7 +12,7 @@ def content( self ):
         if self.clue.emails():
             content += "<p>"
             for email in self.clue.emails():
-                content += "<a href='mailto:%s'>%s</a>"%( email, email )
+                content += "<a href='mailto:%s'>%s</a> "%( email, email )
             content += "</p>"
 
         if self.clue.birthday():

setup.py

@@ -9,7 +9,7 @@
 import py2app
 from glob import glob
 
-version = "0.0.11.9" # update in Cache.py as well, for the User-Agent string
+version = "0.0.12" # update in Cache.py as well, for the User-Agent string
 
 plist = dict(
   CFBundleName="Shelf",