diff --git a/epubmerge.py b/epubmerge.py index a9c51933..99e25238 100644 --- a/epubmerge.py +++ b/epubmerge.py @@ -216,7 +216,7 @@ def doMerge(outputio,files,authoropts=[],titleopt=None,descopt=None, try: outputepub.writestr(href, epub.read(relpath+item.getAttribute("href"))) - if re.match(r'.*/(file|chapter)\d+\.xhtml',href): + if re.match(r'.*/(file|chapter)\d+\.x?html',href): filecount+=1 items.append((id,href,item.getAttribute("media-type"))) filelist.append(href) diff --git a/fanficdownloader/story.py b/fanficdownloader/story.py index ca48cde7..68b24be1 100644 --- a/fanficdownloader/story.py +++ b/fanficdownloader/story.py @@ -25,7 +25,7 @@ class Story: try: self.metadata = {'version':os.environ['CURRENT_VERSION_ID']} except: - self.metadata = {'version':'4.0'} + self.metadata = {'version':'4.1'} self.chapters = [] # chapters will be tuples of (title,html) self.listables = {} # some items (extratags, category, warnings & genres) are also kept as lists.