summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrFileFormatDetector.java11
-rw-r--r--songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java15
2 files changed, 18 insertions, 8 deletions
diff --git a/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrFileFormatDetector.java b/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrFileFormatDetector.java
index fd8dde4..125df35 100644
--- a/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrFileFormatDetector.java
+++ b/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrFileFormatDetector.java
@@ -11,17 +11,20 @@ import org.herac.tuxguitar.io.base.TGFileFormatDetector;
public class SongsterrFileFormatDetector implements TGFileFormatDetector {
public static final TGFileFormat FILE_FORMAT = new TGFileFormat("Songsterr JSON", "application/json",
- new String[] { "" });
+ new String[] { "json", "bin" });
@Override
public TGFileFormat getFileFormat(InputStream arg0) {
- JsonFactory factory = JsonFactory.builder().build();
+ byte[] b = new byte[5];
try {
- JsonParser p = factory.createParser(arg0);
+ arg0.read(b, 0, 5);
+ return FILE_FORMAT;
+ // JsonFactory factory = JsonFactory.builder().build();
+ // JsonParser p = factory.createParser(arg0);
} catch (IOException e) {
return null;
}
- return FILE_FORMAT;
+ // return FILE_FORMAT;
}
}
diff --git a/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java b/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java
index c57e829..3f98c11 100644
--- a/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java
+++ b/songsterr-reader/src/main/java/de/uvok/tuxguitar/SongsterrInputStream.java
@@ -1,11 +1,14 @@
package de.uvok.tuxguitar;
+import java.io.IOException;
+import java.io.InputStream;
+
import org.herac.tuxguitar.io.base.TGFileFormat;
import org.herac.tuxguitar.io.base.TGFileFormatException;
import org.herac.tuxguitar.io.base.TGSongReader;
import org.herac.tuxguitar.io.base.TGSongReaderHandle;
-public class SongsterrInputStream implements TGSongReader {
+public class SongsterrInputStream implements TGSongReader {
@Override
public TGFileFormat getFileFormat() {
@@ -14,8 +17,12 @@ public class SongsterrInputStream implements TGSongReader {
@Override
public void read(TGSongReaderHandle arg0) throws TGFileFormatException {
- // TODO Auto-generated method stub
- throw new UnsupportedOperationException("Unimplemented method 'read'");
+ InputStream is = arg0.getInputStream();
+ byte[] b = new byte[5];
+ try {
+ is.read(b, 0, 5);
+ } catch (IOException e) {
+ }
}
-
+
}