git.hedgecode.org
/
chesshog-scanner.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[LIB-13] Functional for working with strings moved to StringUtils
[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
dfca440
..
56fc032
100644
(file)
--- a/
src/main/java/org/hedgecode/chess/scanner/portal/ChessGamesScanner.java
+++ b/
src/main/java/org/hedgecode/chess/scanner/portal/ChessGamesScanner.java
@@
-20,8
+20,9
@@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
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.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;
import org.hedgecode.chess.scanner.entity.PGNGame;
import org.hedgecode.chess.scanner.entity.PGNTournament;
@@
-40,14
+41,14
@@
public class ChessGamesScanner extends AbstractSettingsScanner implements Scanne
}
@Override
}
@Override
- public PGNTournament scanTournament(String tournamentId) throws
ChessHog
ScannerException {
+ public PGNTournament scanTournament(String tournamentId) throws ScannerException {
PGNTournament tournament = new PGNTournament(tournamentId);
assignTournamentGames(tournament);
return tournament;
}
@Override
PGNTournament tournament = new PGNTournament(tournamentId);
assignTournamentGames(tournament);
return tournament;
}
@Override
- public PGNTournament findTournament(String tournamentName) throws
ChessHog
ScannerException {
+ public PGNTournament findTournament(String tournamentName) throws ScannerException {
PGNTournament tournament = null;
Map<String, String> result = matchMap(
assignUrl(
PGNTournament tournament = null;
Map<String, String> result = matchMap(
assignUrl(
@@
-71,12
+72,12
@@
public class ChessGamesScanner extends AbstractSettingsScanner implements Scanne
}
@Override
}
@Override
- public PGNGame scanGame(String gameId) throws
ChessHog
ScannerException {
+ public PGNGame scanGame(String gameId) throws ScannerException {
String pgn = request(
assignUrl(gameId)
);
String pgn = request(
assignUrl(gameId)
);
- if (!
isPgnFormat
(pgn)) {
- throw new
ChessHog
ScannerException(
+ if (!
StringUtils.isPgn
(pgn)) {
+ throw new ScannerException(
String.format("Failed to get PGN for requesting game ID: %s", gameId)
);
}
String.format("Failed to get PGN for requesting game ID: %s", gameId)
);
}
@@
-86,20
+87,19
@@
public class ChessGamesScanner extends AbstractSettingsScanner implements Scanne
}
@Override
}
@Override
- public PGNGame scanGame(String gameId, String tournamentId) throws
ChessHog
ScannerException {
+ public PGNGame scanGame(String gameId, String tournamentId) throws ScannerException {
return scanGame(gameId);
}
@Override
return scanGame(gameId);
}
@Override
- public PGNGame scanUrl(String gameUrl) throws ChessHogScannerException {
- String pgn = regex(
- request(
- gameUrl
- ),
+ public PGNGame scanUrl(String gameUrl) throws ScannerException {
+ String gamePage = request(gameUrl);
+ String pgn = StringUtils.match(
+ gamePage,
getSettings().getGameUrlRegex()
);
getSettings().getGameUrlRegex()
);
- if (pgn == null || !
isPgnFormat
(pgn)) {
- throw new
ChessHog
ScannerException(
+ if (pgn == null || !
StringUtils.isPgn
(pgn)) {
+ throw new ScannerException(
String.format("Failed to get PGN for requesting URL: %s", gameUrl)
);
}
String.format("Failed to get PGN for requesting URL: %s", gameUrl)
);
}
@@
-109,7
+109,7
@@
public class ChessGamesScanner extends AbstractSettingsScanner implements Scanne
);
}
);
}
- private void assignTournamentGames(PGNTournament tournament) throws
ChessHog
ScannerException {
+ private void assignTournamentGames(PGNTournament tournament) throws ScannerException {
tournament.clearGames();
List<String> gamesId = new ArrayList<>();
tournament.clearGames();
List<String> gamesId = new ArrayList<>();