| skipped 1 lines |
2 | 2 | | Maigret main module |
3 | 3 | | """ |
4 | 4 | | |
5 | | - | import aiohttp |
6 | 5 | | import asyncio |
7 | | - | import csv |
8 | | - | import http.cookiejar as cookielib |
9 | | - | import json |
10 | 6 | | import logging |
11 | 7 | | import os |
12 | 8 | | import platform |
13 | 9 | | import re |
14 | | - | import requests |
15 | 10 | | import ssl |
16 | 11 | | import sys |
| 12 | + | from argparse import ArgumentParser, RawDescriptionHelpFormatter |
| 13 | + | |
| 14 | + | import aiohttp |
| 15 | + | import requests |
17 | 16 | | import tqdm.asyncio |
18 | | - | import xmind |
19 | 17 | | from aiohttp_socks import ProxyConnector |
20 | | - | from argparse import ArgumentParser, RawDescriptionHelpFormatter |
21 | | - | from http.cookies import SimpleCookie |
22 | 18 | | from mock import Mock |
23 | 19 | | from python_socks import _errors as proxy_errors |
24 | 20 | | from socid_extractor import parse, extract, __version__ as socid_version |
25 | 21 | | |
26 | | - | from .activation import ParsingActivator |
| 22 | + | from .activation import ParsingActivator, import_aiohttp_cookies |
27 | 23 | | from .notify import QueryNotifyPrint |
28 | 24 | | from .report import save_csv_report, save_xmind_report, save_html_report, save_pdf_report, \ |
29 | | - | generate_report_context, save_txt_report |
| 25 | + | generate_report_context, save_txt_report |
30 | 26 | | from .result import QueryResult, QueryStatus |
31 | 27 | | from .sites import MaigretDatabase, MaigretSite |
32 | 28 | | |
| skipped 314 lines |
347 | 343 | | # connector = aiohttp.TCPConnector(ssl=False) |
348 | 344 | | connector.verify_ssl=False |
349 | 345 | | |
350 | | - | cookies_dict = {} |
| 346 | + | cookie_jar = None |
351 | 347 | | if cookies: |
352 | | - | cookies_obj = cookielib.MozillaCookieJar(cookies) |
353 | | - | cookies_obj.load(ignore_discard=True, ignore_expires=True) |
354 | | - | |
355 | | - | for c in cookies_obj: |
356 | | - | cookies_dict[c.name] = c.value |
| 348 | + | cookie_jar = await import_aiohttp_cookies(cookies) |
357 | 349 | | |
358 | | - | session = aiohttp.ClientSession(connector=connector, trust_env=True, cookies=cookies_dict) |
| 350 | + | session = aiohttp.ClientSession(connector=connector, trust_env=True, cookie_jar=cookie_jar) |
359 | 351 | | |
360 | 352 | | if logger.level == logging.DEBUG: |
361 | 353 | | future = session.get(url='https://icanhazip.com') |
| skipped 24 lines |
386 | 378 | | results_site['username'] = username |
387 | 379 | | results_site['parsing_enabled'] = recursive_search |
388 | 380 | | results_site['url_main'] = site.url_main |
389 | | - | results_site['cookies'] = cookies_dict |
| 381 | + | results_site['cookies'] = cookie_jar and cookie_jar.filter_cookies(site.url_main) or None |
390 | 382 | | |
391 | 383 | | headers = { |
392 | 384 | | 'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 11.1; rv:55.0) Gecko/20100101 Firefox/55.0', |
| skipped 565 lines |