Fix a few bugs and PR comments

Author: jbarnett-r7

lib/msf/core/db_manager/loot.rb

@@ -97,8 +97,11 @@ def report_loot(opts)
   # @param opts [Hash] Hash containing the updated values. Key should match the attribute to update. Must contain :id of record to update.
   # @return [Mdm::Loot] The updated Mdm::Loot object.
   def update_loot(opts)
-    # TODO: remove unneeded workspace from opts until it's not automatically added to remote requests
-    opts.delete(:workspace)
+    wspace = opts.delete(:workspace)
+    if wspace.kind_of? String
+      wspace = find_workspace(wspace)
+      opts[:workspace] = wspace
+    end
 
     ::ActiveRecord::Base.connection_pool.with_connection {
       id = opts.delete(:id)

lib/msf/ui/console/command_dispatcher/db.rb

@@ -1145,7 +1145,7 @@ def cmd_loot(*args)
                     print_error("Can't make loot with no info")
                     return
                   end
-                when '-t'
+                when '-t', '--type'
                   typelist = args.shift
                   if(!typelist)
                     print_error("Invalid type list")
@@ -1211,6 +1211,8 @@ def cmd_loot(*args)
               loots = loots + framework.db.loots(framework.db.workspace, {:search_term => search_term})
             else
               each_host_range_chunk(host_ranges) do |host_search|
+                break if !host_search.nil? && host_search.empty?
+
                 loots = loots + framework.db.loots(framework.db.workspace, { :hosts => { :address => host_search }, :search_term => search_term })
               end
             end
@@ -1222,7 +1224,6 @@ def cmd_loot(*args)
               if mode == :update
                 begin
                   loot.info = info if info
-                  loot.filename = filename if filename
                   if types.size > 1
                     print_error "May only pass 1 type when performing an update."
                     next