aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v3dv/urls.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sisu/v3dv/urls.rb')
-rw-r--r--lib/sisu/v3dv/urls.rb14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/sisu/v3dv/urls.rb b/lib/sisu/v3dv/urls.rb
index fdebb56c..6d334295 100644
--- a/lib/sisu/v3dv/urls.rb
+++ b/lib/sisu/v3dv/urls.rb
@@ -68,24 +68,24 @@ module SiSU_Urls
end
def read
begin
- SiSU_Urls::Output_urls.new(@opt).songsheet if @opt.fnb
- rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd).error
+ SiSU_Urls::OutputUrls.new(@opt).songsheet if @opt.fnb
+ rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd).error
ensure
end
end
end
- class Output_urls
+ class OutputUrls
attr_reader :fns,:fnb,:cmd,:dir,:m_regular,:u
def initialize(opt)
@opt=opt
- @particulars=SiSU_Particulars::Combined_singleton.instance.get_env_md(opt)
+ @particulars=SiSU_Particulars::CombinedSingleton.instance.get_env_md(opt)
@cmd=@opt.cmd
@md=@particulars.md
@env=@particulars.env
@fnb=@env.fnb
- fn_set_lang=SiSU_Env::Standardise_language.new(@opt.lng).language
+ fn_set_lang=SiSU_Env::StandardiseLanguage.new(@opt.lng).language
@fnl=@env.i18n.lang_filename(fn_set_lang[:c])
- @fn=SiSU_Env::Env_call.new(@opt.fns).lang(fn_set_lang[:c])
+ @fn=SiSU_Env::EnvCall.new(@opt.fns).lang(fn_set_lang[:c])
@m_regular=/(.+?)\.(?:(?:-|ssm\.)?sst|ssm)$/
@prog=@env.program
source=if @opt.fns =~/\.sst$/; @opt.fns
@@ -124,7 +124,7 @@ module SiSU_Urls
def songsheet
begin
@opt.cmd=~/U/ ? urls_all : (urls_select unless @opt.cmd=~/q/)
- rescue; SiSU_Errors::Info_error.new($!,$@,@opt.cmd,@opt.fns).error
+ rescue; SiSU_Errors::InfoError.new($!,$@,@opt.cmd,@opt.fns).error
ensure
end
end