lib/dvdprofiler2xbmc/cli.rb in royw-dvdprofiler2xbmc-0.0.4 vs lib/dvdprofiler2xbmc/cli.rb in royw-dvdprofiler2xbmc-0.0.5

@@ -1,23 +1,8 @@
-require 'rubygems'
-require 'yaml'
-require 'xmlsimple'
-require 'ftools'
-require 'imdb'
-require 'mash'
-require 'log4r'
 require 'commandline/optionparser'
 include CommandLine
 
-require 'dvdprofiler2xbmc/app'
-require 'dvdprofiler2xbmc/app_config'
-require 'dvdprofiler2xbmc/collection'
-require 'dvdprofiler2xbmc/extensions'
-require 'dvdprofiler2xbmc/media'
-require 'dvdprofiler2xbmc/media_files'
-require 'dvdprofiler2xbmc/nfo'
-
 # Command Line interface for the Dvdprofiler2Xbmc application.
 # All application output is via AppConfig[:logger] so we have
 # to set up the logger here.
 # Also handle the command line options.
 # Finally creates an instance of Dvdprofiler2Xbmc and executes
@@ -41,10 +26,11 @@
 
       # we start a STDOUT logger, but it will be switched after
       # the config files are read if config[:logger_output] is set
       logger = Log4r::Logger.new('dvdprofiler2xbmc')
       logger.outputters = Log4r::StdoutOutputter.new(:console)
+      Log4r::Outputter[:console].formatter  = Log4r::PatternFormatter.new(:pattern => "%m")
       logger.level = Log4r::DEBUG
 
       begin
         # trap ^C interrupts and let the app instance cleanly exit any long loops
         Signal.trap("INT") {DvdProfiler2Xbmc.interrupt}
@@ -60,21 +46,26 @@
         # then we load the config files
         # then we run reinitialize_logger again to modify the logger for any logging options from the config files
 
         reinitialize_logger(logger, od["--quiet"], od["--debug"])
         AppConfig.load
-        AppConfig[:imdb_query] = !od["--no_imdb_query"]
         AppConfig.save
+        AppConfig[:imdb_query] = !od["--no_imdb_query"]
+        AppConfig[:logfile] = od['--output'] if od['--output']
+        AppConfig[:logfile_level] = od['--output_level'] if od['--output_level']
         reinitialize_logger(logger, od["--quiet"], od["--debug"])
 
         AppConfig[:do_update] = !od["--reports"]
 
+        AppConfig[:logger].info { "logfile => #{AppConfig[:logfile].inspect}" } unless AppConfig[:logfile].nil?
+        AppConfig[:logger].info { "logfile_level => #{AppConfig[:logfile_level].inspect}" } unless AppConfig[:logfile_level].nil?
+
         unless od["--help"] || od["--version"]
           # create and execute class instance here
           app = DvdProfiler2Xbmc.instance
           app.execute
-          app.report.each {|line| puts line}
+          app.report.each {|line| AppConfig[:logger].info line}
         end
       rescue Exception => eMsg
         logger.error {eMsg.to_s}
         logger.error {options.to_s}
         logger.error {eMsg.backtrace.join("\n")}
@@ -95,31 +86,42 @@
                             :opt_description => "This version of dvdprofiler2xbmc")
       options << Option.new(:flag, :names => %w(--no_imdb_query -n), :opt_description => 'Do not query IMDB.com')
       options << Option.new(:flag, :names => %w(--quiet -q),         :opt_description => 'Display error messages only')
       options << Option.new(:flag, :names => %w(--debug -d),         :opt_description => 'Display debug messages')
       options << Option.new(:flag, :names => %w(--reports -r),       :opt_description => 'Display reports only.  Do not do any updates.')
+      options << Option.new(:names => %w(--output -o),
+                            :argument_arity => [1,1],
+                            :arg_description => 'logfile',
+                            :opt_description => 'Write log messages to file. Default = no log file',
+                            :opt_found       => OptionParser::GET_ARGS
+                           )
+      options << Option.new(:names => %w(--output_level -l),
+                            :argument_arity => [1,1],
+                            :arg_description => 'level',
+                            :opt_description => 'Output logging level: DEBUG, INFO, WARN, ERROR. Default = INFO',
+                            :opt_found       => OptionParser::GET_ARGS
+                           )
       options
     end
 
     # Reinitialize the logger using the loaded config.
     # logger:: logger for any user messages
     # config:: is the application's config hash.
     def self.reinitialize_logger(logger, quiet, debug)
       # switch the logger to the one specified in the config files
-      unless AppConfig[:logfile].nil?
+      unless AppConfig[:logfile].blank?
         logfile_outputter = Log4r::RollingFileOutputter.new(:logfile, :filename => AppConfig[:logfile], :maxsize => 1000000 )
         logger.add logfile_outputter
-        logfile_outputter.level = Log4r::INFO
+        AppConfig[:logfile_level] ||= 'INFO'
         Log4r::Outputter[:logfile].formatter = Log4r::PatternFormatter.new(:pattern => "[%l] %d :: %M")
-        unless AppConfig[:logfile_level].nil?
-          level_map = {'DEBUG' => Log4r::DEBUG, 'INFO' => Log4r::INFO, 'WARN' => Log4r::WARN}
-          logfile_outputter.level = level_map[AppConfig[:logfile_level]] || Log4r::INFO
-        end
+        level_map = {'DEBUG' => Log4r::DEBUG, 'INFO' => Log4r::INFO, 'WARN' => Log4r::WARN}
+        logfile_outputter.level = level_map[AppConfig[:logfile_level].upcase] || Log4r::INFO
       end
       Log4r::Outputter[:console].level = Log4r::INFO
       Log4r::Outputter[:console].level = Log4r::WARN if quiet
       Log4r::Outputter[:console].level = Log4r::DEBUG if debug
-      # logger.trace = true
+      Log4r::Outputter[:console].formatter = Log4r::PatternFormatter.new(:pattern => "%m")
+                                                                                       # logger.trace = true
       AppConfig[:logger] = logger
     end
   end
 end