Start moving index actions to operate on files directly

Author: docelic

src/file.cr

@@ -12,8 +12,8 @@ require "./errors"
 # It can also jail! the path into the *OPTIONS.datadir*.
 abstract class Fluence::File
 
-	class AlreadyExists < Exception
-	end
+  class AlreadyExists < Exception
+  end
 
   # Path of the file that contains the page
   getter path : String
@@ -27,11 +27,13 @@ abstract class Fluence::File
   # Title of the page
   getter title : String
 
-	# Pointless initialize needed due to https://github.com/crystal-lang/crystal/issues/2827
-	def initialize(@path,@name,@url,@title)
-	end
+  getter content : String?
+
+  # Pointless initialize needed due to https://github.com/crystal-lang/crystal/issues/2827
+  def initialize(@path,@name,@url,@title)
+  end
 
-	abstract def url_prefix : String
+  abstract def url_prefix : String
 
   # translate a name ("/test/title" for example)
   # into a directory path ("/srv/data/test/title)
@@ -57,11 +59,11 @@ abstract class Fluence::File
     ::File.read @path
   end
 
-	def update!(user : Fluence::User, body)
-		write user, body
-		process!
-		self
-	end
+  def update!(user : Fluence::User, body)
+    write user, body
+    process!
+    self
+  end
 
   # Writes into the *file*, and commit.
   def write(user : Fluence::User, body)
@@ -76,7 +78,7 @@ abstract class Fluence::File
     jail!
     ::File.delete @path
     commit! user, "delete"
-		self
+    self
   end
 
   # Checks if the *file* exists
@@ -85,9 +87,9 @@ abstract class Fluence::File
     ::File.exists? @path
   end
 
-	def parent_directory
-		::File.dirname @path
-	end
+  def parent_directory
+    ::File.dirname @path
+  end
 
   # Save the modifications on the *file* into the git repository
   # TODO: lock before commit
@@ -96,25 +98,25 @@ abstract class Fluence::File
     dir = Dir.current
     begin
       Dir.cd Fluence::OPTIONS.datadir
-			all_files = @path + " " + other_files.join(" ")
+      all_files = @path + " " + other_files.join(" ")
       puts `git add -- #{all_files}`
       puts `git commit --no-gpg-sign --author \"#{user.name} <#{user.name}@localhost>\" -m \"#{message} #{@name}\" -- #{all_files}`
     ensure
       Dir.cd dir
     end
   end
 
-	def exists?
-		::File.exists? @path
-	end
+  def exists?
+    ::File.exists? @path
+  end
 
   def self.sanitize(text : String)
     self.title_to_slug URI.decode(text)
   end
 
-	def self.title_to_slug(title : String) : String
-		title.gsub(/[^[:alnum:]^\/]+/, "-").downcase
-	end
+  def self.title_to_slug(title : String) : String
+    title.gsub(/[^[:alnum:]^\/]+/, "-").downcase
+  end
 
   def self.remove_empty_directories(path)
     page_dir_elements = ::File.dirname(path).split ::File::SEPARATOR

src/index.cr

@@ -85,64 +85,66 @@ module Fluence
       self
     end
 
-		# Returns T from index, raises if missing.
-		# There is generally little use from sending a T as argument to retrieve the same T back, so this should be used just as a true-or-raise check for existence of pages.
     def [](page : T) : T
-      @entries[page.name]
+      page = self[page]?
+      page ? page : raise Exception.new "Missing: '#{page.path}'"
     end
-		# Returns T from index, raises if missing.
-    def [](name : String) : T
-      @entries[name]
-    end
-
-		# Returns T from index, nil if missing.
-		# There is generally little use from sending a T as argument to retrieve the same T back, so this should be used just as a true-or-nil check for existence of pages.
     def []?(page : T) : T?
-      @entries[page.name]?
+      ::File.exists?(page.path) ? page : nil
     end
-		# Returns T from index, nil if missing.
+
     def []?(name : String) : T?
-      @entries[name]?
+      page = T.new name
+      self[page]?
+    end
+    def [](name : String) : T
+      page = T.new name
+      self[page]
     end
 
-    # Adds a new `T` into the index. This is a memory-only operation and does not sync new index contents to disk.
-		# Only index is affected, not the actual file.
+    # Writes page to disk. Does not commit to Git.
     def add(page : T)
-      @entries[page.name] = page
+      page.jail!
+      page.content.try do |content| ::File.write page.path, content end
       self
     end
     # Adds a new `T` into the index. This operation syncs new index contents to disk.
 		def add!(page : T)
 			add page
-			save!
+			#commit! user, "update"
 			self
 		end
 
     # Removes a T from Index. This is a memory-only operation and does not sync new index contents to disk.
 		# Recursive deletion is not handled here for now.
     def delete(page : T)
-      @entries.delete page.name
+      page.jail!
+      ::File.delete page.path
       self
     end
     # Deletes a page from index. This operation syncs new index contents to disk.
 		# Recursive deletion is not handled here for now.
 		def delete!(page : T)
 			delete page
-			save!
+			#commit! user, "delete"
 			self
 		end
 
     # Renames `T` in index. This is a memory-only operation and does not sync new contents to disk.
 		# Recursive renaming is not handled here for now.
     def rename(page : T, new_name : String)
-      @entries[new_name] = @entries.delete(page.name).not_nil!
-      self
+      old = page
+      new = T.new new_name
+      old.jail!
+      new.jail!
+      ::File.rename old.path, new.path
+      {old, new}
     end
     # Renames a page in index. This operation syncs new index contents to disk.
 		# Recursive renaming is not handled here for now.
 		def rename!(page : T)
-			rename page
-			save!
+			old, new = rename page
+			#commit! user, new, other_files: old
 			self
 		end
 

src/media.cr

@@ -34,6 +34,8 @@ class Fluence::Media < Fluence::File
 		# is created with Fluence::Media.new("existing_name") and #process! is not called.
 		@modification_time = Time.local
 		@size = 0
+
+    jail!
 	end
 
   # Directory where media is stored

src/page.cr

@@ -47,6 +47,8 @@ class Fluence::Page < Fluence::File
 		# is created with Fluence::Page.new("existing_name") and #process! is not called.
 		@modification_time = Time.local
 		@size = 0
+
+    jail!
 	end
 
   # translates a name ("/test/title" for example)