From ef89185439902dbdf8db396bb81380e8f103e24a Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Sun, 18 Sep 2016 11:33:27 +0200 Subject: [PATCH] Added switch to output some encoding values. --- .gitignore | 1 + .../telegram_backup/CommandLineController.java | 2 ++ .../de/fabianonline/telegram_backup/Database.java | 11 +++++++++++ .../de/fabianonline/telegram_backup/TestFeatures.java | 10 ++++++++++ .../telegram_backup/utils/CompareVersionsTest.java | 1 + 5 files changed, 25 insertions(+) diff --git a/.gitignore b/.gitignore index 6689a05..fc65bff 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ data/ .idea src/main/main.iml cache4.* +src/test/test.iml diff --git a/src/main/java/de/fabianonline/telegram_backup/CommandLineController.java b/src/main/java/de/fabianonline/telegram_backup/CommandLineController.java index 1fa63f9..9ad61e7 100644 --- a/src/main/java/de/fabianonline/telegram_backup/CommandLineController.java +++ b/src/main/java/de/fabianonline/telegram_backup/CommandLineController.java @@ -131,6 +131,8 @@ public class CommandLineController { if (CommandLineOptions.val_test != null) { if (CommandLineOptions.val_test == 1) { TestFeatures.test1(); + } else if (CommandLineOptions.val_test == 2) { + TestFeatures.test2(user, client); } else { System.out.println("Unknown test " + CommandLineOptions.val_test); } diff --git a/src/main/java/de/fabianonline/telegram_backup/Database.java b/src/main/java/de/fabianonline/telegram_backup/Database.java index cd80448..9641ffa 100644 --- a/src/main/java/de/fabianonline/telegram_backup/Database.java +++ b/src/main/java/de/fabianonline/telegram_backup/Database.java @@ -498,6 +498,17 @@ public class Database { return result; } catch (Exception e) { throw new RuntimeException(e); } } + + public String getEncoding() { + try { + ResultSet rs = stmt.executeQuery("PRAGMA encoding"); + rs.next(); + return rs.getString(1); + } catch (SQLException e) { + logger.debug("SQLException: {}", e); + return "unknown"; + } + } public LinkedList getListOfChatsForExport() { diff --git a/src/main/java/de/fabianonline/telegram_backup/TestFeatures.java b/src/main/java/de/fabianonline/telegram_backup/TestFeatures.java index c71ab8e..3b31d5f 100644 --- a/src/main/java/de/fabianonline/telegram_backup/TestFeatures.java +++ b/src/main/java/de/fabianonline/telegram_backup/TestFeatures.java @@ -1,12 +1,14 @@ package de.fabianonline.telegram_backup; import com.github.badoualy.telegram.tl.api.*; +import com.github.badoualy.telegram.api.TelegramClient; import java.sql.Connection; import java.sql.DriverManager; import java.sql.Statement; import java.sql.SQLException; import java.sql.ResultSet; import java.io.IOException; +import java.nio.charset.Charset; class TestFeatures { public static void test1() { @@ -51,4 +53,12 @@ class TestFeatures { System.out.println("Success: " + success); System.out.println("Unsupported constructor: " + unsupported_constructor); } + + public static void test2(UserManager user, TelegramClient client) { + // Prints system.encoding and default charset + System.out.println("Default Charset: " + Charset.defaultCharset()); + System.out.println("file.encoding: " + System.getProperty("file.encoding")); + Database db = new Database(user, client, false); + System.out.println("Database encoding: " + db.getEncoding()); + } } diff --git a/src/test/java/de/fabianonline/telegram_backup/utils/CompareVersionsTest.java b/src/test/java/de/fabianonline/telegram_backup/utils/CompareVersionsTest.java index b8ac085..4c5289e 100644 --- a/src/test/java/de/fabianonline/telegram_backup/utils/CompareVersionsTest.java +++ b/src/test/java/de/fabianonline/telegram_backup/utils/CompareVersionsTest.java @@ -12,5 +12,6 @@ public class CompareVersionsTest { assertEquals(Utils.compareVersions("1.0.4", "1.0.4"), Utils.VERSIONS_EQUAL); assertEquals(Utils.compareVersions("1.0.4-pre.2", "1.0.4-pre.1"), Utils.VERSIONS_EQUAL); assertEquals(Utils.compareVersions("1.0.4", "1.0.4-abcdef-dirty"), Utils.VERSION_2_NEWER); + assertEquals(Utils.compareVersions("1.0.5", "1.0.5-test.1"), Utils.VERSION_2_NEWER); } }