forked from openlp/openlp
fix old versions
This commit is contained in:
parent
78078fb2ed
commit
fba6767e79
1
openlp/core/ui/media/vendor/vlc.py
vendored
1
openlp/core/ui/media/vendor/vlc.py
vendored
@ -107,7 +107,6 @@ def find_lib():
|
|||||||
except OSError: # may fail
|
except OSError: # may fail
|
||||||
dll = ctypes.CDLL('libvlc.so.5')
|
dll = ctypes.CDLL('libvlc.so.5')
|
||||||
elif sys.platform.startswith('win'):
|
elif sys.platform.startswith('win'):
|
||||||
ctypes.windll.kernel32.SetDllDirectoryW(None)
|
|
||||||
p = find_library('libvlc.dll')
|
p = find_library('libvlc.dll')
|
||||||
if p is None:
|
if p is None:
|
||||||
try: # some registry settings
|
try: # some registry settings
|
||||||
|
@ -28,9 +28,7 @@ from http.cookiejar import CookieJar
|
|||||||
from urllib.parse import urlencode
|
from urllib.parse import urlencode
|
||||||
from urllib.request import HTTPCookieProcessor, URLError, build_opener
|
from urllib.request import HTTPCookieProcessor, URLError, build_opener
|
||||||
from html.parser import HTMLParser
|
from html.parser import HTMLParser
|
||||||
if sys.version_info > (3, 4):
|
from html import unescape
|
||||||
from html import unescape
|
|
||||||
|
|
||||||
|
|
||||||
from bs4 import BeautifulSoup, NavigableString
|
from bs4 import BeautifulSoup, NavigableString
|
||||||
|
|
||||||
@ -132,18 +130,11 @@ class SongSelectImport(object):
|
|||||||
if not search_results:
|
if not search_results:
|
||||||
break
|
break
|
||||||
for result in search_results:
|
for result in search_results:
|
||||||
if sys.version_info > (3, 4):
|
|
||||||
song = {
|
song = {
|
||||||
'title': unescape(result.find('h3').string),
|
'title': unescape(result.find('h3').string),
|
||||||
'authors': [unescape(author.string) for author in result.find_all('li')],
|
'authors': [unescape(author.string) for author in result.find_all('li')],
|
||||||
'link': BASE_URL + result.find('a')['href']
|
'link': BASE_URL + result.find('a')['href']
|
||||||
}
|
}
|
||||||
else:
|
|
||||||
song = {
|
|
||||||
'title': self.html_parser.unescape(result.find('h3').string),
|
|
||||||
'authors': [self.html_parser.unescape(author.string) for author in result.find_all('li')],
|
|
||||||
'link': BASE_URL + result.find('a')['href']
|
|
||||||
}
|
|
||||||
if callback:
|
if callback:
|
||||||
callback(song)
|
callback(song)
|
||||||
songs.append(song)
|
songs.append(song)
|
||||||
@ -177,10 +168,7 @@ class SongSelectImport(object):
|
|||||||
if callback:
|
if callback:
|
||||||
callback()
|
callback()
|
||||||
song['copyright'] = '/'.join([li.string for li in song_page.find('ul', 'copyright').find_all('li')])
|
song['copyright'] = '/'.join([li.string for li in song_page.find('ul', 'copyright').find_all('li')])
|
||||||
if sys.version_info > (3, 4):
|
|
||||||
song['copyright'] = unescape(song['copyright'])
|
song['copyright'] = unescape(song['copyright'])
|
||||||
else:
|
|
||||||
song['copyright'] = self.html_parser.unescape(song['copyright'])
|
|
||||||
song['ccli_number'] = song_page.find('ul', 'info').find('li').string.split(':')[1].strip()
|
song['ccli_number'] = song_page.find('ul', 'info').find('li').string.split(':')[1].strip()
|
||||||
song['verses'] = []
|
song['verses'] = []
|
||||||
verses = lyrics_page.find('section', 'lyrics').find_all('p')
|
verses = lyrics_page.find('section', 'lyrics').find_all('p')
|
||||||
@ -193,15 +181,9 @@ class SongSelectImport(object):
|
|||||||
else:
|
else:
|
||||||
verse['lyrics'] += '\n'
|
verse['lyrics'] += '\n'
|
||||||
verse['lyrics'] = verse['lyrics'].strip(' \n\r\t')
|
verse['lyrics'] = verse['lyrics'].strip(' \n\r\t')
|
||||||
if sys.version_info > (3, 4):
|
|
||||||
song['verses'].append(unescape(verse))
|
song['verses'].append(unescape(verse))
|
||||||
else:
|
|
||||||
song['verses'].append(self.html_parser.unescape(verse))
|
|
||||||
for counter, author in enumerate(song['authors']):
|
for counter, author in enumerate(song['authors']):
|
||||||
if sys.version_info > (3, 4):
|
|
||||||
song['authors'][counter] = unescape(author)
|
song['authors'][counter] = unescape(author)
|
||||||
else:
|
|
||||||
song['authors'][counter] = self.html_parser.unescape(author)
|
|
||||||
return song
|
return song
|
||||||
|
|
||||||
def save_song(self, song):
|
def save_song(self, song):
|
||||||
|
Loading…
Reference in New Issue
Block a user