raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug #1211049: select a user agent from a list, depending on the platform.

Browse Source 
bzr-revno: 2183
Fixes: https://launchpad.net/bugs/1211049
This commit is contained in:
Raoul Snyman 2013-12-29 00:23:30 +02:00
commit e56593c2c2
2 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openlp/core/ui/firsttimeform.py
View File

@ -45,7 +45,7 @@ from openlp.core.lib import translate, PluginStatus, Receiver, build_icon, \
check_directory_exists
from openlp.core.lib.settings import Settings
from openlp.core.utils import get_web_page, AppLocation, join_url, \
get_filesystem_encoding
get_filesystem_encoding, get_application_version
from firsttimewizard import Ui_FirstTimeWizard, FirstTimePage
log = logging.getLogger(__name__)
@ -106,7 +106,8 @@ class FirstTimeForm(QtGui.QWizard, Ui_FirstTimeWizard):
# url is defined in 'download.cfg' file.
self.baseurl = None
# Check to see if we have web access
self.webAccess = get_web_page(u'%s%s' % (self.web, u'download.cfg'))
user_agent = u'OpenLP/' + get_application_version()[u'version']
self.webAccess = get_web_page(u'%s%s' % (self.web, u'download.cfg'), header=(u'User-Agent', user_agent))
if self.webAccess:
files = self.webAccess.read()
self.config.readfp(io.BytesIO(files))

42
openlp/core/utils/__init__.py
View File

@ -38,6 +38,7 @@ from subprocess import Popen, PIPE
import sys
import urllib2
import urlparse
from random import randint
from openlp.core.lib.settings import Settings
@ -60,6 +61,27 @@ UNO_CONNECTION_TYPE = u'pipe'
#UNO_CONNECTION_TYPE = u'socket'
CONTROL_CHARS = re.compile(r'[\x00-\x1F\x7F-\x9F]', re.UNICODE)
INVALID_FILE_CHARS = re.compile(r'[\\/:\*\?"<>\|\+\[\]%]', re.UNICODE)
USER_AGENTS = {
u'win32': [
'Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.101 Safari/537.36',
'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.101 Safari/537.36',
'Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.71 Safari/537.36'
],
u'darwin': [
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.43 Safari/537.31',
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_3) AppleWebKit/536.11 (KHTML, like Gecko) Chrome/20.0.1132.57 Safari/536.11',
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/536.11 (KHTML, like Gecko) Chrome/20.0.1132.47 Safari/536.11'
],
u'linux2': [
'Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.22 (KHTML, like Gecko) Ubuntu Chromium/25.0.1364.160 Chrome/25.0.1364.160 Safari/537.22',
'Mozilla/5.0 (X11; CrOS armv7l 2913.260.0) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.99 Safari/537.11',
'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.27 (KHTML, like Gecko) Chrome/26.0.1389.0 Safari/537.27'
],
u'default': [
'Mozilla/5.0 (X11; NetBSD amd64; rv:18.0) Gecko/20130120 Firefox/18.0'
]
}
class VersionThread(QtCore.QThread):
"""
@ -364,6 +386,7 @@ def get_images_filter():
visible_formats, actual_formats)
return IMAGES_FILTER
def is_not_image_file(file_name):
"""
Validate that the file is not an image file.
@ -380,6 +403,7 @@ def is_not_image_file(file_name):
return False
return True
def join_url(base, *args):
"""
Join one or more url components with the base url.
@ -438,6 +462,17 @@ def delete_file(file_path_name):
return False
def _get_user_agent():
"""
Return a user agent customised for the platform the user is on.
"""
browser_list = USER_AGENTS.get(sys.platform, None)
if not browser_list:
browser_list = USER_AGENTS[u'default']
random_index = randint(0, len(browser_list) - 1)
return browser_list[random_index]
def get_web_page(url, header=None, update_openlp=False):
"""
Attempts to download the webpage at url and returns that page or None.
@ -458,8 +493,11 @@ def get_web_page(url, header=None, update_openlp=False):
if not url:
return None
req = urllib2.Request(url)
if header:
req.add_header(header[0], header[1])
if not header or header[0].lower() != u'user-agent':
user_agent = _get_user_agent()
req.add_header('User-Agent', str(user_agent))
elif header:
req.add_header(str(header[0]), str(header[1]))
page = None
log.debug(u'Downloading URL = %s' % url)
try: