diff --git a/CHANGELOG.md b/CHANGELOG.md index c6488c4a..e559f372 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## [Unreleased] +## [0.2.2] - 2021-05-07 +* improved ids extractors +* updated sites and engines +* updates CLI options + ## [0.2.1] - 2021-05-02 * fixed json reports generation bug, added tests diff --git a/maigret/maigret.py b/maigret/maigret.py index 440c43ad..ccee03a8 100755 --- a/maigret/maigret.py +++ b/maigret/maigret.py @@ -37,7 +37,7 @@ from .types import QueryResultWrapper from .utils import get_dict_ascii_tree -__version__ = '0.2.1' +__version__ = '0.2.2' def notify_about_errors(search_results: QueryResultWrapper, query_notify): @@ -511,12 +511,15 @@ async def main(): db, site_data, logger, max_connections=args.connections ) if is_need_update: - if input('Do you want to save changes permanently? [Yn]\n').lower() == 'y': + if input('Do you want to save changes permanently? [Yn]\n').lower() in ( + 'y', + '', + ): db.save_to_file(args.db_file) print('Database was successfully updated.') else: print('Updates will be applied only for current search session.') - print(db.get_scan_stats(site_data)) + print('Scan sessions flags stats: ' + str(db.get_scan_stats(site_data))) # Database statistics if args.stats: diff --git a/maigret/resources/data.json b/maigret/resources/data.json index 1f55dc11..39f60639 100644 --- a/maigret/resources/data.json +++ b/maigret/resources/data.json @@ -5,7 +5,7 @@ "ru" ], "engine": "XenForo", - "alexaRank": 5789058, + "alexaRank": 4053644, "urlMain": "http://0-3.ru", "usernameClaimed": "donna", "usernameUnclaimed": "noonewouldeverusethis7" @@ -15,7 +15,7 @@ "ru" ], "engine": "uCoz", - "alexaRank": 9005599, + "alexaRank": 8975317, "urlMain": "http://0k.clan.su", "usernameClaimed": "eruzz", "usernameUnclaimed": "noonewouldeverusethis7" @@ -29,7 +29,7 @@ "absenceStrs": [ "\u042d\u0442\u043e\u0442 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442, \u0438\u043b\u0438 \u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d." ], - "alexaRank": 1178877, + "alexaRank": 1238206, "urlMain": "http://1001mem.ru", "url": "http://1001mem.ru/{username}", "usernameClaimed": "adam", @@ -46,7 +46,7 @@ "absenceStrs": [ "Sorry, the requested user is not valid!" ], - "alexaRank": 37269, + "alexaRank": 37450, "urlMain": "https://www.1001tracklists.com", "url": "https://www.1001tracklists.com/user/{username}/index.html", "usernameClaimed": "JacoWilles", @@ -58,14 +58,14 @@ "ru" ], "engine": "XenForo", - "alexaRank": 66162, + "alexaRank": 60816, "urlMain": "https://forum-ru.101xp.com", "usernameClaimed": "aida", "usernameUnclaimed": "noonewouldeverusethis7" }, "11x2": { "checkType": "status_code", - "alexaRank": 1646492, + "alexaRank": 1337996, "urlMain": "https://11x2.com", "url": "https://11x2.com/user/home/{username}", "usernameClaimed": "hazelamy", @@ -78,7 +78,7 @@ "us" ], "checkType": "response_url", - "alexaRank": 1119, + "alexaRank": 1120, "urlMain": "https://ru.123rf.com", "url": "https://ru.123rf.com/profile_{username}", "usernameClaimed": "rawpixel", @@ -93,7 +93,7 @@ "absenceStrs": [ "Error something went wrong" ], - "alexaRank": 508, + "alexaRank": 504, "urlMain": "https://1337x.to", "url": "https://1337x.to/user/{username}/", "usernameClaimed": "adam", @@ -104,7 +104,7 @@ "ru" ], "engine": "vBulletin", - "alexaRank": 1267171, + "alexaRank": 1213253, "urlMain": "https://1xforum.com", "usernameClaimed": "adam", "usernameUnclaimed": "noonewouldeverusethis7" @@ -115,7 +115,7 @@ "us" ], "checkType": "status_code", - "alexaRank": 2011, + "alexaRank": 2036, "urlMain": "https://247sports.com", "url": "https://247sports.com/user/{username}/", "usernameClaimed": "adam", @@ -129,7 +129,7 @@ "us" ], "checkType": "status_code", - "alexaRank": 44433, + "alexaRank": 46608, "urlMain": "https://24open.ru", "url": "https://24open.ru/user/{username}/", "usernameClaimed": "niko3193", @@ -137,7 +137,7 @@ }, "2Dimensions": { "checkType": "status_code", - "alexaRank": 7307514, + "alexaRank": 7287219, "urlMain": "https://2Dimensions.com/", "url": "https://2Dimensions.com/a/{username}", "usernameClaimed": "blue", @@ -151,7 +151,7 @@ "absenceStrs": [ "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d" ], - "alexaRank": 993896, + "alexaRank": 1078310, "urlMain": "https://2berega.spb.ru", "url": "https://2berega.spb.ru/user/{username}", "usernameClaimed": "adam", @@ -162,7 +162,7 @@ "ru" ], "checkType": "status_code", - "alexaRank": 506974, + "alexaRank": 473688, "urlMain": "https://www.2d-3d.ru", "url": "https://www.2d-3d.ru/user/{username}/", "usernameClaimed": "adam", @@ -176,7 +176,7 @@ "absenceStrs": [ "Deze gebruiker is niet geregistreerd, zodat je zijn of haar profiel niet kunt bekijken." ], - "alexaRank": 1286759, + "alexaRank": 1324525, "urlMain": "https://www.2fast4u.be", "url": "https://www.2fast4u.be/members/?username={username}", "usernameClaimed": "Schussboelie", @@ -195,7 +195,7 @@ "absenceStrs": [ "\u0418\u0437\u0432\u0438\u043d\u0438\u0442\u0435, \u0442\u0430\u043a\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442" ], - "alexaRank": 1191182, + "alexaRank": 1225907, "urlMain": "http://33bru.com/", "url": "http://{username}.33bru.com/", "usernameClaimed": "adam", @@ -219,7 +219,7 @@ "absenceStrs": [ "The specified member cannot be found" ], - "alexaRank": 1023505, + "alexaRank": 1024368, "urlMain": "https://www.3dcadforums.com/", "url": "https://www.3dcadforums.com/members/?username={username}", "usernameClaimed": "adam", @@ -230,7 +230,7 @@ "ru" ], "checkType": "status_code", - "alexaRank": 11178, + "alexaRank": 11164, "urlMain": "https://3ddd.ru", "url": "https://3ddd.ru/users/{username}", "usernameClaimed": "adam", @@ -241,7 +241,7 @@ "ru" ], "engine": "vBulletin", - "alexaRank": 6125, + "alexaRank": 6212, "urlMain": "http://forum.3dnews.ru/", "usernameClaimed": "red", "usernameUnclaimed": "noonewouldeverusethis7" @@ -251,7 +251,7 @@ "ru" ], "checkType": "response_url", - "alexaRank": 80128, + "alexaRank": 81463, "urlMain": "https://3dtoday.ru/", "url": "https://3dtoday.ru/blogs/{username}", "usernameClaimed": "adam", @@ -262,7 +262,7 @@ "ru" ], "engine": "vBulletin", - "alexaRank": 254696, + "alexaRank": 252829, "urlMain": "https://4cheat.ru", "usernameClaimed": "adam", "usernameUnclaimed": "noonewouldeverusethis7" @@ -273,7 +273,7 @@ "ru" ], "engine": "XenForo", - "alexaRank": 76277, + "alexaRank": 70985, "urlMain": "https://4gameforum.com", "usernameClaimed": "persty", "usernameUnclaimed": "noonewouldeverusethis7" @@ -286,7 +286,7 @@ "absenceStrs": [ "\u041a \u0441\u043e\u0436\u0430\u043b\u0435\u043d\u0438\u044e, \u0412\u0430\u0448 \u043f\u043e\u0438\u0441\u043a \u043d\u0435 \u0434\u0430\u043b \u043d\u0438\u043a\u0430\u043a\u0438\u0445 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u043e\u0432." ], - "alexaRank": 3210, + "alexaRank": 3301, "urlMain": "https://4pda.ru/", "url": "https://4pda.ru/forum/index.php?act=search&source=pst&noform=1&username={username}", "usernameClaimed": "green", @@ -297,7 +297,7 @@ "ru" ], "checkType": "status_code", - "alexaRank": 292124, + "alexaRank": 292973, "urlMain": "https://4stor.ru", "url": "https://4stor.ru/user/{username}", "usernameClaimed": "adam", @@ -317,7 +317,7 @@ "absenceStrs": [ "No message available" ], - "alexaRank": 2868, + "alexaRank": 2835, "urlMain": "https://500px.com/", "url": "https://500px.com/p/{username}", "usernameClaimed": "blue", @@ -348,7 +348,7 @@ "us" ], "checkType": "status_code", - "alexaRank": 50413, + "alexaRank": 51925, "urlMain": "https://www.7cups.com/", "url": "https://www.7cups.com/@{username}", "usernameClaimed": "blue", @@ -359,7 +359,7 @@ "ru" ], "checkType": "status_code", - "alexaRank": 16095, + "alexaRank": 15201, "urlMain": "https://7dach.ru/", "url": "https://7dach.ru/profile/{username}", "usernameClaimed": "adam", @@ -370,7 +370,7 @@ "ru" ], "checkType": "status_code", - "alexaRank": 37168, + "alexaRank": 36964, "urlMain": "https://blog.7ya.ru", "url": "https://blog.7ya.ru/{username}/", "usernameClaimed": "trotter", @@ -382,7 +382,7 @@ "us" ], "checkType": "status_code", - "alexaRank": 458, + "alexaRank": 460, "urlMain": "https://www.9gag.com/", "url": "https://www.9gag.com/u/{username}", "usernameClaimed": "blue", @@ -410,7 +410,7 @@ "absenceStrs": [ "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u0441 \u0442\u0430\u043a\u0438\u043c \u0438\u043c\u0435\u043d\u0435\u043c \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d." ], - "alexaRank": 8449116, + "alexaRank": 8436265, "urlMain": "https://aback.com.ua", "url": "https://aback.com.ua/user/{username}", "usernameClaimed": "adam", @@ -422,7 +422,7 @@ "in" ], "checkType": "status_code", - "alexaRank": 7733, + "alexaRank": 7572, "urlMain": "https://about.me/", "url": "https://about.me/{username}", "usernameClaimed": "blue", @@ -436,7 +436,7 @@ "absenceStrs": [ "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u043d\u0435 \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043d \u0438 \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u043f\u0440\u043e\u0444\u0438\u043b\u044f \u0434\u043b\u044f \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0430." ], - "alexaRank": 2484621, + "alexaRank": 2936618, "urlMain": "http://aboutcar.ru", "url": "http://aboutcar.ru/members/{username}.html", "usernameClaimed": "krolenya", @@ -459,7 +459,7 @@ "ru" ], "checkType": "status_code", - "alexaRank": 157110, + "alexaRank": 157046, "urlMain": "https://acomics.ru", "url": "https://acomics.ru/-{username}", "usernameClaimed": "Garage", @@ -474,7 +474,7 @@ "absenceStrs": [ "