openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Minor cleanups

This commit is contained in:
Tim Bentley 2023-07-24 14:23:04 +00:00 committed by Raoul Snyman
parent ceda811e70
commit 08ae435592
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openlp/plugins/songs/lib/songselect.py
View File

@ -24,7 +24,7 @@ The :mod:`~openlp.plugins.songs.lib.songselect` module contains the SongSelect i
import logging
import re
from html import unescape
from urllib.request import URLError
from urllib.error import URLError
from PyQt5 import QtCore
from bs4 import BeautifulSoup, NavigableString
@ -78,14 +78,14 @@ class SongSelectImport(object):
"""
current_url_host = self.webview.page().url().host()
current_url_path = self.webview.page().url().path()
if (current_url_host == QtCore.QUrl(LOGIN_URL).host() and current_url_path == QtCore.QUrl(LOGIN_PAGE).path()):
if current_url_host == QtCore.QUrl(LOGIN_URL).host() and current_url_path == QtCore.QUrl(LOGIN_PAGE).path():
return Pages.Login
elif (current_url_host == QtCore.QUrl(BASE_URL).host()):
if (current_url_path == '/' or current_url_path == ''):
elif current_url_host == QtCore.QUrl(BASE_URL).host():
if current_url_path == '/' or current_url_path == '':
return Pages.Home
elif (current_url_path == QtCore.QUrl(SEARCH_URL).path()):
elif current_url_path == QtCore.QUrl(SEARCH_URL).path():
return Pages.Search
elif (self.get_song_number_from_url(current_url_path) is not None):
elif self.get_song_number_from_url(current_url_path) is not None:
return Pages.Song
return Pages.Other

1
setup.py
View File

@ -106,7 +106,6 @@ using a computer and a display/projector.""",
'flask-cors',
'lxml',
'Mako',
"pillow",
'PyICU',
'pymediainfo >= 2.2',
'pyobjc; platform_system=="Darwin"',