From 2099cce12c2ffb53023c3c644b329b235e442ae0 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 3 Oct 2012 00:19:18 -0400 Subject: v4: skins, remove * remove skins * defaults, rename class Defaults (was InfoSkin) * sisupod, remove skin * db * no skin info to store, omitted from structure * change prefix name (structure changed) --- lib/sisu/v4/sysenv.rb | 118 +++++++++----------------------------------------- 1 file changed, 20 insertions(+), 98 deletions(-) (limited to 'lib/sisu/v4/sysenv.rb') diff --git a/lib/sisu/v4/sysenv.rb b/lib/sisu/v4/sysenv.rb index 286fa408..788c8780 100644 --- a/lib/sisu/v4/sysenv.rb +++ b/lib/sisu/v4/sysenv.rb @@ -266,7 +266,7 @@ module SiSU_Env end class GetInit < InfoSystemGen @@noyaml=false - @@rc,@@sisurc_path,@@vz,@@tx=nil,nil,nil,nil + @@rc,@@sisurc_path,@@tx=nil,nil,nil @@ad={ promo: nil, promo_list: nil, flag_promo: false } @@sdmd=nil attr_accessor :yaml @@ -279,9 +279,6 @@ module SiSU_Env true end end - def skin - @@vz ||=SiSU_Viz::Skin.new - end def tex @@tx ||=SiSU_Viz::TeX.new end @@ -993,6 +990,7 @@ module SiSU_Env @@fb,@@man_path=nil,nil def initialize(fns='',md=nil) super() #you may not want to re-execute this static info so frequently! + @init=SiSU_Env::GetInit.new @fns,@md=fns,md @env=SiSU_Env::EnvCall.new(fns) if fns fnb=if @md \ @@ -1393,7 +1391,7 @@ module SiSU_Env def widget #needs (md) #move @rc=SiSU_Env::GetInit.new.sisu_yaml.rc @ad=SiSU_Env::GetInit.new.ads - @vz=SiSU_Env::GetInit.new.skin + @vz=SiSU_Viz::Defaults.new @flag={ ad: false, md: false, sk: false, rc: false } def promo? @flag[:ad]=if @md.flag_promo && @ad[:flag_promo] @@ -1571,7 +1569,7 @@ WOK end def widget_static @rc=SiSU_Env::GetInit.new.sisu_yaml.rc - @vz=SiSU_Env::GetInit.new.skin + @vz=SiSU_Viz::Defaults.new @flag={ ad: false, md: false, sk: false, rc: false } def search? flag=if defined? @rc['search'] \ @@ -1848,7 +1846,7 @@ WOK defaults[:sample_data_path] end def rc - @sys.rc_path + @init.rc_path end def yamlrc GetInit.new.sisu_yaml.rc_path @@ -3172,22 +3170,6 @@ WOK end self end - def images_from_skin - skin=SiSU_Env::InfoSkin.new(@md).select - skin_array=nil - skin_images_array=[] - if skin - skin_array=IO.readlines(skin,"\n") - skin_array.each do |l| - if l !~/^#/ - if l =~/([a-z0-9._-]+\.(?:png|jpg|gif))/i - skin_images_array << $1 - end - end - end - end - skin_images_array - end def rsync @f=SiSU_Env::FileOp.new(@md) def document @@ -5648,58 +5630,6 @@ WOK @editor,@wc,@tidy,@rexml,@pdflatex,@postgresql,@sqlite=prog.text_editor,prog.wc,prog.tidy,prog.rexml,prog.pdflatex,prog.postgresql,prog.sqlite end end - class InfoSkin - def initialize(md=nil,skin=nil) - @md=md - @d_sk=if skin.is_a?(String) - skin - elsif defined? md.doc_skin \ - and md.doc_skin - md.doc_skin - else nil - end - @home,@pwd=ENV['HOME'],Dir.pwd - m=/.+\/(?:src\/)?(\S+)/m # m=/.+?\/(?:src\/)?([^\/]+)$/im # m=/.+\/(\S+)/m - @pwd_stub=@pwd[m,1] - @env=SiSU_Env::InfoEnv.new - end - def apply - if @m.respond_to?(:make) \ - and @md.make.respond_to(:skin) - skin_path=unless @md.opt.f_pth[:pth] =~/\/\S+?\/#{Gt[:sisupod]}\/\S+?\/#{Gt[:pod]}\/#{Gt[:doc]}/ - [ - "#{@env.path.pwd}/_sisu/skin", - "#{@env.path.home}/.sisu/skin", - '/etc/sisu/skin', - "#{@env.processing_path.processing_sisupod(@md.opt)}/external_document/skin" - ] - else #sisupod - pt=/(\/\S+?\/#{Gt[:sisupod]}\/\S+?\/#{Gt[:pod]}\/#{Gt[:doc]})/.match(@md.opt.f_pth[:pth])[1] - [ "#{pt}/_sisu/skin" ] - end - sk_doc,sk_dir="doc/#{@md.make.skin}.rb","dir/skin_#{@env.stub_pwd}.rb" - skin_path.each do |v| #document skin priority 1 - if FileTest.file?("#{v}/#{sk_doc}") - @skin_apply={ name: @md.make.skin, name_path: "#{v}/#{sk_doc}", type: :doc } - break - end - end - unless @skin_apply.length > 0 - skin_path.each do |v| #directory skin priority 2 - if FileTest.file?("#{v}/#{sk_dir}") - @skin_apply={ name: "skin_#{@env.stub_pwd}.rb", name_path: "#{v}/#{sk_dir}", type: :dir } - break - end - end - end - else nil - end - @skin_apply - end - def select # skin loading logic here, removed - nil - end - end class CSS_Default def html 'html.css' @@ -5834,36 +5764,28 @@ WOK def initialize(cmd) @cmd=cmd @env=SiSU_Env::InfoEnv.new + @init=SiSU_Env::GetInit.new @home,@pwd=ENV['HOME'],ENV['PWD'] #@pwd=Dir.pwd @rc=GetInit.new.sisu_yaml.rc - @vz=SiSU_Env::GetInit.new.skin + @vz=SiSU_Viz::Defaults.new @vz_home=SiSU_Viz::Home.new end def homepage - home_pages_manually_created=nil - @env.sys.rc_path.each do |v| - home_pages_manually_created=Dir.glob("#{v}/home/*.html") - if home_pages_manually_created.length > 0 - break - end - end + home_pages_manually_created=Dir.glob("#{@env.path.rc}/home/*.html") FileUtils::mkdir_p("#{@env.path.webserv}/#{@env.path.stub_pwd}") unless FileTest.directory?("#{@env.path.webserv}/#{@env.path.stub_pwd}") - if home_pages_manually_created - FileUtils.cp(home_pages_manually_created,"#{@env.path.webserv}/#{@env.path.stub_pwd}") - else - doc_skin=nil - sk_doc='doc/skin_sisu.rb' - @env.sys.rc_path.each do |v| #document skin priority 1 - if FileTest.file?("#{v}/skin/#{sk_doc}") - doc_skin="#{v}/skin/#{sk_doc}" - load doc_skin - break - end + if home_pages_manually_created.length > 0 + home_pages_manually_created.each do |homepage| + FileUtils.cp(homepage,"#{@env.path.webserv}/#{@env.path.stub_pwd}") end - filename_homepage=File.new("#{@env.path.webserv}/#{@env.path.stub_pwd}/index.html",'w') - filename_homepage_toc=File.new("#{@env.path.webserv}/#{@env.path.stub_pwd}/toc.html",'w') - filename_homepage << @vz_home.homepage - filename_homepage_toc << @vz_home.homepage + else + filename_homepage="#{@env.path.webserv}/#{@env.path.stub_pwd}/index.html" + filename_home_toc="#{@env.path.webserv}/#{@env.path.stub_pwd}/toc.html" + file_homepage=File.new(filename_homepage,'w') + file_home_toc=File.new(filename_home_toc,'w') + file_homepage << @vz_home.homepage + file_home_toc << @vz_home.homepage + file_homepage.close + file_home_toc.close end end def cp_images(src_path,dest_path) -- cgit v1.2.3