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 
Fixes: https://launchpad.net/bugs/1211049
This commit is contained in:
Raoul Snyman 2013-12-13 21:57:49 +02:00
parent 7c05f002ba
commit 730345b75e
1 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,7 @@ from subprocess import Popen, PIPE
import sys import sys
import urllib2 import urllib2
import urlparse import urlparse
from random import randint
from openlp.core.lib.settings import Settings from openlp.core.lib.settings import Settings
@ -60,6 +61,29 @@ UNO_CONNECTION_TYPE = u'pipe'
#UNO_CONNECTION_TYPE = u'socket' #UNO_CONNECTION_TYPE = u'socket'
CONTROL_CHARS = re.compile(r'[\x00-\x1F\x7F-\x9F]', re.UNICODE) CONTROL_CHARS = re.compile(r'[\x00-\x1F\x7F-\x9F]', re.UNICODE)
INVALID_FILE_CHARS = re.compile(r'[\\/:\*\?"<>\|\+\[\]%]', 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): class VersionThread(QtCore.QThread):
""" """
@ -364,6 +388,7 @@ def get_images_filter():
visible_formats, actual_formats) visible_formats, actual_formats)
return IMAGES_FILTER return IMAGES_FILTER
def is_not_image_file(file_name): def is_not_image_file(file_name):
""" """
Validate that the file is not an image file. Validate that the file is not an image file.
@ -380,6 +405,7 @@ def is_not_image_file(file_name):
return False return False
return True return True
def join_url(base, *args): def join_url(base, *args):
""" """
Join one or more url components with the base url. Join one or more url components with the base url.
@ -438,6 +464,17 @@ def delete_file(file_path_name):
return False 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): def get_web_page(url, header=None, update_openlp=False):
""" """
Attempts to download the webpage at url and returns that page or None. Attempts to download the webpage at url and returns that page or None.
@ -458,6 +495,9 @@ def get_web_page(url, header=None, update_openlp=False):
if not url: if not url:
return None return None
req = urllib2.Request(url) req = urllib2.Request(url)
user_agent = _get_user_agent()
log.debug(u'Using user agent: %s', unicode(user_agent))
req.add_header('User-Agent', user_agent)
if header: if header:
req.add_header(header[0], header[1]) req.add_header(header[0], header[1])
page = None page = None