svn commit: r1614610 - in /tika/trunk: tika-core/src/main/java/org/apache/tika/metadata/XMPDM.java tika-parsers/src/main/java/org/apache/tika/parser/mp3/ID3v1Handler.java

[ni...@apache.org]

Author: nick
Date: Wed Jul 30 10:57:49 2014
New Revision: 1614610

URL: http://svn.apache.org/r1614610
Log:
Partial TIKA-1377 patch from Dan Becker, with changes - add more XMPDM keys (in order), and add ID3v1 stubs for new tags which ID3v1 does not contain (in the same way as others)

Modified:
    tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPDM.java
    tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp3/ID3v1Handler.java

Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPDM.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPDM.java?rev=1614610&r1=1614609&r2=1614610&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPDM.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/metadata/XMPDM.java Wed Jul 30 10:57:49 2014
@@ -60,6 +60,11 @@ public interface XMPDM {
     Property ARTIST = Property.externalText("xmpDM:artist");
 
     /**
+     * "The name of the album artist or group for compilation albums."
+     */
+    Property ALBUM_ARTIST = Property.externalText("xmpDM:albumArtist");
+
+    /**
      * "The date and time when the audio was last modified."
      */
     Property AUDIO_MOD_DATE = Property.internalDate("xmpDM:audioModDate");
@@ -142,6 +147,11 @@ public interface XMPDM {
 //    Property BEAT_SPLICE_PARAMS = "xmpDM:beatSpliceParams";
 
     /**
+     * "An album created by various artists."
+     */
+    Property COMPILATION = Property.externalInteger("xmpDM:compilation");
+
+    /**
      * "The composer's name."
      */
     Property COMPOSER = Property.externalText("xmpDM:composer");
@@ -157,6 +167,11 @@ public interface XMPDM {
     Property COPYRIGHT = Property.externalText("xmpDM:copyright");
 
     /**
+     * "The disc number for part of an album set."
+     */
+    Property DISC_NUMBER = Property.externalInteger("xmpDM:discNumber");
+
+    /**
      * "The duration of the media file."
      */
     Property DURATION = Property.externalReal("xmpDM:duration");

Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp3/ID3v1Handler.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp3/ID3v1Handler.java?rev=1614610&r1=1614609&r2=1614610&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp3/ID3v1Handler.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/mp3/ID3v1Handler.java Wed Jul 30 10:57:49 2014
@@ -121,6 +121,30 @@ public class ID3v1Handler implements ID3
     }
 
     /**
+     * ID3v1 doesn't have album-wide artists,
+     *  so returns null;
+     */
+    public String getAlbumArtist() {
+        return null;
+    }
+
+    /**
+     * ID3v1 doesn't have disc numbers,
+     *  so returns null;
+     */
+    public String getDisc() {
+        return null;
+    }
+
+    /**
+     * ID3v1 doesn't have compilations,
+     *  so returns null;
+     */
+    public String getCompilation() {
+        return null;
+    }
+
+    /**
      * Returns the identified ISO-8859-1 substring from the given byte buffer.
      * The return value is the zero-terminated substring retrieved from
      * between the given start and end positions in the given byte buffer.