Skip to content

Commit

Permalink
Fixed 3 sites, disabed 3, added (#1539)
Browse files Browse the repository at this point in the history
* Fixed/Disabled sites. Update requirements.txt

fixed_sites: AllRecipes, Linktree, CreativeMarket, ImgInn, Shutterstock, Contently

disabled_sites: Forums.ea.com. CrunchyRoll, Windy, MetaCritic, InfosecInstitute, Armchairgm.fandom.com, Bleach.fandom.com

Update requirements to prevent dependency conflicts.

* Update requirements.txt

Update requirements.txt to prevent dependency conflicts

* Update requirements.txt

* Update sites.md

* fixed_sites: Armchairgm.fandom.com, Bleach.fandom.com, Battleraprus. disabled_sites: MicrosoftTechNet, club.cnews.ru, Scorcher

* fixed_sites: Armchairgm.fandom.com, Bleach.fandom.com, Battleraprus. disabled_sites: MicrosoftTechNet, club.cnews.ru, Scorcher

* fixed 2 sites, disabled 22 sites, and added 1 site

* fixed 3 sites, disabled 28, added 4 sites

* update sites.md

* Added 2 more sites

* fixed 3 sites, disabled 3 sites, added 1 site

* fix Twitch. Update snapcraft.yaml. Add pyproject.toml. Remove setup.py, requirements.txt, test-requirements.txt, as they are already specified in pyproject.toml

* fix Twitch. Update snapcraft.yaml. Add pyproject.toml. Remove setup.py, requirements.txt, test-requirements.txt, as they are already specified in pyproject.toml

* fix Twitch. Update snapcraft.yaml. Add pyproject.toml. Remove setup.py, requirements.txt, test-requirements.txt, as they are already specified in pyproject.toml

* fix Twitch. Update snapcraft.yaml. Add pyproject.toml. Remove setup.py, requirements.txt, test-requirements.txt, as they are already specified in pyproject.toml

* Update sites.md

* fix Twitch. Update snapcraft.yaml. Add pyproject.toml. Remove setup.py, requirements.txt, test-requirements.txt, as they are already specified in pyproject.toml

* Update sites.md

* fix forums.drom.ru

* Add EduGeek

* Add EduGeek

* Update python-package.yml

Fix dependency installation

* Update python-package.yml

* Update python-package.yml
  • Loading branch information
rly0nheart authored May 24, 2024
1 parent 9399737 commit 0341537
Show file tree
Hide file tree
Showing 15 changed files with 2,628 additions and 220 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v2
Expand All @@ -24,8 +24,8 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install -r test-requirements.txt
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
python -m pip install poetry
python -m poetry install --with dev
- name: Test with pytest
run: |
pytest --reruns 3 --reruns-delay 5
poetry run pytest --reruns 3 --reruns-delay 5
2 changes: 1 addition & 1 deletion Installer.bat
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ if %errorlevel%==2 goto 1

:install4
cls
pip install -r requirements.txt
pip install .
pip install maigret
goto:after

Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Also, you can run Maigret using cloud shells and Jupyter notebooks (see buttons

### Package installing

**NOTE**: Python 3.7 or higher and pip is required, **Python 3.8 is recommended.**
**NOTE**: Python 3.10 or higher and pip is required, **Python 3.11 is recommended.**

```bash
# install from pypi
Expand All @@ -70,10 +70,12 @@ maigret username
```bash
# or clone and install manually
git clone https://github.com/soxoj/maigret && cd maigret
pip3 install -r requirements.txt

# build and install
pip3 install .

# usage
./maigret.py username
maigret username
```

### Docker
Expand Down
18 changes: 0 additions & 18 deletions bin/maigret

This file was deleted.

21 changes: 0 additions & 21 deletions maigret.py

This file was deleted.

71 changes: 55 additions & 16 deletions maigret/resources/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -2469,6 +2469,7 @@
"usernameUnclaimed": "noonewouldeverusethis7"
},
"BoomInfo": {
"disabled": true,
"ignore403": true,
"tags": [
"ru",
Expand Down Expand Up @@ -2608,13 +2609,10 @@
},
"Buzznet": {
"checkType": "message",
"presenseStrs": [
"<title>Author:"
],
"absenceStrs": [
"The page you are looking for can't be found."
"<title>Author: &#x2d; Buzznet</title>"
],
"url": "https://www.buzznet.com/author/{username}/",
"url": "https://www.buzznet.com/author/{username}",
"usernameClaimed": "karynbailey",
"usernameUnclaimed": "noonewouldeverusethis7"
},
Expand Down Expand Up @@ -4575,6 +4573,16 @@
"usernameClaimed": "adam",
"usernameUnclaimed": "noonewouldeverusethis7"
},
"EduGeek": {
"tags": [
"education",
"us"
],
"engine": "vBulletin",
"urlMain": "https://www.edugeek.net",
"usernameClaimed": "witch",
"usernameUnclaimed": "noonewouldeverusethis7"
},
"Edocr": {
"tags": [
"in"
Expand Down Expand Up @@ -9825,6 +9833,7 @@
"usernameUnclaimed": "noonewouldeverusethis7"
},
"Maxpark": {
"disabled": true,
"tags": [
"news",
"ru"
Expand Down Expand Up @@ -15092,17 +15101,29 @@
"usernameUnclaimed": "noonewouldeverusethis7"
},
"Star Citizen": {
"disabled": true,
"tags": [
"de",
"us"
],
"checkType": "status_code",
"alexaRank": 22154,
"urlMain": "https://robertsspaceindustries.com/",
"url": "https://robertsspaceindustries.com/citizens/{username}",
"url": "https://https://robertsspaceindustries.com/citizens/{username}",
"usernameClaimed": "blue",
"usernameUnclaimed": "noonewouldeverusethis7"
},
"Star Citizens Community": {
"tags": [
"de",
"us"
],
"checkType": "status_code",
"urlMain": "https://robertsspaceindustries.com/",
"url": "https://robertsspaceindustries.com/community-hub/user/{username}",
"usernameClaimed": "SentinelTheFirst",
"usernameUnclaimed": "noonewouldeverusethis7"
},
"Starsonice": {
"tags": [
"ru"
Expand Down Expand Up @@ -16702,14 +16723,15 @@
},
"Twitch": {
"tags": [
"streaming"
"streaming",
"us"
],
"urlProbe": "https://m.twitch.tv/{username}",
"urlProbe": "https://twitchtracker.com/{username}",
"checkType": "status_code",
"alexaRank": 34,
"urlMain": "https://www.twitch.tv/",
"url": "https://www.twitch.tv/{username}",
"usernameClaimed": "jenny",
"url": "https://twitchtracker.com/{username}",
"usernameClaimed": "adam",
"usernameUnclaimed": "noonewouldeverusethis7"
},
"Nitter": {
Expand Down Expand Up @@ -17636,6 +17658,7 @@
"alexaRank": 1734
},
"Waytothelight": {
"disabled": true,
"tags": [
"ru"
],
Expand Down Expand Up @@ -19939,13 +19962,18 @@
"forum",
"ru"
],
"engine": "vBulletin",
"checkType": "message",
"presenseStrs": [
"\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u043f\u0440\u043e\u0444\u0438\u043b\u044f:"
],
"alexaRank": 1272,
"urlMain": "https://forums.drom.ru/",
"usernameClaimed": "adam",
"urlMain": "https://www.forumsdrom.ru/",
"url": "https://www.forumsdrom.ru/member.php?username={username}",
"usernameClaimed": "red",
"usernameUnclaimed": "noonewouldeverusethis7"
},
"forums.ea.com": {
"disabled": true,
"tags": [
"forum",
"gaming",
Expand Down Expand Up @@ -26782,6 +26810,7 @@
"alexaRank": 2079
},
"banki.ru": {
"disabled": true,
"tags": [
"ru"
],
Expand Down Expand Up @@ -31965,6 +31994,7 @@
"url": "https://cloudromance.com/{username}"
},
"club.myce.com": {
"disabled": true,
"checkType": "status_code",
"usernameClaimed": "adam",
"usernameUnclaimed": "noonewouldeverusethis7",
Expand Down Expand Up @@ -32919,8 +32949,11 @@
"url": "https://www.trailville.com/wiki/User:{username}"
},
"trepup.com": {
"checkType": "status_code",
"usernameClaimed": "adam",
"checkType": "message",
"absenceStrs": [
"<title></title>"
],
"usernameClaimed": "partybusservice",
"usernameUnclaimed": "noonewouldeverusethis7",
"url": "https://trepup.com/{username}"
},
Expand Down Expand Up @@ -33039,7 +33072,13 @@
"url": "https://wikiislam.net/wiki/User:{username}"
},
"wikizilla.org": {
"checkType": "status_code",
"checkType": "message",
"absenceStrs": [
"is not registered."
],
"presenseStrs": [
"class=\"mw-socialprofile-avatar\" alt=\"avatar\"/><"
],
"usernameClaimed": "test",
"usernameUnclaimed": "noonewouldeverusethis7",
"url": "https://wikizilla.org/wiki/User:{username}"
Expand Down
50 changes: 25 additions & 25 deletions opensuse.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,43 +5,43 @@
#
# Then run 'pip3 install -r opensuse.txt' as usual.
#
aiodns==3.0.0
aiohttp==3.8.6
aiohttp-socks==0.7.1
aiodns>=3.0.0
aiohttp>=3.8.6
aiohttp-socks>=0.7.1
arabic-reshaper~=3.0.0
async-timeout
attrs==22.2.0
certifi==2023.7.22
chardet==5.0.0
attrs>=22.2.0
certifi>=2023.7.22
chardet>=5.0.0
colorama
future==0.18.3
future-annotations==1.0.0
html5lib==1.1
idna==3.4
future>=0.18.3
future-annotations>=1.0.0
html5lib>=1.1
idna>=3.4
Jinja2
lxml==4.9.2
lxml>=4.9.2
MarkupSafe
mock==4.0.3
mock>=4.0.3
multidict
pycountry==22.3.5
PyPDF2==3.0.1
PySocks==1.7.1
python-bidi==0.4.2
pycountry>=22.3.5
PyPDF2>=3.0.1
PySocks>=1.7.1
python-bidi>=0.4.2
requests
requests-futures==1.0.0
six==1.16.0
requests-futures>=1.0.0
six>=1.16.0
socid-extractor>=0.0.24
soupsieve==2.3.2.post1
stem==1.8.1
torrequest==0.1.0
soupsieve>=2.3.2.post1
stem>=1.8.1
torrequest>=0.1.0
tqdm
typing-extensions
webencodings==0.5.1
webencodings>=0.5.1
svglib
xhtml2pdf~=0.2.11
XMind==1.2.0
XMind>=1.2.0
yarl
networkx
pyvis==0.2.1
pyvis>=0.2.1
reportlab
cloudscraper==1.2.71
cloudscraper>=1.2.71
Loading

0 comments on commit 0341537

Please sign in to comment.