Clear the code from not used parameters

1. Remove a lot of unused self parameters & commands (including 'make screenshot') 2. Make sure adding commands only once 3. Add function to change font faces for any items enumerated in Fonts.fontmap and modify the code to recalculate the width of left column that depends on the selected font face => lface 4. Remove most of outdated comments
2025-08-10 00:52:38 +00:00 · 2012-09-06 20:35:25 +03:00
parent cfa4afe35a
commit 5e6a93191a
1 changed files with 76 additions and 159 deletions
--- a/fileinfo.lua
+++ b/fileinfo.lua
@@ -5,86 +5,79 @@ require "font"
 require "inputbox"
 require "dialog"
 require "settings"
--require "extentions"

 FileInfo = {
-	-- title height
-	title_H = 40,
-	-- spacing between lines
-	spacing = 36,
-	-- foot height
-	foot_H = 28,
-	-- horisontal margin
-	margin_H = 10,
+	title_H = 40,	-- title height
+	spacing = 36,	-- spacing between lines
+	foot_H = 28,	-- foot height
+	margin_H = 10,	-- horisontal margin
 	-- state buffer
+	pagedirty = true,
 	result = {},
-	files = {},
-	lcolumn_width = 0,
+	commands = {},
 	items = 0,
-	page = 1,
-	current = 1,
 	pathfile = "",
 }

-function FileInfo:FileCreated(fname,attr)
+function FileInfo:FileCreated(fname, attr)
 	return os.date("%d %b %Y, %H:%M:%S", lfs.attributes(fname,attr))
 end
-- NuPogodi, 26.05.12: a bit changed to return string from size
-function FileInfo:FileSize(size)
-	if size < 1024 then
-		return size.." Bytes"
-	elseif size < 2^20 then
-		return string.format("%.2f", size/2^10).."KB ("..size.." Bytes)"
-	else
-		return string.format("%.2f", size/2^20).."MB ("..size.." Bytes)"
-	end
-end -- end of changes (NuPogodi, 26.05.12)

-function FileInfo:init(path,fname)
+function FileInfo:FileSize(size)
+	if size < 1024 then		return size.." Bytes"
+	elseif size < 2^20 then	return string.format("%.2f", size/2^10).."KB ("..size.." Bytes)"
+	else				return string.format("%.2f", size/2^20).."MB ("..size.." Bytes)"
+	end
+end
+
+function FileInfo:init(path, fname)
 	self.pathfile = path.."/"..fname
-	self.result = {}
-	self:addAllCommands()
+	-- add commands only once
+	if not self.commands then
+		self:addAllCommands()
+	end

 	local info_entry = {dir = "Name", name = fname}
 	table.insert(self.result, info_entry)
 	info_entry = {dir = "Path", name = path}
 	table.insert(self.result, info_entry)
-	-- NuPogodi, 26.05.12: now one has to call FileInfo:FileSize(integer)
-	info_entry = {dir = "Size", name = FileInfo:FileSize(lfs.attributes(self.pathfile,"size"))}
+
+	info_entry = {dir = "Size", name = FileInfo:FileSize(lfs.attributes(self.pathfile, "size"))}
 	table.insert(self.result, info_entry)
-	-- NuPogodi, 26.05.12: size & filename of unzipped entry for zips 
+	-- size & filename of unzipped entry for zips 
 	if string.lower(string.match(fname, ".+%.([^.]+)")) == "zip" then
 		local outfile = "./data/zip_content"
-		local l, s = 1, ""
-		os.execute("unzip ".."-l \""..self.pathfile.."\" > "..outfile)
+		local l, s = 1
+		os.execute("unzip -l \""..self.pathfile.."\" > "..outfile)
 		if io.open(outfile, "r") then
 			for lines in io.lines(outfile) do 
 				if l == 4 then s = lines break else l = l + 1 end
 			end
-			-- due to rewriting FileInfo:FileSize(integer), one can use it now
-			info_entry = { dir = "Unpacked", name = FileInfo:FileSize(tonumber(string.sub(s,1,11))) }
-			table.insert(self.result, info_entry)
+			if s then
+				info_entry = { dir = "Unpacked", name = FileInfo:FileSize(tonumber(string.sub(s,1,11))) }
+				table.insert(self.result, info_entry)
+			end
 			--[[ TODO: When the fileentry inside zips is encoded as ANSI (codes 128-255)
 			any attempt to print such fileentry causes crash by drawing!!! When fileentries
 			are encoded as UTF8, everything seems fine
 			info_entry = { dir = "Content", name = string.sub(s,29,-1) }
 			table.insert(self.result, info_entry) ]]
 		end
-	end	-- end of changes (NuPogodi, 26.05.12)
+	end

