From 2e7f7c9671b442e90810093e0c7f907efc63e9c3 Mon Sep 17 00:00:00 2001
From: Matthias Faust <syd711@gmail.com>
Date: Tue, 10 Sep 2024 18:49:45 +0200
Subject: [PATCH] 3.5.2

---
 resources/pinemhi/pinemhi.ini                 |   2 +-
 .../vPinball/PinUPSystem/PUPDatabase.db       | Bin 352256 -> 352256 bytes
 .../Visual Pinball/Visual Pinball.xml         |   6 +--
 testsystem/vpin-studio.db                     | Bin 364544 -> 364544 bytes
 .../GithubReleaseFactoryTest.java             |  45 +++++++++---------
 .../mephisto/vpin/connectors/vps/VPSTest.java |   5 ++
 vpin-studio-app/dependency-reduced-pom.xml    |   2 +-
 7 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/resources/pinemhi/pinemhi.ini b/resources/pinemhi/pinemhi.ini
index 3d2574bf7..9f34f5bdd 100644
--- a/resources/pinemhi/pinemhi.ini
+++ b/resources/pinemhi/pinemhi.ini
@@ -1,5 +1,5 @@
 [paths]
-VP=C:/vPinball/visualpinball/VPinMAME/nvram/
+VP=C:/workspace/vpin-studio/vpin-studio-server/../testsystem/vPinball/VisualPinball/VPinMAME/nvram/
 FP=C:\vPinball\Future Pinball\fpRAM
 
 [options]
