STRLCPY/maigret

Merge branch 'main' into tapd-added
soxoj committed with GitHub 3 years ago

cc3df856

2 parents
8007e920
daaddbde

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

■ ■ ■ ■ ■ ■

maigret/resources/data.json

		skipped 117 lines
118	118		"usernameUnclaimed": "noonewouldeverusethis7"
119	119		},
120	120		"24open": {
	121	+	"disabled": true,
121	122		"tags": [
122	123		"dating",
123	124		"ru",
		skipped 485 lines
609	610		],
610	611		"regexCheck": "^[^\\.]+$",
611	612		"checkType": "message",
612		-	"absenceStrs": "Leaderboard",
613		-	"alexaRank": 4875,
	613	+	"presenseStrs": [
	614	+	"Profile"
	615	+	],
	616	+	"absenceStrs": [
	617	+	"You are being"
	618	+	],
	619	+	"alexaRank": 5317,
614	620		"url": "https://www.alltrails.com/members/{username}",
615	621		"urlMain": "https://www.alltrails.com/",
616	622		"usernameClaimed": "blue",
		skipped 9580 lines
10197	10203		"ru"
10198	10204		],
10199	10205		"checkType": "message",
10200		-	"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.",
10201		-	"alexaRank": 419265,
	10206	+	"absenceStrs": [
	10207	+	"\u0417\u0430\u043f\u0440\u0430\u0448\u0438\u0432\u0430\u0435\u043c\u0430\u044f \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0430 \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442"
	10208	+	],
	10209	+	"alexaRank": 427429,
10202	10210		"url": "https://www.prizyvnik.info/members/?username={username}",
10203	10211		"urlMain": "https://www.prizyvnik.info",
10204	10212		"usernameClaimed": "blue",
		skipped 1936 lines
12141	12149		"us"
12142	12150		],
12143	12151		"headers": {
12144		-	"authorization": "Bearer BQBi0R02vlk96QfQoocy9k3T2JR8c3MOBEoh50OJsM0018HDphfsClmHbTBG2QyQuHiqJ00nqSXN6C4zo3g"
	12152	+	"authorization": "Bearer BQC38O_gP1qY7X8Ui7RsgyutAuZ2QissgeFgsDEX6siaE_dAFmzV0mWMSziGB_dLErQwtfJZa7qM9IsmNHI"
12145	12153		},
12146	12154		"errors": {
12147	12155		"Spotify is currently not available in your country.": "Access denied in your country, use proxy/vpn"
		skipped 1804 lines
13952	13960		"usernameUnclaimed": "noonewouldeverusethis7"
13953	13961		},
13954	13962		"Volgogradru": {
	13963	+	"disabled": true,
13955	13964		"tags": [
13956	13965		"ru"
13957	13966		],
		skipped 9795 lines

■ ■ ■ ■ ■ ■

maigret/submit.py

		skipped 182 lines
183	183
184	184		# check for existence
185	185		matched_sites = list(filter(lambda x: domain_raw in x.url_main + x.url, db.sites))
	186	+
186	187		if matched_sites:
187	188		print(f'Sites with domain "{domain_raw}" already exists in the Maigret database!')
188	189		status = lambda s: '(disabled)' if s.disabled else ''
189	190		url_block = lambda s: f'\n\t{s.url_main}\n\t{s.url}'
190	191		print('\n'.join([f'{site.name} {status(site)}{url_block(site)}' for site in matched_sites]))
191		-	return False
	192	+
	193	+	if input(f'Do you want to continue? [yN] ').lower() in 'n':
	194	+	return False
192	195
193	196		url_mainpage = extract_mainpage_url(url_exists)
194	197
		skipped 39 lines

Merge branch 'main' into tapd-added