Merge branch 'benbusby:main' into main

.github/workflows/pypi.yml

@@ -20,6 +20,7 @@ jobs:
         python -m
         pip install
         build
+        setuptools
         --user
     - name: Set dev timestamp
       run: echo "DEV_BUILD=$(date +%s)" >> $GITHUB_ENV

app/utils/results.py

@@ -18,10 +18,11 @@ BLANK_B64 = ('data:image/png;base64,'
 
 # Ad keywords
 BLACKLIST = [
-    'ad', 'anuncio', 'annuncio', 'annonce', 'Anzeige', '广告', '廣告', 'Reklama',
-    'Реклама', 'Anunț', '광고', 'annons', 'Annonse', 'Iklan', '広告', 'Augl.',
-    'Mainos', 'Advertentie', 'إعلان', 'Գովազդ', 'विज्ञापन', 'Reklam', 'آگهی',
-    'Reklāma', 'Reklaam', 'Διαφήμιση', 'מודעה', 'Hirdetés', 'Anúncio'
+    'ad', 'ads', 'anuncio', 'annuncio', 'annonce', 'Anzeige', '广告', '廣告',
+    'Reklama', 'Реклама', 'Anunț', '광고', 'annons', 'Annonse', 'Iklan',
+    '広告', 'Augl.', 'Mainos', 'Advertentie', 'إعلان', 'Գովազդ', 'विज्ञापन',
+    'Reklam', 'آگهی', 'Reklāma', 'Reklaam', 'Διαφήμιση', 'מודעה', 'Hirdetés',
+    'Anúncio'
 ]
 
 SITE_ALTS = {
@@ -89,7 +90,8 @@ def has_ad_content(element: str) -> bool:
         bool: True/False for the element containing an ad
 
     """
-    return (element.upper() in (value.upper() for value in BLACKLIST)
+    element_str = ''.join(filter(str.isalpha, element))
+    return (element_str.upper() in (value.upper() for value in BLACKLIST)
             or 'ⓘ' in element)
 
 

setup.cfg

@@ -0,0 +1,37 @@
+[metadata]
+name = whoogle-search
+url = https://github.com/benbusby/whoogle-search
+description = Self-hosted, ad-free, privacy-respecting metasearch engine
+long_description = file: README.md
+long_description_content_type = text/markdown
+keywords = search, metasearch, flask, adblock, degoogle, privacy
+author = Ben Busby
+author_email = contact@benbusby.com
+license = MIT
+classifiers =
+    Programming Language :: Python :: 3
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+
+[options]
+packages = find:
+include_package_data = True
+install_requires=
+    beautifulsoup4
+    cryptography
+    Flask
+    Flask-Session
+    python-dotenv
+    requests
+    stem
+    waitress
+
+[options.extras_require]
+test =
+    pytest
+    python-dateutil
+dev = pycodestyle
+
+[options.entry_points]
+console_scripts =
+    whoogle-search = app.routes:run_app

setup.py

@@ -1,34 +1,8 @@
 import os
 import setuptools
 
-long_description = open('README.md', 'r').read()
-
-requirements = list(open('requirements.txt', 'r'))
-
 optional_dev_tag = ''
 if os.getenv('DEV_BUILD'):
     optional_dev_tag = '.dev' + os.getenv('DEV_BUILD')
 
-setuptools.setup(
-    author='Ben Busby',
-    author_email='contact@benbusby.com',
-    name='whoogle-search',
-    version='0.7.1' + optional_dev_tag,
-    include_package_data=True,
-    install_requires=requirements,
-    description='Self-hosted, ad-free, privacy-respecting metasearch engine',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    url='https://github.com/benbusby/whoogle-search',
-    entry_points={
-        'console_scripts': [
-            'whoogle-search=app.routes:run_app',
-        ]
-    },
-    packages=setuptools.find_packages(),
-    classifiers=[
-        'Programming Language :: Python :: 3',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-    ],
-)
+setuptools.setup(version='0.7.1' + optional_dev_tag)