diff --git a/testsystem/vPinball/PinUPSystem/PUPDatabase.db b/testsystem/vPinball/PinUPSystem/PUPDatabase.db
index ca2dcedc52623c83f7c8b2c33cf7874a81eccd3d..d5f1f8879981c6041675f989bb87db9e7fd37c83 100644
GIT binary patch
delta 235
zcmZoTAlh(1bb>Ua+C&*=MzzL-)&$1Z1g6#m=GFw3tqH90F+P^Mh6W0T7FH(aRwkx;
z=7xqwhNhOu7O951<_5_Yx+a#%M!FVBhUU5^X%;{^OC$3%OH(5QBNJT%WUXd;CI*(%
z<KkGwrz^#>&K5+K18UfQE|!&tQ5{v>#K;n>QAX1l<5}I&4KXmE9vRPCFMwu-<@DG%
GRtW&_OE*{m

delta 236
zcmZoTAlh(1bb>Ua=tLQ3M$yKE)&$1Z1g6#m=GFw3tqH90F+S$H#s&&T23DqqRz~J}
z78Zu7DVC-tMg}IjX(@)5x+W&ZDY_PEDVDm124=~r7OBSON#+Jd21X{j2FO}1^h}LR
zrpLvxiceRHWt}aEDraVBzWrP*D-WYOs<^4KC03)1r!&U0x}zInU@<*1p0yrL*woSz
GY%c(7kvHl9

diff --git a/testsystem/vPinball/pinballX/Databases/Visual Pinball/Visual Pinball.xml b/testsystem/vPinball/pinballX/Databases/Visual Pinball/Visual Pinball.xml
index 196357708..8b51e3172 100644
--- a/testsystem/vPinball/pinballX/Databases/Visual Pinball/Visual Pinball.xml	
+++ b/testsystem/vPinball/pinballX/Databases/Visual Pinball/Visual Pinball.xml	
@@ -7,7 +7,7 @@
     <hidetopper>True</hidetopper>
     <hidebackglass>True</hidebackglass>
     <enabled>True</enabled>
-    <dateadded>2024-07-30 20:51:28</dateadded>
+    <dateadded>2024-09-10 18:47:46</dateadded>
   </game>
   <game name="Jaws">
     <description>Jaws</description>
@@ -17,7 +17,7 @@
     <hidetopper>True</hidetopper>
     <hidebackglass>True</hidebackglass>
     <enabled>True</enabled>
-    <dateadded>2024-07-30 20:51:28</dateadded>
+    <dateadded>2024-09-10 18:47:46</dateadded>
   </game>
   <game name="Twister (1996)">
     <description>Twister (1996)</description>
@@ -28,6 +28,6 @@
     <hidebackglass>True</hidebackglass>
     <enabled>True</enabled>
     <author>Test Osterone</author>
-    <dateadded>2024-07-30 20:51:28</dateadded>
+    <dateadded>2024-09-10 18:47:46</dateadded>
   </game>
 </menu>
\ No newline at end of file
diff --git a/testsystem/vpin-studio.db b/testsystem/vpin-studio.db
index bf889c63897bd097080c2df35b292ef25af45876..39e4235b61ea40a209c5cde84c04d5ffc6e73836 100644
GIT binary patch
delta 715
zcmYk4&rcIU6vuaFwo9wQsV4S<N&}P%GIW1VcOnM}p%KIu`Kc$`-EGyAi9k4@DViup
zAsl+}vj2dImdGZaym-_Y6E4OBA@SfzylJA~+a-#J&%E#C`@Zi@vb*Z1R{hj^8_I2*
z8%DX8<)`ME^l<6g#K`pM^k}JwHa_p%AKyaO!3o5hgNGEQn-gD8wRMC>eIPn7$F#g|
z37gy86qdEAzMsh-8KpvDe6%<cT^!Z0?V868X6uGvrX@fLC(n4rak*O+rj<7~*XJ)x
zwuk*I(d-qW{F`kET||!fZ|ur|Ra0Hf=HVRSFjEsA6HditURC#O&NW`;YP0-<raG`B
zNs7|m3Wd;uM4!_oTG%?B+-u$1e=v*cjHGaD3|uLW&P$O9bzJEV*RG{o7MB+m=S|g$
zu0J_GZa<s-+n$Iknb3c7po~?P7siI>rmoz%b$iOad#@Vhwy&e3oCa&M$2kagg$<9t
zZN97LWLQ{iu70Pqn<xY$C4*xGCzP({I(&odBY)dRC;gsYc;FP!1Ka?*ff-;9m<1+*
zo500}If$Pz4$=ZlzyNeW15_Xf^aBj&11<%>264-LK+<G~_Jx0e<LJ6=t5qg6LuIBg
zL3ysn9L=Z+VGD!TYEe*55_n`^W9T(%4?2CcOA!m?7wC}U{;Q3LP1F_iyg{F6Kt5oU
z4CGyKkQT`MVbx#B7>W_dNvH`kd-x^4RDRpp80y8DKuhC~6j_0+g1JV@1dsz#j{VO4
E0kgNgc>n+a

delta 743
zcmYk4JxtVK7{~jzy@HyvNbm@`0|$-VDKETj-}c(X0fG<#ImjI!I^DHzTXj+d#TW^v
z1FJ`FI1`r+f}6q-ZQ|r$oY2k1iMYApX5#15I}#Xv@AH2A|No~+pK_2W2Z>4&b*!g`
zQO9=aDQ)i@o|>E<nHifIo64be@z-X22kC#0qjY`npNu-|)89`fyP}7eBaQWPOv$RM
zX6V#3EXAmj&$HR)!_?^L)v;Vtb%*GVPaM<1s%80@nv`K%(|l}$&$2z+_dTmxDfZ+O
zk$HoQ))#-I!)#5{ns-NHH#kFAvNX#G_L=En>JkTA%uz8R78oqb2xIlqPdU-Wa~vm0
zi8vHN&U5m%ydvj!PPKiD@9eM4q1A<Zx%+ByVaS=t85yCSkH<jCwW4mWvEiidsQv3_
zElbObOGQfb=(zPr<qxH&dk>_khV-E{ZZ9v656u^@+`4hIz;5658lFp&sOeE4zW2b>
zDkY=GR}ZS6RtH3A^r2q<A<Nx@B=AT|@iBovCMD|?_y;{tg0}%W5o8SbzyhEH*MRfD
zEHDqu0eRp$Kx=f6e~#0z%>WmGi$EWMfqq~BAb<j>fENB9<XeiU?~TYqOB{;(2x@;Q
z?m-QOeIB);iQ3~jIu~Z%qpvbjLUAjSsI{SY=uCJvKzlOM;1c|y5b$5*zG#?yThUFQ
zxtM9bg(=JW*vy&~GsbjR(S5_!9q6wgO)-w9q{ZFxN0=r>wLOXr;u1`$8>KK9DZ}+#
S$97eZ7;7bAtt4)iV&p%Uw8P*4

diff --git a/vpin-connector-github/src/test/java/de/mephisto/githubloader/GithubReleaseFactoryTest.java b/vpin-connector-github/src/test/java/de/mephisto/githubloader/GithubReleaseFactoryTest.java
index 29e2984e5..0613598ec 100644
--- a/vpin-connector-github/src/test/java/de/mephisto/githubloader/GithubReleaseFactoryTest.java
+++ b/vpin-connector-github/src/test/java/de/mephisto/githubloader/GithubReleaseFactoryTest.java
@@ -55,18 +55,18 @@ public void testMameDownloadSimulated() throws Exception {
     assertNull(install.getStatus());
   }
 
-//  @Test
-  public void testMameDiff() throws Exception {
-    GithubRelease githubRelease = GithubReleaseFactory.loadRelease("https://github.com/vpinball/pinmame/releases", Arrays.asList("win-", "VPinMAME"), Arrays.asList("linux", "sc-", "osx"));
-    assertNotNull(githubRelease);
 
-    ReleaseArtifact artifact = githubRelease.getArtifacts().get(0);
-    ReleaseArtifactActionLog install = artifact.diff(new File(TEST_FOLDER, artifact.getName()), new File(TEST_FOLDER), Arrays.asList("VPMAlias.txt"), Collections.emptyList(), "*.dll");
-    assertNotNull(install);
-    assertFalse(install.getLogs().isEmpty());
-    assertFalse(install.getDiffEntries().isEmpty());
-    assertNull(install.getStatus());
-  }
+//  public void testMameDiff() throws Exception {
+//    GithubRelease githubRelease = GithubReleaseFactory.loadRelease("https://github.com/vpinball/pinmame/releases", Arrays.asList("win-", "VPinMAME"), Arrays.asList("linux", "sc-", "osx"));
+//    assertNotNull(githubRelease);
+//
+//    ReleaseArtifact artifact = githubRelease.getArtifacts().get(0);
+//    ReleaseArtifactActionLog install = artifact.diff(new File(TEST_FOLDER, artifact.getName()), new File(TEST_FOLDER), Arrays.asList("VPMAlias.txt"), Collections.emptyList(), "*.dll");
+//    assertNotNull(install);
+//    assertFalse(install.getLogs().isEmpty());
+//    assertFalse(install.getDiffEntries().isEmpty());
+//    assertNull(install.getStatus());
+//  }
 
 
   @Test
@@ -109,18 +109,17 @@ public void testVpx2() throws Exception {
   }
 
 
-  @Test
-  public void testVpxDiff() throws Exception {
-    GithubRelease githubRelease = GithubReleaseFactory.loadRelease("https://github.com/vpinball/vpinball/releases", Collections.emptyList(), Arrays.asList("Debug"));
-    assertNotNull(githubRelease);
-
-    ReleaseArtifact artifact = githubRelease.getArtifacts().get(0);
-    ReleaseArtifactActionLog install = artifact.diff(new File(TEST_FOLDER, artifact.getName()), new File(TEST_FOLDER), Arrays.asList("VPinballX64.exe", "VPinballX.exe", "VPinballX_GL.exe"), Collections.emptyList());
-    assertNotNull(install);
-    assertNull(install.getStatus());
-    assertFalse(install.getDiffEntries().isEmpty());
-
-  }
+//  @Test
+//  public void testVpxDiff() throws Exception {
+//    GithubRelease githubRelease = GithubReleaseFactory.loadRelease("https://github.com/vpinball/vpinball/releases", Collections.emptyList(), Arrays.asList("Debug"));
+//    assertNotNull(githubRelease);
+//
+//    ReleaseArtifact artifact = githubRelease.getArtifacts().get(0);
+//    ReleaseArtifactActionLog install = artifact.diff(new File(TEST_FOLDER, artifact.getName()), new File(TEST_FOLDER), Arrays.asList("VPinballX64.exe", "VPinballX.exe", "VPinballX_GL.exe"), Collections.emptyList());
+//    assertNotNull(install);
+//    assertNull(install.getStatus());
+//    assertFalse(install.getDiffEntries().isEmpty());
+//  }
 
   @Test
   public void testBackglass() throws Exception {
diff --git a/vpin-connector-vps/src/test/java/de/mephisto/vpin/connectors/vps/VPSTest.java b/vpin-connector-vps/src/test/java/de/mephisto/vpin/connectors/vps/VPSTest.java
index 5897bf394..adb5c2211 100644
--- a/vpin-connector-vps/src/test/java/de/mephisto/vpin/connectors/vps/VPSTest.java
+++ b/vpin-connector-vps/src/test/java/de/mephisto/vpin/connectors/vps/VPSTest.java
@@ -34,6 +34,11 @@ public void testCorruption() throws IOException {
 
     List<VpsTable> tables = vps.getTables();
     for (VpsTable table : tables) {
+      if(table == null || table.getB2sFiles() == null) {
+        System.out.println(table);
+        continue;
+      }
+
       for (VpsBackglassFile b2sFile : table.getB2sFiles()) {
         if(b2sFile.getId() == null) {
           System.out.println(table.getName());
diff --git a/vpin-studio-app/dependency-reduced-pom.xml b/vpin-studio-app/dependency-reduced-pom.xml
index 17eac55af..608e5e44d 100644
--- a/vpin-studio-app/dependency-reduced-pom.xml
+++ b/vpin-studio-app/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>studio</artifactId>
     <groupId>de.mephisto.vpin</groupId>
-    <version>3.4.1</version>
+    <version>3.5.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>vpin-studio-app</artifactId>