Compare commits

..

No commits in common. "466cb63d0e5235364249cd6b83431ef8b5c82444" and "436233f71853f4911114cba8d685de50e9fb254c" have entirely different histories.

10 changed files with 68 additions and 77 deletions

View File

@ -10,9 +10,9 @@ jobs:
name: Build and publish to TestPyPI
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v2
- name: Set up Python 3.9
uses: actions/setup-python@v5
uses: actions/setup-python@v1
with:
python-version: 3.9
- name: Install pypa/build
@ -41,9 +41,9 @@ jobs:
name: Build and publish to PyPI
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v2
- name: Set up Python 3.9
uses: actions/setup-python@v5
uses: actions/setup-python@v1
with:
python-version: 3.9
- name: Install pypa/build
@ -65,3 +65,4 @@ jobs:
uses: pypa/gh-action-pypi-publish@master
with:
password: ${{ secrets.PYPI_API_TOKEN }}

View File

@ -6,9 +6,9 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v5
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Install dependencies

View File

@ -176,7 +176,7 @@ for cb_dir in cache_busting_dirs:
# Templating functions
app.jinja_env.globals.update(clean_query=clean_query)
app.jinja_env.globals.update(
cb_url=lambda f: app.config['CACHE_BUSTING_MAP'][f.lower()])
cb_url=lambda f: app.config['CACHE_BUSTING_MAP'][f])
# Attempt to acquire tor identity, to determine if Tor config is available
send_tor_signal(Signal.HEARTBEAT)

View File

@ -15,7 +15,6 @@ class GClasses:
result_class_a = 'ZINbbc'
result_class_b = 'luh4td'
scroller_class = 'idg8be'
line_tag = 'BsXmcf'
result_classes = {
result_class_a: ['Gx5Zad'],

View File

@ -70,10 +70,6 @@ select {
border-radius: 8px !important;
}
.BsXmcf {
background-color: unset !important;
}
.KP7LCb {
box-shadow: 0 0 0 0 !important;
}

View File

@ -45,10 +45,6 @@ select {
box-shadow: 0 1px 6px rgba(32,33,36,0.28) !important;
}
.BsXmcf {
background-color: unset !important;
}
.BVG0Nb {
background-color: var(--whoogle-result-bg) !important;
}

View File

@ -27,8 +27,7 @@ BLACKLIST = [
'Reklama', 'Реклама', 'Anunț', '광고', 'annons', 'Annonse', 'Iklan',
'広告', 'Augl.', 'Mainos', 'Advertentie', 'إعلان', 'Գովազդ', 'विज्ञापन',
'Reklam', 'آگهی', 'Reklāma', 'Reklaam', 'Διαφήμιση', 'מודעה', 'Hirdetés',
'Anúncio', 'Quảng cáo', 'โฆษณา', 'sponsored', 'patrocinado', 'gesponsert',
'Sponzorováno', '스폰서', 'Gesponsord'
'Anúncio', 'Quảng cáo','โฆษณา', 'sponsored', 'patrocinado', 'gesponsert'
]
SITE_ALTS = {
@ -99,7 +98,7 @@ def bold_search_terms(response: str, query: str) -> BeautifulSoup:
else:
reg_pattern = fr'\b((?![{{}}<>-]){target_word}(?![{{}}<>-]))\b'
if re.match(r'.*[@_!#$%^&*()<>?/\|}{~:].*', target_word) or (
if re.match('.*[@_!#$%^&*()<>?/\|}{~:].*', target_word) or (
element.parent and element.parent.name == 'style'):
return

View File

@ -4,4 +4,4 @@ optional_dev_tag = ''
if os.getenv('DEV_BUILD'):
optional_dev_tag = '.dev' + os.getenv('DEV_BUILD')
__version__ = '0.9.0' + optional_dev_tag
__version__ = '0.8.4' + optional_dev_tag

View File

@ -3,7 +3,7 @@ name: whoogle
description: A self hosted search engine on Kubernetes
type: application
version: 0.1.0
appVersion: 0.9.0
appVersion: 0.8.4
icon: https://github.com/benbusby/whoogle-search/raw/main/app/static/img/favicon/favicon-96x96.png

View File

@ -11,7 +11,7 @@ cryptography==43.0.1; platform_machine != 'armv7l'
cssutils==2.6.0
defusedxml==0.7.1
Flask==2.3.2
idna==3.7
idna==3.4
itsdangerous==2.1.2
Jinja2==3.1.4
MarkupSafe==2.1.2
@ -33,5 +33,5 @@ urllib3==1.26.19
validators==0.22.0
waitress==2.1.2
wcwidth==0.2.6
Werkzeug==3.0.3
Werkzeug==3.0.1
python-dotenv==0.21.1