Bump version, add notice about fimfiction.net.

Brought fimfiction.net fic status in line with other adapters
Added fimfiction.net to index.html
2026-09-14 11:14:10 +08:00 · 2011-09-25 16:32:56 -05:00 · 2011-09-26 07:18:06 +10:00 · 2011-09-25 15:23:06 +10:00 · 2011-09-25 10:39:58 +10:00 · 2011-09-19 17:04:39 -05:00
8 changed files with 15 additions and 58 deletions
@@ -1,6 +1,6 @@
 # fanfictionloader ffd-retief
 application: fanfictionloader
-version: 4-0-7
+version: 4-0-6
 runtime: python
 api_version: 1

@@ -122,12 +122,9 @@ class AdAstraFanficComSiteAdapter(BaseSiteAdapter):
            if 'Summary' in label:
                ## Everything until the next span class='label'
                svalue = ''
-                while value and not defaultGetattr(value,'class') == 'label':
+                while not defaultGetattr(value,'class') == 'label':
                    svalue += str(value)
                    value = value.nextSibling
-                # sometimes poorly formated desc (<p> w/o </p>) leads
-                # to all labels being included.
-                svalue=svalue[:svalue.find('<span class="label">')]
                self.story.setMetadata('description',stripHTML(svalue))

            if 'Rated' in label:
@@ -94,11 +94,7 @@ class FimFictionNetSiteAdapter(BaseSiteAdapter):
        self.story.setMetadata("authorId", author) # The author's name will be unique
        self.story.setMetadata("authorUrl", "http://%s/user/%s" % (self.getSiteDomain(),author))
        
-        chapterDates = []
-
-        for chapter in soup.findAll("a", {"class":"chapter_link"}):
-            chapterDates.append(chapter.span.extract().text.strip("()"))
-            self.chapterUrls.append((chapter.text.strip(), "http://"+self.getSiteDomain() + chapter['href']))
+        self.chapterUrls = [(chapter.text, "http://"+self.getSiteDomain() + chapter['href']) for chapter in soup.findAll("a", {"class":"chapter_link"})]
        
        self.story.setMetadata('numChapters',len(self.chapterUrls))
        
@@ -142,10 +138,9 @@ class FimFictionNetSiteAdapter(BaseSiteAdapter):
        # than miss an update, we hardcode the year of creation and update to be 2011.

        # Get the date of creation from the first chapter
-        datePublished_text = chapterDates[0]
-        day, month = datePublished_text.split()
-        day = re.sub(r"[^\d.]+", '', day)
-        datePublished = makeDate("2011"+month+day, "%Y%b%d")
+        datePublished_soup = bs.BeautifulSoup(self._fetchUrl(self.chapterUrls[0][1])).find("div", {"class":"calendar"})
+        datePublished_soup.find('span').extract()
+        datePublished = makeDate("2011"+datePublished_soup.text, "%Y%b%d")
        self.story.setMetadata("datePublished", datePublished)
        dateUpdated_soup = bs.BeautifulSoup(data).find("div", {"class":"calendar"})
        dateUpdated_soup.find('span').extract()
@@ -112,13 +112,11 @@ class WhoficComSiteAdapter(BaseSiteAdapter):
        logging.debug("Author URL: "+self.story.getMetadata('authorUrl'))
        soup = bs.BeautifulStoneSoup(self._fetchUrl(self.story.getMetadata('authorUrl')),
                                     selfClosingTags=('br')) # normalize <br> tags to <br />
+        
        # find this story in the list, parse it's metadata based on
        # lots of assumptions about the html, since there's little
        # tagging.
-        # Found a story once that had the story URL in the desc for a
-        # series on the same author's page.  Now using the reviews
-        # link instead to find the appropriate metadata.
-        a = soup.find('a', href=re.compile(r'reviews.php\?sid='+self.story.getMetadata('storyId')))
+        a = soup.find('a', href=re.compile(r'viewstory.php\?sid='+self.story.getMetadata('storyId')))
        metadata = a.findParent('td')
        metadatachunks = utf8FromSoup(metadata).split('<br />')
        # process metadata for this story.
@@ -158,6 +156,7 @@ class WhoficComSiteAdapter(BaseSiteAdapter):
        for g in genre.split(r', '):
            self.story.addToList('genre',g)

