fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-28 18:43:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:musicbrainz/picard

Browse Source
This commit is contained in:
Wieland Hoffmann
2017-01-29 15:53:30 +01:00
parent 605e225b3e ffcbbec156
commit 7075b1935f
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -4,7 +4,7 @@ stages:
variables:
CHROMAPRINT_FPCALC_VERSION: "1.4.2"
DISCID_VERSION: "0.6.1"
PYTHON_DISCID_VERSION: "1.1.0"
PYTHON_DISCID_VERSION: "1.1.1"
MUTAGEN_VERSION: "1.36"
package win:

14
picard/tagger.py
View File

@@ -151,7 +151,7 @@ class Tagger(QtGui.QApplication):
log.debug("Platform: %s %s %s", platform.platform(),
platform.python_implementation(), platform.python_version())
log.debug("Versions: %s", versions.as_string())
log.debug("Configuration file path: %s", config.config.fileName())
log.debug("Configuration file path: %r", config.config.fileName())
# TODO remove this before the final release
if sys.platform == "win32":
@@ -160,12 +160,12 @@ class Tagger(QtGui.QApplication):
olduserdir = "~/.picard"
olduserdir = os.path.expanduser(olduserdir)
if os.path.isdir(olduserdir):
log.info("Moving %s to %s", olduserdir, USER_DIR)
log.info("Moving %r to %r", olduserdir, USER_DIR)
try:
shutil.move(olduserdir, USER_DIR)
except:
pass
log.debug("User directory: %s", os.path.abspath(USER_DIR))
log.debug("User directory: %r", os.path.abspath(USER_DIR))
# for compatibility with pre-1.3 plugins
QtCore.QObject.tagger = self
@@ -356,10 +356,10 @@ class Tagger(QtGui.QApplication):
for filename in filenames:
filename = os.path.normpath(os.path.realpath(filename))
if ignore_hidden and is_hidden(filename):
log.debug("File ignored (hidden): %s" % (filename))
log.debug("File ignored (hidden): %r" % (filename))
continue
if ignoreregex is not None and ignoreregex.search(filename):
log.info("File ignored (matching %s): %s" % (pattern, filename))
log.info("File ignored (matching %r): %r" % (pattern, filename))
continue
if filename not in self.files:
file = open_file(filename)
@@ -399,7 +399,7 @@ class Tagger(QtGui.QApplication):
'count': number_of_files,
'directory': root,
}
log.debug("Adding %(count)d files from '%(directory)s'" %
log.debug("Adding %(count)d files from '%(directory)r'" %
mparms)
self.window.set_statusbar_message(
ungettext(
@@ -432,7 +432,7 @@ class Tagger(QtGui.QApplication):
'count': number_of_files,
'directory': path,
}
log.debug("Adding %(count)d files from '%(directory)s'" %
log.debug("Adding %(count)d files from '%(directory)r'" %
mparms)
self.window.set_statusbar_message(
ungettext(

2
picard/ui/mainwindow.py
View File

@@ -799,7 +799,7 @@ class MainWindow(QtGui.QMainWindow):
def open_folder(self):
files = self.tagger.get_files_from_objects(self.selected_objects)
folders = set([os.path.realpath(os.path.dirname(f.filename)) for f in files])
folders = set([os.path.dirname(f.filename) for f in files])
for folder in folders:
QtGui.QDesktopServices.openUrl(self._openUrl(folder))

2
scripts/package-osx.sh
View File

@@ -15,7 +15,7 @@ virtualenv -p python2.7 --system-site-packages e
. e/bin/activate
pip install mutagen==$MUTAGEN_VERSION
pip install https://github.com/JonnyJD/python-discid/archive/dmg.zip # XXX can't use $PYTHON_DISCID_VERSION
pip install discid==$PYTHON_DISCID_VERSION
pip install py2app
perl -pi -e 's{plugin_dir = (.*)$}{plugin_dir = "/Developer/Applications/Qt/plugins"}' e/lib/python2.7/site-packages/py2app/recipes/sip.py