Merge branch 'subtree'

[nikiroo-utils.git] / src / be / nikiroo / fanfix / supported / InfoText.java

diff --git a/src/be/nikiroo/fanfix/supported/InfoText.java b/src/be/nikiroo/fanfix/supported/InfoText.java
index 42e2c13b6f75a1e32afa10f560361c1670ea9572..2af8c7e2f4880139540aa6f7f4e4895fd6e4742d 100644 (file)
--- a/src/be/nikiroo/fanfix/supported/InfoText.java
+++ b/src/be/nikiroo/fanfix/supported/InfoText.java
@@ -22,30 +22,7 @@ class InfoText extends Text {
 
        @Override
        protected MetaData getMeta() throws IOException {
-               MetaData meta = InfoReader.readMeta(getInfoFile(), true);
-
-               // Some old .info files don't have those now required fields...
-               String test = meta.getTitle() == null ? "" : meta.getTitle();
-               test += meta.getAuthor() == null ? "" : meta.getAuthor();
-               test += meta.getDate() == null ? "" : meta.getDate();
-               test += meta.getUrl() == null ? "" : meta.getUrl();
-               if (test.isEmpty()) {
-                       MetaData superMeta = super.getMeta();
-                       if (meta.getTitle() == null || meta.getTitle().isEmpty()) {
-                               meta.setTitle(superMeta.getTitle());
-                       }
-                       if (meta.getAuthor() == null || meta.getAuthor().isEmpty()) {
-                               meta.setAuthor(superMeta.getAuthor());
-                       }
-                       if (meta.getDate() == null || meta.getDate().isEmpty()) {
-                               meta.setDate(superMeta.getDate());
-                       }
-                       if (meta.getUrl() == null || meta.getUrl().isEmpty()) {
-                               meta.setUrl(superMeta.getUrl());
-                       }
-               }
-
-               return meta;
+               return InfoReader.readMeta(getInfoFile(), true);
        }
 
        @Override