smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #673 from kiwix/urlEncode

This commit is contained in:
Kelson 2022-01-12 13:19:54 +01:00 committed by GitHub
parent d4db090bb9 3052d0787a
commit 7dfafe0196
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opds_dumper.cpp
View File

@ -81,7 +81,7 @@ kainjow::mustache::object getSingleBookData(const Book& book)
{"title", book.getTitle()}, {"title", book.getTitle()},
{"description", book.getDescription()}, {"description", book.getDescription()},
{"language", book.getLanguage()}, {"language", book.getLanguage()},
{"content_id", book.getHumanReadableIdFromPath()}, {"content_id", urlEncode(book.getHumanReadableIdFromPath(), true)},
{"updated", book.getDate() + "T00:00:00Z"}, {"updated", book.getDate() + "T00:00:00Z"},
{"category", book.getCategory()}, {"category", book.getCategory()},
{"flavour", book.getFlavour()}, {"flavour", book.getFlavour()},

4
test/data/library.xml
View File

@ -35,8 +35,8 @@
></book> ></book>
<book <book
id="charlesray" id="charlesray"
path="./zimfile.zim" path="./zimfile&amp;other.zim"
url="https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile.zim" url="https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile%26other.zim"
title="Charles, Ray" title="Charles, Ray"
description="Wikipedia articles about Ray Charles" description="Wikipedia articles about Ray Charles"
language="fra" language="fra"

1
test/data/zimfile&other.zim Symbolic link
View File

@ -0,0 +1 @@
zimfile.zim

1
test/meson.build
View File

@ -29,6 +29,7 @@ if gtest_dep.found() and not meson.is_cross_build()
data_files = [ data_files = [
'example.zim', 'example.zim',
'zimfile.zim', 'zimfile.zim',
'zimfile&other.zim',
'corner_cases.zim', 'corner_cases.zim',
'library.xml' 'library.xml'
] ]

4
test/server.cpp
View File

@ -701,14 +701,14 @@ std::string maskVariableOPDSFeedData(std::string s)
" <tags>unittest;wikipedia;_category:jazz;_pictures:no;_videos:no;_details:no;_ftindex:yes</tags>\n" \ " <tags>unittest;wikipedia;_category:jazz;_pictures:no;_videos:no;_details:no;_ftindex:yes</tags>\n" \
" <articleCount>284</articleCount>\n" \ " <articleCount>284</articleCount>\n" \
" <mediaCount>2</mediaCount>\n" \ " <mediaCount>2</mediaCount>\n" \
" <link type=\"text/html\" href=\"/ROOT/zimfile\" />\n" \ " <link type=\"text/html\" href=\"/ROOT/zimfile%26other\" />\n" \
" <author>\n" \ " <author>\n" \
" <name>Wikipedia</name>\n" \ " <name>Wikipedia</name>\n" \
" </author>\n" \ " </author>\n" \
" <publisher>\n" \ " <publisher>\n" \
" <name>Kiwix</name>\n" \ " <name>Kiwix</name>\n" \
" </publisher>\n" \ " </publisher>\n" \
" <link rel=\"http://opds-spec.org/acquisition/open-access\" type=\"application/x-zim\" href=\"https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile.zim\" length=\"569344\" />\n" \ " <link rel=\"http://opds-spec.org/acquisition/open-access\" type=\"application/x-zim\" href=\"https://github.com/kiwix/libkiwix/raw/master/test/data/zimfile%26other.zim\" length=\"569344\" />\n" \
" </entry>\n" " </entry>\n"
#define RAY_CHARLES_CATALOG_ENTRY \ #define RAY_CHARLES_CATALOG_ENTRY \