Skip to content

Commit

Permalink
v3.0.0 changes
Browse files Browse the repository at this point in the history 
field focus remains after links clicked
trycatching and better error proofing
working filters actually this time
try again on fail scrape
stripped unnecessary components
fixed refresh button shifting and buttons changing size in focus
create program folder if doesnt exist in linu
  • Loading branch information
@BLCK-B
BLCK-B committed Jul 3, 2023
1 parent 41ff54d commit 2be34e1
Show file tree
Hide file tree
Showing 8 changed files with 286 additions and 61 deletions.
14 changes: 12 additions & 2 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ plugins {
}

group 'com.blck'
version '2.0.0'
version '3.0.0'

repositories {
mavenCentral()
}

ext {
junitVersion = '5.9.2'
junitVersion = '5.9.3'
}

configurations {
Expand Down Expand Up @@ -43,6 +43,7 @@ javafx {
dependencies {
implementation 'org.xerial:sqlite-jdbc:3.42.0.0'
implementation 'org.jsoup:jsoup:1.16.1'
implementation 'com.typesafe:config:1.4.2'
testImplementation("org.junit.jupiter:junit-jupiter-api:${junitVersion}")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitVersion}")
}
Expand Down Expand Up @@ -77,6 +78,15 @@ tasks.jar {
}

shadowJar {
exclude 'org/sqlite/native/Linux-Musl/**'
exclude 'org/sqlite/native/Linux-Android/**'
exclude 'org/sqlite/native/FreeBSD/**'
exclude 'org/sqlite/native/Mac/**'
exclude 'org/sqlite/native/Linux/aarch64/**'
exclude 'org/sqlite/native/Linux/arm/**'
exclude 'org/sqlite/native/Linux/armv6/**'
exclude 'org/sqlite/native/Linux/ppc64/**'
exclude 'org/sqlite/native/Windows/aarch64/**'
configurations = [project.configurations.runtimeClasspath, project.configurations.shadow]
archiveClassifier.set('')
manifest {
Expand Down
115 changes: 110 additions & 5 deletions src/main/java/com/blck/MusicReleaseTracker/DBtools.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
package com.blck.MusicReleaseTracker;

import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

import com.typesafe.config.*;

/* MusicReleaseTrcker
Copyright (C) 2023 BLCK
Expand All @@ -24,6 +32,8 @@
//class for essential tasks
public class DBtools {
public static String DBpath;
public static String ConfigPath;
public static String ConfigFolder;

public static void path() {
String os = System.getProperty("os.name").toLowerCase();
Expand All @@ -32,15 +42,24 @@ public static void path() {
if (ide != null && ide.equals("IDE")) { //IDE
String appDataPath = System.getenv("APPDATA");
DBpath = "jdbc:sqlite:musicdata.db";
ConfigPath = appDataPath + File.separator + "MusicReleaseTracker" + File.separator + "MRTsettings.hocon";
ConfigFolder = appDataPath + File.separator + "MusicReleaseTracker" + File.separator;
} else if (os.contains("win")) { //Windows
String appDataPath = System.getenv("APPDATA");
DBpath = "jdbc:sqlite:" + appDataPath + File.separator + "MusicReleaseTracker" + File.separator + "musicdata.db";
ConfigPath = appDataPath + File.separator + "MusicReleaseTracker" + File.separator + "MRTsettings.hocon";
ConfigFolder = appDataPath + File.separator + "MusicReleaseTracker" + File.separator;
} else if (os.contains("nix") || os.contains("nux") || os.contains("mac")) { //Linux
String userHome = System.getProperty("user.home");
File folder = new File(userHome + File.separator + ".MusicReleaseTracker");
if (!folder.exists())
folder.mkdirs();
DBpath = "jdbc:sqlite:" + userHome + File.separator + ".MusicReleaseTracker" + File.separator + "musicdata.db";
ConfigPath = userHome + File.separator + ".MusicReleaseTracker" + File.separator + "MRTsettings.hocon";
ConfigFolder = userHome + File.separator + ".MusicReleaseTracker" + File.separator;
}
else
throw new UnsupportedOperationException("Unsupported operating system.");
throw new UnsupportedOperationException("unsupported OS");
}

public static void createTables() throws SQLException {
Expand Down Expand Up @@ -95,13 +114,99 @@ public static void createTables() throws SQLException {
public static List<String> filterWords = new ArrayList<>();

public static void readFilters() {

filterWords.clear();
Config config = ConfigFactory.parseFile(new File(ConfigPath));
Config filtersConfig = config.getConfig("filters");
for (Map.Entry<String, ConfigValue> entry : filtersConfig.entrySet()) {
String filter = entry.getKey();
boolean enabled = entry.getValue().unwrapped().equals(true);
if (enabled)
filterWords.add(filter);
}
}

public static void UpdateSettingsDB() {
public static void updateSettingsDB() {
//create config if it does not exist, transfer data to new structure if update changed it
//the int version should be changed on structure update (change of string templateContent)
final int version = 1;
String templateContent =
"version=" + version + "\n" +
"filters {\n" +
" Acoustic=false\n" +
" Extended=false\n" +
" Instrumental=false\n" +
" Remaster=false\n" +
" Remix=false\n" +
" VIP=false\n" +
"}";
File templateFile = new File(ConfigFolder + "/MRTsettingsTemplate.hocon");
if (!templateFile.exists()) {
try (PrintWriter writer = new PrintWriter(new FileWriter(templateFile))) {
writer.write(templateContent);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
File configFile = new File(ConfigPath);
if (!configFile.exists()) {
try (PrintWriter writer = new PrintWriter(new FileWriter(configFile))) {
writer.write(templateContent);
} catch (IOException e) {
throw new RuntimeException(e);
}
}
//comparing versions
Config config = ConfigFactory.parseFile(new File(ConfigPath));
int fileVersion = config.getInt("version");
if (fileVersion != version) {
//if different version > update template > transfer all possible data to template > replace files
try (PrintWriter writer = new PrintWriter(new FileWriter(templateFile))) {
writer.write(templateContent);
} catch (IOException e) {
throw new RuntimeException(e);
}
//transfer the states of options from MRTsettings to MRTsettingsTemplate, update version
config = ConfigFactory.parseFile(new File(ConfigPath));
Config templateConfig = ConfigFactory.parseFile(new File(ConfigFolder + "MRTsettingsTemplate.hocon"));
for (Map.Entry<String, ConfigValue> entry : config.entrySet()) {
String key = entry.getKey();
ConfigValue value = entry.getValue();

if (value.valueType() == ConfigValueType.BOOLEAN && templateConfig.hasPath(key)) {
boolean state = config.getBoolean(key);
templateConfig = templateConfig.withValue(key, ConfigValueFactory.fromAnyRef(state));
}
else if (value.valueType() == ConfigValueType.STRING && templateConfig.hasPath(key)) {
String stringValue = config.getString(key);
templateConfig = templateConfig.withValue(key, ConfigValueFactory.fromAnyRef(stringValue));
}
}
config = config.withValue("version", ConfigValueFactory.fromAnyRef(version));
//save the updated template config to MRTsettingsTemplate.hocon
try (PrintWriter writer = new PrintWriter(new FileWriter(ConfigFolder + "MRTsettingsTemplate.hocon"))) {
ConfigRenderOptions renderOptions = ConfigRenderOptions.defaults().setOriginComments(false).setJson(false).setFormatted(true);
String renderedConfig = templateConfig.root().render(renderOptions);
writer.write(renderedConfig);
} catch (IOException e) {
throw new RuntimeException("Error while saving MRTsettingsTemplate.hocon", e);
}
//replace contents of MRTsettings (old) with MRTsettingsTemplate (new), default the template again
try {
Files.copy(templateFile.toPath(), configFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
} catch (IOException e) {
throw new RuntimeException("Error while replacing MRTsettings with MRTsettingsTemplate", e);
}
try (PrintWriter writer = new PrintWriter(new FileWriter(templateFile))) {
writer.write(templateContent);
} catch (IOException e) {
throw new RuntimeException(e);
}


}

}
}
}



}
Loading

0 comments on commit 2be34e1

Please sign in to comment.