sch/Slixfeed
sch/Slixfeed
3
1
Fork 1
Code Issues 15 Pull requests Projects Releases Packages Wiki Activity Actions

Print user agent and http proxy if set

Browse source
This commit is contained in:
Schimon Jehudah 2024-03-13 16:17:43 +00:00
parent 3c89b84908
commit f18659fd88
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
slixfeed/__main__.py
View file

@ -190,6 +190,9 @@ def main():
config_dir = config.get_default_config_directory() config_dir = config.get_default_config_directory()
logging.info('Reading configuration from {}'.format(config_dir)) logging.info('Reading configuration from {}'.format(config_dir))
print('Reading configuration from {}'.format(config_dir)) print('Reading configuration from {}'.format(config_dir))
network_settings = config.get_values('settings.toml', 'network')
print('User agent:', network_settings['user_agent'] or 'Slixfeed/0.1')
if network_settings['http_proxy']: print('HTTP Proxy:', network_settings['http_proxy'])
# values = config.get_value('accounts', 'XMPP Proxy', # values = config.get_value('accounts', 'XMPP Proxy',
# ['socks5_host', 'socks5_port']) # ['socks5_host', 'socks5_port'])

7
slixfeed/fetch.py
View file

@ -119,11 +119,10 @@ async def http(url):
msg: list or str msg: list or str
Document or error message. Document or error message.
""" """
user_agent = (config.get_values('settings.toml', 'network')['user_agent'] network_settings = config.get_values('settings.toml', 'network')
or 'Slixfeed/0.1') user_agent = (network_settings['user_agent'] or 'Slixfeed/0.1')
headers = {'User-Agent': user_agent} headers = {'User-Agent': user_agent}
proxy = (config.get_values('settings.toml', 'network')['http_proxy'] proxy = (network_settings['http_proxy'] or None)
or None)
timeout = ClientTimeout(total=10) timeout = ClientTimeout(total=10)
async with ClientSession(headers=headers) as session: async with ClientSession(headers=headers) as session:
# async with ClientSession(trust_env=True) as session: # async with ClientSession(trust_env=True) as session: