Compare commits
10 Commits
436233f718
...
466cb63d0e
Author | SHA1 | Date |
---|---|---|
Ben Busby | 466cb63d0e | |
Ben Busby | c056322037 | |
Ben Busby | 5eb609d0b2 | |
Ben Busby | a016a1bcf4 | |
Ben Busby | 6924f5ce0d | |
Ben Busby | 6abe5511f4 | |
xatier | 9d7ab1e2f8 | |
dependabot[bot] | 441ce72527 | |
Andrew | 58d54c6384 | |
dependabot[bot] | add9313a99 |
|
@ -10,9 +10,9 @@ jobs:
|
||||||
name: Build and publish to TestPyPI
|
name: Build and publish to TestPyPI
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v4
|
||||||
- name: Set up Python 3.9
|
- name: Set up Python 3.9
|
||||||
uses: actions/setup-python@v1
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: 3.9
|
python-version: 3.9
|
||||||
- name: Install pypa/build
|
- name: Install pypa/build
|
||||||
|
@ -41,9 +41,9 @@ jobs:
|
||||||
name: Build and publish to PyPI
|
name: Build and publish to PyPI
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v4
|
||||||
- name: Set up Python 3.9
|
- name: Set up Python 3.9
|
||||||
uses: actions/setup-python@v1
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: 3.9
|
python-version: 3.9
|
||||||
- name: Install pypa/build
|
- name: Install pypa/build
|
||||||
|
@ -65,4 +65,3 @@ jobs:
|
||||||
uses: pypa/gh-action-pypi-publish@master
|
uses: pypa/gh-action-pypi-publish@master
|
||||||
with:
|
with:
|
||||||
password: ${{ secrets.PYPI_API_TOKEN }}
|
password: ${{ secrets.PYPI_API_TOKEN }}
|
||||||
|
|
||||||
|
|
|
@ -6,9 +6,9 @@ jobs:
|
||||||
test:
|
test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v4
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v2
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: '3.x'
|
python-version: '3.x'
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
|
|
|
@ -176,7 +176,7 @@ for cb_dir in cache_busting_dirs:
|
||||||
# Templating functions
|
# Templating functions
|
||||||
app.jinja_env.globals.update(clean_query=clean_query)
|
app.jinja_env.globals.update(clean_query=clean_query)
|
||||||
app.jinja_env.globals.update(
|
app.jinja_env.globals.update(
|
||||||
cb_url=lambda f: app.config['CACHE_BUSTING_MAP'][f])
|
cb_url=lambda f: app.config['CACHE_BUSTING_MAP'][f.lower()])
|
||||||
|
|
||||||
# Attempt to acquire tor identity, to determine if Tor config is available
|
# Attempt to acquire tor identity, to determine if Tor config is available
|
||||||
send_tor_signal(Signal.HEARTBEAT)
|
send_tor_signal(Signal.HEARTBEAT)
|
||||||
|
|
|
@ -15,6 +15,7 @@ class GClasses:
|
||||||
result_class_a = 'ZINbbc'
|
result_class_a = 'ZINbbc'
|
||||||
result_class_b = 'luh4td'
|
result_class_b = 'luh4td'
|
||||||
scroller_class = 'idg8be'
|
scroller_class = 'idg8be'
|
||||||
|
line_tag = 'BsXmcf'
|
||||||
|
|
||||||
result_classes = {
|
result_classes = {
|
||||||
result_class_a: ['Gx5Zad'],
|
result_class_a: ['Gx5Zad'],
|
||||||
|
|
|
@ -70,6 +70,10 @@ select {
|
||||||
border-radius: 8px !important;
|
border-radius: 8px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.BsXmcf {
|
||||||
|
background-color: unset !important;
|
||||||
|
}
|
||||||
|
|
||||||
.KP7LCb {
|
.KP7LCb {
|
||||||
box-shadow: 0 0 0 0 !important;
|
box-shadow: 0 0 0 0 !important;
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,6 +45,10 @@ select {
|
||||||
box-shadow: 0 1px 6px rgba(32,33,36,0.28) !important;
|
box-shadow: 0 1px 6px rgba(32,33,36,0.28) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.BsXmcf {
|
||||||
|
background-color: unset !important;
|
||||||
|
}
|
||||||
|
|
||||||
.BVG0Nb {
|
.BVG0Nb {
|
||||||
background-color: var(--whoogle-result-bg) !important;
|
background-color: var(--whoogle-result-bg) !important;
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,7 +27,8 @@ BLACKLIST = [
|
||||||
'Reklama', 'Реклама', 'Anunț', '광고', 'annons', 'Annonse', 'Iklan',
|
'Reklama', 'Реклама', 'Anunț', '광고', 'annons', 'Annonse', 'Iklan',
|
||||||
'広告', 'Augl.', 'Mainos', 'Advertentie', 'إعلان', 'Գովազդ', 'विज्ञापन',
|
'広告', 'Augl.', 'Mainos', 'Advertentie', 'إعلان', 'Գովազդ', 'विज्ञापन',
|
||||||
'Reklam', 'آگهی', 'Reklāma', 'Reklaam', 'Διαφήμιση', 'מודעה', 'Hirdetés',
|
'Reklam', 'آگهی', 'Reklāma', 'Reklaam', 'Διαφήμιση', 'מודעה', 'Hirdetés',
|
||||||
'Anúncio', 'Quảng cáo','โฆษณา', 'sponsored', 'patrocinado', 'gesponsert'
|
'Anúncio', 'Quảng cáo', 'โฆษณา', 'sponsored', 'patrocinado', 'gesponsert',
|
||||||
|
'Sponzorováno', '스폰서', 'Gesponsord'
|
||||||
]
|
]
|
||||||
|
|
||||||
SITE_ALTS = {
|
SITE_ALTS = {
|
||||||
|
@ -98,7 +99,7 @@ def bold_search_terms(response: str, query: str) -> BeautifulSoup:
|
||||||
else:
|
else:
|
||||||
reg_pattern = fr'\b((?![{{}}<>-]){target_word}(?![{{}}<>-]))\b'
|
reg_pattern = fr'\b((?![{{}}<>-]){target_word}(?![{{}}<>-]))\b'
|
||||||
|
|
||||||
if re.match('.*[@_!#$%^&*()<>?/\|}{~:].*', target_word) or (
|
if re.match(r'.*[@_!#$%^&*()<>?/\|}{~:].*', target_word) or (
|
||||||
element.parent and element.parent.name == 'style'):
|
element.parent and element.parent.name == 'style'):
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
|
@ -4,4 +4,4 @@ optional_dev_tag = ''
|
||||||
if os.getenv('DEV_BUILD'):
|
if os.getenv('DEV_BUILD'):
|
||||||
optional_dev_tag = '.dev' + os.getenv('DEV_BUILD')
|
optional_dev_tag = '.dev' + os.getenv('DEV_BUILD')
|
||||||
|
|
||||||
__version__ = '0.8.4' + optional_dev_tag
|
__version__ = '0.9.0' + optional_dev_tag
|
||||||
|
|
|
@ -3,7 +3,7 @@ name: whoogle
|
||||||
description: A self hosted search engine on Kubernetes
|
description: A self hosted search engine on Kubernetes
|
||||||
type: application
|
type: application
|
||||||
version: 0.1.0
|
version: 0.1.0
|
||||||
appVersion: 0.8.4
|
appVersion: 0.9.0
|
||||||
|
|
||||||
icon: https://github.com/benbusby/whoogle-search/raw/main/app/static/img/favicon/favicon-96x96.png
|
icon: https://github.com/benbusby/whoogle-search/raw/main/app/static/img/favicon/favicon-96x96.png
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ cryptography==43.0.1; platform_machine != 'armv7l'
|
||||||
cssutils==2.6.0
|
cssutils==2.6.0
|
||||||
defusedxml==0.7.1
|
defusedxml==0.7.1
|
||||||
Flask==2.3.2
|
Flask==2.3.2
|
||||||
idna==3.4
|
idna==3.7
|
||||||
itsdangerous==2.1.2
|
itsdangerous==2.1.2
|
||||||
Jinja2==3.1.4
|
Jinja2==3.1.4
|
||||||
MarkupSafe==2.1.2
|
MarkupSafe==2.1.2
|
||||||
|
@ -33,5 +33,5 @@ urllib3==1.26.19
|
||||||
validators==0.22.0
|
validators==0.22.0
|
||||||
waitress==2.1.2
|
waitress==2.1.2
|
||||||
wcwidth==0.2.6
|
wcwidth==0.2.6
|
||||||
Werkzeug==3.0.1
|
Werkzeug==3.0.3
|
||||||
python-dotenv==0.21.1
|
python-dotenv==0.21.1
|
||||||
|
|
Loading…
Reference in New Issue