ITGreader invalid data fix

Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2 years ago · baf1916417
parent d7115ef89f
commit baf1916417
25 changed files with 18 additions and 11 deletions
--- a/bin/ArcadeReader$1.class
+++ b/bin/ArcadeReader$1.class
--- a/bin/ArcadeReader.class
+++ b/bin/ArcadeReader.class
--- a/bin/exceptions/FailedResponseException.class
+++ b/bin/exceptions/FailedResponseException.class
--- a/bin/readers/Box.class
+++ b/bin/readers/Box.class
--- a/bin/readers/ColorRange.class
+++ b/bin/readers/ColorRange.class
--- a/bin/readers/DDRReader.class
+++ b/bin/readers/DDRReader.class
--- a/bin/readers/ITGReader.class
+++ b/bin/readers/ITGReader.class
--- a/bin/readers/LoveLiveReader.class
+++ b/bin/readers/LoveLiveReader.class
--- a/bin/readers/PopnReader.class
+++ b/bin/readers/PopnReader.class
--- a/bin/readers/Reader.class
+++ b/bin/readers/Reader.class
--- a/bin/readers/SoundVoltexReader.class
+++ b/bin/readers/SoundVoltexReader.class
--- a/bin/readers/TestReader.class
+++ b/bin/readers/TestReader.class
--- a/bin/readers/fonts/Font.class
+++ b/bin/readers/fonts/Font.class
--- a/bin/readers/fonts/Glyph.class
+++ b/bin/readers/fonts/Glyph.class
--- a/bin/requests/GETRequest$1.class
+++ b/bin/requests/GETRequest$1.class
--- a/bin/requests/GETRequest.class
+++ b/bin/requests/GETRequest.class
--- a/bin/requests/MultipartUtility.class
+++ b/bin/requests/MultipartUtility.class
--- a/bin/requests/POSTRequest$1.class
+++ b/bin/requests/POSTRequest$1.class
--- a/bin/requests/POSTRequest.class
+++ b/bin/requests/POSTRequest.class
--- a/bin/sigPlace.class
+++ b/bin/sigPlace.class
--- a/bin/sigServer.class
+++ b/bin/sigServer.class
--- a/readers/ITGReader.java
+++ b/readers/ITGReader.java
@ -170,14 +170,19 @@ public class ITGReader extends Reader{
            case 0:{
                Font f = Font.FONT_ITG_EX;
                List<Glyph> glyphs = Glyph.split(cutImg);
-                glyphs.remove(glyphs.size()-3);
+                if (glyphs.size()>=3) {
+                    glyphs.remove(glyphs.size()-3);
+                }
                String res = f.convertGlyphs(glyphs);
                return res.substring(0,res.length()-2)+"."+res.substring(res.length()-2,res.length());
+
            }
            case 7:{
                Font f = Font.FONT_ITG_PCT;
                List<Glyph> glyphs = Glyph.split(cutImg);
-                glyphs.remove(glyphs.size()-3);
+                if (glyphs.size()>=3) {
+                    glyphs.remove(glyphs.size()-3);
+                }
                String res = f.convertGlyphs(glyphs);
                return res.substring(0,res.length()-2)+"."+res.substring(res.length()-2,res.length());
            }
--- a/requests/GETRequest.java
+++ b/requests/GETRequest.java
@ -50,7 +50,7 @@ public class GETRequest{
        this(url,timeout,null,headers);
    }
    public GETRequest(String url){
-        this(url,30000,null);
+        this(url,30000,(String[])null);
    }
    public HttpResponse<?> run() throws FailedResponseException {
        build();
--- a/sigPlace.jar
+++ b/sigPlace.jar
--- a/sigPlace.java
+++ b/sigPlace.java
@ -110,15 +110,17 @@ public class sigPlace {
                    }
                    final Path temp = Paths.get("temp.png");
                    Reader result = ArcadeReader.interpret(screenshot);
-                    System.out.println("Detected as "+result.getClass().getSimpleName());
-                    ImageIO.write(screenshot,"png",temp.toFile());
-                    result.interpretBoxes(temp, true);
-                    if (result.isReasonableData()) {
-                        System.out.println("Data is reasonable, prepare for submitting...");
+                    if (result!=null) {
+                        System.out.println("Detected as "+result.getClass().getSimpleName());
+                        ImageIO.write(screenshot,"png",temp.toFile());
+                        result.interpretBoxes(temp, true);
+                        if (result.isReasonableData()) {
+                            System.out.println("Data is reasonable, prepare for submitting...");
+                        }
+                        /*if (result.isReasonableData()) {
+                            POSTRequest postRes = new POSTRequest("http://"+args[0]+"/uploadform.html",Path.of("..",filename));
+                        }*/
                    }
-                    /*if (result.isReasonableData()) {
-					    POSTRequest postRes = new POSTRequest("http://"+args[0]+"/uploadform.html",Path.of("..",filename));
-                    }*/
                    Thread.sleep(50);
                }
            } catch (AWTException | InterruptedException | IOException e) {