potzplitz/ExtremeDemonList
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

get GDLevel length

Browse source
This commit is contained in:
potzplitz 2024-05-11 01:11:43 +02:00
parent 603e187e06
commit 5a7d53f600
18 changed files with 318 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.settings/org.eclipse.core.resources.prefs
View file

@ -1,5 +1,3 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8 encoding/<project>=UTF-8
encoding/src=UTF-8 encoding/src=UTF-8

9
pom.xml
View file

@ -55,12 +55,17 @@
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
<version>1.15</version> <!-- oder die neueste Version --> <version>1.15</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>31.0.1-jre</version> <!-- oder die neueste Version --> <version>31.0.1-jre</version>
</dependency>
<dependency>
<groupId>org.kohsuke</groupId>
<artifactId>github-api</artifactId>
<version>1.127</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>

18
src/api/GetApiData.java
View file

@ -25,5 +25,23 @@ public class GetApiData {
return songID; return songID;
} }
private static int lock = 0;
GDClient client = null;
GDLevel level = null;
public String getLevelLength(int id) {
if(lock == 0) {
client = GDClient.create();
}
lock = 1;
level = client.findLevelById(id).block();
String length = level.length() + "";
return length;
}
} }

5
src/data/DownloadLevels.java
View file

@ -12,6 +12,7 @@ import javax.swing.JProgressBar;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.JTextArea; import javax.swing.JTextArea;
import api.GetApiData;
import gui.MainGUI; import gui.MainGUI;
import settingsfunctions.LoadSettings; import settingsfunctions.LoadSettings;
import settingsfunctions.MigrateData; import settingsfunctions.MigrateData;
@ -96,6 +97,10 @@ public class DownloadLevels {
MainGUI gui = new MainGUI(); MainGUI gui = new MainGUI();
MigrateData migrate = new MigrateData(); MigrateData migrate = new MigrateData();
migrate.migrateData(); migrate.migrateData();
RequestLevelLength req = new RequestLevelLength();
req.request();
try { try {
gui.build(); gui.build();
} catch (IOException e) { } catch (IOException e) {

3
src/data/ManageFiles.java
View file

@ -38,6 +38,5 @@ public class ManageFiles {
MainGUI gui = new MainGUI(); MainGUI gui = new MainGUI();
gui.build(); gui.build();
} }
} }
} }

37
src/data/RequestLevelLength.java Normal file
View file

