Update conversion to work with cache manifest

lib/common.js

@@ -1,5 +0,0 @@
-"use strict";
-
-exports.getChapterTitle = function (rawChapterDoc) {
-  return rawChapterDoc.querySelector("h1.entry-title").textContent;
-};

lib/convert.js

@@ -4,39 +4,31 @@ const fs = require("mz/fs");
 const throat = require("throat");
 const serializeToXml = require("xmlserializer").serializeToString;
 const jsdom = require("./jsdom.js");
-const getChapterTitle = require("./common.js").getChapterTitle;
 
-module.exports = function (cachePath, contentPath) {
+module.exports = function (cachePath, manifestPath, contentPath) {
-  return getChapterFilePaths(cachePath)
+  return fs.readFile(manifestPath, { encoding: "utf-8" }).then(function (manifestContents) {
-    .then(function (chapterFilePaths) {
+    const chapters = JSON.parse(manifestContents);
-      console.log("All chapters downloaded; beginning conversion to EPUB chapters");
+    console.log("All chapters downloaded; beginning conversion to EPUB chapters");
 
-      const mapper = throat(10, function (filePath) {
+    const mapper = throat(10, function (chapter) {
-        return convertChapter(filePath, contentPath);
+      return convertChapter(chapter, cachePath, contentPath);
-      });
-      return Promise.all(chapterFilePaths.map(mapper));
-    })
-    .then(function () {
-      console.log("All chapters converted");
     });
+    return Promise.all(chapters.map(mapper));
+  })
+  .then(function () {
+    console.log("All chapters converted");
+  });
 };
 
-
+function convertChapter(chapter, cachePath, contentPath) {
-function getChapterFilePaths(cachePath) {
+  const filename = chapter.filename;
-  return fs.readdir(cachePath).then(function (filenames) {
+  const filePath = path.resolve(cachePath, filename);
-    return filenames.filter(function (f) { return f.endsWith(".html"); })
-                    .map(function (f) { return path.resolve(cachePath, f); });
-  });
-}
-
-function convertChapter(filePath, contentPath) {
-  const filename = path.basename(filePath);
 
   console.log(`- Reading ${filename}`);
   return fs.readFile(filePath, { encoding: "utf-8" }).then(function (contents) {
     console.log(`- Read ${filename}`);
     const rawChapterDoc = jsdom(contents);
-    const output = getChapterString(rawChapterDoc);
+    const output = getChapterString(chapter.title, rawChapterDoc);
 
     // TODO: this should probably not be necessary... jsdom bug I guess!?
     rawChapterDoc.defaultView.close();
@@ -50,8 +42,7 @@ function convertChapter(filePath, contentPath) {
   });
 }
 
-function getChapterString(rawChapterDoc) {
+function getChapterString(title, rawChapterDoc) {
-  const title = getChapterTitle(rawChapterDoc);
   const body = getBodyXml(title, rawChapterDoc.querySelector(".entry-content"));
 
   return `<?xml version="1.0" encoding="UTF-8" ?>

lib/download.js

@@ -5,7 +5,6 @@ const mkdirp = require("mkdirp-then");
 const request = require("requisition");
 const zfill = require("zfill");
 const jsdom = require("./jsdom.js");
-const getChapterTitle = require("./common.js").getChapterTitle;
 
 const FILENAME_PREFIX = "chapter";
 
@@ -110,6 +109,10 @@ function getNextChapterUrl(rawChapterDoc) {
   return null;
 }
 
+function getChapterTitle(rawChapterDoc) {
+  return rawChapterDoc.querySelector("h1.entry-title").textContent;
+}
+
 function retry(times, fn) {
   if (times === 0) {
     return fn();

lib/worm-scraper.js

@@ -21,16 +21,16 @@ Promise.resolve()
   .then(function () {
     return download(START_CHAPTER_URL, cachePath, manifestPath);
   })
-/*  .then(function () {
+  .then(function () {
     return rimraf(chaptersPath);
   })
   .then(function () {
     return mkdirp(chaptersPath);
   })
   .then(function () {
-    return convert(cachePath, chaptersPath);
+    return convert(cachePath, manifestPath, chaptersPath);
   })
-  .then(function () {
+/*  .then(function () {
     return extras(contentPath, chaptersPath);
   })*/
   .then(function () {