Merge remote-tracking branch 'origin/develop'

evolutionsoftswiss · Dec 24, 2022 · 904a162 · 904a162
2 parents 37d1d3b + f82dddd
commit 904a162
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -18,10 +18,10 @@ You need a more or less recent Java SE Runtime Environment to run the released p
 
 For a quick start you can unzip the release version (without subdirectory, but directly all three files) in a folder where you've already got one or more csv's from pokernow.club.
 
-Execute from the directory with containing 'handhistory-converter-0.2.4-jar-with-dependencies.jar' and the two properties files:
+Execute from the directory with containing 'handhistory-converter-0.2.5-jar-with-dependencies.jar' and the two properties files:
 
 ```
-java -jar handhistory-converter-0.2.4-jar-with-dependencies.jar
+java -jar handhistory-converter-0.2.5-jar-with-dependencies.jar
 ```
 
 The csv files from pokernow.club in the directory should then get converted.

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.evolutionsoft.poker.pokernow</groupId>
 	<artifactId>handhistory-converter</artifactId>
-	<version>0.2.4</version>
+	<version>0.2.5</version>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/src/main/java/ch/evolutionsoft/poker/pokernow/PokernowConstants.java b/src/main/java/ch/evolutionsoft/poker/pokernow/PokernowConstants.java
@@ -9,7 +9,7 @@ private PokernowConstants() {
   public static final String OMAHA_GAME_TYPE = "Pot Limit Omaha Hi";
   public static final String OMAHA_HI_LO_GAME_TYPE = "Pot Limit Omaha Hi/Lo";
   public static final String TEXAS_GAME_TYPE = "No Limit Texas Hold'em";
-  public static final int GAME_TYPE_GROUP = 1;
+  public static final int GAME_TYPE_GROUP = 2;
 
   public static final String STARTING_HAND = "-- starting hand #";
   public static final String ENDING_HAND = "-- ending hand #";

diff --git a/src/main/java/ch/evolutionsoft/poker/pokernow/PokernowSingleHandConverter.java b/src/main/java/ch/evolutionsoft/poker/pokernow/PokernowSingleHandConverter.java
@@ -69,7 +69,7 @@ String convertSingleHand(String singleHandHistoryBase, long handIdPrefix) throws
     String handNumber = readHandNumber(singleHandHistoryLine);
 
     Pattern gameTypeGameIdPattern = Pattern.compile(
-            "hand " + HAND_NUMBER_PREFIX_CHAR + "\\d+ \\(id: \\w+\\)\\s+\\(([^\\)]+)\\)"
+            "hand " + HAND_NUMBER_PREFIX_CHAR + "\\d+ (\\(id: \\w+\\))?\\s+\\(([^\\)]+)\\)"
     );
 
     Matcher m = gameTypeGameIdPattern.matcher(singleHandHistoryLine);
@@ -380,7 +380,7 @@ String convertSingleHand(String singleHandHistoryBase, long handIdPrefix) throws
   String readHandNumber(String singleHandHistoryLine) {
 
     return singleHandHistoryLine.substring(singleHandHistoryLine.indexOf(HAND_NUMBER_PREFIX_CHAR) + 1, 
-        singleHandHistoryLine.indexOf(" (id"));
+        singleHandHistoryLine.indexOf(StringUtils.SPACE, singleHandHistoryLine.indexOf(HAND_NUMBER_PREFIX_CHAR)));
   }
 
   String createConvertedHandSummary(String buttonPlayerName, String playerSummary, String smallBlindPlayerName,