[LIB-13] Add 2700chess scanner

diff --git a/src/main/java/org/hedgecode/chess/scanner/ChessHogScanner.java b/src/main/java/org/hedgecode/chess/scanner/ChessHogScanner.java
index 93c8143..3ea995c 100644 (file)
--- a/src/main/java/org/hedgecode/chess/scanner/ChessHogScanner.java
+++ b/src/main/java/org/hedgecode/chess/scanner/ChessHogScanner.java
@@ -25,6 +25,7 @@ import java.util.Set;
 
 import org.hedgecode.chess.scanner.entity.PGNGame;
 import org.hedgecode.chess.scanner.portal.Chess24Scanner;
+import org.hedgecode.chess.scanner.portal.Chess2700Scanner;
 import org.hedgecode.chess.scanner.portal.ChessBombScanner;
 import org.hedgecode.chess.scanner.portal.ChessComScanner;
 import org.hedgecode.chess.scanner.portal.ChessGamesScanner;
@@ -46,6 +47,7 @@ public final class ChessHogScanner {
             put( ScannerType.CHESSBOMB,  new ChessBombScanner()  );
             put( ScannerType.CHESS24,    new Chess24Scanner()    );
             put( ScannerType.CHESSCOM,   new ChessComScanner()   );
+            put( ScannerType.CHESS2700,  new Chess2700Scanner()  );
         }
     };
 
@@ -74,7 +76,7 @@ public final class ChessHogScanner {
             hostName = new URL(url).getHost();
         } catch (MalformedURLException cause) {
             throw new ScannerException(
-                    String.format("Incorrect  URL: %s", url), cause
+                    String.format("Incorrect URL: %s", url), cause
             );
         }
         ScannerType type = ScannerType.byHost(hostName);

diff --git a/src/main/java/org/hedgecode/chess/scanner/format/AbstractPGNFormat.java b/src/main/java/org/hedgecode/chess/scanner/format/AbstractPGNFormat.java
index 3aee762..a9f0467 100644 (file)
--- a/src/main/java/org/hedgecode/chess/scanner/format/AbstractPGNFormat.java
+++ b/src/main/java/org/hedgecode/chess/scanner/format/AbstractPGNFormat.java
@@ -68,10 +68,6 @@ public abstract class AbstractPGNFormat implements PGNFormat {
         );
     }
 
-    protected String formatTagValue(String value) {
-        return value.replaceAll("([\\\\\"])", "\\\\$1");
-    }
-
     private String moves() {
         return pgnMoves != null ? pgnMoves : PGNTag.EMPTY;
     }

diff --git a/src/main/java/org/hedgecode/chess/scanner/format/PGNConstants.java b/src/main/java/org/hedgecode/chess/scanner/format/PGNConstants.java
index 02b8bca..46e203d 100644 (file)
--- a/src/main/java/org/hedgecode/chess/scanner/format/PGNConstants.java
+++ b/src/main/java/org/hedgecode/chess/scanner/format/PGNConstants.java
@@ -28,10 +28,11 @@ public final class PGNConstants {
 
     public static final String PGN_CRLF = "\n";
 
+    public static final String PGN_DETECT_REGEX = "^\\[Event \"[^\"]+\"\\]$";
+
     public static final String WHITE_MOVE_FORMAT = "%d. %s ";
     public static final String BLACK_MOVE_FORMAT = "%s ";
 
-
     private PGNConstants() {
         throw new AssertionError(
                 String.format("No %s instances!", getClass().getName())

diff --git a/src/main/java/org/hedgecode/chess/scanner/format/ReducePGNFormat.java b/src/main/java/org/hedgecode/chess/scanner/format/ReducePGNFormat.java
index f595dd7..2421480 100644 (file)
--- a/src/main/java/org/hedgecode/chess/scanner/format/ReducePGNFormat.java
+++ b/src/main/java/org/hedgecode/chess/scanner/format/ReducePGNFormat.java
@@ -35,7 +35,9 @@ public class ReducePGNFormat extends AbstractPGNFormat {
                         String.format(
                                 PGNTag.TAG_FORMAT,
                                 tag.getName(),
-                                tagValue != null ? formatTagValue(tagValue) : tag.defaultValue()
+                                tagValue != null
+                                        ? PGNTag.formatTagValue(tagValue)
+                                        : tag.defaultValue()
                         )
                 ).append(PGN_CRLF);
             }

diff --git a/src/main/java/org/hedgecode/chess/scanner/portal/Chess2700Scanner.java b/src/main/java/org/hedgecode/chess/scanner/portal/Chess2700Scanner.java
new file mode 100644 (file)
index 0000000..ac0c8f3
--- /dev/null
+++ b/src/main/java/org/hedgecode/chess/scanner/portal/Chess2700Scanner.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2019-2020. Developed by Hedgecode.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hedgecode.chess.scanner.portal;
+
+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;
+
+/**
+ * Chess2700Scanner
+ *
+ * @author Dmitry Samoshin aka gotty
+ */
+public class Chess2700Scanner extends AbstractSettingsScanner implements Scanner {
+
+    private static final String SETTINGS_FILENAME = "2700chess.settings";
+
+    @Override
+    protected String getResourceName() {
+        return SETTINGS_FILENAME;
+    }
+
+    @Override
+    public PGNTournament scanTournament(String tournamentId) throws ScannerException {
+        throw new ScannerException(
+                "2700Chess does not support searching for a tournament by ID!"
+        );
+    }
+
+    @Override
+    public PGNTournament findTournament(String tournamentName) throws ScannerException {
+        throw new ScannerException(
+                "2700Chess does not support searching for a tournament by name!"
+        );
+    }
+
+    @Override
+    public PGNGame scanGame(String gameId) throws ScannerException {
+        return scanUrl(
+                assignUrl(gameId)
+        );
+    }
+
+    @Override
+    public PGNGame scanGame(String gameId, String tournamentId) throws ScannerException {
+        return scanGame(gameId);
+    }
+
+    @Override
+    public PGNGame scanUrl(String gameUrl) throws ScannerException {
+        String pgn = match(
+                gameUrl,
+                getSettings().getGameUrlRegex()
+        );
+        if (pgn == null) {
+            throw new ScannerException(
+                    String.format("Failed to get PGN for requesting URL: %s", gameUrl)
+            );
+        }
+        pgn = StringUtils.formatCrlf(pgn);
+        if (!StringUtils.isPgn(pgn)) {
+            throw new ScannerException(
+                    String.format("Incorrect PGN for requesting URL: %s", gameUrl)
+            );
+        }
+        return new PGNGame(
+                null,
+                pgn
+        );
+    }
+
+}

diff --git a/src/main/resources/settings/2700chess.settings b/src/main/resources/settings/2700chess.settings
new file mode 100644 (file)
index 0000000..5314040
--- /dev/null
+++ b/src/main/resources/settings/2700chess.settings
@@ -0,0 +1,4 @@
+{
+  "gameUrl": "https://2700chess.com/games/[gameId]",
+  "gameUrlRegex": "setPgn\\(\"([^)]+)\", -1\\);"
+}
\ No newline at end of file