From e31a10b04e18dd4381a29f95ac2ad8e2d93eb6e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Mon, 15 Apr 2019 13:30:29 +0200 Subject: [PATCH] 1.10.6 RELEASE --- .gitignore | 4 +- CHANGELOG.txt | 96 ++++++++++++++++++++++++++++++++- build.gradle | 41 +++++--------- src/main/de/jClipCorn/Main.java | 6 +-- 4 files changed, 113 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 8ee7cf43..c34439a5 100644 --- a/.gitignore +++ b/.gitignore @@ -130,4 +130,6 @@ jClipCornPermissionTest.emptyfile jClipCorn Wiki jClipCorn Wiki/* -.do_publish_release \ No newline at end of file +.do_publish_release + +launch4j/launch4j.cfg.xml \ No newline at end of file diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 70007082..05590510 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,99 @@ +######################################################################## +############ Mon Apr 15 13:30:29 2019 +0200 1.10.6 RELEASE ############ +######################################################################## + + +1.10.6 Feature: Edit OnlineRef dialog +1.10.6 Task: Made CCTagList immutable +1.10.6 Feature: Call MediaInfo from QuickAddEpisodesFrame +1.10.6 Feature: Call MediaInfo from AddEpisodesFrame +1.10.6 Feature: Call MediaInfo from EditSeriesFrame +1.10.6 Feature: Call MediaInfo from EditMovieFrame +1.10.6 Feature: Call MediaInfo from AddMovieFrame +1.10.6 Task: Show warnings in UpdateCodecFrame +1.10.6 Bugfix: Fixed unordered episodes keep being unordered +1.10.6 Task: Minor MediaInfo fixes +1.10.6 Task: New XML Serialization version (v2) +1.10.6 Task: Use ActionTree commands in PreviewSeriesFrame popup +1.10.6 Task: Use ActionTree commands in PreviewSeriesFrame menu +1.10.6 Task: Refactoring of CCActionTree (+ more elements in PreviewMovieFrame menu) +1.10.6 Bugfix: Fixed unit tests +1.10.6 Task: Refactor DB XML Serialization (Part 2 - Import) +1.10.6 Task: Refactor DB XML Serialization (Part 1 - Export) +1.10.6 Feature: Warn when exiting with unread errors +1.10.6 Task: Explicitly throw error on wrong values in Movies/Series/Season/Episodes +1.10.6 Feature: Update metadata via MediaQuery (language + length) +1.10.6 Feature: Multiple languages per element & Different Language per episode (db schema changes) +1.10.6 Task: Eclipse cleanup +1.10.6 Feature: Try to auto mount missing network drives (windows) +1.10.6 Task: Less left padding in only-icon columns in the main table +1.10.6 Feature: Show view count in table(s) (left side of icon) +1.10.6 Task: Major refactoring of Resources.java +1.10.6 Task: Switch back to java-1.8 +1.10.6 Task: Upgrade to java-11 +1.10.6 Feature: Statistics Timeline: Only show consecutive episodes +1.10.6 Task: java package restructuring +1.10.6 Feature: Added validation 'ERROR_NON_NORMALIZED_PATH' +1.10.6 Task: Better UI for CreateSeriesFolderStructureFrame +1.10.6 Bugfix: Fixed ERROR_TAG_NOT_VALID_ON_SERIE +1.10.6 Bugfix: Fixed writing Settings in readonly mode +1.10.6 Task: Added Tag->Type associations (Movie|Series|Episode) and validations +1.10.6 Feature: New OnlineRefType: ANIDB +1.10.6 Feature: Add genre: Isekai +1.10.6 Task: Support for combined genres in CCGenre parsing from online metadata +1.10.6 Feature: Async operation of InitBackupmanager +1.10.6 Feature: Async operation of PreloadResources +1.10.6 Task: Code cleanup (Eclipse Oxygen) +1.10.6 Task: Faster startup time (reduced initial db queries) +1.10.6 Bugfix: Fixed PreviewSeries action being labeled as read-only-restricted +1.10.6 Feature: Show Progressbars in QuickAdd dialogs +1.10.6 Task: Visual improvements of combined timeline statistic +1.10.6 Feature: New statistic: [[Combined series timeline]] +1.10.6 Task: Gradle cleanup stuff +1.10.6 Feature: Added new AddDate Algorithm (Newest_Season_by_oldest_Episode) +1.10.6 Task: A bit more tooltip infos in Statusbar +1.10.6 Task: Add new statusbar item: DriveMapStatus +1.10.6 Task: Better Globals.Timer Output +1.10.6 Feature: New statistics: Groups +1.10.6 Feature: Rescan drive after 30sec if unreferenced drives are used +1.10.6 Bugfix: Fixed ConcurrentModificationException in CCLog +1.10.6 Bugfix: Fixed exception when creating backup on remote drive (windows) +1.10.6 Bugfix: Fixed async cover loading sometimes not updating JLabel +1.10.6 Feature: New CCPath syntax for variables: +1.10.6 Bugfix: Fixed illegal characters in syntax +1.10.6 Bugfix: Fixed loading of test resources under non-UTF8 environments (win cmd) +1.10.6 Feature: New CCPath syntax: +1.10.6 Bugfix: Missing icon in QuickAddMoviesDialog +1.10.6 Feature: QuickAdd (+copy) movies by drag'n'dropping them into the MainWindow +1.10.6 Feature: QuickAdd Episode by drag'n'dropping it into the PreviewSeriesFrame +1.10.6 Bugfix: Fixed CCDate.sub across year boundaries +1.10.6 Task: Fixed unit tests (2) +1.10.6 Task: Fixed unit tests +1.10.6 Feature: OpenDirectory (via menu & right-click) on series +1.10.6 Feature: Tags in Series +1.10.6 Feature: Cancelled Tag +1.10.6 Feature: Relative Viewed-History Filter +1.10.6 Bugfix: Fixed Comparable interface of CCDateTime +1.10.6 Bugfix: Fixed Exception when [OpenInBrowser] with new RefTypes +1.10.6 Task: Ignore spaces in CustomFilterSyntax +1.10.6 Bugfix: Fixed Import-Filter not working if SearchText is currently set +1.10.6 Feature: AniList OnlineParser (GraphQL API) +1.10.6 Task: Use IntelliJ IDEA as (second) IDE +1.10.6 Task: Filter serialization schema v2 +1.10.6 Feature: Added CounterAggregator filter +1.10.6 Feature: Added OnlineRefType [Kitsu] +1.10.6 Feature: Added OnlineRefType [AnimePlanet] +1.10.6 Task: OnlineRefType refactoring +1.10.6 Feature: Added OnlineRefType [AniList] +1.10.6 Feature: Open Subreferences via popupmenu +1.10.6 Task: Fix travis builds +1.10.6 Task: Re-add ability to do local grade beta builds +1.10.6 Bugfix: Fixed VLC not starting until jCC is closed +1.10.6 Task: Enable gradle builds on jenkins + + ######################################################################## ############ Thu Oct 25 22:42:10 2018 +0200 1.10.5 RELEASE ############ ######################################################################## @@ -400,7 +494,7 @@ 1.9.8 Feature: Show (optionally) icons for partially viewed series 1.9.8 Task: Properties re-organized (UI and code) 1.9.8 Feature: Added new Property PROP_SERIES_KEEP_LASTVIEWED_PERSISTANT -1.9.8 Task: erty.getDefault() and CCProperty.getStandard() are redundant methods -.- +1.9.8 Task: CCProperty.getDefault() and CCProperty.getStandard() are redundant methods -.- 1.9.8 Bugfix: Progressmonitor (create backup) can no longer be closed by [X] 1.9.8 Task: Better default value for statusbar under Metal L'n'F 1.9.8 Bugfix: Fixed YearRange visibility in StatisticsFrame diff --git a/build.gradle b/build.gradle index 0391261d..3d79a6bf 100644 --- a/build.gradle +++ b/build.gradle @@ -55,8 +55,8 @@ configurations { // Direct Callable: // ================ // -// [betaJar] Used by local - create a new beta version, increment version etc -// [tryCreateRelease] Used by jenkins - build new release if git tag is set, increment version etc +// [betaJar] Used by local - create a new beta version, increment version etc +// [manualReleaseJar] Used by local - create a new release, based on the latest tag version // // Other: // ====== @@ -95,13 +95,13 @@ tasks.register("anyReleaseJar", Jar) { doLast { if (! isBetaRelease() /* && Os.isFamily(Os.FAMILY_WINDOWS) */) { + println "Running Launch4j" + if (new File("launch4j/launch4j.cfg.xml").exists()) new File("launch4j/launch4j.cfg.xml").delete() new File('launch4j/launch4j.cfg.xml').write createLaunch4jConfig() - def stdout = ['java', '-jar', 'launch4j/launch4jc.jar', 'launch4j.cfg.xml'].execute(null, new File("launch4j")).text + def stdout = ['java', '-jar', 'launch4j.jar', 'launch4j.cfg.xml'].execute(null, new File("launch4j")).text println stdout - new File('launch4j/launch4j.cfg.xml').delete() - createChangelog() } } @@ -109,7 +109,9 @@ tasks.register("anyReleaseJar", Jar) { -tasks.register("tryCreateRelease") { + + +tasks.register("manualReleaseJar") { group = 'Custom' doLast { @@ -124,31 +126,14 @@ tasks.register("tryCreateRelease") { println "Version (Tag): " + tagVersion println "Version (Code): " + currVersion - if (new File(".do_publish_release").exists()) new File(".do_publish_release").delete() - - if (currVersion == tagVersion) { - println "This version was already built - skip deployment" - } else { - mainContent = mainContent.replaceFirst(rexMainVers(), tagVersion); - mainContent = mainContent.replaceFirst(rexMainBeta(), "false"); - - println "" - println "===========================================================" - println "===========================================================" - println "(!) This is a new release - create deployment trigger file" - println "===========================================================" - println "===========================================================" - println "" + mainContent = mainContent.replaceFirst(rexMainVers(), tagVersion); + mainContent = mainContent.replaceFirst(rexMainBeta(), "false"); - new File('src/main/de/jClipCorn/Main.java').write mainContent - - new File(".do_publish_release").createNewFile() - - // Do build - tryCreateRelease.finalizedBy anyReleaseJar - } + new File('src/main/de/jClipCorn/Main.java').write mainContent } } +manualReleaseJar.finalizedBy anyReleaseJar + tasks.register("betaJar") { group = 'Custom' diff --git a/src/main/de/jClipCorn/Main.java b/src/main/de/jClipCorn/Main.java index 1e05aa6b..cd834620 100644 --- a/src/main/de/jClipCorn/Main.java +++ b/src/main/de/jClipCorn/Main.java @@ -28,14 +28,14 @@ public class Main { public final static String TITLE = "jClipCorn"; //$NON-NLS-1$ - public final static String VERSION = /**/"1.10.5.36"/**/; //$NON-NLS-1$ + public final static String VERSION = /**/"1.10.6"/**/; //$NON-NLS-1$ public final static String DBVERSION = "12"; //$NON-NLS-1$ public final static String JXMLVER = "2"; //$NON-NLS-1$ private final static String PROPERTIES_PATH = "jClipcorn.properties"; //$NON-NLS-1$ public static boolean DEBUG = "true".equals(System.getProperty("ineclipse")); //$NON-NLS-1$//$NON-NLS-2$ - public static boolean BETA = true; + public static boolean BETA = false; public static void main(String[] arg) { Globals.TIMINGS.start(Globals.TIMING_STARTUP_TOTAL); @@ -219,5 +219,3 @@ private static void post_init(String[] args) { //TODO EditSeriesFrame re-do layout (resizable) //TODO remove viewed field from db (get from history) - -//TODO RELEASE 1.10.6.0 \ No newline at end of file