From ffc7c89bf02df559349cc22f0e4dec31dd3c7dd1 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Sun, 10 May 2015 07:29:54 +0000
Subject: [PATCH] * improved deploy-website script

---
 build.xml               | 46 ++++++++++++++++++++++++++---------------
 website/syno/index.json | 25 +++++++++++-----------
 2 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/build.xml b/build.xml
index 341dc520..3d29b22f 100644
--- a/build.xml
+++ b/build.xml
@@ -213,8 +213,8 @@
 			<classpath file="${path.fatjar}" />
 			<librarypath dir="${dir.lib}/native/mac-x86_64" />
 			<arch name="x86_64" />
-			
-			<option value="-Dnet.filebot.UserFiles.fileChooser=COCOA" />	
+
+			<option value="-Dnet.filebot.UserFiles.fileChooser=COCOA" />
 			<option value="-Dapplication.deployment=app" />
 			<option value="-Dapplication.update=auto" />
 			<option value="-Dunixfs=false" />
@@ -750,13 +750,22 @@
 
 
 	<target name="deploy-website" depends="login">
-		<!-- prepare website resources -->
+		<!-- prepare ant variables required for dynamically generated website content -->
+		<property name="dir.download" value="${dir.build}/package-source" />
+		<property name="spk.download" value="http://downloads.sourceforge.net/project/filebot/filebot/FileBot_${version}/filebot-${version}-noarch.spk" />
+		<mkdir dir="${dir.download}" />
+		<get src="${spk.download}" dest="${dir.download}" usetimestamp="true" />
+
+		<checksum file="${dir.download}/filebot-${version}-noarch.spk" algorithm="MD5" property="spk.md5" />
+		<length file="${dir.download}/filebot-${version}-noarch.spk" property="spk.size" />
+
+		<!-- copy static website resources -->
 		<copy todir="${dir.dist}/website">
 			<fileset dir="${dir.website}">
+				<include name="*.html" />
+				<include name="*.php" />
 				<include name="*.json" />
 				<include name="*.xml" />
-				<include name="*.php" />
-				<include name="*.html" />
 				<include name="*.css" />
 				<include name="*.js" />
 				<include name="*.png" />
@@ -769,18 +778,21 @@
 				<include name="getting-started/**" />
 			</fileset>
 		</copy>
-
-		<!-- get MD5 sum for Synology Package -->
-		<checksum file="${dir.release}/filebot-${version}-noarch.spk" algorithm="MD5" property="spk.md5" />
-
-		<!-- replace variables for new release -->
-		<replace dir="${dir.dist}/website" encoding="utf-8" summary="yes">
-			<include name="**/*.html" />
-			<include name="**/*.php" />
-			<include name="**/*.json" />
-			<replacefilter token="@{version}" value="${version}" />
-			<replacefilter token="@{spk.md5}" value="${spk.md5}" />
-		</replace>
+		
+		<!-- copy files and resolve ant variables -->
+		<echo message="Replace Ant variables" />
+		<copy todir="${dir.dist}/website" overwrite="yes" encoding="UTF-8" verbose="true">
+			<fileset dir="${dir.website}">
+				<include name="*.html" />
+				<include name="*.php" />
+				<include name="syno/*.json" />
+			</fileset>
+			<filterset begintoken="@{" endtoken="}">
+				<propertyset>
+					<propertyref builtin="all" />
+				</propertyset>
+			</filterset>
+		</copy>
 
 		<!-- upload -->
 		<scp todir="${sf.user}:${sf.password}@${frs.website}" trust="yes" verbose="true" sftp="true">
diff --git a/website/syno/index.json b/website/syno/index.json
index 062624fd..a9825ea9 100644
--- a/website/syno/index.json
+++ b/website/syno/index.json
@@ -7,21 +7,20 @@
 	{
 		"dname": "FileBot",
 		"desc": "FileBot is the ultimate tool for organizing and renaming your movies, TV shows or anime, as well as downloading subtitles and artwork. It's smart and just works.",
-		"maintainer": "rednoah",
-		"distributor": "FileBot",
-		"distributor_url": "http://www.filebot.net/",
-		"qinst": true,
-		"qupgrade": true,
-		"qstart": true,
-		"depsers": "ssh",
+		"distributor":"FileBot",
+		"distributor_url":"http://www.filebot.net/",
+		"maintainer":"rednoah",
+		"maintainer_url":"http://www.filebot.net/",
 		"icon": "http://packages.filebot.net/syno/spk.icon.png",
-		"snapshot": [
-			"http://packages.filebot.net/syno/spk.snapshot.png"
-		],
+		"snapshot": [ "http://packages.filebot.net/syno/spk.snapshot.png" ],
 		"package": "filebot",
 		"version": "@{version}",
-		"link": "https://downloads.sourceforge.net/project/filebot/filebot/FileBot_@{version}/filebot-@{version}-noarch.spk",
-		"size": "52428800",
-		"md5": "@{spk.md5}"
+		"size": @{spk.size},
+		"md5": "@{spk.md5}",
+		"link": "@{spk.download}",
+		"depsers": "ssh",
+		"qinst":true,
+		"qstart":true,
+		"qupgrade":true
 	}
 ]