nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use "weboob/VERSION" as user-agent to download files on repositories

Browse source
This commit is contained in:
Romain Bignon 2012-02-06 18:20:49 +01:00
commit 822bd8c59d
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
weboob/core/repositories.py
View file

@ -39,6 +39,11 @@ from weboob.tools.misc import to_unicode
from weboob.tools.browser import StandardBrowser, BrowserUnavailable from weboob.tools.browser import StandardBrowser, BrowserUnavailable
from ConfigParser import RawConfigParser, DEFAULTSECT from ConfigParser import RawConfigParser, DEFAULTSECT
class WeboobBrowser(StandardBrowser):
@classmethod
def set_version(klass, version):
klass.USER_AGENT = 'weboob/%s' % version
class ModuleInfo(object): class ModuleInfo(object):
def __init__(self, name): def __init__(self, name):
self.name = name self.name = name
@ -152,7 +157,7 @@ class Repository(object):
fp = open(filename, 'r') fp = open(filename, 'r')
else: else:
# This is a remote repository, download file # This is a remote repository, download file
browser = StandardBrowser() browser = WeboobBrowser()
try: try:
fp = browser.openurl(posixpath.join(self.url, self.INDEX)) fp = browser.openurl(posixpath.join(self.url, self.INDEX))
except BrowserUnavailable, e: except BrowserUnavailable, e:
@ -181,7 +186,7 @@ class Repository(object):
if not keyring.exists() or self.key_update > keyring.version: if not keyring.exists() or self.key_update > keyring.version:
# This is a remote repository, download file # This is a remote repository, download file
browser = StandardBrowser() browser = WeboobBrowser()
try: try:
fpkr = browser.openurl(posixpath.join(self.url, self.KEYRING)) fpkr = browser.openurl(posixpath.join(self.url, self.KEYRING))
fpkrsig = browser.openurl(posixpath.join(self.url, self.KEYRING + '.sig')) fpkrsig = browser.openurl(posixpath.join(self.url, self.KEYRING + '.sig'))
@ -387,6 +392,8 @@ class Repositories(object):
def __init__(self, workdir, datadir, version): def __init__(self, workdir, datadir, version):
self.logger = getLogger('repositories') self.logger = getLogger('repositories')
self.version = version self.version = version
WeboobBrowser.set_version(version)
self.workdir = workdir self.workdir = workdir
self.datadir = datadir self.datadir = datadir
self.sources_list = os.path.join(self.workdir, self.SOURCES_LIST) self.sources_list = os.path.join(self.workdir, self.SOURCES_LIST)
@ -486,7 +493,7 @@ class Repositories(object):
else: else:
icon_url = module.url.replace('.tar.gz', '.png') icon_url = module.url.replace('.tar.gz', '.png')
browser = StandardBrowser() browser = WeboobBrowser()
try: try:
icon = browser.openurl(icon_url) icon = browser.openurl(icon_url)
except BrowserUnavailable: except BrowserUnavailable:
@ -580,7 +587,7 @@ class Repositories(object):
else: else:
raise ModuleInstallError('The last version of %s is already installed' % module.name) raise ModuleInstallError('The last version of %s is already installed' % module.name)
browser = StandardBrowser() browser = WeboobBrowser()
progress.progress(0.2, 'Downloading module...') progress.progress(0.2, 'Downloading module...')
try: try:
fp = browser.openurl(module.url) fp = browser.openurl(module.url)