summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-26[mod] utils/manage_static.sh: remove git_log_current_branchMarkus Heiser
Marginal simplification of the procedure to get only the last local commit which is not in remotes. Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-26[mod] utils/manage_static.sh: simplify git restore actionsMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-26[mod] utils/manage_static.sh: add script to shellcheckMarkus Heiser
- add script to shellcheck, - fix error messages from shellcheck and - moved global variables to local variables (lower case) No functional change! Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-26[mod] add make targets to manage the build files in the /searx/static directoryAlexandre Flament
The idea is to avoid conflict when there are differents branches with changes are made on the static files. A solution is to ask the administrators to build the files from the sources, but it requires to install the npm dependencies. So the solution in this commit keep the sources and the build files in the same git repository. In one branch, the modification of the source (*.less, *.js) are commited without the built files. The built files are commited in a uniq commit, with a commit message "Static build" In case of merge or rebase, this commit can be dropped. New make targets: * static.build.commit.drop: drop the last "Static build". The command checks that there are only build files in the commit. * static.build.commit : call "make static.build.commit.drop" call "make themes.all" commit the files * static.git.restore.staged: git restore --staged <build files> * static.git.restore: git restore <build files> Related to https://github.com/searxng/searxng/issues/137
2021-06-26Merge pull request #177 from unixfox/patch-1Alexandre Flament
Set use_mobile_ui to false for Google engine
2021-06-26Set use_mobile_ui to false for Google engineÉmilien Devos
2021-06-25README.rst: remove searx logo.Alexandre Flament
2021-06-25Merge pull request #173 from return42/fix-lxc-iptablesMarkus Heiser
[mod] utils/lxc.sh: detect conflict of docker & LXC in the iptables
2021-06-25Merge pull request #168 from return42/stylelintAlexandre Flament
Lint the less files of the simple theme
2021-06-24[emacs] .dir-locals.el: add setup for js-modeMarkus Heiser
- move jshint option from gruntfile to .jshintrc - remove trailing-whitespace from gruntfile and - add jshint esversion: 6 - .dir-locals.el add locals for js-mode to use JSHint from the simple theme Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-24[stylelint] disable role 'no-descending-specificity'Markus Heiser
This patch disables role 'no-descending-specificity'. IMO it is better to have this rule active (see below [1]), but it is hard to rewrite the less files to pass this rule, so for the first I chose to disable this rule. --- Source order is important in CSS, and when two selectors have the same specificity, the one that occurs last will take priority. However, the situation is different when one of the selectors has a higher specificity. In that case, source order does not matter: the selector with higher specificity will win out even if it comes first. The clashes of these two mechanisms for prioritization, source order and specificity, can cause some confusion when reading stylesheets. If a selector with higher specificity comes before the selector it overrides, we have to think harder to understand it, because it violates the source order expectation. Stylesheets are most legible when overriding selectors always come after the selectors they override. That way both mechanisms, source order and specificity, work together nicely. This rule enforces that practice as best it can, reporting fewer errors than it should. It cannot catch every actual overriding selector, but it can catch certain common mistakes. [1] https://stylelint.io/user-guide/rules/list/no-descending-specificity/ Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-24[stylelint] simple theme: fix some errors reported by stylelintMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-24[fix] simple theme: use stylint to fix common lint errorsMarkus Heiser
This fix was autogenerated by:: npx stylelint -f unix --fix 'searx/static/themes/simple/src/less/**/*.less' Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-24[mod] add stylelint process to target themes.simpleMarkus Heiser
Before build, do lint the LESS files using stylelint [1]. The configuration 'stylelint-config-standard' [2] is added to the root of the simple theme [3]. [1] https://stylelint.io/ [2] https://github.com/stylelint/stylelint-config-standard [3] https://stylelint.io/user-guide/configure Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-23Merge pull request #172 from return42/fix-searx.shAlexandre Flament
[fix] utils/searx.sh: signature of YAML settings has been changed
2021-06-23[mod] utils/lxc.sh: detect conflict of docker & LXC in the iptablesMarkus Heiser
Docker is blocking network of existing LXC containers / there is a conflict in the iptables setup of Docker & LXC. With this patch: - utils/lxc.sh checks internet connectivity (instead of silently hang) - Chapter "Internet Connectivity & Docker" describes the problem and made a suggestion for a solution a solution Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-23[fix] utils/searx.sh: signature of YAML settings has been changedMarkus Heiser
In 5a7b12ee we changed the signature of the YAML settings, this patch takes this into account. Related-to: 5a7b12ee [yamllint] searx/settings.yml Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-22Merge pull request #169 from return42/tidy-ignorelistsMarkus Heiser
[fix] tidy up ignore lists .gitignore & .dockerignore
2021-06-22Merge pull request #171 from searxng/build_static_cleanupMarkus Heiser
Build static cleanup
2021-06-22[fix] update .gitattributesAlexandre Flament
2021-06-22[fix] Makefile: remove themes.bootstrapAlexandre Flament
2021-06-22Merge pull request #170 from return42/emacsMarkus Heiser
[emacs] .dir-locals.el: add setup for json-mode
2021-06-22[emacs] .dir-locals.el: add setup for json-modeMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-22[fix] tidy up ignore lists .gitignore & .dockerignoreMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-22Merge pull request #157 from searxng/mod_static_buildAlexandre Flament
static build: move generated files to searx/static/themes/*/src/generated
2021-06-22[fix] .gitattributes: bootstrap.css & .js has been moved to oscarMarkus Heiser
see 86912e22 [mod] oscar: get bootstrap and typeahead from NPM Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-22[fix] pygments.less - remove pyenv_OK conditionMarkus Heiser
BTW: add pygments.less to the help message Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-22[themes] ignore packages-lock.jsonAlexandre Flament
2021-06-22Static buildAlexandre Flament
2021-06-22[mod] simple theme: include fontsAlexandre Flament
"npm run webfont" to build the fonts directory. It requires fontforge and ttfautohint distro packages. partial revert of commit 7137d2893f33e9158e8563a21d9586119d175269
2021-06-22[mod] make themes.all update pygments*.lessAlexandre Flament
Add a searx/static/themes/*/src/generated empty folder
2021-06-22Merge pull request #164 from searxng/docker_upgrade_alpineAlexandre Flament
Docker: upgrade to alpine 3.14
2021-06-21Merge pull request #167 from return42/fix-166Markus Heiser
[fix] UnicodeEncodeError for preferences ULR
2021-06-22[fix] UnicodeEncodeError for preferences ULRMarkus Heiser
Closes: https://github.com/searxng/searxng/issues/166 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-21Merge pull request #165 from return42/patch-googleAlexandre Flament
improve & document google engine
2021-06-21[docs] add documentation from the sources of the google enginesMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-21Docker: upgrade to alpine 3.14Alexandre Flament
Uses Python version 3.9 instead of 3.8
2021-06-21[fix] google answers: normalize space of the answers.Markus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-21[mod] google engine: reduce mobile UI parameters to what is neededMarkus Heiser
Reverse engineering shows that not all of the parameters used by google's mobile UI (aka "more results" button) are needed [1]. [1] https://github.com/searxng/searxng/pull/160#issuecomment-865013625 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-21Merge pull request #160 from searxng/google_mobile_uiAlexandre Flament
[experimental] google: use the mobile UI
2021-06-21Merge pull request #161 from return42/fix-typo-manageAlexandre Flament
[fix] py.build - fix small typo in the build message
2021-06-21[mod] google: add "use_mobile_ui" parameter to use mobile endpoint.Alexandre Flament
disable by default, it has to be enabled in settings.yml related to #159
2021-06-21[fix] py.build - fix small typo in the build messageMarkus Heiser
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-21[mod] simple theme: normalize.css becomes a packages.json dependencyAlexandre Flament
2021-06-20Merge pull request #158 from return42/fix-node.cleanAlexandre Flament
[fix] node.clean - ignore npm dependencies when npm is not installed
2021-06-19[fix] node.clean - ignore npm dependencies when npm is not installedMarkus Heiser
error pattern:: $ make clean CLEAN pyenv PYENV [virtualenv] drop local/py3 CLEAN docs -- build/docs dist/docs CLEAN locally installed npm dependencies ./manage: line 318: npm: command not found ERROR: node.clean exit with error (127) make: *** [Makefile:90: node.clean] Error 127 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-18Merge pull request #156 from return42/fix-google-newsAlexandre Flament
Fix google news
2021-06-18[fix] google news - send CONSENT Cookie to not be redirectedMarkus Heiser
In the EU there exists a "General Data Protection Regulation" [1] aka GDPR (BTW: very user friendly!) which requires consent to tracking. To get the consent from the user, google-news requests are redirected to confirm and get a CONSENT Cookie from https://consent.google.de/s?continue=... This patch adds a CONSENT Cookie to the google-news request to avoid redirection. The behavior of the CONTENTS cookies over all google engines seems similar but the pattern is not yet fully clear to me, here are some random samples from my analysis .. Using common google search from different domains:: google.com: CONSENT=YES+cb.{{date}}-14-p0.de+FX+816 google.de: CONSENT=YES+cb.{{date}}-14-p0.de+FX+333 google.fr: CONSENT=YES+srp.gws-{{date}}-0-RC2.fr+FX+826 When searching about videos (google-videos):: google.es: CONSENT=YES+srp.gws-{{date}}-0-RC2.es+FX+076 google.de: CONSENT=YES+srp.gws-{{date}}-0-RC2.de+FX+171 Google news has only one domain for all languages:: news.google.com: CONSENT=YES+cb.{{date}}-14-p0.de+FX+816 Using google-scholar search from different domains:: scholar.google.de: CONSENT=YES+cb.{{date}}-14-p0.de+FX+333 scholar.google.fr: does not use such a cookie / did not ask the user scholar.google.es: does not use such a cookie / did not ask the user Interim summary: Pattern is unclear and I won't apply the CONSENT cookie to all google engines. More experience is need before we generalize the CONSENT cookies over all google engines. Related: - e9a6ab401 [fix] youtube - send CONSENT Cookie to not be redirected - https://github.com/benbusby/whoogle-search/issues/311 - https://github.com/benbusby/whoogle-search/issues/243 [1] https://en.wikipedia.org/wiki/General_Data_Protection_Regulation Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-18[fix] google-news engine - KeyError: 'hl in requestMarkus Heiser
Since we added - 1c67b6aec [enh] google engine: supports "default language" there is a KeyError: 'hl in request,error pattern:: ERROR:searx.searx.search.processor.online:engine google news : exception : 'hl' Traceback (most recent call last): File "searx/search/processors/online.py", line 144, in search search_results = self._search_basic(query, params) File "searx/search/processors/online.py", line 118, in _search_basic self.engine.request(query, params) File "searx/engines/google_news.py", line 97, in request if lang_info['hl'] == 'en': KeyError: 'hl' Closes: https://github.com/searxng/searxng/issues/154 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
2021-06-18Merge pull request #153 from searxng/dependabot/pip/master/sphinx-tabs-3.1.0Markus Heiser
Bump sphinx-tabs from 3.0.0 to 3.1.0