Merge pull request #122 from openzim/dups

Remove duplicated bits

Author: rgaudin

.flake8

@@ -24,6 +24,11 @@ libzim_linux-*/
 
 # Autogenerated files
 wrapper.*.so
-libzim/wrapper.cpp
-libzim/wrapper.h
-libzim/wrapper_api.h
+libzim/libzim.cpp
+libzim/libzim.h
+libzim/libzim_api.h
+
+# custom-dev
+Pipfile
+.dev
+.env

.gitignore

@@ -46,3 +46,6 @@ test_requires =
 
 [isort]
 profile = black
+
+[flake8]
+max-line-length = 88

Pipfile

@@ -7,8 +7,6 @@
 
 from invoke import task
 
-MAX_LINE_LENGTH = 88
-
 
 @task
 def build_ext(c):
@@ -37,17 +35,17 @@ def install_dev(c):
 
 @task
 def check(c):
-    c.run("isort --profile=black --check-only .")
+    c.run("isort --check-only .")
     c.run("black --check .")
     c.run('echo "one pass for show-stopper syntax errors or undefined names"')
     c.run("flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics")
     c.run('echo "one pass for small stylistic things"')
-    c.run(f"flake8 . --count --max-line-length={MAX_LINE_LENGTH} --statistics")
+    c.run("flake8 . --count --statistics")
 
 
 @task
 def lint(c):
-    c.run("isort --profile=black .")
+    c.run("isort .")
     c.run("black .")
     c.run("flake8 .")
 

run_tests.sh

@@ -12,6 +12,7 @@
 
 import libzim.writer
 from libzim.reader import Archive
+from libzim.search import Query, Searcher
 from libzim.suggestion import SuggestionSearcher
 from libzim.writer import (
     Blob,
@@ -232,15 +233,17 @@ def test_creator_clustersize(fpath, cluster_size, lipsum_item):
     ],
 )
 def test_creator_indexing(fpath, lipsum_item, indexing, language, expected):
-    fpath = "lolo.zim"
     with Creator(fpath).config_indexing(indexing, language) as c:
         c.add_item(lipsum_item)
 
     zim = Archive(fpath)
     assert zim.has_fulltext_index == indexing
 
-    # upstream bug https://github.com/openzim/libzim/issues/481
-    # assert zim.get_estimated_search_results_count("standard") == expected
+    if indexing:
+        query = Query().set_query("standard")
+        searcher = Searcher(zim)
+        search = searcher.search(query)
+        assert search.getEstimatedMatches() == expected
 
 
 @pytest.mark.parametrize("nb_workers", [1, 2, 3, 5])