From 1593c568033be0e2df2b80e7253debec552c6a54 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Thu, 5 Apr 2012 10:31:31 +0800 Subject: [PATCH] mod: add html support in crereader --- crereader.lua | 3 +++ filechooser.lua | 6 +++++- filesearcher.lua | 1 + reader.lua | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/crereader.lua b/crereader.lua index 7575e3d9b..79733ae91 100644 --- a/crereader.lua +++ b/crereader.lua @@ -16,6 +16,9 @@ end function CREReader:open(filename) local ok local file_type = string.lower(string.match(filename, ".+%.([^.]+)")) + if file_type == "html" then + file_type = "htm" + end local style_sheet = "./data/"..file_type..".css" ok, self.doc = pcall(cre.openDocument, filename, style_sheet, width, height) diff --git a/filechooser.lua b/filechooser.lua index 58c294f65..cb5a5aaf5 100644 --- a/filechooser.lua +++ b/filechooser.lua @@ -54,7 +54,11 @@ function FileChooser:readDir() table.insert(self.dirs, f) else local file_type = string.lower(string.match(f, ".+%.([^.]+)") or "") - if file_type == "djvu" or file_type == "pdf" or file_type == "xps" or file_type == "cbz" or file_type == "epub" or file_type == "txt" or file_type == "rtf" or file_type == "htm" or file_type == "fb2" or file_type == "chm" then + if file_type == "djvu" + or file_type == "pdf" or file_type == "xps" or file_type == "cbz" + or file_type == "epub" or file_type == "txt" or file_type == "rtf" + or file_type == "htm" or file_type == "html" + or file_type == "fb2" or file_type == "chm" then table.insert(self.files, f) end end diff --git a/filesearcher.lua b/filesearcher.lua index 097fb5c57..31ec6e371 100644 --- a/filesearcher.lua +++ b/filesearcher.lua @@ -38,6 +38,7 @@ function FileSearcher:readDir() or file_type == "xps" or file_type == "cbz" or file_type == "epub" or file_type == "txt" or file_type == "rtf" or file_type == "htm" + or file_type == "html" or file_type == "fb2" or file_type == "chm" then file_entry = {dir=d, name=f,} table.insert(self.files, file_entry) diff --git a/reader.lua b/reader.lua index adbd99447..f74f5d1f5 100755 --- a/reader.lua +++ b/reader.lua @@ -43,7 +43,7 @@ function openFile(filename) reader = DJVUReader elseif file_type == "pdf" or file_type == "xps" or file_type == "cbz" then reader = PDFReader - elseif file_type == "epub" or file_type == "txt" or file_type == "rtf" or file_type == "htm" or file_type == "fb2" or file_type == "chm" then + elseif file_type == "epub" or file_type == "txt" or file_type == "rtf" or file_type == "htm" or file_type == "html" or file_type == "fb2" or file_type == "chm" then reader = CREReader end if reader then