-	info_entry = {dir = "Created", name = FileInfo:FileCreated(self.pathfile,"change")}
+	info_entry = {dir = "Created", name = FileInfo:FileCreated(self.pathfile, "change")}
 	table.insert(self.result, info_entry)
-	info_entry = {dir = "Modified", name = FileInfo:FileCreated(self.pathfile,"modification")}
+	info_entry = {dir = "Modified", name = FileInfo:FileCreated(self.pathfile, "modification")}
 	table.insert(self.result, info_entry)

 	-- if the document was already opened
 	local history = DocToHistory(self.pathfile)
-	local file, msg = io.open(history,"r")
+	local file, msg = io.open(history, "r")
 	if not file then 
 		info_entry = {dir = "Last Read", name = "Never"}
 		table.insert(self.result, info_entry)
 	else
-		info_entry = {dir = "Last Read", name = FileInfo:FileCreated(history,"change")}
+		info_entry = {dir = "Last Read", name = FileInfo:FileCreated(history, "change")}
 		table.insert(self.result, info_entry)
 		local file_type = string.lower(string.match(self.pathfile, ".+%.([^.]+)"))
 		local to_search, add, factor = "[\"last_percent\"]", "%", 100
@@ -94,100 +87,73 @@ function FileInfo:init(path,fname)
 			factor = 1
 		end
 		for line in io.lines(history) do
-			if string.match(line,"%b[]") == to_search then
+			if string.match(line, "%b[]") == to_search then
 				local cdc = tonumber(string.match(line, "%d+")) / factor
-				info_entry = {dir = "Completed", name = string.format("%d",cdc)..add }
+				info_entry = {dir = "Completed", name = string.format("%d", cdc)..add }
 				table.insert(self.result, info_entry)
 			end
 		end
 	end
-
 	self.items = #self.result
-	-- now calculating the horizontal space for left column
-	local tw, width
-	for i = 1, self.items do
-		tw = TextWidget:new({text = self.result[i].dir, face = Font:getFace("tfont", 22)})
-		width = tw:getSize().w
-		if width > self.lcolumn_width then self.lcolumn_width = width end
-		tw:free()
-	end
 end

-function FileInfo:show(path,name)
-	-- at first, one has to test whether the file still exists or not
-	-- it's necessary for last documents
+function FileInfo:show(path, name)
+	-- at first, one has to test whether the file still exists or not: necessary for last documents
 	if not io.open(path.."/"..name,"r") then return nil end
 	-- then goto main functions
-	self.perpage = math.floor(G_height / self.spacing) - 2
-	self.pagedirty = true
-	self.markerdirty = false
 	FileInfo:init(path,name)
-
+	-- local variables
+	local cface, lface, tface, fface, width, xrcol, c, dy, ev, keydef, ret_code
 	while true do
-		local cface = Font:getFace("cfont", 22)
-		local lface = Font:getFace("tfont", 22)
-		local tface = Font:getFace("tfont", 25)
-		local fface = Font:getFace("ffont", 16)
-
 		if self.pagedirty then
-			self.markerdirty = true
-			-- gap between title rectangle left & left text drawing point
+			-- refresh the fonts, if not yet defined or updated via 'F'
+			cface = Font:getFace("cfont", 22)
+			lface = Font:getFace("tfont", 22)
+			tface = Font:getFace("tfont", 25)
+			fface = Font:getFace("ffont", 16)
+			-- drawing
 			fb.bb:paintRect(0, 0, G_width, G_height, 0)
-			-- draw menu title
-			DrawTitle("Document Information",self.margin_H,0,self.title_H,4,tface)
-			-- position of left column
-			local x1 = self.margin_H
-			-- position of right column + its width + a small gap between columns
-			local x2 = x1 + self.lcolumn_width + 15
-			-- y-position correction because of the multiline drawing 
-			local dy, c = 5, 1
-			for c = 1, self.perpage do
-				local i = (self.page - 1) * self.perpage + c
-				if i <= self.items then
-					y = self.title_H + self.spacing * c + dy
-					renderUtf8Text(fb.bb, x1, y, lface, self.result[i].dir, true)
-					dy = dy + renderUtf8Multiline(fb.bb, x2, y, cface, self.result[i].name, true,
-						G_width - self.margin_H - x2, 1.65).y - y
-				end
+			DrawTitle("Document Information", self.margin_H, 0, self.title_H, 3, tface)
+			-- now calculating xrcol-position for the right column
+			width = 0
+			for c = 1, self.items do
+				width = math.max(sizeUtf8Text(0, G_width, lface, self.result[c].dir, true).x, width)
+			end
+			xrcol = self.margin_H + width + 25
+			dy = 5 -- to store the y-position correction 'cause of the multiline drawing
+			for c = 1, self.items do
+				y = self.title_H + self.spacing * c + dy
+				renderUtf8Text(fb.bb, self.margin_H, y, lface, self.result[c].dir, true)
+				dy = dy + renderUtf8Multiline(fb.bb, xrcol, y, cface, self.result[c].name, true,
+						G_width - self.margin_H - xrcol, 1.65).y - y
 			end
