X-Git-Url: https://git.hedgecode.org/?p=chesshog-scanner.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fhedgecode%2Fchess%2Fscanner%2Fportal%2FLiChessScanner.java;fp=src%2Fmain%2Fjava%2Forg%2Fhedgecode%2Fchess%2Fscanner%2Fportal%2FLiChessScanner.java;h=55a53e932d65343b921f1b85486d780298854100;hp=e43795a96754e605d3d1a2bd7d7f781158d83ca7;hb=df574e5ec8ae08c1c50adbe30b597cd86e6ab3fa;hpb=25ccd0fd5d5a640bc2dac646f2d760b5d64b989b diff --git a/src/main/java/org/hedgecode/chess/scanner/portal/LiChessScanner.java b/src/main/java/org/hedgecode/chess/scanner/portal/LiChessScanner.java index e43795a..55a53e9 100644 --- a/src/main/java/org/hedgecode/chess/scanner/portal/LiChessScanner.java +++ b/src/main/java/org/hedgecode/chess/scanner/portal/LiChessScanner.java @@ -20,14 +20,14 @@ import java.util.List; import org.apache.commons.text.StringEscapeUtils; -import org.hedgecode.chess.scanner.ChessHogScannerException; import org.hedgecode.chess.scanner.Scanner; +import org.hedgecode.chess.scanner.ScannerException; import org.hedgecode.chess.scanner.entity.PGNGame; import org.hedgecode.chess.scanner.entity.PGNTournament; import org.hedgecode.chess.scanner.format.lichess.Format; import org.hedgecode.chess.scanner.format.lichess.GameFormat; -import static org.hedgecode.chess.scanner.ChessHogScannerConstants.*; +import static org.hedgecode.chess.scanner.ScannerConstants.*; /** * LiChessScanner @@ -44,26 +44,26 @@ public class LiChessScanner extends AbstractSettingsScanner implements Scanner { } @Override - public PGNTournament scanTournament(String tournamentId) throws ChessHogScannerException { + public PGNTournament scanTournament(String tournamentId) throws ScannerException { PGNTournament tournament = new PGNTournament(tournamentId); assignTournamentGames(tournament); return tournament; } @Override - public PGNTournament findTournament(String tournamentName) throws ChessHogScannerException { - throw new ChessHogScannerException( + public PGNTournament findTournament(String tournamentName) throws ScannerException { + throw new ScannerException( "Lichess does not support searching for a tournament by name!" ); } @Override - public PGNGame scanGame(String gameId) throws ChessHogScannerException { + public PGNGame scanGame(String gameId) throws ScannerException { String pgn = request( assignUrl(gameId) ); if (!isPgnFormat(pgn)) { - throw new ChessHogScannerException( + throw new ScannerException( String.format("Failed to get PGN for requesting game ID: %s", gameId) ); } @@ -73,12 +73,12 @@ public class LiChessScanner extends AbstractSettingsScanner implements Scanner { } @Override - public PGNGame scanGame(String gameId, String tournamentId) throws ChessHogScannerException { + public PGNGame scanGame(String gameId, String tournamentId) throws ScannerException { return scanGame(gameId); } @Override - public PGNGame scanUrl(String gameUrl) throws ChessHogScannerException { + public PGNGame scanUrl(String gameUrl) throws ScannerException { String gamePage = request(gameUrl); String pgn = regex( gamePage, @@ -90,7 +90,7 @@ public class LiChessScanner extends AbstractSettingsScanner implements Scanner { getSettings().getGameJsonUrlRegex() ); if (pgn == null) { - throw new ChessHogScannerException( + throw new ScannerException( String.format("Failed to get source data for requesting URL: %s", gameUrl) ); } @@ -102,7 +102,7 @@ public class LiChessScanner extends AbstractSettingsScanner implements Scanner { } else { pgn = StringEscapeUtils.unescapeHtml4(pgn); if (!isPgnFormat(pgn)) { - throw new ChessHogScannerException( + throw new ScannerException( String.format("Failed to get PGN for requesting URL: %s", gameUrl) ); } @@ -113,7 +113,7 @@ public class LiChessScanner extends AbstractSettingsScanner implements Scanner { } } - private void assignTournamentGames(PGNTournament tournament) throws ChessHogScannerException { + private void assignTournamentGames(PGNTournament tournament) throws ScannerException { tournament.clearGames(); List pgnGames = split( assignUrl(