Skip to content

Commit

Permalink
crengine: return description and keywords metadata
Browse files Browse the repository at this point in the history
Only available for EPUB documents for now.
crengine bumped (includes css related improvements, fix crash,
better handling of gif by frankyfei).
Also fix pb with permissions in travis build.
  • Loading branch information
poire-z authored and Frenzie committed Jun 27, 2017
1 parent 4cecbef commit c6c1bd5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .ci/build_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ if [ "$TARGET" = kobo ]; then
docker run -t \
-v "${HOME}"/.ccache:${DOCKER_HOME}/.ccache \
-v `pwd`:${DOCKER_HOME}/base ${DOCKER_IMG} \
/bin/bash -c 'source /home/ko/.bashrc && cd /home/ko/base && make TARGET=kobo all'
/bin/bash -c 'source /home/ko/.bashrc && cd /home/ko/base && sudo chown -R ko:ko . && make TARGET=kobo all'
elif [ "$TARGET" = kindle ]; then
chmod -R 777 $HOME/.ccache
docker run -t \
-v "${HOME}"/.ccache:${DOCKER_HOME}/.ccache \
-v `pwd`:${DOCKER_HOME}/base ${DOCKER_IMG} \
/bin/bash -c 'source /home/ko/.bashrc && cd /home/ko/base && make TARGET=kindle all'
/bin/bash -c 'source /home/ko/.bashrc && cd /home/ko/base && sudo chown -R ko:ko . && make TARGET=kindle all'
elif [ "$TARGET" = pocketbook ]; then
chmod -R 777 $HOME/.ccache
docker run -t \
-v "${HOME}"/.ccache:${DOCKER_HOME}/.ccache \
-v `pwd`:${DOCKER_HOME}/base ${DOCKER_IMG} \
/bin/bash -c "source /home/ko/.bashrc && cd /home/ko/base && make pocketbook-toolchain && make VERBOSE=1 TARGET=pocketbook all"
/bin/bash -c "source /home/ko/.bashrc && cd /home/ko/base && sudo chown -R ko:ko . && make pocketbook-toolchain && make VERBOSE=1 TARGET=pocketbook all"
else
make all
fi
8 changes: 8 additions & 0 deletions cre.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,14 @@ static int getDocumentProps(lua_State *L) {
lua_pushstring(L, UnicodeToLocal(doc->text_view->getSeries()).c_str());
lua_settable(L, -3);

lua_pushstring(L, "description");
lua_pushstring(L, UnicodeToLocal(doc->text_view->getDescription()).c_str());
lua_settable(L, -3);

lua_pushstring(L, "keywords");
lua_pushstring(L, UnicodeToLocal(doc->text_view->getKeywords()).c_str());
lua_settable(L, -3);

return 1;
}

Expand Down

0 comments on commit c6c1bd5

Please sign in to comment.