+        
        # the next line is stuff with ' - ' separators *and* names--with tags.
        moremeta = metadatachunks[5]
        moremeta = re.sub(r'<[^>]+>','',moremeta) # strip tags.
@@ -54,33 +54,17 @@
 	      much easier. </p>
 	  </div>
 	  <!-- put announcements here, h3 is a good title size. -->
-	  <h3>Please Switch to <a href="http://fanfictiondownloader.appspot.com/">New Version</a></h3>
 	  <p>
-	    We have a new, more efficient, version of the system up now.  Please start using the 
-	    <a href="http://fanfictiondownloader.appspot.com/">New
-	      Version here</a>.  If for some reason, the new version
-	      doesn't work for you, please let us know on
-	      the <a href="http://groups.google.com/group/fanfic-downloader">Fanfiction
-	      Downloader Google Group</a>.
-	  </p>
-	  <h3>New Google Quotas</h3>
-	  <p>
-	    Google has changed their quota limits for free
-	    applications using their AppEngine system, like this one.
-	    We expect that there will be times when the
-	    system exceeds it's permitted processing quota.
-	  </p>
-	  <p>
-	    You also have the option of running the downloader on your
-	    own computer if you have Python available.
-	    <a href="http://code.google.com/p/fanficdownloader/downloads/list">Download here.</a>
+	    <b>New Site:</b> Now supporting fimfiction.net.  Many
+	    thanks to our latest developer, althaine, for this new
+	    adapter.
 	  </p>
 	  <p>
 	    If you have any problems with this application, please
 	    report them in
 	    the <a href="http://groups.google.com/group/fanfic-downloader">Fanfiction
 	      Downloader Google Group</a>.  The
-	    <a href="http://4-0-6.fanfictionloader.appspot.com">Previous
+	    <a href="http://4-0-5.fanfictionloader.appspot.com">Previous
 	      Version</a> is also available for you to use if necessary.
 	  </p>
 	  <div id='error'>
@@ -43,15 +43,6 @@
 	<div id='greeting'>
 	  <p>Hi, {{ nickname }}! These are the fanfics you've recently requested.</p>
 	  <p><a href="/clearrecent">Clear your Recent Downloads List</a></p>
-	  <h3>Please Switch to <a href="http://fanfictiondownloader.appspot.com/">New Version</a></h3>
-	  <p>
-	    We have a new, more efficient, version of the system up now.  Please start using the 
-	    <a href="http://fanfictiondownloader.appspot.com/">New
-	      Version here</a>.  If for some reason, the new version
-	      doesn't work for you, please let us know on
-	      the <a href="http://groups.google.com/group/fanfic-downloader">Fanfiction
-	      Downloader Google Group</a>.
-	  </p>
 	</div>
      </div>
      
@@ -6,7 +6,7 @@
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    <meta name="google-site-verification" content="kCFc-G4bka_pJN6Rv8CapPBcwmq0hbAUZPkKWqRsAYU" />
    {% if not fic.completed and not fic.failure %}
-    <meta http-equiv="refresh" content="10">
+    <meta http-equiv="refresh" content="7">
    {% endif %}
    <script type="text/javascript">

@@ -66,15 +66,6 @@
 	</div>
 	{% endif %}
 	  <p>See your personal list of <a href="/recent">previously downloaded fanfics</a>.</p>
-	  <h3>Please Switch to <a href="http://fanfictiondownloader.appspot.com/">New Version</a></h3>
-	  <p>
-	    We have a new, more efficient, version of the system up now.  Please start using the 
-	    <a href="http://fanfictiondownloader.appspot.com/">New
-	      Version here</a>.  If for some reason, the new version
-	      doesn't work for you, please let us know on
-	      the <a href="http://groups.google.com/group/fanfic-downloader">Fanfiction
-	      Downloader Google Group</a>.
-	  </p>
      </div>
      <div style='text-align: center'>
 	<img src="http://code.google.com/appengine/images/appengine-silver-120x30.gif"
@@ -38,7 +38,7 @@ class Remover(webapp.RequestHandler):
        logging.debug("Starting r3m0v3r")
        user = users.get_current_user()
        logging.debug("Working as user %s" % user)
-        theDate = datetime.datetime.now() - datetime.timedelta(days=3)
+        theDate = datetime.datetime.now() - datetime.timedelta(days=6) # days=7
        logging.debug("Will delete stuff older than %s" % theDate)
        
        fics = DownloadMeta.all()