X-Git-Url: https://git.hedgecode.org/?p=chesshog-scanner.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fhedgecode%2Fchess%2Fscanner%2Fportal%2FChessGamesScanner.java;fp=src%2Fmain%2Fjava%2Forg%2Fhedgecode%2Fchess%2Fscanner%2Fportal%2FChessGamesScanner.java;h=56fc032d4c3a1f1c494bb9c953b658a4ee94717e;hp=247660a23e4051a421c489a2eef6e16636f7ca4b;hb=6e3a8590a26312b6cea579777db885107cae88df;hpb=df574e5ec8ae08c1c50adbe30b597cd86e6ab3fa

diff --git a/src/main/java/org/hedgecode/chess/scanner/portal/ChessGamesScanner.java b/src/main/java/org/hedgecode/chess/scanner/portal/ChessGamesScanner.java
index 247660a..56fc032 100644
--- a/src/main/java/org/hedgecode/chess/scanner/portal/ChessGamesScanner.java
+++ b/src/main/java/org/hedgecode/chess/scanner/portal/ChessGamesScanner.java
@@ -22,6 +22,7 @@ import java.util.Map;
 
 import org.hedgecode.chess.scanner.Scanner;
 import org.hedgecode.chess.scanner.ScannerException;
+import org.hedgecode.chess.scanner.StringUtils;
 import org.hedgecode.chess.scanner.entity.PGNGame;
 import org.hedgecode.chess.scanner.entity.PGNTournament;
 
@@ -75,7 +76,7 @@ public class ChessGamesScanner extends AbstractSettingsScanner implements Scanne
         String pgn = request(
                 assignUrl(gameId)
         );
-        if (!isPgnFormat(pgn)) {
+        if (!StringUtils.isPgn(pgn)) {
             throw new ScannerException(
                     String.format("Failed to get PGN for requesting game ID: %s", gameId)
             );
@@ -92,13 +93,12 @@ public class ChessGamesScanner extends AbstractSettingsScanner implements Scanne
 
     @Override
     public PGNGame scanUrl(String gameUrl) throws ScannerException {
-        String pgn = regex(
-                request(
-                        gameUrl
-                ),
+        String gamePage = request(gameUrl);
+        String pgn = StringUtils.match(
+                gamePage,
                 getSettings().getGameUrlRegex()
         );
-        if (pgn == null || !isPgnFormat(pgn)) {
+        if (pgn == null || !StringUtils.isPgn(pgn)) {
             throw new ScannerException(
                     String.format("Failed to get PGN for requesting URL: %s", gameUrl)
             );