Changeset 1324

Timestamp:

02/18/08 18:11:59

Author:

rsz

Message:

cleanup

Files:

• HTTP/WikiContent.lua (modified) (4 diffs)
• HTTP/WikiContentService.lua (modified) (4 diffs)
• HTTP/WikiContentService.txt (modified) (1 diff)
• HTTP/WikiEditorService.lua (modified) (2 diffs)

HTTP/WikiContent.lua

@@ -25 +25 @@
-local tonumber = tonumber
-local tostring = tostring
+local print = print
-
---------------------------------------------------------------------------------
@@ -313 +314 @@
-end
-
+local function CanWrite( aName )
+    local File = require( 'File' )
+    local aDirectory = Directory( aName )
+    local aFile = File( aDirectory.path, 'nowrite' )
+    
+    if aFile.exists then
+        return false
+    end
+    
+    return true
+end
+
+local function SetWrite( aName, aValue )
+    local File = require( 'File' )
+    local aDirectory = Directory( aName )
+    local aFile = File( aDirectory.path, 'nowrite' )
+    
+    print( 'SetWrite', aFile, aValue )
+
+    if aValue then
+        aFile.delete = true
+    else
+        aFile.content = 'nowrite'
+    end    
+end
+
---------------------------------------------------------------------------------
--- File utilities
@@ -412 +439 @@
-
-function self:__index( aKey )
-
+
+
+
-        local someData = ContentData( self.name, self.version )
-        rawset( self, 'data', someData )
@@ -447 +476 @@
-
-function self:__newindex( aKey, aValue )
-fil
-AddFil
-    
-
+canWrit
+return SetWrit
+elseif aKey == 'file' then
+ AddFile( self.name, aValue )
-    elseif aKey == 'link' then
-
-
-
+
-    elseif aKey == 'modification' then
-        DataFile( self.name, self.version ).modification = aValue

HTTP/WikiContentService.lua

@@ -96 +96 @@
-    
-    return isLastWeek, aStartTime, anEndTime
+end
+
+local function EditorLink( self ) 
+    local aContent = self.content
+    local aTitle = Encode( aContent.data.title )
+
+    if aContent.canWrite then
+        local aLink = Encode( self.path( 'editor' ) )
+    
+        return ( '<a href=\'%s\' title=\'Editor\' rel=\'nofollow\'>%s</a>' ):format( aLink, aTitle )
+    
+    end
+    
+    return aTitle
-end
-
@@ -177 +191 @@
-
---------------------------------------------------------------------------------
+-- Default content
+--------------------------------------------------------------------------------
+
+local function Syntax()
+    local aContent = WikiContent( 'markdown-syntax-reference' )
+    
+    if not aContent.exists then
+        local WikiDate = require( 'WikiDate' )
+        local WikiRecent = require( 'WikiRecent' )
+        local WikiSearch = require( 'WikiSearch' )
+        local aTemplate = Template[ 'MarkdownSyntaxReference.txt' ]
+        
+        aContent.by = 'file://nanoki@localhost/'
+        aContent.title = 'Markdown syntax reference'
+        aContent.text = tostring( aTemplate )
+        aContent()
+        
+        WikiDate[ aContent.creation ] = aContent.name
+        WikiRecent[ aContent.modification ] = aContent.name
+        WikiSearch[ aContent.name ] = aContent.name
+    end
+end
+
+local function Nanoki()
+    local aContent = WikiContent( 'nanoki' )
+    
+    if not aContent.exists then
+        local File = require( 'File' )
+        local WikiDate = require( 'WikiDate' )
+        local WikiRecent = require( 'WikiRecent' )
+        local WikiSearch = require( 'WikiSearch' )
+        local aDirectory = File( 'Nanoki' )
+        local aTemplate = Template[ 'Nanoki.txt' ]
+        
+        aContent.by = 'file://nanoki@localhost/'
+        aContent.title = 'Nanoki'
+        aContent.text = tostring( aTemplate )
+        aContent()
+        
+        for aFile in aDirectory() do
+            aContent.file = aFile
+        end
+        
+        aContent.canWrite = false
+        WikiDate[ aContent.creation ] = aContent.name
+        WikiRecent[ aContent.modification ] = aContent.name
+        WikiSearch[ aContent.name ] = aContent.name
+    end
+end
+
+Syntax()
+Nanoki()
+
+--------------------------------------------------------------------------------
--- Service methods
---------------------------------------------------------------------------------
@@ -214 +282 @@
-        Referer( self )
-
-
-
+
-        aTemplate[ 'version' ] = Encode(self.content.version )
-        aTemplate[ 'title' ] = Encode( self.content.data.title )
@@ -297 +364 @@
-    local aContent = WikiContent( self.content.name, aVersion )
-    
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-end
-

HTTP/WikiContentService.txt

@@ -1 @@
-<a href='[v:editorLink]' title='Editor' rel='nofollow'>[v:title]</a>
+[v:editorLink]
-<h4>Published on <a href='[v:dateLink]' title='Published on [v:creation]. Edited on [v:modification] by [v:by].'>[v:creation]</a> [v:tag]</h4>
-[v:message]

HTTP/WikiEditorService.lua

@@ -254 +254 @@
-end
-
-local function Syntax()
-    local aContent = WikiContent( 'markdown-syntax-reference' )
-    
-    if not aContent.exists then
-        local aTemplate = Template[ 'MarkdownSyntaxReference.txt' ]
-        
-        aContent.by = 'file://nanoki@localhost/'
-        aContent.title = 'Markdown syntax reference'
-        aContent.text = tostring( aTemplate )
-        aContent()
-        
-        WikiDate[ aContent.creation ] = aContent.name
-        WikiSearch[ aContent.name ] = aContent.name
-        WikiRecent[ aContent.modification ] = aContent.name
-    end
-end
-
-local function Nanoki()
-    local aContent = WikiContent( 'nanoki' )
-    
-    if not aContent.exists then
-        local File = require( 'File' )
-        local aDirectory = File( 'Nanoki' )
-        local aTemplate = Template[ 'Nanoki.txt' ]
-        
-        aContent.by = 'file://nanoki@localhost/'
-        aContent.title = 'Nanoki'
-        aContent.text = tostring( aTemplate )
-        aContent()
-        
-        for aFile in aDirectory() do
-            aContent.file = aFile
-        end
-        
-        WikiDate[ aContent.creation ] = aContent.name
-        WikiSearch[ aContent.name ] = aContent.name
-        WikiRecent[ aContent.modification ] = aContent.name
-    end
-end
-
---------------------------------------------------------------------------------
--- Service methods
@@ -306 +266 @@
-    local aContext = Context()
-    local aToken = Token()
-    
-    Syntax()
-    Nanoki()
-    
-    aTemplate[ 'actionPath' ] = Encode( HTTP.request.url.path )