Fix epub files with toc using relative file path.

Author: gonwan

lib/libebook/ebook_epub.cpp

@@ -25,6 +25,7 @@
 
 #include <QByteArray>
 #include <QChar>
+#include <QDir>
 #include <QIODevice>
 #include <QFileInfo>
 #include <QList>
@@ -235,17 +236,26 @@ bool EBook_EPUB::parseBookinfo()
 	if ( content_parser.tocname.isEmpty() )
 		return false;
 
-	// All the files, including TOC, are relative to the container_parser.contentPath
-	m_documentRoot.clear();
+	// TOC is relative to the container_parser.contentPath
+	QString contentRoot;
 	int sep = container_parser.contentPath.lastIndexOf( '/' );
 
 	if ( sep != -1 )
-		m_documentRoot = container_parser.contentPath.left( sep + 1 );  // Keep the trailing slash
+		contentRoot = container_parser.contentPath.left( sep + 1 );  // Keep the trailing slash
+
+	QString tocPath = combinePath( contentRoot, content_parser.tocname );
+
+	// All pages are relative to the container_parser.tocname
+	QString tocRoot;
+	sep = tocPath.lastIndexOf( '/' );
+
+	if ( sep != -1 )
+		tocRoot = tocPath.left( sep + 1 );  // Keep the trailing slash
 
 	// Parse the TOC
-	HelperXmlHandler_EpubTOC toc_parser( this );
+	HelperXmlHandler_EpubTOC toc_parser( this, tocRoot );
 
-	if ( !parseXML( content_parser.tocname, &toc_parser ) )
+	if ( !parseXML( tocPath, &toc_parser ) )
 		return false;
 
 	// Get the data
@@ -256,12 +266,18 @@ bool EBook_EPUB::parseBookinfo()
 
 	// Move the manifest entries into the list
 	Q_FOREACH ( QString f, content_parser.manifest.values() )
-		m_ebookManifest.push_back( pathToUrl( f ) );
+	{
+		QString combined = combinePath( contentRoot, f );
+		m_ebookManifest.push_back( pathToUrl( combined ) );
+	}
 
 	for ( const auto& si : qAsConst( content_parser.spine ) )
 	{
 		if ( content_parser.manifest.contains( si ) )
-			m_spinePath.push_back( content_parser.manifest[ si ] );
+		{
+			QString combined = combinePath( contentRoot, content_parser.manifest[ si ] );
+			m_spinePath.push_back( combined );
+		}
 	}
 
 	// Copy the manifest information and fill up the other maps if we have it
@@ -372,12 +388,11 @@ bool EBook_EPUB::getFileAsBinary( QByteArray& data, const QString& path ) const
 {
 	// Retrieve the file size
 	struct zip_stat fileinfo;
-	QString completeUrl;
+
+	QString completeUrl = path;
 
 	if ( !path.isEmpty() && path[0] == '/' )
-		completeUrl = m_documentRoot + path.mid( 1 );
-	else
-		completeUrl = m_documentRoot + path;
+		completeUrl = path.mid( 1 );
 
 	//qDebug("URL requested: %s (%s)", qPrintable(path), qPrintable(completeUrl));
 
@@ -413,3 +428,9 @@ bool EBook_EPUB::getFileAsBinary( QByteArray& data, const QString& path ) const
 	zip_fclose( file );
 	return true;
 }
+
+QString EBook_EPUB::combinePath( const QString& baseDir, const QString& path )
+{
+	QString combined = QDir( baseDir ).filePath( path );
+	return QDir::cleanPath( combined );
+}

lib/libebook/ebook_epub.h

@@ -190,13 +190,14 @@ class EBook_EPUB : public EBook
 		bool    getFileAsString( QString& str, const QString& path ) const;
 		bool    getFileAsBinary( QByteArray& data, const QString& path ) const;
 
+		static QString combinePath( const QString& baseDir, const QString& path );
+
 		// ZIP archive fd and structs
 		QFile           m_epubFile;
 		struct zip*     m_zipFile;
 
 		// Ebook info
 		QString         m_title;
-		QString         m_documentRoot;
 
 		// List of files in the ebook
 		QList<QUrl>     m_ebookManifest;

lib/libebook/helperxmlhandler_epubtoc.cpp

@@ -16,6 +16,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <QDir>
 #include <QString>
 #include <QUrl>
 #include <QXmlAttributes>
@@ -24,12 +25,13 @@
 #include "helperxmlhandler_epubtoc.h"
 
 
-HelperXmlHandler_EpubTOC::HelperXmlHandler_EpubTOC( EBook_EPUB* epub )
+HelperXmlHandler_EpubTOC::HelperXmlHandler_EpubTOC( EBook_EPUB* epub, const QString& documentRoot )
+	: m_inNavMap( false ),
+	  m_inText( false ),
+	  m_indent( 0 ),
+	  m_epub( epub ),
+	  m_documentRoot( documentRoot )
 {
-	m_epub = epub;
-	m_inNavMap = false;
-	m_inText = false;
-	m_indent = 0;
 }
 
 bool HelperXmlHandler_EpubTOC::startElement( const QString&, const QString& localName, const QString&, const QXmlAttributes& atts )
@@ -103,7 +105,8 @@ void HelperXmlHandler_EpubTOC::checkNewTocEntry()
 	{
 		EBookTocEntry entry;
 		entry.name = m_lastTitle;
-		entry.url = m_epub->pathToUrl( m_lastId );
+		QString combined = QDir( m_documentRoot ).filePath( m_lastId );
+		entry.url = m_epub->pathToUrl( QDir::cleanPath( combined ) );
 		entry.iconid = EBookTocEntry::IMAGE_AUTO;
 		entry.indent = m_indent - 1;
 

lib/libebook/helperxmlhandler_epubtoc.h

@@ -33,7 +33,7 @@ class EBook_EPUB;
 class HelperXmlHandler_EpubTOC : public QXmlDefaultHandler
 {
 	public:
-		HelperXmlHandler_EpubTOC( EBook_EPUB* epub );
+		HelperXmlHandler_EpubTOC( EBook_EPUB* epub, const QString& documentRoot );
 
 		QList< EBookTocEntry >  entries;
 
@@ -50,6 +50,7 @@ class HelperXmlHandler_EpubTOC : public QXmlDefaultHandler
 		QString         m_lastId;
 		QString         m_lastTitle;
 		EBook_EPUB*     m_epub;
+		QString         m_documentRoot;
 };
 
 #endif // HELPERXMLHANDLER_EPUBTOC_H