-			-- draw footer
-			all_page = math.ceil(self.items/self.perpage)
-			DrawFooter("Page "..self.page.." of "..all_page,fface,self.foot_H)
-		end
-
-		if self.pagedirty then
 			fb:refresh(0)
 			self.pagedirty = false
-		end	
-
-		local ev = input.saveWaitForEvent()
+		end
+		-- waiting for user's commands
+		ev = input.saveWaitForEvent()
 		ev.code = adjustKeyEvents(ev)
 		if ev.type == EV_KEY and ev.value ~= EVENT_VALUE_KEY_RELEASE then
 			keydef = Keydef:new(ev.code, getKeyModifier())
-			Debug("key pressed: "..tostring(keydef))
-
+			--Debug("key pressed: "..tostring(keydef))
 			command = self.commands:getByKeydef(keydef)
 			if command ~= nil then
-				Debug("command to execute: "..tostring(command))
+				--Debug("command to execute: "..tostring(command))
 				ret_code = command.func(self, keydef)
 			else
-				Debug("command not found: "..tostring(command))
+				--Debug("command not found: "..tostring(command))
 			end
-
 			if ret_code == "break" then break end
-
-			if self.selected_item ~= nil then
-				Debug("# selected "..self.selected_item)
-				return self.selected_item
-			end
-		end -- if
+		end -- if ev.type
 	end -- while true
+	-- clear results
+	self.pagedirty = true
+	result = {}
 	return nil
 end

 function FileInfo:addAllCommands()
 	self.commands = Commands:new{}
-
 	self.commands:add({KEY_SPACE}, nil, "Space",
 		"refresh page manually",
 		function(self)
@@ -200,7 +166,14 @@ function FileInfo:addAllCommands()
 			HelpPage:show(0, G_height, self.commands)
 			self.pagedirty = true
 		end
-	) 
+	)
+	self.commands:add({KEY_F, KEY_AA}, nil, "F",
+		"change font faces",
+		function(self)
+			Font:chooseFonts()
+			self.pagedirty = true
+		end
+	)
 	self.commands:add(KEY_L, nil, "L",
 		"last documents",
 		function(self)
@@ -209,55 +182,6 @@ function FileInfo:addAllCommands()
 			self.pagedirty = true
 		end
 	) 
-	self.commands:add({KEY_F, KEY_AA}, nil, "F",
-		"font menu",
-		function(self)
-			local item_no = 0
-			local face_list = Font:getFontList() 
-			while face_list[item_no] ~= Font.fontmap.cfont and item_no < #face_list do 
-				item_no = item_no + 1 
-			end
-				
-			local fonts_menu = SelectMenu:new{
-				menu_title = "Fonts Menu",
-				item_array = face_list,
-				current_entry = item_no - 1,
-				}
-			local re, font = fonts_menu:choose(0, G_height)
-			if re then
-				Font.fontmap["cfont"] = font
-				Font:update()
-			end
-			self.pagedirty = true
-		end
-	)
-	self.commands:add({KEY_PGFWD, KEY_LPGFWD}, nil, ">",
-		"next page",
-		function(self)
-			if self.page < (self.items / self.perpage) then
-				if self.current + self.page*self.perpage > self.items then
-					self.current = self.items - self.page*self.perpage
-				end
-				self.page = self.page + 1
-				self.pagedirty = true
-			else
-				self.current = self.items - (self.page-1)*self.perpage
-				self.markerdirty = true
-			end
-		end
-	)
-	self.commands:add({KEY_PGBCK, KEY_LPGBCK}, nil, "<",
-		"previous page",
-		function(self)
-			if self.page > 1 then
-				self.page = self.page - 1
-				self.pagedirty = true
-			else
-				self.current = 1
-				self.markerdirty = true
-			end
-		end
-	) 
 	self.commands:add({KEY_ENTER, KEY_FW_PRESS}, nil, "Enter",
 		"open document",
 		function(self)
@@ -265,13 +189,6 @@ function FileInfo:addAllCommands()
 			self.pagedirty = true
 		end
 	)
-	-- make screenshot
-	self.commands:add(KEY_P, MOD_SHIFT, "P",
-		"make screenshot",
-		function(self)
-			Screen:screenshot()
-		end
-	) 
 	self.commands:add({KEY_BACK, KEY_FW_LEFT}, nil, "Back",
 		"back",
 		function(self)