collector.rb in snapshot-1.7.0

- old
+ new

@@ -1,8 +1,9 @@
 module Snapshot
   # Responsible for collecting the generated screenshots and copying them over to the output directory
   class Collector
+    # Returns true if it succeeds
     def self.fetch_screenshots(output, language, device_type, launch_arguments_index)
       # Documentation about how this works in the project README
       containing = File.join(TestCommandGenerator.derived_data_path, "Logs", "Test")
       attachments_path = File.join(containing, "Attachments")
 
@@ -12,11 +13,11 @@
       if to_store.count == 0 && matches.count == 0
         return false
       end
 
       if matches.count != to_store.count
-        Helper.log.error "Looks like the number of screenshots (#{to_store.count}) doesn't match the number of names (#{matches.count})"
+        UI.error "Looks like the number of screenshots (#{to_store.count}) doesn't match the number of names (#{matches.count})"
       end
 
       matches.each_with_index do |current, index|
         name = current[0]
         filename = to_store[index]
@@ -28,46 +29,53 @@
         components = [device_name, launch_arguments_index, name].delete_if { |a| a.to_s.length == 0 }
 
         output_path = File.join(language_folder, components.join("-") + ".png")
         from_path = File.join(attachments_path, filename)
         if $verbose
-          Helper.log.info "Copying file '#{from_path}' to '#{output_path}'...".green
+          UI.success "Copying file '#{from_path}' to '#{output_path}'..."
         else
-          Helper.log.info "Copying '#{output_path}'...".green
+          UI.success "Copying '#{output_path}'..."
         end
         FileUtils.cp(from_path, output_path)
       end
 
       return true
     end
 
     def self.attachments(containing)
-      Helper.log.info "Collecting screenshots..."
+      UI.message "Collecting screenshots..."
 
       plist_path = Dir[File.join(containing, "*.plist")].last # we clean the folder before each run
-      Helper.log.info "Loading up '#{plist_path}'..." if $verbose
+      UI.verbose "Loading up '#{plist_path}'..."
       report = Plist.parse_xml(plist_path)
 
       to_store = [] # contains the names of all the attachments we want to use
       report["TestableSummaries"].each do |summary|
         (summary["Tests"] || []).each do |test|
           (test["Subtests"] || []).each do |subtest|
             (subtest["Subtests"] || []).each do |subtest2|
               (subtest2["Subtests"] || []).each do |subtest3|
                 (subtest3["ActivitySummaries"] || []).each do |activity|
-                  # We now check if it's the rotation gesture, because that's the only thing we care about
-                  if activity["Title"] == "Set device orientation to Unknown"
-                    to_store << activity["Attachments"].last["FileName"]
-                  end
+                  check_activity(activity, to_store)
                 end
               end
             end
           end
         end
       end
 
-      Helper.log.info "Found #{to_store.count} screenshots..."
-      Helper.log.info "Found #{to_store.join(', ')}" if $verbose
+      UI.message "Found #{to_store.count} screenshots..."
+      UI.verbose "Found #{to_store.join(', ')}"
       return to_store
+    end
+
+    def self.check_activity(activity, to_store)
+      # We now check if it's the rotation gesture, because that's the only thing we care about
+      if activity["Title"] == "Set device orientation to Unknown"
+        to_store << activity["Attachments"].last["FileName"]
+      end
+      (activity["SubActivities"] || []).each do |subactivity|
+        check_activity(subactivity, to_store)
+      end
     end
   end
 end