Merge branch 'autoredirect-v5.3.0-dev' into wiki.ohea.xyz-dev

Based on: https://github.com/remyd1/gollum/commit/925ebcfe04f294c979b9e088dc0955ca1dfa8c44

lib/gollum/app.rb

@@ -560,7 +560,6 @@ module Precious
         wiki         = wiki_new
         @results     = wiki.tree_list
 
-
         if path
           @path = Pathname.new(path).cleanpath.to_s
           check_path   = wiki.page_file_dir ? ::File.join(wiki.page_file_dir, @path, '/') : "#{@path}/"
@@ -625,42 +624,65 @@ module Precious
       end
     end
 
-    def folder_exists(path, wiki)
-      paths = wiki.tree_list
-      return paths.any? { |item| item.path.start_with?(path) }
-    end
-
-    def show_page(page, fullpath, wiki)
-      @page          = page
-      @name          = page.filename_stripped
-      @content       = page.formatted_data
-      @upload_dest   = find_upload_dest(Pathname.new(fullpath).cleanpath.to_s)
-
-      # Extensions and layout data
-      @editable      = true
-      @toc_content   = wiki.universal_toc ? @page.toc_data : nil
-      @h1_title      = wiki.h1_title
-      @bar_side      = wiki.bar_side
-      @allow_uploads = wiki.allow_uploads
-      @navbar        = true
-      return mustache :page
-    end
-
     def show_page_or_file(fullpath)
-      wiki  = wiki_new
+      wiki = wiki_new
 
-      if fullpath[-1] != '/' ? page = wiki.page(fullpath) : false
-        show_page(page, fullpath, wiki)
-      elsif page = wiki.page("#{fullpath}/#{wiki.index_page}")
-        show_page(page, fullpath, wiki)
-      elsif page = wiki.page("#{fullpath}/#{File.basename(fullpath)}")
-        show_page(page, fullpath, wiki)
+
+      # check if folders exists
+      contents = wiki.tree_list
+      print contents
+      entry    = contents.detect do |entry|
+        Gollum::File::path_match(fullpath, entry)
+      end
+      print entry
+      #if path
+      #  @path = Pathname.new(path).cleanpath.to_s
+      #  check_path   = wiki.page_file_dir ? ::File.join(wiki.page_file_dir, @path, '/') : "#{@path}/"
+      #  @results.select!  {|result| result.path.start_with?(check_path) }
+      #end
+
+      #@results.sort_by! {|result| result.name.downcase}
+      #elsif fullpath[-1] == '/' ? Gollum::Page.valid_page_name?(fullpath) : false
+
+
+
+      if page = fullpath[-1] != '/' ? wiki.page("#{fullpath}/#{wiki.index_page}") : false
+        @page          = page
+        @name          = page.filename_stripped
+        @content       = page.formatted_data
+        @upload_dest   = find_upload_dest(Pathname.new(fullpath).cleanpath.to_s)
+
+        # Extensions and layout data
+        @editable      = true
+        @toc_content   = wiki.universal_toc ? @page.toc_data : nil
+        @h1_title      = wiki.h1_title
+        @bar_side      = wiki.bar_side
+        @allow_uploads = wiki.allow_uploads
+        @navbar        = true
+        mustache :page
+      elsif page = wiki.page(fullpath)
+        @page          = page
+        @name          = page.filename_stripped
+        @content       = page.formatted_data
+        @upload_dest   = find_upload_dest(Pathname.new(fullpath).cleanpath.to_s)
+
+        # Extensions and layout data
+        @editable      = true
+        @toc_content   = wiki.universal_toc ? @page.toc_data : nil
+        @h1_title      = wiki.h1_title
+        @bar_side      = wiki.bar_side
+        @allow_uploads = wiki.allow_uploads
+        @navbar        = true
+        mustache :page
       elsif file = wiki.file(fullpath, wiki.ref, true)
         show_file(file)
       elsif @redirects_enabled && redirect_path = wiki.redirects[fullpath]
         redirect to("#{encodeURIComponent(redirect_path)}?redirected_from=#{encodeURIComponent(fullpath)}")
-      elsif folder_exists(fullpath, wiki)
-        redirect to("/gollum/overview/#{clean_url(encodeURIComponent(fullpath))}")
+      elsif entry
+        # check if the folder fullpath exists
+        # if so, redirect to overview
+        #
+          redirect to("/gollum/overview/#{clean_url(encodeURIComponent(fullpath))}")
       else
         if @allow_editing && @user_authed
           path = fullpath[-1] == '/' ? "#{fullpath}#{wiki.index_page}" : fullpath # Append default index page if no page name is supplied