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

test fixes

Browse Source
This commit is contained in:
Philip Ridout 2017-08-02 07:09:38 +01:00
parent 17fb6ba835
commit e787896931
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openlp/core/common/applocation.py
View File

@ -87,7 +87,7 @@ class AppLocation(object):
def get_data_path(): def get_data_path():
""" """
Return the path OpenLP stores all its data under. Return the path OpenLP stores all its data under.
:return: The data path to use. :return: The data path to use.
:rtype: pathlib.Path :rtype: pathlib.Path
""" """
@ -103,15 +103,15 @@ class AppLocation(object):
def get_files(section=None, extension=''): def get_files(section=None, extension=''):
""" """
Get a list of files from the data files path. Get a list of files from the data files path.
:param section: Defaults to *None*. The section of code getting the files - used to load from a section's data :param section: Defaults to *None*. The section of code getting the files - used to load from a section's data
subdirectory. subdirectory.
:type section: None | str :type section: None | str
:param extension: Defaults to ''. The extension to search for. For example:: :param extension: Defaults to ''. The extension to search for. For example::
'.png' '.png'
:type extension: str :type extension: str
:return: List of files found. :return: List of files found.
:rtype: list[pathlib.Path] :rtype: list[pathlib.Path]
""" """
@ -141,10 +141,10 @@ class AppLocation(object):
def _get_os_dir_path(dir_type): def _get_os_dir_path(dir_type):
""" """
Return a path based on which OS and environment we are running in. Return a path based on which OS and environment we are running in.
:param dir_type: AppLocation Enum of the requested path type :param dir_type: AppLocation Enum of the requested path type
:type dir_type: AppLocation Enum :type dir_type: AppLocation Enum
:return: The requested path :return: The requested path
:rtype: pathlib.Path :rtype: pathlib.Path
""" """

2
openlp/core/lib/path.py
View File

@ -58,4 +58,4 @@ def str_to_path(string):
raise TypeError('parameter \'string\' must be of type str') raise TypeError('parameter \'string\' must be of type str')
if string == '': if string == '':
return None return None
return Path(string) return Path(string)

2
openlp/plugins/bibles/lib/importers/http.py
View File

@ -773,7 +773,7 @@ def get_soup_for_bible_ref(reference_url, header=None, pre_parse_regex=None, pre
return None return None
try: try:
page = get_web_page(reference_url, header, True) page = get_web_page(reference_url, header, True)
except: except Exception as e:
page = None page = None
if not page: if not page:
send_error_message('download') send_error_message('download')

3
openlp/plugins/songs/lib/mediaitem.py
View File

@ -533,7 +533,8 @@ class SongMediaItem(MediaManagerItem):
'copy', 'For song cloning')) 'copy', 'For song cloning'))
# Copy audio files from the old to the new song # Copy audio files from the old to the new song
if len(old_song.media_files) > 0: if len(old_song.media_files) > 0:
save_path = os.path.join(str(AppLocation.get_section_data_path(self.plugin.name)), 'audio', str(new_song.id)) save_path = os.path.join(
str(AppLocation.get_section_data_path(self.plugin.name)), 'audio', str(new_song.id))
check_directory_exists(save_path) check_directory_exists(save_path)
for media_file in old_song.media_files: for media_file in old_song.media_files:
new_media_file_name = os.path.join(save_path, os.path.basename(media_file.file_name)) new_media_file_name = os.path.join(save_path, os.path.basename(media_file.file_name))

2
tests/functional/openlp_core_lib/test_path.py
View File

@ -85,4 +85,4 @@ class TestPath(TestCase):
result = str_to_path('') result = str_to_path('')
# THEN: `path_to_str` should return None # THEN: `path_to_str` should return None
self.assertEqual(result, None) self.assertEqual(result, None)