653 Commits

Author SHA1 Message Date
Matthieu Gautier
8871e6c2e3 first version of meson 2016-12-22 13:49:56 +01:00
mhutti1
d326603662 Merge branch 'master' of https://github.com/kiwix/kiwix imported_from_kiwix 2016-10-15 15:33:46 +01:00
Kelson
a53dea6d1e Merge pull request #340 from kiwix/perf_kiwix_serve
Perf kiwix serve
2016-10-10 07:42:02 +01:00
kelson42
37bef7cb63 Script to benchmark kiwix-serve 2016-10-09 21:51:29 +02:00
Matthieu Gautier
dffff7ba57 Do not make unnecessary copy when serving binary content.
Binary content do not need to be modified, so we don't need to copy it.
We can directly serve it from the internal zim (cluster) buffer.

The handle_content function now getArticleObjectByDecodedUrl instead of
getContentByDecodedUrl.

This is to get the mimetype of the article and copy the content only when
needed (getContentByDecodedUrl always copy the content).
Thus, handle_content is a bit more complex as it need to do some
manipulation previously made in getContentByDecodedUrl.

The main change is that if the content is binary, we serve the content
with a callback response who will get the content chunks directly from
the blob buffer.
2016-10-07 18:23:47 +02:00
Matthieu Gautier
d14460a666 Split accessHandlerCallback into several functions.
Instead of having a big callback function doing almost everything to
handle a request, we split the code into several functions.

There are two new helper functions :
 - build_response that create a response object with correct headers set.
 - compress_content who compress the content if necessary.

All the different cases are handle by different functions :
 - handle_suggest
 - handle_skin
 - handle_search
 - handle_random
 - handle_content
 - handle_default

accesHandlerCallback now handle common stuff, delegate to the handle_*
functions everything else.

There is no special optimization made here. Only splitting code.
2016-10-07 18:23:47 +02:00
mhutti1
1a5f21f1b6 Merge branch 'master' of https://github.com/kiwix/kiwix 2016-10-07 16:44:39 +01:00
Kelson
8a08fb147e Merge pull request #339 from kiwix/handle_zim_without_index
Handle zim without index
2016-10-04 08:46:19 +02:00
Kelson
defa768b25 Merge pull request #338 from kiwix/kiwix_server_no_arg
Do not loop infinitely if there is no argument passed to kiwix-serve.
2016-10-04 08:45:12 +02:00
Matthieu Gautier
8a9673191e Do not loop infinitely if there is no argument passed to kiwix-serve.
If there is no argument, optind==argc==1. We must not try to look into argv[1]
but we need to break the loop anyway.
2016-10-03 13:32:59 +02:00
kelson42
cd623ce358 Fix crash with ZIM files without FT indexes 2016-10-02 18:29:49 +02:00
kelson42
2458c22e09 Fix kiwix-mange problem with relative paths 2016-09-04 21:43:26 +02:00
Kelson
96f0fff54d Implement ZIM reader getTags() and getName() 2016-09-04 20:41:10 +02:00
Kelson
4b6ad3508a Merge pull request #275 from kiwix/several_zim_argument
Be able to run kiwix-serve with several zim as arguments.
2016-08-12 21:30:32 +02:00
Matthieu Gautier
44255453db Be able to run kiwix-serve with several zim as arguments. 2016-08-12 17:23:29 +02:00
Kelson
493c8cb95e Merge pull request #274 from kiwix/embedded_zim_support
Add support of embedded ft-index in zim for kiwix-serve and kiwix-search.
2016-08-12 12:35:37 +02:00
Matthieu Gautier
2fc94514f8 Add support of embedded ft-index in zim for kiwix-serve and kiwix-search.
- kiwix-search will try the embedded ft-index if no indexPath is specified
  in the library.xml or command argument.
- kiwix-search also uses xapianSearcher and xapianSearcher needs zimlib,
  so add zimlib in compilation flag for searcher.
