Fixed inquire statements. Added releases support, in theory, to the web handler.

2 files changed, 179 insertions, 3 deletions

diff --git a/captain/requtils.f90 b/captain/requtils.f90
index 01c4472..23df37a 100644
--- a/captain/requtils.f90
+++ b/captain/requtils.f90
@@ -52,7 +52,7 @@ contains
             
         else
         
-            inquire(file=actual_filename, exist=exists)
+            inquire(name=actual_filename, exist=exists)
             if(exists) then
             
                 call get_one_line_output_shell_command("mimetype -b "//trim(actual_filename), mimetype)
@@ -138,7 +138,7 @@ contains
         
         resp%body_filename => get_special_full_filename(trim(category), trim(filename))
     
-        inquire(file=resp%body_filename, exist=exists)
+        inquire(name=resp%body_filename, exist=exists)
         if(.not. exists) then
         
             resp%code = notfound_code(req)
diff --git a/captain/web.f90 b/captain/web.f90
index 0899159..c0fdbf0 100644
--- a/captain/web.f90
+++ b/captain/web.f90
@@ -49,14 +49,190 @@ contains
         deallocate(script_name)
         
     end subroutine build_request_object
+    
+    function html_link(link, label) result(res)
+    implicit none
+        
+        character(*), intent(in)::link, label
+        character(len=:), pointer::res
+        integer::nl
+        
+        
+        nl = len_trim(link) + len_trim(label) + len('<a href=""></a>')
+        allocate(character(len=nl)::res)
+        res = '<a href="'//trim(link)//'">'//trim(label)//'</a>'
+    
+    end function html_link
+
+    function generate_releases_html(req) result(res)
+    use utilities
+    use server_response
+    use config
+    implicit none
+    
+        type(request), intent(in)::req
+        character(len=:), pointer::res
+        character(len=DIR_LIST_STRING_LENGTH), dimension(:), pointer::directories
+        character(len=DIR_LIST_STRING_LENGTH), dimension(:), pointer::files
+        
+        character(1024)::public_path, local_path, subpath
+        integer::allocation_size, i
+        character(1)::nl = new_line(' ')
+        character(4)::folder_icon = char(240)//char(159)//char(147)//char(129)
+        character(len=:), pointer::one_link
+        
+        if(.not. associated(req%query_string)) then
+            public_path = "/releases"
+            local_path = release_dir
+        else
+            call combine_paths("/releases", req%query_string, public_path)
+            call combine_paths(release_dir, req%query_string, local_path)
+        end if
+        
+        res => null()
+        
+        ! Easy safety check - no relative paths
+        if(index(local_path, '..') > 0) then
+            allocate(character(len=64)::res)
+            res = "None Found"
+            return
+        end if
+        
+        directories => get_directories_in_directory(local_path)
+        files => get_files_in_directory(local_path)
+        
+        allocation_size = 1024
+        if(associated(directories)) then
+            allocation_size = allocation_size + 2 * size(directories) * (DIR_LIST_STRING_LENGTH+32)
+        end if
+        if(associated(files)) then
+            allocation_size = allocation_size + 2 * size(files) * (DIR_LIST_STRING_LENGTH+32)
+        end if
+        allocate(character(len=allocation_size) :: res)
+        res = "<h2>Listing for "//trim(public_path)//"</h2>"//nl//"<ul>"
+        
+        ! Add an "Up" link
+        if(trim(public_path) /= "/releases") then
+            i = index(req%query_string, "/", back=.true.)
+            if(i > 0) then
+                one_link = html_link("/releases.html?"//req%query_string(1:(i-1)), "Up a directory")
+            else
+                one_link = html_link("/releases.html", "Up a directory")
+            end if
+            res = trim(res)//nl//"<li>"//one_link//"</li>"
+            deallocate(one_link)
+        end if
+        
+        if(associated(directories)) then
+            
+            do i = 1, size(directories)
+            
+                if(associated(req%query_string)) then
+                    call combine_paths(req%query_string, trim(directories(i)), subpath)
+                else
+                    subpath = trim(directories(i))
+                end if
+
+                one_link = html_link("/releases.html?"//trim(subpath), folder_icon//" "//trim(directories(i)))
+                res = trim(res)//nl//"<li>"//one_link//"</li>"
+                deallocate(one_link)
+                
+            end do
+            
+            deallocate(directories)
+            
+        end if
+        
+        if(associated(files)) then
+        
+            do i = 1, size(files)
+                call combine_paths(public_path, trim(files(i)), subpath)
+                one_link = html_link("/releases.html?"//trim(subpath), trim(files(i)))
+                res = trim(res)//nl//"<li>"//one_link//"</li>"
+                deallocate(one_link)
+            end do
+            
+            deallocate(files)
+            
+        end if
+            
+    end function generate_releases_html
 
     function request_templated(req) result(resp)
+    use page_template
+    use config, only: template_filepath, project
+    use logging
     use server_response, only:request, response
     implicit none
     
         type(request), intent(in)::req
         type(response)::resp
         
+        character(1024)::template_file
+        type(template)::page
+        character(64)::first
+        
+        character(len=:), pointer::contents
+        
+        call template_filepath("index.html", template_file)
+        call page%init(trim(template_file))
+        
+        call req%path_component(1, first)
+        
+        if(trim(req%location) == "/" .or. trim(req%location) == "/index.html") then
+        
+            call page%assign('title', 'Home')
+            
+        else if(trim(req%location) == "/releases.html") then
+        
+            call page%assign('title', 'Releases')
+            contents => generate_releases_html(req)
+            call page%assign('contents', contents)
+        
+        else if(trim(req%location) == "/jobs.html") then
+        
+            call page%assign('title', 'Jobs')
+            !contents => generate_jobs_gemini(req)
+            call page%assign('contents', contents)
+        
+        else if(trim(req%location) == "/players.html") then
+        
+            call page%assign('title', 'Players')
+            !contents => generate_players_gemini()
+            call page%assign('contents', contents)
+            
+        else if(req%location(1:9) == '/players/') then
+        
+        else if(trim(req%location) == "/about.html") then
+        
+            call page%assign('title', 'About')
+            
+        else if(trim(req%location) == "/instructions.html") then
+            
+            call page%assign('title', 'Build Instructions')
+            !contents => generate_instructions_gemini()
+            call page%assign('contents', contents)
+            
+        else if(trim(first) == "instructions") then
+            
+            call page%assign('title', 'Build Instructions')
+            !contents => generate_one_instuction_gemini(req)
+            call page%assign('contents', contents)
+        
+        else if(trim(first) == "jobs") then
+            
+            call get_job_page_title(req, job_page_title)
+            call page%assign('title', trim(job_page_title))
+            !contents => generate_one_job_gemini(req)
+            call page%assign('contents', contents)
+            
+        else
+        
+            call page%assign('title', 'Not Found')
+   
+        end if
+        
+        call page%assign('project', project)
         
         
     end function request_templated
@@ -92,7 +268,7 @@ contains
                 call write_redirect(output_unit, resp%code, trim(resp%url))
                 
             case(HTTP_CODE_SUCCESS)
-                inquire(file=resp%body_filename, size=response_size)
+                inquire(name=resp%body_filename, size=response_size)
                 call write_response_headers(output_unit, resp%code, response_size, trim(resp%body_mimetype))
                 call echo_file_stdout(resp%body_filename)