diff --git a/source/net/sourceforge/filebot/Main.java b/source/net/sourceforge/filebot/Main.java
index eccb33a5..9494b66c 100644
--- a/source/net/sourceforge/filebot/Main.java
+++ b/source/net/sourceforge/filebot/Main.java
@@ -171,7 +171,7 @@ public class Main {
Properties properties = new Properties();
NodeList fields = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ByteBufferInputStream(data)).getFirstChild().getChildNodes();
for (int i = 0; i < fields.getLength(); i++) {
- properties.setProperty(fields.item(i).getNodeName(), fields.item(i).getTextContent());
+ properties.setProperty(fields.item(i).getNodeName(), fields.item(i).getTextContent().trim());
}
return properties;
} catch (Exception e) {
diff --git a/website/cli.html b/website/cli.html
index 2bd2b3a2..752b1456 100644
--- a/website/cli.html
+++ b/website/cli.html
@@ -2,9 +2,11 @@
-
+
FileBot CLI
+
+
diff --git a/website/data/shell/banners.groovy b/website/data/shell/banners.groovy
index 223d2fb3..d10e34fa 100644
--- a/website/data/shell/banners.groovy
+++ b/website/data/shell/banners.groovy
@@ -22,10 +22,9 @@ def fetchBanner(outputFile, series, bannerType, bannerType2, season = null) {
def fetchNfo(outputFile, series) {
- TheTVDB.getSeriesInfo(series, Locale.ENGLISH).applyXmlTemplate('''
-
+ TheTVDB.getSeriesInfo(series, Locale.ENGLISH).applyXmlTemplate('''
$name
- $firstAired.year
+ ${firstAired?.year}
$rating
$ratingCount
$overview
@@ -34,7 +33,7 @@ def fetchNfo(outputFile, series) {
${genre.size() > 0 ? genre.get(0) : ''}
$id
$bannerUrl
- $firstAired.year
+ $firstAired
$status
$network
actors.each {
@@ -78,7 +77,7 @@ def jobs = args.getFolders().findResults { dir ->
def sxe = videos.findResult{ parseEpisodeNumber(it) }
if (query == null) {
- query = dir.name
+ query = dir.dir.hasFile{ it.name =~ /Season.\d+/ } ? dir.dir.name : dir.name
println "Failed to detect series name from video files -> Query by $query instead"
}
@@ -92,7 +91,7 @@ def jobs = args.getFolders().findResults { dir ->
def series = options[0]
// auto-detect structure
- def seriesDir = similarity(dir.dir.name, series.name) > 0.8 ? dir.dir : dir
+ def seriesDir = [dir.dir, dir].sort{ a, b -> similarity(b.name, series.name).compareTo(similarity(a.name, series.name)) }[0]
def season = sxe && sxe.season > 0 ? sxe.season : 1
return { fetchSeriesBannersAndNfo(seriesDir, dir, series, season) }
diff --git a/website/data/shell/sorty.groovy b/website/data/shell/sorty.groovy
index 8c894d6f..80565f39 100644
--- a/website/data/shell/sorty.groovy
+++ b/website/data/shell/sorty.groovy
@@ -7,7 +7,7 @@ def movieDir = "V:/in/Movies"
def movieFormat = "V:/out/Movies/{movie}/{movie}"
// ignore chunk, part, par and hidden files
-def incomplete(f) { f.name =~ /[.]chunk|[.]part$|[.]par$/ || f.isHidden() }
+def incomplete(f) { f.name =~ /[.]chunk|[.]part\d{0,3}$|[.]par$/ || f.isHidden() }
// run cmdline unrar (require -trust-script) on multi-volume rar files
diff --git a/website/index.html b/website/index.html
index 0293a674..86c28856 100644
--- a/website/index.html
+++ b/website/index.html
@@ -2,10 +2,12 @@
-
+
FileBot - The ultimate tv renamer / subtitle downloader / sfv validator
+
+
diff --git a/website/naming.html b/website/naming.html
index cb97fa88..bc2e861d 100644
--- a/website/naming.html
+++ b/website/naming.html
@@ -2,9 +2,11 @@
-
+
Episode Format Expression
+
+
diff --git a/website/script.html b/website/script.html
index e05ce3e4..65bf65f7 100644
--- a/website/script.html
+++ b/website/script.html
@@ -2,9 +2,11 @@
-
+
Scripts and Automation
+
+
diff --git a/website/sitemap.xml b/website/sitemap.xml
new file mode 100644
index 00000000..adcb037c
--- /dev/null
+++ b/website/sitemap.xml
@@ -0,0 +1,51 @@
+
+
+
+ http://filebot.sourceforge.net/
+ weekly
+
+
+ http://filebot.sourceforge.net/naming.html
+ weekly
+
+
+ http://filebot.sourceforge.net/cli.html
+ weekly
+
+
+ http://filebot.sourceforge.net/script.html
+ weekly
+
+
+ http://filebot.sourceforge.net/forums/
+ daily
+
+
+ http://filebot.sourceforge.net/forums/viewtopic.php?f=3&t=7
+ weekly
+
+
+ http://filebot.sourceforge.net/forums/viewtopic.php?f=3&t=7
+ weekly
+
+
+ http://filebot.sourceforge.net/forums/viewtopic.php?f=7&t=25
+ weekly
+
+
+ http://filebot.sourceforge.net/forums/viewtopic.php?f=3&t=13
+ weekly
+
+
+ http://filebot.sourceforge.net/forums/viewtopic.php?f=5&t=2
+ weekly
+
+
+ http://filebot.sourceforge.net/forums/viewtopic.php?f=4&t=5
+ weekly
+
+
+ http://filebot.sourceforge.net/data/shell/
+ weekly
+
+
\ No newline at end of file