Bump versions.

app.yaml

@@ -1,6 +1,6 @@
 # ffd-retief-hrd fanfictiondownloader
 application: fanfictiondownloader
-version: 4-4-33
+version: 4-4-34
 runtime: python27
 api_version: 1
 threadsafe: true

calibre-plugin/__init__.py

@@ -27,7 +27,7 @@ class FanFictionDownLoaderBase(InterfaceActionBase):
     description         = 'UI plugin to download FanFiction stories from various sites.'
     supported_platforms = ['windows', 'osx', 'linux']
     author              = 'Jim Miller'
-    version             = (1, 6, 18)
+    version             = (1, 6, 19)
     minimum_calibre_version = (0, 8, 57)
 
     #: This field defines the GUI plugin class that contains all the code

calibre-plugin/ffdl_plugin.py

@@ -540,8 +540,8 @@ make_firstimage_cover:true
             # 'new' book from URL.  collision handling applies.
             print("from URL(%s)"%url)
 
-            # try to find by identifier url first.
-            searchstr = 'identifiers:"=url:=%s"'%url.replace(":","|")
+            # try to find by identifier url or uri first.
+            searchstr = 'identifiers:"~ur(i|l):=%s"'%url.replace(":","|")
             identicalbooks = db.search_getting_ids(searchstr, None)
             if len(identicalbooks) < 1:
                 # find dups
@@ -1249,6 +1249,10 @@ make_firstimage_cover:true
             # identifiers have :->| in url.
             #print("url from book:"+identifiers['url'].replace('|',':'))
             return identifiers['url'].replace('|',':')
+        elif 'uri' in identifiers:
+            # identifiers have :->| in uri.
+            #print("uri from book:"+identifiers['uri'].replace('|',':'))
+            return identifiers['uri'].replace('|',':')
         else:
             ## only epub has URL in it--at least where I can easily find it.
             if db.has_format(book_id,'EPUB',index_is_id=True):
@@ -1258,7 +1262,7 @@ make_firstimage_cover:true
                 if 'url' in identifiers:
                     #print("url from epub:"+identifiers['url'].replace('|',':'))
                     return identifiers['url'].replace('|',':')
-                # look for dc:source first, then scan HTML if 
+                # look for dc:source first, then scan HTML if lookforurlinhtml
                 link = get_dcsource(existingepub)
                 if link:
                     return link

fanficdownloader/adapters/adapter_efpfanficnet.py

@@ -171,10 +171,11 @@ class EFPFanFicNet(BaseSiteAdapter):
 
         storya = None
         authsoup = None
+        storyblock = None
         authurl = self.story.getMetadata('authorUrl')
         
         ## author can have more than one page of stories.
-        while storya == None:
+        while storyblock == None:
 
             # no storya, but do have authsoup--we're looping on author pages.
             if authsoup != None:
@@ -186,10 +187,14 @@ class EFPFanFicNet(BaseSiteAdapter):
             logger.debug("fetching author page: (%s)"%authurl)
             authsoup = bs.BeautifulSoup(self._fetchUrl(authurl))
             #print("authsoup:%s"%authsoup)
-        
-            storya = authsoup.find('a', href=re.compile(r'viewstory.php\?sid='+self.story.getMetadata('storyId')+r'&i=1$'))
-        
-        storyblock = storya.parent.parent.parent
+
+            storyas = authsoup.findAll('a', href=re.compile(r'viewstory.php\?sid='+self.story.getMetadata('storyId')+r'&i=1$'))
+            for storya in storyas:
+                #print("======storya:%s"%storya)
+                storyblock = storya.findParent('div',{'class':'storybloc'})
+                #print("======storyblock:%s"%storyblock)
+                if storyblock != None:
+                    continue
 
         self.setDescription(url,storyblock.find('div', {'class':'introbloc'}))
 
@@ -293,4 +298,14 @@ class EFPFanFicNet(BaseSiteAdapter):
         if None == div:
             raise exceptions.FailedToDownload("Error downloading Chapter: %s!  Missing required element!" % url)
     
-        return self.utf8FromSoup(url,div)
+        # remove any header and 'o:p' tags.
+        for tag in div.findAll("head") + div.findAll("o:p"):
+            tag.extract()
+
+        # change any html and body tags to div.
+        for tag in div.findAll("html") + div.findAll("body"):
+            tag.name='div'
+
+        # remove extra bogus doctype.
+        #<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+        return re.sub(r"<!DOCTYPE[^>]+>","",self.utf8FromSoup(url,div))

fanficdownloader/adapters/adapter_fimfictionnet.py

@@ -125,10 +125,12 @@ class FimFictionNetSiteAdapter(BaseSiteAdapter):
         self.story.setMetadata("numChapters", len(self.chapterUrls))
         
         # In the case of fimfiction.net, possible statuses are 'Completed', 'Incomplete', 'On Hiatus' and 'Cancelled'
-        # For the sake of bringing it in line with the other adapters, 'Incomplete' and 'On Hiatus' become 'In-Progress'
+        # For the sake of bringing it in line with the other adapters, 'Incomplete' becomes 'In-Progress'
         # and 'Complete' beomes 'Completed'. 'Cancelled' seems an important enough (not to mention more strictly true) 
         # status to leave unchanged.
-        status = storyMetadata["status"].replace("Incomplete", "In-Progress").replace("On Hiatus", "In-Progress").replace("Complete", "Completed")
+        # Nov2012 - 'On Hiatus' is now passed, too.  It's easy now for users to change/remove if they want
+        # with replace_metadata
+        status = storyMetadata["status"].replace("Incomplete", "In-Progress").replace("Complete", "Completed")
         self.story.setMetadata("status", status)
         self.story.setMetadata("rating", storyMetadata["content_rating_text"])
             

index.html

@@ -56,7 +56,7 @@
 	  <!-- put announcements here, h3 is a good title size. -->
 	  <h3>Fixes:</h3>
 	  <p>
-	    Minor fixes for fictionalley.org, thehexfiles.net, ponyfictionarchive.net, and potionsandsnitches.net.
+	    Minor fixes for efpfanfic.net, allow 'On Hiatus' status for fimfiction.net.
 	  </p>
 	  <p>
 	    Questions?  Check out our 
@@ -66,7 +66,7 @@
 	    If you have any problems with this application, please
 	    report them in
 	    the <a href="http://groups.google.com/group/fanfic-downloader">FanFictionDownLoader Google Group</a>.  The
-	    <a href="http://4-4-32.fanfictiondownloader.appspot.com">Previous Version</a> is also available for you to use if necessary.
+	    <a href="http://4-4-33.fanfictiondownloader.appspot.com">Previous Version</a> is also available for you to use if necessary.
 	  </p>
 	  <div id='error'>
 	    {{ error_message }}