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

Imported just 'which' from shutil, instead of the complete module. Also set the default song search to search as type.

Browse Source
This commit is contained in:
Tomas Groth 2014-12-06 20:08:42 +00:00
parent 402e91f688
commit 4123b9af1d
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openlp/core/ui/servicemanager.py
View File

@ -747,8 +747,7 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ServiceManage
'File is not a valid service.\n The content encoding is not UTF-8.')) 'File is not a valid service.\n The content encoding is not UTF-8.'))
continue continue
os_file = ucs_file.replace('/', os.path.sep) os_file = ucs_file.replace('/', os.path.sep)
if not os_file.startswith('audio'): os_file = os.path.basename(os_file)
os_file = os.path.split(os_file)[1]
self.log_debug('Extract file: %s' % os_file) self.log_debug('Extract file: %s' % os_file)
zip_info.filename = os_file zip_info.filename = os_file
zip_file.extract(zip_info, self.service_path) zip_file.extract(zip_info, self.service_path)

6
openlp/plugins/presentations/lib/pdfcontroller.py
View File

@ -31,7 +31,7 @@ import os
import logging import logging
from tempfile import NamedTemporaryFile from tempfile import NamedTemporaryFile
import re import re
import shutil from shutil import which
from subprocess import check_output, CalledProcessError, STDOUT from subprocess import check_output, CalledProcessError, STDOUT
from openlp.core.utils import AppLocation from openlp.core.utils import AppLocation
@ -145,10 +145,10 @@ class PdfController(PresentationController):
else: else:
DEVNULL = open(os.devnull, 'wb') DEVNULL = open(os.devnull, 'wb')
# First try to find mupdf # First try to find mupdf
self.mudrawbin = shutil.which('mudraw') self.mudrawbin = which('mudraw')
# if mupdf isn't installed, fallback to ghostscript # if mupdf isn't installed, fallback to ghostscript
if not self.mudrawbin: if not self.mudrawbin:
self.gsbin = shutil.which('gs') self.gsbin = which('gs')
# Last option: check if mudraw is placed in OpenLP base folder # Last option: check if mudraw is placed in OpenLP base folder
if not self.mudrawbin and not self.gsbin: if not self.mudrawbin and not self.gsbin:
application_path = AppLocation.get_directory(AppLocation.AppDir) application_path = AppLocation.get_directory(AppLocation.AppDir)

2
openlp/plugins/songs/songsplugin.py
View File

@ -60,7 +60,7 @@ __default_settings__ = {
'songs/last search type': SongSearch.Entire, 'songs/last search type': SongSearch.Entire,
'songs/last import type': SongFormat.OpenLyrics, 'songs/last import type': SongFormat.OpenLyrics,
'songs/update service on edit': False, 'songs/update service on edit': False,
'songs/search as type': False, 'songs/search as type': True,
'songs/add song from service': True, 'songs/add song from service': True,
'songs/display songbar': True, 'songs/display songbar': True,
'songs/display songbook': False, 'songs/display songbook': False,