v1.3.0 (#11)

* Removed exclude range

* Bumped version

* Updated pom version extract

* Added missing merchandise items
* Encyclopedia Eorzea
* Both Heavensward Lore books
* Both new carbuncle plushes

* Updated changelog and readme to reflect changes added

* Added Moogle Beast Tribe Mount

* Added Vanu Vanu beast tribe mount

* Added Vath beast tribe mount

* Update pom.xml

* [Bugfix] 180 days and 90 day subscriptions were returing wrong value

Author: ReidWeb

CHANGELOG.md

@@ -1,3 +1,17 @@
+v1.3.0
+======
+* Completely removed 30 second exclude range from image reader - it was excluding players that are active, and none of the players being excluded are inactive.
+* DB field `artbook` renamed to `arrartbook`
+* Added parsing for owners of Encyclopedia Eorzea
+* Added parsing for owners of Heavensward Lore book 1
+* Added parsing for owners of Heavensward Lore book 2
+* Added parsing for owners of Topaz Carbuncle plush
+* Added parsing for owners of Emerald Carbuncle plush
+* Added parsing for characters who have completed Moogle Beast Tribe to Rank 7
+* Added parsing for characters who have completed Vanu Vanu Beast Tribe to Rank 7
+* Added parsing for characters who have completed Vath Beast Tribe to Rank 7
+* [Bugfix] 180 days and 90 day subscriptions were returing wrong value
+
 v1.2.1
 ======
 * Fixed issue with 'active' players not being defined as active because their profile had been updated in the 5 mins before the run (we built this is in as a feature to stop us defining inactive players as active)

Jenkinsfile

@@ -13,6 +13,8 @@ try {
     }
 
     stage ('Generate Artifacts') {
+      pom = readMavenPom file: 'pom.xml'
+      $POM_VERSION = pom.version
       step([$class: 'JavadocArchiver', javadocDir: 'target/site/apidocs'])
       sh 'mkdir - p target/release'
       sh 'cp target/*dependencies.jar target/release/XIVStats-Gatherer-Java.jar'

README.md

@@ -154,7 +154,10 @@ The database table ```tblplayers``` has the following structure:
 |p960days              |bit      |Minion - Wind-up Firion         |
 |prearr                |bit      |Minion - Cait Sith Doll         |
 |prehw                 |bit      |Minion - Chocobo Chick Courier  |
-|artbook               |bit      |Minion - Model Enterprise       |
+|arrartbook            |bit      |Minion - Model Enterprise       |
+|hwartbookone          |bit      |Minion - Wind-Up Relm           |
+|hwartbooktw           |bit      |Minion - Wind-Up Hraesvelgr     |
+|hasencyclopedia       |bit      |Minion - Namingway              |
 |beforemeteor          |bit      |Minion - Wind-up Dalamud        |
 |beforethefall         |bit      |Minion - Set Of Primogs         |
 |soundtrack            |bit      |Minion - Wind-up Bahamut        |
@@ -163,6 +166,8 @@ The database table ```tblplayers``` has the following structure:
 |arr_25_complete       |bit      |Minion - Midgardsormr           |
 |comm50                |bit      |Minion - Princely Hatchling     |
 |moogleplush           |bit      |Minion - Wind-up Delivery Moogle|
+|topazcarubuncleplush  |bit      |Minion - Heliodor Carbuncle     |
+|emeraldcarbuncleplush |bit      |Minion - Peridot Carbuncle      |
 |hildibrand            |bit      |Minion - Wind-up Gentleman      |
 |ps4collectors         |bit      |Minion - Wind-up Moogle         |
 |dideternalbond        |bit      |Mount - Ceremony Chocobo        |
@@ -171,6 +176,9 @@ The database table ```tblplayers``` has the following structure:
 |sahagin               |bit      |Mount - Cavalry Elbst           |
 |amaljaa               |bit      |Mount - Cavalry Drake           |
 |sylph                 |bit      |Mount - Laurel Goobbue          |
+|moogle                |bit      |Mount - Cloud Mallow            |
+|vanuvanu              |bit      |Mount - Sanuwa                  |
+|vath                  |bit      |Mount - Kongamato               |
 |hw_complete           |bit      |Mount - Midgardsormr            |
 |hw_31_complete        |bit      |Minion - Wind-up Haurchefant    |
 |hw_33_complete        |bit      |Minion - Wind-up Aymeric        |

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.ffxivcensus.gatherer</groupId>
     <artifactId>XIVStats-Gatherer-Java</artifactId>
-    <version>v1.2.0</version>
+    <version>v1.3.0</version>
     <name>XIVStats Lodestone Gatherer</name>
     <url>https://github.com/xivstats</url>
 

src/main/java/com/ffxivcensus/gatherer/GathererController.java

@@ -342,10 +342,12 @@ private void createTable(String tableName) {
             if (this.storeProgression) {
                 sbSQL.append(",");
                 sbSQL.append("p30days BIT, p60days BIT, p90days BIT, p180days BIT, p270days BIT,p360days BIT,p450days BIT,p630days BIT,p960days BIT,");
-                sbSQL.append("prearr BIT,prehw BIT, artbook BIT, beforemeteor BIT, beforethefall BIT, ps4collectors BIT, ");
+                sbSQL.append("prearr BIT,prehw BIT, arrartbook BIT, hwartbookone BIT, hwartbooktwo BIT, hasencyclopedia BIT, ");
+                sbSQL.append("beforemeteor BIT, beforethefall BIT, ps4collectors BIT, ");
                 sbSQL.append("soundtrack BIT,saweternalbond BIT,sightseeing BIT,comm50 BIT,moogleplush BIT,");
+                sbSQL.append("topazcarubuncleplush BIT,emeraldcarbuncleplush BIT,");
                 sbSQL.append("hildibrand BIT, dideternalbond BIT, arrcollector BIT,");
-                sbSQL.append("kobold BIT, sahagin BIT, amaljaa BIT, sylph BIT,");
+                sbSQL.append("kobold BIT, sahagin BIT, amaljaa BIT, sylph BIT, moogle BIT, vanuvanu BIT, vath BIT, ");
                 sbSQL.append("arr_25_complete BIT,hw_complete BIT, hw_31_complete BIT, hw_33_complete BIT, legacy_player BIT");
             }
             if (this.storeMounts) {
@@ -494,21 +496,25 @@ protected String writeToDB(Player player) {
                         + player.getBitHas450DaysSub() + "," + player.getBitHas630DaysSub() + ","
                         + player.getBitHas960DaysSub() + ",");
 
-                sbFields.append("prearr, prehw, artbook, beforemeteor, beforethefall, soundtrack, saweternalbond, "
-                                + "sightseeing, arr_25_complete, comm50, moogleplush,");
+                sbFields.append("prearr, prehw, arrartbook, hwartbookone, hwartbooktwo, hasencyclopedia, beforemeteor, beforethefall, soundtrack, saweternalbond, "
+                                + "sightseeing, arr_25_complete, comm50, moogleplush, topazcarubuncleplush, emeraldcarbuncleplush");
                 sbValues.append(player.getBitHasPreOrderArr() + "," + player.getBitHasPreOrderHW() + ","
-                                + player.getBitHasArtBook() + "," + player.getBitHasBeforeMeteor() + ","
+                                + player.getBitHasArrArtbook() + "," + player.getBitHasHWArtbookOne() + ","
+                                + player.getBitHasHWArtbookTwo() + "," + player.getBitHasEncyclopediaEorzea() + ","
+                                + player.getBitHasBeforeMeteor() + ","
                                 + player.getBitHasBeforeTheFall() + "," + player.getBitHasSoundTrack() + ","
                                 + player.getBitHasAttendedEternalBond() + "," + player.getBitHasCompletedHWSightseeing()
                                 + "," + player.getBitHasCompleted2pt5() + "," + player.getBitHasFiftyComms() + ","
-                                + player.getBitHasMooglePlush() + ",");
+                                + player.getBitHasMooglePlush() + "," + player.getBitHasTopazCarbunclePlush() + ","
+                                + player.getBitHasEmeraldCarbunclePlush() + ",");
 
                 sbFields.append("hildibrand, ps4collectors, dideternalbond, arrcollector, kobold, sahagin, amaljaa, "
-                                + "sylph, hw_complete, hw_31_complete, hw_33_complete, legacy_player");
+                                + "sylph, moogle, vanuvanu, vath, hw_complete, hw_31_complete, hw_33_complete, legacy_player");
                 sbValues.append(player.getBitHasCompletedHildibrand() + "," + player.getBitHasPS4Collectors() + ","
                         + player.getBitHasEternalBond() + "," + player.getBitHasARRCollectors() + ","
-                        + player.getBitHasKobold() + "," + player.getBitHasSahagin() + "," + player.getBitHasAmaljaa()
-                        + "," + player.getBitHasSylph() + "," + player.getBitHasCompletedHW() + ","
+                        + player.getBitHasKobold() + "," + player.getBitHasSahagin() + "," + player.getBitHasAmaljaa() + ","
+                        + player.getBitHasSylph() + "," + player.getBitHasMoogle() + "," + player.getBitHasVanuVanu() + ","
+                        + player.getBitHasVath() + "," + player.getBitHasCompletedHW() + ","
                         + player.getBitHasCompleted3pt1() + "," + player.getBitHasCompleted3pt3() + ","
                         + player.getBitIsLegacyPlayer());