- kiwix-serve already depends on zimlib.
2016-08-11 17:50:25 +02:00
Elad Keyshawn
d8acb2328c Merge-Conflict resolved 2016-05-05 16:52:39 +03:00
Elad Keyshawn
b4d5571375 Merge pull request #30 from EladKeyshawn/master
New hint dialog of right contents drawer - on first launch
2016-05-02 17:47:36 +03:00
Elad Keyshawn
5f9cd39ccc Merge pull request #28 from EladKeyshawn/master
Now only one  - Clear History option which clears recent searches and all open tabs. ;)
2016-04-30 22:41:09 +03:00
Elad Keyshawn
464106ad28 Merge remote-tracking branch 'remotes/upstream/master'
# Conflicts:
#	android/res/values/strings.xml
2016-04-30 22:26:47 +03:00
Isaac
489aadf271 Merge pull request #25 from EladKeyshawn/master
Added "Clear History" in settings - clears history
2016-04-19 19:02:45 +01:00
Elad Keyshawn
a7c51d676a Resolve merge conflict 2016-04-17 20:27:39 +03:00
Elad Keyshawn
575b36ee1f Merge remote-tracking branch 'remotes/upstream/master' 2016-04-14 23:38:20 +03:00
Elad Keyshawn
4d51e6f460 Merge remote-tracking branch 'remotes/upstream/master' 2016-04-10 09:38:39 +03:00
Elad Keyshawn
52a60e8857 Merge remote-tracking branch 'remotes/upstream/master' 2016-04-09 23:02:51 +03:00
Isaac
e892e32e45 Merge pull request #18 from EladKeyshawn/master
- Implemented improved bookmarks  - Fixed undo when only one tab exists
2016-04-06 12:11:39 +01:00
Elad Keyshawn
cbd94bbc03 Merge remote-tracking branch 'remotes/upstream/master'
# Conflicts resolved:
#	android/res/values/strings.xml
#	android/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
2016-04-05 10:16:54 +03:00
Isaac
16bb669711 Merge branch 'wmhack' 2016-04-03 13:30:57 +03:00
Rashiq Ahmad
25093ec6a0 Merge pull request #14 from EladKeyshawn/master
implemented snackbar - UNDO on closing tab
2016-04-02 15:15:05 +03:00
Elad Keyshawn
5e496b9b40 implemented snackbar - UNDO on closing tab
https://sourceforge.net/p/kiwix/feature-requests/232/
2016-04-02 15:08:59 +03:00
kelson42
b7133c5304 Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2016-01-28 08:26:09 +01:00
Emmanuel Engelhart
cb9074d528 Merge commit 'f596570027141d30117c086d3833d426fb4d2b25' 2016-01-17 17:18:11 +01:00
kelson42
ecdad092a2 Merge commit 'f596570027141d30117c086d3833d426fb4d2b25' 2016-01-13 11:47:25 +01:00
kelson42
7c249c65c2 Merge commit 'd15d05d386ebff533017a83241971d352797a00e' 2016-01-13 10:44:09 +01:00
kelson42
1562e78390 Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2016-01-13 10:43:51 +01:00
Emmanuel Engelhart
cf01999bf7 Merge commit '6e58ab4ffc29ac9d2aa4805b46796692caddfea1' 2016-01-11 21:36:31 +01:00
Emmanuel Engelhart
a1c7b7ebee Merge branch 'master' of git://git.code.sf.net/p/kiwix/kiwix 2016-01-11 21:15:51 +01:00
Kelson
97e2c777d2 Merge commit '8be5d3badf99d4707afbddddf58a87eb54aa68c1'
Conflicts:
	android/src/org/kiwix/kiwixmobile/SearchActivity.java
2016-01-07 10:56:26 +01:00
Kelson
da8c49621a Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2016-01-07 10:42:36 +01:00
Rashiq
72eeb245fa Merge remote-tracking branch 'origin/master'
* origin/master:
  Reformat project
  Remove html-inverting js
  Organize files in packages
  The actionbar title is now clickable
  Added persistent fullscreen
  Added persistent fullscreen
  Add 'sc' and 'lki' UI languages
  Update of the UI translations
  Update meta data of custom Android apps
  Add VAR HTTP-HEADER if necessary
  Make the app movable to the sd card
  Update UI translations
  Windows FSJ-Lite ZIM file splitter is not available anymore, replace it in the help with 'JS-SplitD'
  Beautify bookmark XML file
  Fix selection color problem with library buttons
  Revised the instructions for OS X
  Bump up Android version
2016-01-06 15:42:42 +01:00
kelson42
b7f6ddd3f5 Add a few comments 2016-01-03 14:00:53 +01:00
Florian Schüller
912fb35fae Linux implementation to select interface to bind to 2015-12-12 00:23:10 +01:00
Emmanuel Engelhart
022b8b3445 Fix typo in HTTP 404 error message 2015-12-07 19:12:13 +01:00
Emmanuel Engelhart
09cd024199 Add VAR HTTP-HEADER if necessary 2015-11-10 22:24:56 +01:00
Emmanuel Engelhart
cdb53beb3b Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix
Conflicts:
	android/AndroidManifest.xml
2015-08-01 20:55:40 +02:00
Emmanuel Engelhart
e6e500007c Merge branch 'master' of ssh://git.code.sf.net/p/kiwix/kiwix 2015-07-23 17:46:19 +02:00
Wilfredo Rodriguez
2490f3c916 small fix redundant 2015-07-03 10:10:14 -03:00
Kelson42
ecb821a834 More aggresive caching 2015-04-19 13:01:40 +02:00
kelson42
5983eea473 Merge branch 'master' of git://git.code.sf.net/p/kiwix/kiwix 2015-04-03 19:37:24 +02:00