From 2cc68fd3845ec9951265a0cbc67d9334fab8214a Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Thu, 3 Nov 2011 11:56:29 +0000 Subject: [PATCH] * clean-up --- source/net/sourceforge/filebot/Analytics.java | 3 +++ .../sourceforge/filebot/cli/ArgumentBean.java | 18 +++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/source/net/sourceforge/filebot/Analytics.java b/source/net/sourceforge/filebot/Analytics.java index 2370666c..80042667 100644 --- a/source/net/sourceforge/filebot/Analytics.java +++ b/source/net/sourceforge/filebot/Analytics.java @@ -132,6 +132,9 @@ public class Analytics { } else if (Platform.isMac()) { wm = "Macintosh"; os = System.getProperty("os.name"); + } else { + wm = System.getProperty("os.name"); + os = System.getProperty("os.name") + " " + System.getProperty("os.version"); } return String.format("%s/%s (%s; U; %s; JRE %s)", getApplicationName(), getApplicationVersion(), wm, os, System.getProperty("java.version")); diff --git a/source/net/sourceforge/filebot/cli/ArgumentBean.java b/source/net/sourceforge/filebot/cli/ArgumentBean.java index 74fb9970..3568b568 100644 --- a/source/net/sourceforge/filebot/cli/ArgumentBean.java +++ b/source/net/sourceforge/filebot/cli/ArgumentBean.java @@ -25,12 +25,6 @@ public class ArgumentBean { @Option(name = "-rename", usage = "Rename episode/movie files", metaVar = "fileset") public boolean rename = false; - @Option(name = "-list", usage = "Fetch episode list") - public boolean list = false; - - @Option(name = "-mediainfo", usage = "Get media info") - public boolean mediaInfo = false; - @Option(name = "--db", usage = "Episode/Movie database", metaVar = "[TVRage, AniDB, TheTVDB] or [OpenSubtitles, TheMovieDB]") public String db; @@ -61,15 +55,21 @@ public class ArgumentBean { @Option(name = "--log", usage = "Log level", metaVar = "[all, config, info, warning]") public String log = "all"; + @Option(name = "-list", usage = "Fetch episode list") + public boolean list = false; + + @Option(name = "-mediainfo", usage = "Get media info") + public boolean mediaInfo = false; + + @Option(name = "-script", usage = "Run Groovy script") + public String script = null; + @Option(name = "-open", usage = "Open file in GUI", metaVar = "file") public boolean open = false; @Option(name = "-clear", usage = "Clear cache and application settings") public boolean clear = false; - @Option(name = "-script", usage = "Run Groovy script") - public String script = null; - @Option(name = "-no-analytics", usage = "Disable analytics") public boolean disableAnalytics = false;