fixed RssGenerator so that it correctly uses default dir & extension the same way as in SitemapGenerators

Author: jirka.pinkas@gmail.com

README.md

@@ -12,7 +12,7 @@ First add this library to classpath:
     <dependency>
       <groupId>cz.jiripinkas</groupId>
       <artifactId>jsitemapgenerator</artifactId>
-      <version>3.13</version>
+      <version>3.14</version>
     </dependency>
 
 If you want to use "ping google / bing" functionality, also add this library to classpath:

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>cz.jiripinkas</groupId>
 	<artifactId>jsitemapgenerator</artifactId>
-	<version>3.13</version>
+	<version>3.14</version>
 	<packaging>jar</packaging>
 	<name>Java sitemap generator</name>
 	<description>This library generates a web sitemap and can ping Google that it has changed. This project has been inspired by sitemapgen4j, but is much more focused on traditional web sitemap and ease of use.</description>

src/main/java/cz/jiripinkas/jsitemapgenerator/WebPage.java

@@ -120,7 +120,7 @@ public void setPriority(Double priority) {
     }
 
     /**
-     * Constructs name from dir and extension (if available)
+     * Constructs name from dir and extension (if available), used in SitemapGenerators
      * @return Name
      */
     public String constructName() {
@@ -134,6 +134,25 @@ public String constructName() {
         return result;
     }
 
+    /**
+     * Constructs shortName from dir and extension (if available), used in RssGenerator
+     * @return Name
+     */
+    public String constructShortName() {
+        String result = shortName;
+        if(dir != null) {
+            result = dir + "/" + result;
+        }
+        if(extension != null) {
+            result = result + "." + extension;
+        }
+        return result;
+    }
+
+    public String getName() {
+        return name;
+    }
+
     public Map<String, String> getAlternateNames() {
         return alternateNames;
     }

src/main/java/cz/jiripinkas/jsitemapgenerator/generator/RssGenerator.java

@@ -14,6 +14,10 @@ public class RssGenerator extends AbstractGenerator<RssGenerator> {
 
     private String webDescription;
 
+    private String defaultDir;
+
+    private String defaultExtension;
+
     /**
      * Create RssGenerator
      *
@@ -164,7 +168,7 @@ public String toString() {
             builder.append("<item>" + "\n")
 
                     .append("<title>")
-                    .append(webPage.constructName())
+                    .append(webPage.getName())
                     .append("</title>" + "\n")
 
                     .append("<description>")
@@ -173,7 +177,7 @@ public String toString() {
 
                     .append("<link>")
                     .append(baseUrl)
-                    .append(webPage.getShortName())
+                    .append(webPage.constructShortName())
                     .append("</link>" + "\n")
 
                     .append("<pubDate>")
@@ -188,4 +192,62 @@ public String toString() {
         return builder.toString();
     }
 
+    @Override
+    protected void beforeAddPageEvent(WebPage webPage) {
+        if(defaultDir != null && webPage.getDir() == null) {
+            webPage.setShortName(defaultDir + "/" + webPage.getShortName());
+        }
+        if(defaultExtension != null && webPage.getExtension() == null) {
+            webPage.setShortName(webPage.getShortName() + "." + defaultExtension);
+        }
+    }
+
+    /**
+     * Sets default prefix dir to name for all subsequent WebPages. Final name will be "dirName/name"
+     * @param dirName Dir name
+     * @return this
+     */
+    public RssGenerator defaultDir(String dirName) {
+        defaultDir = dirName;
+        return getThis();
+    }
+
+    /**
+     * Sets default prefix dirs to name for all subsequent WebPages. For dirs: ["a", "b", "c"], the final name will be "a/b/c/name"
+     * @param dirNames Dir names
+     * @return this
+     */
+    public RssGenerator defaultDir(String ... dirNames) {
+        defaultDir = String.join("/", dirNames);
+        return getThis();
+    }
+
+    /**
+     * Reset default dir value
+     * @return this
+     */
+    public RssGenerator resetDefaultDir() {
+        defaultDir = null;
+        return getThis();
+    }
+
+    /**
+     * Sets default suffix extension for all subsequent WebPages. Final name will be "name.extension"
+     * @param extension Extension
+     * @return this
+     */
+    public RssGenerator defaultExtension(String extension) {
+        defaultExtension = extension;
+        return getThis();
+    }
+
+    /**
+     * Reset default extension value
+     * @return this
+     */
+    public RssGenerator resetDefaultExtension() {
+        defaultExtension = null;
+        return getThis();
+    }
+
 }