* some minor adjustments

This commit is contained in:
Reinhard Pointner 2009-07-29 22:09:10 +00:00
parent 3956b61127
commit d85d6c6356
3 changed files with 19 additions and 25 deletions

View File

@ -21,6 +21,14 @@
<!-- main jar --> <!-- main jar -->
<jar destfile="${dir.dist}/filebot.jar"> <jar destfile="${dir.dist}/filebot.jar">
<manifest>
<attribute name="Built-By" value="${user.name}" />
<attribute name="Built-Date" value="${today}" />
<attribute name="Application-Name" value="${title}" />
<attribute name="Application-Version" value="${version}" />
<attribute name="Main-Class" value="net.sourceforge.filebot.Main" />
</manifest>
<fileset dir="${dir.build}" excludes="**/*Test*" /> <fileset dir="${dir.build}" excludes="**/*Test*" />
</jar> </jar>
@ -36,16 +44,8 @@
<mkdir dir="${dir.dist}/fatjar" /> <mkdir dir="${dir.dist}/fatjar" />
<jar destfile="${dir.dist}/fatjar/FileBot.jar" filesetmanifest="merge" duplicate="fail"> <jar destfile="${dir.dist}/fatjar/FileBot.jar" filesetmanifest="merge" duplicate="fail">
<manifest> <!-- include main jar -->
<attribute name="Built-By" value="${user.name}" /> <zipfileset src="${dir.dist}/filebot.jar" />
<attribute name="Built-Date" value="${today}" />
<attribute name="Application-Name" value="${title}" />
<attribute name="Application-Version" value="${version}" />
<attribute name="Main-Class" value="net.sourceforge.filebot.Main" />
</manifest>
<!-- include build -->
<fileset dir="${dir.build}" excludes="**/*Test*" />
<!-- include libs --> <!-- include libs -->
<zipfileset src="${dir.lib}/xercesImpl.jar"> <zipfileset src="${dir.lib}/xercesImpl.jar">

View File

@ -290,15 +290,15 @@ class EpisodeBindingDialog extends JDialog {
File selectedFile = chooser.getSelectedFile(); File selectedFile = chooser.getSelectedFile();
if (selectedFile.isFile()) { if (selectedFile.isFile()) {
// update text field
mediaFileTextField.setText(selectedFile.getAbsolutePath());
// display media info
try { try {
// display media info
MediaInfoPane.showMessageDialog(getWindow(evt.getSource()), selectedFile); MediaInfoPane.showMessageDialog(getWindow(evt.getSource()), selectedFile);
} catch (LinkageError e) { } catch (LinkageError e) {
Logger.getLogger("ui").log(Level.SEVERE, "Unable to load native library 'mediainfo'", e); Logger.getLogger("ui").log(Level.SEVERE, "Unable to load native library 'mediainfo'", e);
} }
// update text field
mediaFileTextField.setText(selectedFile.getAbsolutePath());
} }
} }
} }

View File

@ -22,8 +22,8 @@ expr[c4]: crc32
# media info expressions [media] # media info expressions [media]
expr[d1]: media.title expr[d1]: media.title
expr[d2]: media.Duration_String expr[d2]: media.DurationString
expr[d3]: media.OverallBitRate_String expr[d3]: media.OverallBitRateString
# media info expressions [video] # media info expressions [video]
expr[e1]: video.Codec expr[e1]: video.Codec
@ -35,15 +35,9 @@ expr[e5]: video.InterlacementString
# media info expressions [audio] # media info expressions [audio]
expr[f1]: audio.Codec expr[f1]: audio.Codec
expr[f2]: audio.Channels expr[f2]: audio.Channels
expr[f3]: audio.BitRate_String expr[f3]: audio.BitRateString
expr[f4]: audio.Language expr[f4]: audio.Language
# media info expressions [text] # media info expressions [text]
expr[g1]: text.CodecInfo expr[g1]: text.CodecInfo
expr[g2]: text.Language expr[g2]: text.Language
# fundamental media info expressions
expr[h1]: media
expr[h2]: video
expr[h3]: audio
expr[h4]: text