@ -0,0 +1,37 @@
package data;
import api.GetApiData;
import database.Sqlite;
public class RequestLevelLength {
GetApiData data = new GetApiData();
FetchData fetch = new FetchData();
Sqlite sql = new Sqlite("levels");
public void request() {
sql.queryData("levels");
Thread thread = new Thread(new Runnable( ) {
@Override
public void run() {
for(int i = 0; i < ManageFiles.getMissinglevels().size(); i++) {
sql.modifyData(sql.getLevelname().get(sql.getRawLevelNames().indexOf(sql.getRawLevelNames().get(i))), Boolean.parseBoolean(sql.getCompleted().get(i).toString()), sql.getAttempts().get(i).intValue(), sql.getLocked().get(i).booleanValue(), sql.getPbarr().get(i), "" + data.getLevelLength(Integer.parseInt(sql.getLevelID().get(sql.getRawLevelNames().indexOf(ManageFiles.getMissinglevels().get(i))))));
try {
Thread.sleep(200);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
});
thread.start();
}
}

181
src/database/DatabaseManager.java
View file

@ -7,95 +7,102 @@ import java.util.ArrayList;
import data.FetchData; import data.FetchData;
import data.GuiData; import data.GuiData;
import gui.LoadingStatus;
import settingsfunctions.LoadSettings; import settingsfunctions.LoadSettings;
public class DatabaseManager { public class DatabaseManager {
public void manage() { private LoadingStatus status; // Singleton-Instanz von LoadingStatus
Sqlite createLevelDB = new Sqlite("levels");
if(createLevelDB.exists()) { public void manage() {
} else { Sqlite createLevelDB = new Sqlite("levels");
createLevelDB.createNewDatabase("levels"); if(createLevelDB.exists()) {
} } else {
createLevelDB.createNewTable("levels"); createLevelDB.createNewDatabase("levels");
}
createLevelDB.checkColumns("levels"); createLevelDB.createNewTable("levels");
} createLevelDB.checkColumns("levels");
public void migrateData() { }
Sqlite database = new Sqlite("levels");
FetchData fetch = new FetchData(); public void migrateData() {
Sqlite database = new Sqlite("levels");
LoadSettings settings = new LoadSettings(); FetchData fetch = new FetchData();
try { status = LoadingStatus.getInstance(); // Holen der Singleton-Instanz
settings.load();
} catch (IOException e) { status.initialize();
e.printStackTrace();
} LoadSettings settings = new LoadSettings();
try {
ArrayList<String> levels = new ArrayList<String>(); settings.load();
ArrayList<String> rawLevels = new ArrayList<String>(); } catch (IOException e) {
e.printStackTrace();
File file = new File("C:\\ExtremeDemonList\\levels"); }
File[] listLevels = file.listFiles();
ArrayList<String> levels = new ArrayList<String>();
for(int i = 0; i < listLevels.length; i++) { ArrayList<String> rawLevels = new ArrayList<String>();
rawLevels.add(listLevels[i].getName());
} File file = new File("C:\\ExtremeDemonList\\levels");
File[] listLevels = file.listFiles();
for(int i = 0; i < fetch.allLevels().size(); i++) {
if(rawLevels.indexOf(fetch.allLevels().get(i) + ".json") != -1) { for(int i = 0; i < listLevels.length; i++) {
levels.add(rawLevels.get(rawLevels.indexOf(fetch.allLevels().get(i) + ".json"))); rawLevels.add(listLevels[i].getName());
} }
} for(int i = 0; i < fetch.allLevels().size(); i++) {
if(rawLevels.indexOf(fetch.allLevels().get(i) + ".json") != -1) {
GuiData data = new GuiData(); levels.add(rawLevels.get(rawLevels.indexOf(fetch.allLevels().get(i) + ".json")));
}
try {
data.IndexData(levels); }
fetch.getGithubString();
} catch (IOException e) { GuiData data = new GuiData();
e.printStackTrace();
} try {
data.IndexData(levels);
System.out.println(data.getLocalLevels().size() + " ====== lovallevelsize"); fetch.getGithubString();
} catch (IOException e) {
for (int i = 0; i < data.getLocalLevels().size(); i++) { e.printStackTrace();
}
System.out.println(data.getLocalLevels().get(i));
System.out.println(data.getLocalLevels().size() + " ====== lovallevelsize");
for (int i = 0; i < data.getLocalLevels().size(); i++) {
status.update(data.getLocalLevels().get(i), i);
database.insertData( database.insertData(
"levels", // Tabellenname "levels", // Tabellenname
data.getAttempts().get(i), data.getAttempts().get(i),
fetch.allLevels().indexOf(levels.get(i).replace(".json", "")) + 1, fetch.allLevels().indexOf(levels.get(i).replace(".json", "")) + 1,
data.getLocalLevels().get(i), // Level-Name data.getLocalLevels().get(i), // Level-Name
levels.get(i).replace(".json", ""), // Level-Name-Raw (oder entsprechender Wert aus fetch.allLevels()) levels.get(i).replace(".json", ""), // Level-Name-Raw (oder entsprechender Wert aus fetch.allLevels())
Integer.parseInt(data.getId().get(i)), // ID Integer.parseInt(data.getId().get(i)), // ID
data.getCreator().get(i), // Ersteller data.getCreator().get(i), // Ersteller
data.getCreators().get(i), // Ersteller data.getCreators().get(i), // Ersteller
data.getVerifier().get(i), // Überprüfer data.getVerifier().get(i), // Überprüfer
data.getYoutubeLink().get(i), // YouTube-Link data.getYoutubeLink().get(i), // YouTube-Link
Integer.parseInt(data.getQualification().get(i)), // Qualifikation Integer.parseInt(data.getQualification().get(i)), // Qualifikation
data.getVictors().get(i), // Sieger data.getVictors().get(i), // Sieger
false, false,
false, false,
"" "",
); ""
} );
}
try {
database.sortData("levels"); try {
} catch (SQLException e) { database.sortData("levels");
e.printStackTrace(); } catch (SQLException e) {
} e.printStackTrace();
}
} status.dispose();
}
public void queryData(String tablename) {
Sqlite database = new Sqlite("levels"); public void queryData(String tablename) {
database.queryData(tablename); Sqlite database = new Sqlite("levels");
} database.queryData(tablename);
}
} }

52
src/database/Sqlite.java
View file

@ -11,11 +11,14 @@ import java.sql.Statement;
import java.util.ArrayList; import java.util.ArrayList;
import data.FetchData; import data.FetchData;
import gui.LoadingStatus;
public class Sqlite { public class Sqlite {
private static String url = "jdbc:sqlite:C:\\ExtremeDemonList\\database\\sqlite\\"; private static String url = "jdbc:sqlite:C:\\ExtremeDemonList\\database\\sqlite\\";
private static String filename; private static String filename;
private LoadingStatus status;
private ArrayList<String> levelname = new ArrayList<String>(); private ArrayList<String> levelname = new ArrayList<String>();
private ArrayList<String> levelID = new ArrayList<String>(); private ArrayList<String> levelID = new ArrayList<String>();
@ -30,6 +33,7 @@ public class Sqlite {
private ArrayList<Integer> attempts = new ArrayList<Integer>(); private ArrayList<Integer> attempts = new ArrayList<Integer>();
private ArrayList<Boolean> locked = new ArrayList<Boolean>(); // New column private ArrayList<Boolean> locked = new ArrayList<Boolean>(); // New column
private ArrayList<String> pbarr = new ArrayList<String>(); private ArrayList<String> pbarr = new ArrayList<String>();
private ArrayList<String> levelLength = new ArrayList<String>();
public ArrayList<String> getLevelname() { public ArrayList<String> getLevelname() {
return levelname; return levelname;
@ -82,6 +86,10 @@ public class Sqlite {
public ArrayList<String> getPbarr() { public ArrayList<String> getPbarr() {
return pbarr; return pbarr;
} }
public ArrayList<String> getLevelLength() {
return levelLength;
}
public Sqlite(String dbname) { // setzt variablen public Sqlite(String dbname) { // setzt variablen
url = "jdbc:sqlite:C:\\ExtremeDemonList\\database\\sqlite\\"; url = "jdbc:sqlite:C:\\ExtremeDemonList\\database\\sqlite\\";
@ -121,7 +129,8 @@ public class Sqlite {
+ " attempts INTEGER NOT NULL,\n" + " attempts INTEGER NOT NULL,\n"
+ " completed BOOLEAN NOT NULL,\n" + " completed BOOLEAN NOT NULL,\n"
+ " locked BOOLEAN NOT NULL,\n" // Neue Spalte + " locked BOOLEAN NOT NULL,\n" // Neue Spalte
+ " personalBest STRING\n" + " personalBest STRING,\n"
+ " levelLength String\n"
+ ");"; + ");";
try (Connection conn = DriverManager.getConnection(url); try (Connection conn = DriverManager.getConnection(url);
@ -133,8 +142,8 @@ public class Sqlite {
} }
} }
public void insertData(String tablename, Integer attempts, int placement, String levelname, String levelnameRaw, int levelid, String author, String creators, String verifier, String verificationLink, int percenttoqualify, String records, boolean completed, boolean locked, String pb) { public void insertData(String tablename, Integer attempts, int placement, String levelname, String levelnameRaw, int levelid, String author, String creators, String verifier, String verificationLink, int percenttoqualify, String records, boolean completed, boolean locked, String pb, String levelLength) {
String sql = "INSERT INTO " + tablename + " (placement, levelname, levelnameRaw, levelID, author, creators, verifier, verificationLink, percentToQualify, records, attempts, completed, locked, personalBest) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; String sql = "INSERT INTO " + tablename + " (placement, levelname, levelnameRaw, levelID, author, creators, verifier, verificationLink, percentToQualify, records, attempts, completed, locked, personalBest, levelLength) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
System.out.println("tablename: " + levelname); System.out.println("tablename: " + levelname);
@ -158,6 +167,7 @@ public class Sqlite {
pstmt.setBoolean(12, completed); pstmt.setBoolean(12, completed);
pstmt.setBoolean(13, locked); pstmt.setBoolean(13, locked);
pstmt.setString(14, pb); pstmt.setString(14, pb);
pstmt.setString(15, levelLength);
pstmt.executeUpdate(); pstmt.executeUpdate();
} catch (SQLException e) { } catch (SQLException e) {
@ -188,6 +198,7 @@ public class Sqlite {
attempts.add(rs.getInt("attempts")); attempts.add(rs.getInt("attempts"));
locked.add(rs.getBoolean("locked")); // Get the value of the new column locked.add(rs.getBoolean("locked")); // Get the value of the new column
pbarr.add(rs.getString("personalBest")); pbarr.add(rs.getString("personalBest"));
levelLength.add(rs.getString("levelLength"));
} }
@ -199,6 +210,11 @@ public class Sqlite {
public void sortData(String tablename) throws SQLException { public void sortData(String tablename) throws SQLException {
FetchData data = new FetchData(); FetchData data = new FetchData();
status = LoadingStatus.getInstance(); // Holen der Singleton-Instanz
status.initialize();
status.changeState("Datenbank wird sortiert...");
ArrayList<String> levelnamelocal = new ArrayList<String>(); ArrayList<String> levelnamelocal = new ArrayList<String>();
ArrayList<String> levelIDlocal = new ArrayList<String>(); ArrayList<String> levelIDlocal = new ArrayList<String>();
@ -213,6 +229,7 @@ public class Sqlite {
ArrayList<Integer> attemptsLocal = new ArrayList<Integer>(); ArrayList<Integer> attemptsLocal = new ArrayList<Integer>();
ArrayList<Boolean> lockedLocal = new ArrayList<Boolean>(); ArrayList<Boolean> lockedLocal = new ArrayList<Boolean>();
ArrayList<String> pblocal = new ArrayList<String>(); ArrayList<String> pblocal = new ArrayList<String>();
ArrayList<String> levelLengthlocal = new ArrayList<String>();
try (Connection conn = DriverManager.getConnection(url); try (Connection conn = DriverManager.getConnection(url);
Statement stmt = conn.createStatement()) { Statement stmt = conn.createStatement()) {
@ -229,11 +246,15 @@ public class Sqlite {
maxPlacement = maxPlacementResult.getInt("maxPlacement"); maxPlacement = maxPlacementResult.getInt("maxPlacement");
} }
int index = 0;
// Durchlaufen Sie die Platzierungen und holen Sie die Daten entsprechend // Durchlaufen Sie die Platzierungen und holen Sie die Daten entsprechend
for (int i = 1; i <= maxPlacement; i++) { for (int i = 1; i <= maxPlacement; i++) {
String sql = "SELECT * FROM " + tablename + " WHERE placement = " + i; String sql = "SELECT * FROM " + tablename + " WHERE placement = " + i;
ResultSet rs = stmt.executeQuery(sql); ResultSet rs = stmt.executeQuery(sql);
while (rs.next()) { while (rs.next()) {
index++;
status.update(rs.getString("levelname"), index);
levelnamelocal.add(rs.getString("levelname")); levelnamelocal.add(rs.getString("levelname"));
levelIDlocal.add(rs.getInt("levelID") + ""); levelIDlocal.add(rs.getInt("levelID") + "");
authorlocal.add(rs.getString("author")); authorlocal.add(rs.getString("author"));
@ -247,6 +268,7 @@ public class Sqlite {
attemptsLocal.add(rs.getInt("attempts")); attemptsLocal.add(rs.getInt("attempts"));
lockedLocal.add(rs.getBoolean("locked")); lockedLocal.add(rs.getBoolean("locked"));
pblocal.add(rs.getString("personalBest")); pblocal.add(rs.getString("personalBest"));
levelLengthlocal.add(rs.getString("levelLength"));
} }
} }
@ -256,10 +278,13 @@ public class Sqlite {
// Erstelle eine neue Tabelle mit dem ursprünglichen Namen // Erstelle eine neue Tabelle mit dem ursprünglichen Namen
createNewTable(tablename); createNewTable(tablename);
status.changeState("Daten werden in neue Tabelle migriert...");
// Füge Daten in die neue Tabelle ein // Füge Daten in die neue Tabelle ein
String insert = "INSERT INTO " + tablename + " (placement, levelname, levelnameRaw, levelID, author, creators, verifier, verificationLink, percentToQualify, records, attempts, completed, locked, personalBest) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"; String insert = "INSERT INTO " + tablename + " (placement, levelname, levelnameRaw, levelID, author, creators, verifier, verificationLink, percentToQualify, records, attempts, completed, locked, personalBest, levelLength) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
try (PreparedStatement pstmt = conn.prepareStatement(insert)) { try (PreparedStatement pstmt = conn.prepareStatement(insert)) {
for (int i = 0; i < levelnamelocal.size(); i++) { for (int i = 0; i < levelnamelocal.size(); i++) {
status.update(levelnamelocal.get(i), i);
if (i < rawLevelNameslocal.size()) { // Überprüfen, ob der Index im Array rawLevelNameslocal gültig ist if (i < rawLevelNameslocal.size()) { // Überprüfen, ob der Index im Array rawLevelNameslocal gültig ist
String currentRawLevelName = rawLevelNameslocal.get(i); String currentRawLevelName = rawLevelNameslocal.get(i);
if (data.allLevels().indexOf(currentRawLevelName) == -1) { if (data.allLevels().indexOf(currentRawLevelName) == -1) {
@ -281,6 +306,7 @@ public class Sqlite {
pstmt.setBoolean(12, Boolean.parseBoolean(completedlocal.get(i))); pstmt.setBoolean(12, Boolean.parseBoolean(completedlocal.get(i)));
pstmt.setBoolean(13, lockedLocal.get(i)); // Insert value of locked column pstmt.setBoolean(13, lockedLocal.get(i)); // Insert value of locked column
pstmt.setString(14, pblocal.get(i)); pstmt.setString(14, pblocal.get(i));
pstmt.setString(15, levelLengthlocal.get(i));
pstmt.executeUpdate(); pstmt.executeUpdate();
} }
} else { } else {
@ -295,6 +321,7 @@ public class Sqlite {
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
} }
status.dispose();
} }
public void removeEntry(String tablename, String rawLevelName) throws SQLException { public void removeEntry(String tablename, String rawLevelName) throws SQLException {
@ -311,16 +338,17 @@ public class Sqlite {
} }
} }
public void modifyData(String levelname, boolean completedStatus, int attempts, boolean lock, String percent) { public void modifyData(String levelname, boolean completedStatus, int attempts, boolean lock, String percent, String levelLength) {
String sql = "UPDATE levels SET completed = ?, attempts = ?, locked = ?, personalBest = ? WHERE levelname = ?"; String sql = "UPDATE levels SET completed = ?, attempts = ?, locked = ?, personalBest = ?, levelLength = ? WHERE levelname = ?";
try (Connection conn = DriverManager.getConnection(url); try (Connection conn = DriverManager.getConnection(url);
PreparedStatement pstmt = conn.prepareStatement(sql)) { PreparedStatement pstmt = conn.prepareStatement(sql)) {
pstmt.setBoolean(1, completedStatus); pstmt.setBoolean(1, completedStatus);
pstmt.setInt(2, attempts); pstmt.setInt(2, attempts);
pstmt.setBoolean(3, lock); // Korrigierte Reihenfolge pstmt.setBoolean(3, lock); // Korrigierte Reihenfolge
pstmt.setString(4, percent); pstmt.setString(4, percent);
pstmt.setString(5, levelname); // Korrigierte Reihenfolge pstmt.setString(5, levelLength);
pstmt.setString(6, levelname); // Korrigierte Reihenfolge
@ -336,7 +364,7 @@ public class Sqlite {
} }
public void checkColumns(String tablename) { public void checkColumns(String tablename) {
String[] spalten = {"placement", "levelname", "levelnameRaw", "levelID", "author", "creators", "verifier", "verificationLink", "percentToQualify", "records", "attempts", "completed", "locked", "personalBest"}; String[] spalten = {"placement", "levelname", "levelnameRaw", "levelID", "author", "creators", "verifier", "verificationLink", "percentToQualify", "records", "attempts", "completed", "locked", "personalBest", "levelLength"};
// Datenbankverbindung // Datenbankverbindung
try (Connection connection = DriverManager.getConnection(url)) { try (Connection connection = DriverManager.getConnection(url)) {

10
src/firstlaunch/FirstlaunchMain.java
View file

@ -1,10 +0,0 @@
package firstlaunch;
public class FirstlaunchMain {
public void main() {
}
}

78
src/gui/LoadingStatus.java Normal file
View file

@ -0,0 +1,78 @@
package gui;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JProgressBar;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import data.FetchData;
import data.ManageFiles;
public class LoadingStatus {
private static LoadingStatus instance = null;
private JTextArea area = new JTextArea();
private JProgressBar bar = new JProgressBar();
private JFrame main = new JFrame("Updater");
private JLabel info = new JLabel("Updateroutine wird durchgeführt...");
private FetchData data = new FetchData();
private LoadingStatus() {
initialize();
}
public void initialize() {
main.setSize(400, 300);
main.setLayout(null);
main.setResizable(false);
main.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
info.setBounds(80, 1, 500, 30);
area.setEditable(false);
area.setLineWrap(true);
area.setWrapStyleWord(true);
area.setCaretPosition(area.getDocument().getLength());
JScrollPane scroll = new JScrollPane(area);
scroll.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED);
scroll.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
scroll.setBounds(1, 60, 383, 201);
bar.setBounds(1, 29, 382, 30);
bar.setMinimum(0);
bar.setStringPainted(true);
main.add(info);
main.add(scroll);
main.add(bar);
main.setVisible(true);
}
public static synchronized LoadingStatus getInstance() {
if (instance == null) {
instance = new LoadingStatus();
}
return instance;
}
public void update(String level, int barValue) {
area.append(level + "\n");
bar.setValue(barValue + 1);
}
public void dispose() {
main.dispose();
}
public void changeState(String state) {
bar.setMaximum(data.allLevels().size());
bar.setValue(0);
info.setText(state);
area.setText("");
}
}

2
src/gui/MainGUI.java
View file

@ -280,7 +280,7 @@ public class MainGUI {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
if(!(comp[index] == Boolean.parseBoolean(data.getCompleted().get(index))) || !(attempts.getText().equals(data.getAttempts().get(index) + "")) || !(data.getLocked().get(index) == lockbool[index])) { if(!(comp[index] == Boolean.parseBoolean(data.getCompleted().get(index))) || !(attempts.getText().equals(data.getAttempts().get(index) + "")) || !(data.getLocked().get(index) == lockbool[index])) {
data.modifyData(data.getLevelname().get(index), comp[index], Integer.parseInt(attempts.getText()), lockbool[index], data.getPbarr().get(index)); data.modifyData(data.getLevelname().get(index), comp[index], Integer.parseInt(attempts.getText()), lockbool[index], data.getPbarr().get(index), data.getLevelLength().get(index));
} }

2
src/gui/SettingsGui.java
View file

@ -87,6 +87,8 @@ public class SettingsGui {
}); });
Button lengthReq = new Button("Länge der Level abfragen");
Button delete = new Button("Datenbank löschen"); Button delete = new Button("Datenbank löschen");
delete.setBounds(150, 206, 150, 30); delete.setBounds(150, 206, 150, 30);

1
src/main/Main.java
View file

@ -3,6 +3,7 @@ package main;
import java.io.IOException; import java.io.IOException;
import java.util.zip.DataFormatException; import java.util.zip.DataFormatException;
import api.GetApiData;
import data.FetchData; import data.FetchData;
import data.ManageFiles; import data.ManageFiles;
import database.DatabaseManager; import database.DatabaseManager;

1
src/module-info.java
View file

@ -10,4 +10,5 @@
requires java.sql; requires java.sql;
requires java.xml; requires java.xml;
requires org.apache.commons.codec; requires org.apache.commons.codec;
requires github.api;
} }

6
src/preload/AssetManager.java
View file

@ -1,5 +1,11 @@
package preload; package preload;
import java.io.File;
public class AssetManager { public class AssetManager {
public void checkAssets() {
File file = new File("");
}
} }

15
src/readsafefile/ReadAttemptsFromXML.java
View file

@ -15,6 +15,7 @@ public class ReadAttemptsFromXML {
public Map<String, String> attempts = new HashMap<String, String>(); public Map<String, String> attempts = new HashMap<String, String>();
public Map<String, String> newbestMap = new HashMap<>(); public Map<String, String> newbestMap = new HashMap<>();
public Map<String, String> lengthMap = new HashMap<>();
public void readAttempts() { public void readAttempts() {
try { try {
@ -46,6 +47,7 @@ public class ReadAttemptsFromXML {
NodeList dChildren = dElement.getChildNodes(); NodeList dChildren = dElement.getChildNodes();
String attemptsValue = null; String attemptsValue = null;
String percentValue = null; String percentValue = null;
String lengthValue = null;
for (int j = 0; j < dChildren.getLength(); j++) { for (int j = 0; j < dChildren.getLength(); j++) {
if (dChildren.item(j).getNodeName().equals("k")) { if (dChildren.item(j).getNodeName().equals("k")) {
@ -54,21 +56,30 @@ public class ReadAttemptsFromXML {
if (kChild.getTextContent().equals("k18")) { if (kChild.getTextContent().equals("k18")) {
attemptsValue = dChildren.item(j + 1).getTextContent(); attemptsValue = dChildren.item(j + 1).getTextContent();
} }
if (kChild.getTextContent().equals("k19")) { if (kChild.getTextContent().equals("k19")) {
percentValue = dChildren.item(j + 1).getTextContent(); percentValue = dChildren.item(j + 1).getTextContent();
} }
if(kChild.getTextContent().equals("k23")) {
lengthValue = dChildren.item(j + 1).getTextContent();
}
} }
} }
if(lengthValue != null) {
lengthMap.put(currentLevelID, lengthValue);
}
if (attemptsValue != null && percentValue != null) { if (attemptsValue != null && percentValue != null) {
tempAttempts.put(currentLevelID, attemptsValue ); // + "," + percentValue tempAttempts.put(currentLevelID, attemptsValue ); // + "," + percentValue
newbestMap.put(currentLevelID, percentValue); newbestMap.put(currentLevelID, percentValue);
} }
} }
} }
// Füge die Daten aus der temporären Map in die attempts-Map ein
attempts.putAll(tempAttempts); attempts.putAll(tempAttempts);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();

5
src/readsafefile/Request.java Normal file
View file

@ -0,0 +1,5 @@
package readsafefile;
public class Request {
}

10
src/readsafefile/SafeFileManager.java
View file

@ -8,6 +8,8 @@ import gui.AttemptsProgress;
public class SafeFileManager { public class SafeFileManager {
private String[] lengthArr = {"Tiny", "Short", "Medium", "Long", "XL", "Platformer", "N/A"};
public void DecryptSafeFile() throws IOException { public void DecryptSafeFile() throws IOException {
DecryptXOR.decryptAndWriteFiles(); DecryptXOR.decryptAndWriteFiles();
} }
@ -39,6 +41,12 @@ public class SafeFileManager {
for(int i = 0; i < database.getLevelID().size(); i++) { for(int i = 0; i < database.getLevelID().size(); i++) {
attempts = read.attempts.get(database.getLevelID().get(i)); attempts = read.attempts.get(database.getLevelID().get(i));
percent = read.newbestMap.get(database.getLevelID().get(i)); percent = read.newbestMap.get(database.getLevelID().get(i));
if(read.lengthMap.get(database.getLevelID().get(i)) != null) {
System.out.println(lengthArr[Integer.parseInt(read.lengthMap.get(database.getLevelID().get(i)))]);
}
if(attempts == null) { if(attempts == null) {
attempts = 0 + ""; attempts = 0 + "";
} }
@ -47,7 +55,7 @@ public class SafeFileManager {
} }
prog.update(database.getLevelname().get(i), Integer.parseInt(attempts), Integer.parseInt(percent), i); prog.update(database.getLevelname().get(i), Integer.parseInt(attempts), Integer.parseInt(percent), i);
if(!database.getLocked().get(i)) { if(!database.getLocked().get(i)) {
database.modifyData(database.getLevelname().get(i), Boolean.parseBoolean(database.getCompleted().get(i)), Integer.parseInt(attempts), database.getLocked().get(i), percent); database.modifyData(database.getLevelname().get(i), Boolean.parseBoolean(database.getCompleted().get(i)), Integer.parseInt(attempts), database.getLocked().get(i), percent, database.getLevelLength().get(i));
} }
} }
prog.close(); prog.close();