[LIB-13] Add function to Scanner API

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

diff --git a/src/main/java/org/hedgecode/chess/scanner/portal/AbstractSettingsScanner.java b/src/main/java/org/hedgecode/chess/scanner/portal/AbstractSettingsScanner.java
index 871c778..0910047 100644 (file)
--- a/src/main/java/org/hedgecode/chess/scanner/portal/AbstractSettingsScanner.java
+++ b/src/main/java/org/hedgecode/chess/scanner/portal/AbstractSettingsScanner.java
@@ -22,9 +22,10 @@ import org.hedgecode.chess.scanner.Settings;
 import org.hedgecode.chess.scanner.SettingsBuilder;
 import org.hedgecode.chess.scanner.regex.RegexBuilder;
 import org.hedgecode.chess.scanner.regex.RegexParams;
-import org.hedgecode.chess.scanner.regex.RegexType;
 import org.hedgecode.chess.scanner.spi.ServiceRegistry;
 
+import static org.hedgecode.chess.scanner.regex.RegexBuilder.Type;
+
 /**
  * AbstractSettingsScanner
  *
@@ -51,9 +52,12 @@ public abstract class AbstractSettingsScanner extends AbstractRequestScanner imp
     }
 
     protected String assignUrl(String tournamentId, String pageId) {
+        String tournamentUrl = assignUrlWithParams(
+                settings.getTournamentUrl(), settings.getTournamentQueryParams()
+        );
         return RegexBuilder.build(
-                RegexType.TOURNAMENT,
-                settings.getTournamentUrl(),
+                Type.TOURNAMENT,
+                tournamentUrl,
                 new RegexParams(
                         tournamentId,
                         settings.isTournamentMultiPage() ? pageId : null
@@ -66,18 +70,42 @@ public abstract class AbstractSettingsScanner extends AbstractRequestScanner imp
                 ? settings.getGamePgnUrl()
                 : settings.getGameUrl();
         return RegexBuilder.build(
-                RegexType.GAME,
-                gameUrl,
+                Type.GAME,
+                assignUrlWithParams(gameUrl, settings.getGameQueryParams()),
                 new RegexParams(gameId)
         );
     }
 
+    protected String assignUrl(String gameId, String tournamentId, boolean withTournament) {
+        String gameUrl = settings.getGamePgnUrl() != null
+                ? settings.getGamePgnUrl()
+                : settings.getGameUrl();
+        return RegexBuilder.build(
+                Type.GAME,
+                assignUrlWithParams(gameUrl, settings.getGameQueryParams()),
+                new RegexParams(
+                        gameId,
+                        tournamentId,
+                        withTournament
+                )
+        );
+    }
+
     protected String assignUrl(String query, boolean isUrlEncode) {
         return RegexBuilder.build(
-                RegexType.QUERY,
+                Type.QUERY,
                 settings.getTournamentQuery(),
-                new RegexParams(query, isUrlEncode)
+                new RegexParams(
+                        query,
+                        isUrlEncode
+                )
         );
     }
 
+    private String assignUrlWithParams(String url, String params) {
+        return params != null
+                ? url.concat(params)
+                : url;
+    }
+
 }