You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2021/06/15 16:18:47 UTC
[tika] branch main updated: TIKA-3412 -- checkstyle and logic
improvements
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
The following commit(s) were added to refs/heads/main by this push:
new f230a9a TIKA-3412 -- checkstyle and logic improvements
f230a9a is described below
commit f230a9ab575c481a5130a3cbe0285a0b57ff48e0
Author: tallison <ta...@apache.org>
AuthorDate: Tue Jun 15 12:18:17 2021 -0400
TIKA-3412 -- checkstyle and logic improvements
---
.../java/org/apache/tika/parser/mp4/LegacyMP4Parser.java | 4 ++++
.../main/java/org/apache/tika/parser/mp4/MP4Parser.java | 10 +++++-----
.../org/apache/tika/parser/mp4/TikaMp4BoxHandler.java | 16 ++++++++++++++++
.../org/apache/tika/parser/mp4/LegacyMP4ParserTest.java | 5 -----
4 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/LegacyMP4Parser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/LegacyMP4Parser.java
index 5a2936c..f1ff774 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/LegacyMP4Parser.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/LegacyMP4Parser.java
@@ -80,7 +80,11 @@ import org.apache.tika.sax.XHTMLContentHandler;
* <p>
* This uses the MP4Parser project from http://code.google.com/p/mp4parser/
* to do the underlying parsing
+ * <p>
+ * This class is deprecated and will be removed in Tika 2.x.
+ * </p>
*/
+@Deprecated
public class LegacyMP4Parser extends AbstractParser {
/**
* Serial version UID
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java
index 00861e7..6163927 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/MP4Parser.java
@@ -16,7 +16,6 @@
*/
package org.apache.tika.parser.mp4;
-import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
@@ -36,7 +35,6 @@ import java.util.Set;
import com.drew.imaging.mp4.Mp4Reader;
import com.drew.metadata.Directory;
import com.drew.metadata.MetadataException;
-import com.drew.metadata.Tag;
import com.drew.metadata.mp4.Mp4BoxHandler;
import com.drew.metadata.mp4.Mp4Directory;
import com.drew.metadata.mp4.media.Mp4SoundDirectory;
@@ -203,13 +201,15 @@ public class MP4Parser extends AbstractParser {
try {
long numerator = Long.parseLong(bits[0]);
long denominator = Long.parseLong(bits[1]);
- durationSeconds = (double)numerator/(double)denominator;
+ if (denominator != 0) {
+ durationSeconds = (double) numerator / (double) denominator;
+ // Get the duration
+ metadata.set(XMPDM.DURATION, DURATION_FORMAT.format(durationSeconds));
+ }
} catch (NumberFormatException e) {
//log
return;
}
- // Get the duration
- metadata.set(XMPDM.DURATION, DURATION_FORMAT.format(durationSeconds));
}
private void handleBrands(Mp4Directory mp4Directory, Metadata metadata) {
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/TikaMp4BoxHandler.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/TikaMp4BoxHandler.java
index 6cb6ccc..0675110 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/TikaMp4BoxHandler.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/main/java/org/apache/tika/parser/mp4/TikaMp4BoxHandler.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.tika.parser.mp4;
import java.io.IOException;
diff --git a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp4/LegacyMP4ParserTest.java b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp4/LegacyMP4ParserTest.java
index f00394c..31f565f 100644
--- a/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp4/LegacyMP4ParserTest.java
+++ b/tika-parsers/tika-parsers-standard/tika-parsers-standard-modules/tika-parser-audiovideo-module/src/test/java/org/apache/tika/parser/mp4/LegacyMP4ParserTest.java
@@ -18,8 +18,6 @@ package org.apache.tika.parser.mp4;
import static org.junit.Assert.assertEquals;
-import java.util.Arrays;
-
import org.junit.Test;
import org.xml.sax.ContentHandler;
@@ -82,9 +80,6 @@ public class LegacyMP4ParserTest extends TikaTest {
assertEquals("iTunes 10.5.3.3", metadata.get(XMP.CREATOR_TOOL));
- assertContains("org.apache.tika.parser.mp4.LegacyMP4Parser",
- Arrays.asList(metadata.getValues(TikaCoreProperties.TIKA_PARSED_BY)));
-
// Check again by file, rather than stream
TikaInputStream tstream =