[LIB-13] Stub scanners for some portals

[chesshog-scanner.git] / src / main / java / org / hedgecode / chess / scanner / portal / ChessGamesScanner.java

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 c07e392..dfca440 100644 (file)
--- a/src/main/java/org/hedgecode/chess/scanner/portal/ChessGamesScanner.java
+++ b/src/main/java/org/hedgecode/chess/scanner/portal/ChessGamesScanner.java
@@ -21,17 +21,16 @@ import java.util.List;
 import java.util.Map;
 
 import org.hedgecode.chess.scanner.ChessHogScannerException;
+import org.hedgecode.chess.scanner.Scanner;
 import org.hedgecode.chess.scanner.entity.PGNGame;
 import org.hedgecode.chess.scanner.entity.PGNTournament;
-import org.hedgecode.chess.scanner.regex.RegexMatcherResult;
-import org.hedgecode.chess.scanner.regex.RegexResult;
 
 /**
  * ChessGamesScanner
  *
  * @author Dmitry Samoshin aka gotty
  */
-public class ChessGamesScanner extends AbstractSettingsScanner {
+public class ChessGamesScanner extends AbstractSettingsScanner implements Scanner {
 
     private static final String SETTINGS_FILENAME = "chessgames.settings";
 
@@ -41,7 +40,7 @@ public class ChessGamesScanner extends AbstractSettingsScanner {
     }
 
     @Override
-    public PGNTournament getTournament(String tournamentId) throws ChessHogScannerException {
+    public PGNTournament scanTournament(String tournamentId) throws ChessHogScannerException {
         PGNTournament tournament = new PGNTournament(tournamentId);
         assignTournamentGames(tournament);
         return tournament;
@@ -49,18 +48,15 @@ public class ChessGamesScanner extends AbstractSettingsScanner {
 
     @Override
     public PGNTournament findTournament(String tournamentName) throws ChessHogScannerException {
-        RegexResult result = matchRequest(
+        PGNTournament tournament = null;
+        Map<String, String> result = matchMap(
                 assignUrl(
                         tournamentName, true
                 ),
-                new RegexMatcherResult(
-                        getSettings().getTournamentQueryUrlRegex(),
-                        true,
-                        true
-                )
+                getSettings().getTournamentQueryUrlRegex(),
+                true
         );
-        PGNTournament tournament = null;
-        for (Map.Entry<String, String> entry : result.resultMap().entrySet()) {
+        for (Map.Entry<String, String> entry : result.entrySet()) {
             if (entry.getValue().contains(tournamentName)) { // todo: contains?
                 tournament = new PGNTournament(
                         entry.getKey(),
@@ -75,15 +71,44 @@ public class ChessGamesScanner extends AbstractSettingsScanner {
     }
 
     @Override
-    public PGNGame getGame(String gameId) throws ChessHogScannerException {
+    public PGNGame scanGame(String gameId) throws ChessHogScannerException {
         String pgn = request(
                 assignUrl(gameId)
         );
+        if (!isPgnFormat(pgn)) {
+            throw new ChessHogScannerException(
+                    String.format("Failed to get PGN for requesting game ID: %s", gameId)
+            );
+        }
         return new PGNGame(
                 gameId, pgn
         );
     }
 
+    @Override
+    public PGNGame scanGame(String gameId, String tournamentId) throws ChessHogScannerException {
+        return scanGame(gameId);
+    }
+
+    @Override
+    public PGNGame scanUrl(String gameUrl) throws ChessHogScannerException {
+        String pgn = regex(
+                request(
+                        gameUrl
+                ),
+                getSettings().getGameUrlRegex()
+        );
+        if (pgn == null || !isPgnFormat(pgn)) {
+            throw new ChessHogScannerException(
+                    String.format("Failed to get PGN for requesting URL: %s", gameUrl)
+            );
+        }
+        return new PGNGame(
+                null,
+                pgn
+        );
+    }
+
     private void assignTournamentGames(PGNTournament tournament) throws ChessHogScannerException {
         tournament.clearGames();
         List<String> gamesId = new ArrayList<>();
@@ -91,7 +116,7 @@ public class ChessGamesScanner extends AbstractSettingsScanner {
         List<String> pageGamesId;
         int pageId = 0;
         do {
-            pageGamesId = matchRequest(
+            pageGamesId = match(
                     assignUrl(
                             tournament.id(),
                             Integer.toString(++pageId)
@@ -106,7 +131,7 @@ public class ChessGamesScanner extends AbstractSettingsScanner {
 
         for (String gameId : gamesId) {
             tournament.addGame(
-                    getGame(gameId)
+                    scanGame(gameId)
             );
         }
     }