From 8c67d466ead2096d713515c88fcee17c473ecde5 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 19 Oct 2007 20:28:48 +0100 Subject: mostly paths for shared markup source (txt and pod), also... also current Debian/Sid ruby1.9 upgrade removes a bug, so a related test/warning in options.rb removed --- lib/sisu/v0/manifest.rb | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'lib/sisu/v0/manifest.rb') diff --git a/lib/sisu/v0/manifest.rb b/lib/sisu/v0/manifest.rb index e0617fec..891d6f41 100644 --- a/lib/sisu/v0/manifest.rb +++ b/lib/sisu/v0/manifest.rb @@ -91,11 +91,8 @@ module SiSU_Manifest @md,@fns=md @env=SiSU_Env::Info_env.new(@md.fns) @fnb=@md.fnb - out=@env.path.output - @base_url="#{@env.url.root}/#@fnb" - @base_url_src="#{@env.url.root}/src" - @base_path="#{out}/#@fnb" - @base_path_src="#{out}/src" + @base_url,@base_url_src,@base_url_pod="#{@env.url.root}/#@fnb","#{@env.url.src_txt}","#{@env.url.src_pod}" + @base_path,@base_path_src,@base_path_pod="#{@env.path.output}/#@fnb","#{@env.path.output_src}","#{@env.path.output_pod}" @@dg ||=SiSU_Env::Info_env.new.digest.type @dg=@@dg l=SiSU_Env::Standardise_language.new.file_to_language(@md.fns) @@ -129,6 +126,19 @@ module SiSU_Manifest @manifest[:html] << %{

#{id}

#{file}   #{dgst[1]}
#{@url_brace.xml_open}#@base_url_src/#{file}#{@url_brace.xml_close}

#{kb}

\n} if kb and kb =~/\d+/ end + def summarize_pod(id,file) + sys=SiSU_Env::System_call.new + dgst =if @dg =~/^sha(?:2|256)$/; sys.sha256("#{@base_path_pod}/#{file}") + else sys.md5("#{@base_path_pod}/#{file}") + end + tell=SiSU_Screen::Ansi.new(@md.cmd,"#{dgst[1]} #{file}") + tell.warn if @md.cmd =~/[vVM]/ + size=(File.size("#{@base_path_pod}/#{file}")/1024.00).to_s + kb=/([0-9]+\.[0-9]{0,1})/m.match(size)[1] + @manifest[:txt] << "#{file} #{id} #{kb}\n" + @manifest[:html] << %{

#{id}

#{file}   #{dgst[1]}
#{@url_brace.xml_open}#@base_url_pod/#{file}#{@url_brace.xml_close}

#{kb}

+ \n} if kb and kb =~/\d+/ + end def languages(id,file) flv=@env.published_manifests?(@base_path) @manifest[:html] << %{