* start preparing special package for ubuntu software center

build.xml

@@ -246,7 +246,7 @@
 	<target name="deb-arch">
 		<deb todir="${dir.dist}" package="filebot" version="${version}" architecture="${arch}" section="misc" depends="openjdk-7-jre | default-jre-headless" recommends="libchromaprint-tools" homepage="http://filebot.sourceforge.net" priority="optional" postinst="${dir.installer}/deb/postinst.sh" prerm="${dir.installer}/deb/prerem.sh">
 			<maintainer name="Reinhard Pointner" email="rednoah@users.sourceforge.net" />
-			<description synopsis="The ultimate tv renamer / subtitle downloader / sfv validator">FileBot is the ultimate tool for renaming your movies, tv shows or anime and downloading subtitles. It's smart, streamlined for simplicity and just works. Plus there's a full-featured command-line interface for all sorts of automation.</description>
+			<description synopsis="The ultimate TV and Movie Renamer">FileBot is the ultimate tool for renaming your movies, tv shows or anime and even downloading subtitles. It's smart, streamlined for simplicity and just works. Putting the super-efficient UI aside, it's also got a full-featured command-line interface and scripting engine for all sorts of automation. Anything is possible.</description>
 			<tarfileset fullpath="usr/share/filebot/FileBot.jar" file="${path.fatjar}" />
 			<tarfileset prefix="usr/share/filebot" dir="${dir.lib}/native/linux-${arch}" includes="*.so" />
 			<tarfileset prefix="usr/share/filebot" file="${dir.installer}/icons/icon.svg" />

installer/deb/FileBot.desktop

@@ -3,7 +3,7 @@ Version=1.0
 Type=Application
 Terminal=false
 Name=FileBot
-Comment=The ultimate tv renamer / subtitle downloader / sfv validator
+Comment=The ultimate TV and Movie Renamer
 Exec=/usr/share/filebot/bin/filebot.sh
 Icon=/usr/share/filebot/icon.svg
 Categories=AudioVideo;Video;Renamer

installer/msi/filebot.launcher.l4j.ini

@@ -8,7 +8,7 @@
 -Dsun.net.client.defaultReadTimeout=60000
 
 # disable analytics
-# -no-analytics
+# -Dapplication.analytics=false
 
 # use native shell for move/copy operations
 -DuseNativeShell=true

installer/msi/filebot.platform.launcher.l4j.ini

@@ -12,7 +12,7 @@
 -Dsun.net.client.defaultReadTimeout=60000
 
 # disable analytics
-# -no-analytics
+# -Dapplication.analytics=false
 
 # do not use native shell for move/copy operations
 -DuseNativeShell=false

installer/portable/FileBot.l4j.ini

@@ -9,7 +9,7 @@
 -Dsun.net.client.defaultReadTimeout=60000
 
 # disable analytics
-# -no-analytics
+# -Dapplication.analytics=false
 
 # do not use native shell for move/copy operations
 -DuseNativeShell=false

installer/ubuntu/FileBot.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Terminal=false
+Name=FileBot
+Comment=The ultimate TV and Movie Renamer
+Exec=/usr/share/filebot/bin/filebot.sh
+Icon=/usr/share/filebot/icon.svg
+Categories=AudioVideo;Video;Renamer

installer/ubuntu/filebot.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+java -Xmx256m -Dunixfs=false -DuseGVFS=true -DuseExtendedFileAttributes=true -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=ppa -Dapplication.analytics=false -Dapplication.dir=$HOME/.filebot -Djava.io.tmpdir=$HOME/.filebot/temp -Djna.library.path=/usr/share/filebot -Djava.library.path=/usr/share/filebot -jar /usr/share/filebot/FileBot.jar "$@"

installer/ubuntu/postinst.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+ln -s /usr/share/filebot/bin/filebot.sh /usr/bin/filebot

installer/ubuntu/prerem.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+rm /usr/bin/filebot

source/net/sourceforge/filebot/Main.java

