Added 'path' support for addon documentation.

forge · Jun 11, 2014 · c81bdca · c81bdca
1 parent 3c1b0c8
commit c81bdca
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/main/java/org/jboss/forge/website/model/Addon.java b/src/main/java/org/jboss/forge/website/model/Addon.java
@@ -26,6 +26,7 @@ public enum Category
    private String branch;
    private String tags;
    private String logo;
+   private String path;
    private Category category;
 
    public String getId()
@@ -107,6 +108,16 @@ public void setBranch(String branch)
    {
       this.branch = branch;
    }
+
+   public String getPath()
+   {
+      return path;
+   }
+
+   public void setPath(String path)
+   {
+      this.path = path;
+   }
 
    public String getTags()
    {

diff --git a/src/main/java/org/jboss/forge/website/view/AddonBean.java b/src/main/java/org/jboss/forge/website/view/AddonBean.java
@@ -57,8 +57,10 @@ public void load()
       List<Addon> addons = service.getAllAddons();
       for (Addon addon : addons)
       {
-         if (Strings.isNullOrEmpty(searchQuery) || (addon.getName() != null && addon.getName().toLowerCase().contains(searchQuery.toLowerCase()))
-                  || (addon.getDescription() != null && addon.getDescription().toLowerCase().contains(searchQuery.toLowerCase()))
+         if (Strings.isNullOrEmpty(searchQuery)
+                  || (addon.getName() != null && addon.getName().toLowerCase().contains(searchQuery.toLowerCase()))
+                  || (addon.getDescription() != null && addon.getDescription().toLowerCase()
+                           .contains(searchQuery.toLowerCase()))
                   || (addon.getAuthor() != null && addon.getAuthor().toLowerCase().contains(searchQuery.toLowerCase()))
                   || (addon.getTags() != null && addon.getTags().toLowerCase().contains(searchQuery.toLowerCase())))
          {
@@ -100,11 +102,23 @@ public void retrieve() throws IOException
 
    public String getReadmeHTML()
    {
+      String path = "/README";
+      if (addon.getPath() != null && !addon.getPath().trim().isEmpty())
+      {
+         if (addon.getPath().endsWith("/"))
+            path = path.substring(1);
+
+         path = addon.getPath() + path;
+
+         if (!path.startsWith("/"))
+            path = "/" + path;
+      }
+
       Address address = AddressBuilder.begin().scheme("http").domain(SiteConstants.REDOCULOUS_DOMAIN)
                .path("/api/v1/serve")
                .query("repo", addon.getRepo())
                .query("ref", addon.getBranch())
-               .query("path", "/README").build();
+               .query("path", path).build();
 
       String result = downloader.download(address.toString());