Skip to content

Commit 0341537

Browse files
rly0nheartrly0nheart
authored
Fixed 3 sites, disabed 3, added (soxoj#1539)
* 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
1 parent 9399737 commit 0341537

15 files changed

+2628
-220
lines changed

‎.github/workflows/python-package.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
16-
python-version: ["3.8", "3.9", "3.10", "3.11"]
16+
python-version: ["3.10", "3.11", "3.12"]
1717

1818
steps:
1919
- uses: actions/checkout@v2
@@ -24,8 +24,8 @@ jobs:
2424
- name: Install dependencies
2525
run: |
2626
python -m pip install --upgrade pip
27-
python -m pip install -r test-requirements.txt
28-
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
27+
python -m pip install poetry
28+
python -m poetry install --with dev
2929
- name: Test with pytest
3030
run: |
31-
pytest --reruns 3 --reruns-delay 5
31+
poetry run pytest --reruns 3 --reruns-delay 5

‎Installer.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ if %errorlevel%==2 goto 1
105105

106106
:install4
107107
cls
108-
pip install -r requirements.txt
108+
pip install .
109109
pip install maigret
110110
goto:after
111111

‎README.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Also, you can run Maigret using cloud shells and Jupyter notebooks (see buttons
5555

5656
### Package installing
5757

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

6060
```bash
6161
# install from pypi
@@ -70,10 +70,12 @@ maigret username
7070
```bash
7171
# or clone and install manually
7272
git clone https://github.com/soxoj/maigret && cd maigret
73-
pip3 install -r requirements.txt
73+
74+
# build and install
75+
pip3 install .
7476

7577
# usage
76-
./maigret.py username
78+
maigret username
7779
```
7880

7981
### Docker

‎bin/maigret

-18
This file was deleted.

‎maigret.py

-21
This file was deleted.

‎maigret/resources/data.json

+55-16
Original file line numberDiff line numberDiff line change
@@ -2469,6 +2469,7 @@
24692469
"usernameUnclaimed": "noonewouldeverusethis7"
24702470
},
24712471
"BoomInfo": {
2472+
"disabled": true,
24722473
"ignore403": true,
24732474
"tags": [
24742475
"ru",
@@ -2608,13 +2609,10 @@
26082609
},
26092610
"Buzznet": {
26102611
"checkType": "message",
2611-
"presenseStrs": [
2612-
"<title>Author:"
2613-
],
26142612
"absenceStrs": [
2615-
"The page you are looking for can't be found."
2613+
"<title>Author: &#x2d; Buzznet</title>"
26162614
],
2617-
"url": "https://www.buzznet.com/author/{username}/",
2615+
"url": "https://www.buzznet.com/author/{username}",
26182616
"usernameClaimed": "karynbailey",
26192617
"usernameUnclaimed": "noonewouldeverusethis7"
26202618
},
@@ -4575,6 +4573,16 @@
45754573
"usernameClaimed": "adam",
45764574
"usernameUnclaimed": "noonewouldeverusethis7"
45774575
},
4576+
"EduGeek": {
4577+
"tags": [
4578+
"education",
4579+
"us"
4580+
],
4581+
"engine": "vBulletin",
4582+
"urlMain": "https://www.edugeek.net",
4583+
"usernameClaimed": "witch",
4584+
"usernameUnclaimed": "noonewouldeverusethis7"
4585+
},
45784586
"Edocr": {
45794587
"tags": [
45804588
"in"
@@ -9825,6 +9833,7 @@
98259833
"usernameUnclaimed": "noonewouldeverusethis7"
98269834
},
98279835
"Maxpark": {
9836+
"disabled": true,
98289837
"tags": [
98299838
"news",
98309839
"ru"
@@ -15092,17 +15101,29 @@
1509215101
"usernameUnclaimed": "noonewouldeverusethis7"
1509315102
},
1509415103
"Star Citizen": {
15104+
"disabled": true,
1509515105
"tags": [
1509615106
"de",
1509715107
"us"
1509815108
],
1509915109
"checkType": "status_code",
1510015110
"alexaRank": 22154,
1510115111
"urlMain": "https://robertsspaceindustries.com/",
15102-
"url": "https://robertsspaceindustries.com/citizens/{username}",
15112+
"url": "https://https://robertsspaceindustries.com/citizens/{username}",
1510315113
"usernameClaimed": "blue",
1510415114
"usernameUnclaimed": "noonewouldeverusethis7"
1510515115
},
15116+
"Star Citizens Community": {
15117+
"tags": [
15118+
"de",
15119+
"us"
15120+
],
15121+
"checkType": "status_code",
15122+
"urlMain": "https://robertsspaceindustries.com/",
15123+
"url": "https://robertsspaceindustries.com/community-hub/user/{username}",
15124+
"usernameClaimed": "SentinelTheFirst",
15125+
"usernameUnclaimed": "noonewouldeverusethis7"
15126+
},
1510615127
"Starsonice": {
1510715128
"tags": [
1510815129
"ru"
@@ -16702,14 +16723,15 @@
1670216723
},
1670316724
"Twitch": {
1670416725
"tags": [
16705-
"streaming"
16726+
"streaming",
16727+
"us"
1670616728
],
16707-
"urlProbe": "https://m.twitch.tv/{username}",
16729+
"urlProbe": "https://twitchtracker.com/{username}",
1670816730
"checkType": "status_code",
1670916731
"alexaRank": 34,
1671016732
"urlMain": "https://www.twitch.tv/",
16711-
"url": "https://www.twitch.tv/{username}",
16712-
"usernameClaimed": "jenny",
16733+
"url": "https://twitchtracker.com/{username}",
16734+
"usernameClaimed": "adam",
1671316735
"usernameUnclaimed": "noonewouldeverusethis7"
1671416736
},
1671516737
"Nitter": {
@@ -17636,6 +17658,7 @@
1763617658
"alexaRank": 1734
1763717659
},
1763817660
"Waytothelight": {
17661+
"disabled": true,
1763917662
"tags": [
1764017663
"ru"
1764117664
],
@@ -19939,13 +19962,18 @@
1993919962
"forum",
1994019963
"ru"
1994119964
],
19942-
"engine": "vBulletin",
19965+
"checkType": "message",
19966+
"presenseStrs": [
19967+
"\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 \u043f\u0440\u043e\u0444\u0438\u043b\u044f:"
19968+
],
1994319969
"alexaRank": 1272,
19944-
"urlMain": "https://forums.drom.ru/",
19945-
"usernameClaimed": "adam",
19970+
"urlMain": "https://www.forumsdrom.ru/",
19971+
"url": "https://www.forumsdrom.ru/member.php?username={username}",
19972+
"usernameClaimed": "red",
1994619973
"usernameUnclaimed": "noonewouldeverusethis7"
1994719974
},
1994819975
"forums.ea.com": {
19976+
"disabled": true,
1994919977
"tags": [
1995019978
"forum",
1995119979
"gaming",
@@ -26782,6 +26810,7 @@
2678226810
"alexaRank": 2079
2678326811
},
2678426812
"banki.ru": {
26813+
"disabled": true,
2678526814
"tags": [
2678626815
"ru"
2678726816
],
@@ -31965,6 +31994,7 @@
3196531994
"url": "https://cloudromance.com/{username}"
3196631995
},
3196731996
"club.myce.com": {
31997+
"disabled": true,
3196831998
"checkType": "status_code",
3196931999
"usernameClaimed": "adam",
3197032000
"usernameUnclaimed": "noonewouldeverusethis7",
@@ -32919,8 +32949,11 @@
3291932949
"url": "https://www.trailville.com/wiki/User:{username}"
3292032950
},
3292132951
"trepup.com": {
32922-
"checkType": "status_code",
32923-
"usernameClaimed": "adam",
32952+
"checkType": "message",
32953+
"absenceStrs": [
32954+
"<title></title>"
32955+
],
32956+
"usernameClaimed": "partybusservice",
3292432957
"usernameUnclaimed": "noonewouldeverusethis7",
3292532958
"url": "https://trepup.com/{username}"
3292632959
},
@@ -33039,7 +33072,13 @@
3303933072
"url": "https://wikiislam.net/wiki/User:{username}"
3304033073
},
3304133074
"wikizilla.org": {
33042-
"checkType": "status_code",
33075+
"checkType": "message",
33076+
"absenceStrs": [
33077+
"is not registered."
33078+
],
33079+
"presenseStrs": [
33080+
"class=\"mw-socialprofile-avatar\" alt=\"avatar\"/><"
33081+
],
3304333082
"usernameClaimed": "test",
3304433083
"usernameUnclaimed": "noonewouldeverusethis7",
3304533084
"url": "https://wikizilla.org/wiki/User:{username}"

‎opensuse.txt

+25-25
Original file line numberDiff line numberDiff line change
@@ -5,43 +5,43 @@
55
#
66
# Then run 'pip3 install -r opensuse.txt' as usual.
77
#
8-
aiodns==3.0.0
9-
aiohttp==3.8.6
10-
aiohttp-socks==0.7.1
8+
aiodns>=3.0.0
9+
aiohttp>=3.8.6
10+
aiohttp-socks>=0.7.1
1111
arabic-reshaper~=3.0.0
1212
async-timeout
13-
attrs==22.2.0
14-
certifi==2023.7.22
15-
chardet==5.0.0
13+
attrs>=22.2.0
14+
certifi>=2023.7.22
15+
chardet>=5.0.0
1616
colorama
17-
future==0.18.3
18-
future-annotations==1.0.0
19-
html5lib==1.1
20-
idna==3.4
17+
future>=0.18.3
18+
future-annotations>=1.0.0
19+
html5lib>=1.1
20+
idna>=3.4
2121
Jinja2
22-
lxml==4.9.2
22+
lxml>=4.9.2
2323
MarkupSafe
24-
mock==4.0.3
24+
mock>=4.0.3
2525
multidict
26-
pycountry==22.3.5
27-
PyPDF2==3.0.1
28-
PySocks==1.7.1
29-
python-bidi==0.4.2
26+
pycountry>=22.3.5
27+
PyPDF2>=3.0.1
28+
PySocks>=1.7.1
29+
python-bidi>=0.4.2
3030
requests
31-
requests-futures==1.0.0
32-
six==1.16.0
31+
requests-futures>=1.0.0
32+
six>=1.16.0
3333
socid-extractor>=0.0.24
34-
soupsieve==2.3.2.post1
35-
stem==1.8.1
36-
torrequest==0.1.0
34+
soupsieve>=2.3.2.post1
35+
stem>=1.8.1
36+
torrequest>=0.1.0
3737
tqdm
3838
typing-extensions
39-
webencodings==0.5.1
39+
webencodings>=0.5.1
4040
svglib
4141
xhtml2pdf~=0.2.11
42-
XMind==1.2.0
42+
XMind>=1.2.0
4343
yarl
4444
networkx
45-
pyvis==0.2.1
45+
pyvis>=0.2.1
4646
reportlab
47-
cloudscraper==1.2.71
47+
cloudscraper>=1.2.71

0 commit comments

Comments
 (0)