@@ -115,9 +115,12 @@ public class Main {
 			if (args.unixfs) {
 				System.setProperty("unixfs", "true");
 			}
+			if (args.disableAnalytics) {
+				System.setProperty("application.analytics", "false");
+			}
 			
 			// initialize analytics
-			Analytics.setEnabled(!args.disableAnalytics);
+			Analytics.setEnabled(System.getProperty("application.analytics") == null ? true : Boolean.getBoolean(System.getProperty("application.analytics")));
 			
 			// CLI mode => run command-line interface and then exit
 			if (args.runCLI()) {

website/data/query-blacklist.txt

@@ -71,11 +71,13 @@
 A.Release.Lounge
 ABC
 AC3D
+Addic7ed.com
 Anime[s]?
 Arte
 BBC
 btarena.org
 By.Cool.Release
+C.orig
 CBC
 CD[0]?[1-3]
 Channel.4

website/index.html

@@ -3,10 +3,11 @@
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 		<meta name="keywords" content="rename tv shows, rename movies, download subtitles, check sfv files" />
-		<link rel="alternate" type="application/rss+xml" title="RSS" href="http://twitter.com/statuses/user_timeline/filebot_renamer.rss" />
+		<link rel="alternate" type="application/rss+xml" title="RSS" href="https://api.twitter.com/1/statuses/user_timeline.rss?screen_name=filebot_renamer" />
 		
 		<title>FileBot - The ultimate TV and Movie Renamer</title>
 		<meta name="description" content="FileBot is the ultimate tool for renaming your movies, tv shows or anime and downloading subtitles. It's smart, streamlined for simplicity and just works. FileBot supports Windows, Linux and Mac, plus there's a full-featured command-line interface for all sorts of automation." />
+		<meta name="author" content="Reinhard Pointner" />
 		
 		<meta itemprop="name" content="FileBot - The ultimate TV and Movie Renamer" />
 		<meta itemprop="description" content="FileBot is the ultimate tool for renaming your movies, tv shows or anime and downloading subtitles. It's smart, streamlined for simplicity and just works. FileBot supports Windows, Linux and Mac, plus there's a full-featured command-line interface for all sorts of automation." />
@@ -302,17 +303,18 @@
 					<span class="quote">Today is the day</span>
 					<h2>Download</h2>
 					<ul class="list">
-						<li>Executable Jar: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot.jar'])" target="_blank" href="download.php?mode=s&amp;type=jar">FileBot_@{version}.jar</a> (<strong>19MB</strong>) <small class="comment">for Windows, Linux, Mac OS X, BSD and Solaris</small>
-							<ul>
-								<li>This package does not include the <a href="https://sourceforge.net/p/filebot/code/HEAD/tree/trunk/lib/native/" target="_blank">MediaInfo and 7-Zip native libraries</a>. <small class="comment">32-bit JRE requires 32-bit native libs</small></li>
-							</ul>
-						</li>
 						<li>Mac OS X app bundle: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot.app'])" target="_blank" href="download.php?mode=s&amp;type=app">FileBot_@{version}.app</a> (<span class="filesize">21MB</span>)</li>
 						<li>Windows installer: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot_x86.msi'])" target="_blank" href="download.php?mode=s&amp;type=msi&amp;arch=x86">FileBot_@{version}_x86.msi</a> or <a onclick="_gaq.push(['_trackPageview', '/download/FileBot_x64.msi'])" target="_blank" href="download.php?mode=s&amp;type=msi&amp;arch=x64">FileBot_@{version}_x64.msi</a> (<span class="filesize">20MB</span>)</li>
 						<li>Debian packages: <a onclick="_gaq.push(['_trackPageview', '/download/filebot_i386.deb'])" target="_blank" href="download.php?mode=s&amp;type=deb&amp;arch=i386">filebot_@{version}_i386.deb</a> or <a onclick="_gaq.push(['_trackPageview', '/download/filebot_amd64.deb'])" target="_blank" href="download.php?mode=s&amp;type=deb&amp;arch=amd64">filebot_@{version}_amd64.deb</a> (<span class="filesize">20MB</span>)</li>
 						<li>Embedded Linux packages: <a onclick="_gaq.push(['_trackPageview', '/download/filebot_arm.ipk'])" target="_blank" href="download.php?mode=s&amp;type=ipkg&amp;arch=arm">filebot_@{version}_arm.ipk</a> or <a onclick="_gaq.push(['_trackPageview', '/download/filebot_i686.ipk'])" target="_blank" href="download.php?mode=s&amp;type=ipkg&amp;arch=i686">filebot_@{version}_i686.ipk</a> (<span class="filesize">20MB</span>)</li>
 						<li>Portable: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot-portable.zip'])" target="_blank" href="download.php?mode=s&amp;type=portable">FileBot-@{version}-portable.zip</a> (<span class="filesize">17MB</span>)</li>
+						<li>Executable Jar: <a onclick="_gaq.push(['_trackPageview', '/download/FileBot.jar'])" target="_blank" href="download.php?mode=s&amp;type=jar">FileBot_@{version}.jar</a> (<strong>19MB</strong>) <small class="comment">for Windows, Linux, Mac OS X, BSD and Solaris</small>
+							<ul>
+								<li>This package does not include the <a href="https://sourceforge.net/p/filebot/code/HEAD/tree/trunk/lib/native/" target="_blank">MediaInfo and 7-Zip native libraries</a>. <small class="comment">32-bit JRE requires 32-bit native libs</small></li>
+							</ul>
+						</li>
 						<li>Source Zip: <a onclick="_gaq.push(['_trackPageview', '/download/filebot-src.zip'])" target="_blank" href="download.php?mode=s&amp;type=src">filebot-@{version}-src.zip</a> (<span class="filesize">600kB</span>)</li>
+						<li>Ubuntu App is available in the <a target="_blank" href="https://apps.ubuntu.com/cat/applications/filebot/">Ubuntu Software Center</a></li>
 						<li>Chocolatey Windows package is available <a target="_blank" href="http://chocolatey.org/packages/filebot/">via Chocolatey</a></li>
 						<li>Arch Linux package is available <a target="_blank" href="https://aur.archlinux.org/packages.php?ID=27459">via AUR</a></li>
 						<li>Synology NAS package is available <a target="_blank" href="http://missilehugger.com/735/synology-package-filebot/">from MissileHugger</a></li>

website/reviews.json

@@ -89,6 +89,16 @@
         "date": "2011-02-18",
         "text": "best app on series renaming i could find"
     },
+    {
+        "user": "charmainebellora",
+        "date": "2013-01-23",
+        "text": "nice app!"
+    },
+    {
+        "user": "Mason",
+        "date": "2013-01-20",
+        "text": "works perfectly."
+    },
     {
         "user": "Blake",
         "date": "2012-12-19",