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

File list refactor

Browse Source
This commit is contained in:
Jon Tibble 2010-04-28 00:49:21 +01:00
parent c626653092
commit 5a8cd52acf
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
openlp/core/lib/settingsmanager.py
View File

@ -1,3 +1,4 @@
import os.path
# -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
@ -153,15 +154,15 @@ class SettingsManager(object):
return list
@staticmethod
def get_files(section=None, suffix=None):
def get_files(section=None, extension=None):
"""
Get a list of files from the data files path.
``section``
Defaults to *None*. The section of code getting the files - used
to load from section directory.
to load from a section's data subdirectory.
``suffix``
``extension``
Defaults to *None*. The extension to search for.
"""
path = AppLocation.get_data_path()
@ -171,17 +172,9 @@ class SettingsManager(object):
files = os.listdir(path)
except:
return []
if suffix:
return_files = []
for file in files:
if file.find(u'.') != -1:
filename = file.split(u'.')
filesuffix = filename[1].lower()
filesuffix = filesuffix.lower()
# only load files with the correct suffix
if suffix.find(filesuffix) > -1 :
return_files.append(file)
return return_files
if extension:
return [file for file in files
if extension == os.path.splitext(file)[1]]
else:
# no filtering required
return files

2
openlp/plugins/bibles/lib/manager.py
View File

@ -114,7 +114,7 @@ class BibleManager(object):
self.path = AppLocation.get_section_data_path(u'bibles')
self.proxy_name = unicode(
QtCore.QSettings().value(u'bibles/proxy name', u'').toString())
self.suffix = u'sqlite'
self.suffix = u'.sqlite'
self.import_wizard = None
self.reload_bibles()
self.media = None