Enable-disable takeover of the server

cesar-rgon · Oct 24, 2019 · 13755d5 · 13755d5
1 parent e21d8b6
commit 13755d5
Show file tree

Hide file tree

Showing 25 changed files with 472 additions and 169 deletions.
diff --git a/scripts/sql/script.sql b/scripts/sql/script.sql
@@ -80,7 +80,7 @@ INSERT INTO KF2DATABASE.MAPS(ID, CODE, OFFICIAL, URL_INFO, URL_PHOTO, DOWNLOADED
 -----------------------------------
 -- PROFILES
 -----------------------------------
-INSERT INTO KF2DATABASE.PROFILES(ID, NAME, ID_LANGUAGE, ID_GAMETYPE, ID_MAP, ID_DIFFICULTY, ID_LENGTH, ID_MAXPLAYERS, SERVER_NAME, WEB_PORT, GAME_PORT, QUERY_PORT) VALUES(1000, 'Default', 1, 1000, 1000, 1000, 1000, 1006, 'Killing Floor 2 Server', 8080, 7777, 27015);
+INSERT INTO KF2DATABASE.PROFILES(ID, NAME, ID_LANGUAGE, ID_GAMETYPE, ID_MAP, ID_DIFFICULTY, ID_LENGTH, ID_MAXPLAYERS, SERVER_NAME, WEB_PORT, GAME_PORT, QUERY_PORT, WEB_PAGE) VALUES(1000, 'Default', 1, 1000, 1000, 1000, 1000, 1006, 'Killing Floor 2 Server', 8080, 7777, 27015, true);
 
 -----------------------------------
 -- PROFILES_MAPS

diff --git a/src/main/java/daos/MapDao.java b/src/main/java/daos/MapDao.java
@@ -25,8 +25,8 @@ public static MapDao getInstance() {
         return instance;
     }
 
-    public List<Map> listNotDownloadedMapsAndMods() throws SQLException {
-        String query="select m from entities.Map m where m.downloaded=false";
+    public List<Map> listAllMaps() throws SQLException {
+        String query="select m from entities.Map m";
         return list(query, null);
     }
 

diff --git a/src/main/java/dtos/ProfileDto.java b/src/main/java/dtos/ProfileDto.java
@@ -28,10 +28,11 @@ public class ProfileDto {
     private final String welcomeMessage;
     private final String customParameters;
     private final ObservableList<MapDto> mapList;
+    private final Boolean takeover;
 
     public ProfileDto(String name, SelectDto language, GameTypeDto gametype, MapDto map, SelectDto difficulty, SelectDto length, SelectDto maxPlayers,
                    String serverName, String serverPassword, Boolean webPage, String webPassword, Integer webPort, Integer gamePort, Integer queryPort,
-                   String yourClan, String yourWebLink, String urlImageServer, String welcomeMessage, String customParameters, ObservableList<MapDto> mapList) {
+                   String yourClan, String yourWebLink, String urlImageServer, String welcomeMessage, String customParameters, ObservableList<MapDto> mapList, Boolean takeover) {
         super();
         this.name = new SimpleStringProperty(name);
         this.language = language;
@@ -53,6 +54,7 @@ public ProfileDto(String name, SelectDto language, GameTypeDto gametype, MapDto
         this.welcomeMessage = welcomeMessage;
         this.customParameters = customParameters;
         this.mapList = mapList;
+        this.takeover = takeover;
     }
 
     public StringProperty getNameProperty() {
@@ -139,6 +141,10 @@ public ObservableList<MapDto> getMapList() {
         return mapList;
     }
 
+    public Boolean getTakeover() {
+        return takeover;
+    }
+
     @Override
     public String toString() {
         return getName();

diff --git a/src/main/java/dtos/factories/ProfileDtoFactory.java b/src/main/java/dtos/factories/ProfileDtoFactory.java
@@ -47,7 +47,8 @@ public ProfileDto newDto(Profile profile) {
                 profile.getUrlImageServer(),
                 profile.getWelcomeMessage(),
                 profile.getCustomParameters(),
-                mapDtoFactory.newDtos(profile.getMapList()));
+                mapDtoFactory.newDtos(profile.getMapList()),
+                profile.getTakeover());
     }
 
     public ObservableList<ProfileDto> newDtos(List<Profile> profiles) {

diff --git a/src/main/java/entities/Profile.java b/src/main/java/entities/Profile.java
@@ -52,6 +52,9 @@ public class Profile extends CommonEntity {
     @Column(name="WEB_PASSWORD", length=100)
     private String webPassword;
 
+    @Column(name="TAKEOVER")
+    private Boolean takeover;
+
     @Column(name="WEB_PORT")
     private Integer webPort;
 
@@ -90,7 +93,7 @@ public Profile() {
     }
 
     public Profile(String name, Language language, GameType gametype, Map map, Difficulty difficulty, Length length, MaxPlayers maxPlayers,
-                   String serverName, Integer webPort, Integer gamePort, Integer queryPort, List<Map> mapList) {
+                   String serverName, Integer webPort, Integer gamePort, Integer queryPort, List<Map> mapList, Boolean webPage) {
         super();
         this.name = name;
         this.language = language;
@@ -104,11 +107,12 @@ public Profile(String name, Language language, GameType gametype, Map map, Diffi
         this.gamePort = gamePort;
         this.queryPort = queryPort;
         this.mapList = mapList;
+        this.webPage = webPage;
     }
 
     public Profile(String name, Language language, GameType gametype, Map map, Difficulty difficulty, Length length, MaxPlayers maxPlayers,
                    String serverName, String serverPassword, Boolean webPage, String webPassword, Integer webPort, Integer gamePort, Integer queryPort,
-                   String yourClan, String yourWebLink, String urlImageServer, String welcomeMessage, String customParameters, List<Map> mapList) {
+                   String yourClan, String yourWebLink, String urlImageServer, String welcomeMessage, String customParameters, List<Map> mapList, Boolean takeover) {
         super();
         this.name = name;
         this.language = language;
@@ -130,6 +134,7 @@ public Profile(String name, Language language, GameType gametype, Map map, Diffi
         this.welcomeMessage = welcomeMessage;
         this.customParameters = customParameters;
         this.mapList = mapList;
+        this.takeover = takeover;
     }
 
     @Override
@@ -301,4 +306,12 @@ public List<Map> getMapList() {
     public void setMapList(List<Map> mapList) {
         this.mapList = mapList;
     }
+
+    public Boolean getTakeover() {
+        return takeover;
+    }
+
+    public void setTakeover(Boolean takeover) {
+        this.takeover = takeover;
+    }
 }
diff --git a/src/main/java/pojos/kf2factory/Kf2Common.java b/src/main/java/pojos/kf2factory/Kf2Common.java
@@ -202,14 +202,22 @@ protected void replaceInFileKfEngineIni(String installationFolder, Profile profi
                             pw.println("DownloadManagers=OnlineSubsystemSteamworks.SteamWorkshopDownload");
                         }
                     }
-                    if (StringUtils.isBlank(line) || (!line.contains("[OnlineSubsystemSteamworks.KFWorkshopSteamworks]") &&
-                            !line.contains("ServerSubscribedWorkshopItems="))) {
-                        pw.println(line);
+                    if (StringUtils.isNotBlank(line) && line.contains("bUsedForTakeover=")) {
+                        pw.println("bUsedForTakeover=" + (profile.getTakeover()!=null?profile.getTakeover():"FALSE"));
+                    } else {
+                        if (StringUtils.isBlank(line) || (!line.contains("[OnlineSubsystemSteamworks.KFWorkshopSteamworks]") &&
+                                !line.contains("ServerSubscribedWorkshopItems="))) {
+                            pw.println(line);
+                        }
                     }
                 } else {
-                    if (StringUtils.isBlank(line) || (!line.contains("DownloadManagers=OnlineSubsystemSteamworks.SteamWorkshopDownload") &&
-                            !line.contains("[OnlineSubsystemSteamworks.KFWorkshopSteamworks]") && !line.contains("ServerSubscribedWorkshopItems="))) {
-                        pw.println(line);
+                    if (StringUtils.isNotBlank(line) && line.contains("bUsedForTakeover=")) {
+                        pw.println("bUsedForTakeover=" + (profile.getTakeover()!=null?profile.getTakeover():"FALSE"));
+                    } else {
+                        if (StringUtils.isBlank(line) || (!line.contains("DownloadManagers=OnlineSubsystemSteamworks.SteamWorkshopDownload") &&
+                                !line.contains("[OnlineSubsystemSteamworks.KFWorkshopSteamworks]") && !line.contains("ServerSubscribedWorkshopItems="))) {
+                            pw.println(line);
+                        }
                     }
                 }
             }

diff --git a/src/main/java/pojos/listener/TimeListener.java b/src/main/java/pojos/listener/TimeListener.java
@@ -30,11 +30,11 @@ public TimeListener() {
     public void run() {
         logger.info("Starting the process of checking downloaded custom maps and mods.");
         try {
-            List<Map> notDownloadedMapList = databaseService.listNotDownloadedMapsAndMods();
-            if (notDownloadedMapList != null && !notDownloadedMapList.isEmpty()) {
+            List<Map> mapList = databaseService.listAllMaps();
+            if (mapList != null && !mapList.isEmpty()) {
                 PropertyService propertyService = new PropertyServiceImpl();
                 String installationFolder = propertyService.getPropertyValue("properties/config.properties", "prop.config.installationFolder");
-                for (Map map : notDownloadedMapList) {
+                for (Map map : mapList) {
                     try {
                         List<Path> kfmFilesPath = Files.walk(Paths.get(installationFolder + "/KFGame/Cache/" + map.getIdWorkShop()))
                                 .filter(Files::isRegularFile)

diff --git a/src/main/java/services/DatabaseService.java b/src/main/java/services/DatabaseService.java
@@ -7,6 +7,6 @@
 import java.util.List;
 
 public interface DatabaseService {
-    List<Map> listNotDownloadedMapsAndMods() throws SQLException;
+    List<Map> listAllMaps() throws SQLException;
     boolean updateMap(Map map) throws SQLException;
 }
diff --git a/src/main/java/services/DatabaseServiceImpl.java b/src/main/java/services/DatabaseServiceImpl.java
@@ -1,13 +1,10 @@
 package services;
 
 import daos.MapDao;
-import daos.ProfileDao;
 import entities.Map;
-import entities.Profile;
 
 import java.sql.SQLException;
 import java.util.List;
-import java.util.Optional;
 
 public class DatabaseServiceImpl implements DatabaseService {
 
@@ -16,8 +13,8 @@ public DatabaseServiceImpl() {
     }
 
     @Override
-    public List<Map> listNotDownloadedMapsAndMods() throws SQLException {
-        return MapDao.getInstance().listNotDownloadedMapsAndMods();
+    public List<Map> listAllMaps() throws SQLException {
+        return MapDao.getInstance().listAllMaps();
     }
 
     @Override

diff --git a/src/main/java/start/MainApplication.java b/src/main/java/start/MainApplication.java
@@ -40,7 +40,8 @@ public void start(Stage primaryStage) throws Exception {
         mainContent.load();
         primaryStage.getIcons().add(new Image(getClass().getClassLoader().getResourceAsStream("images/logo.png")));
         String applicationTitle = propertyService.getPropertyValue("properties/config.properties", "prop.config.applicationTitle");
-        primaryStage.setTitle(applicationTitle);
+        String applicationVersion = propertyService.getPropertyValue("properties/config.properties", "prop.config.applicationVersion");
+        primaryStage.setTitle(applicationTitle + " " + applicationVersion);
         primaryStage.setScene(scene);
         primaryStage.setMinWidth(1280);
         primaryStage.setMinHeight(800);

diff --git a/src/main/java/stories/console/ConsoleController.java b/src/main/java/stories/console/ConsoleController.java
@@ -0,0 +1,24 @@
+package stories.console;
+
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.control.TextArea;
+import org.apache.commons.lang3.StringUtils;
+import pojos.session.Session;
+
+import java.net.URL;
+import java.util.ResourceBundle;
+
+public class ConsoleController implements Initializable {
+
+    @FXML private TextArea console;
+
+    public ConsoleController() {
+        super();
+    }
+
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+        console.setText(StringUtils.isNotBlank(Session.getInstance().getConsole())? Session.getInstance().getConsole(): "");
+    }
+}