Changeset 80570

Timestamp:

07/14/11 23:35:23 (4 years ago)

Author:

derek@…

Message:

Added some basic port information verification, small refactor of port saving

• Ensure that a submitted port exists in the MacPorts repository (port table) before saving
• Renamed add_port_data to add_installed_ports
• Moved port saving code from inside a loop to add_port helper method

File:

• branches/gsoc11-statistics/stats-server/app/controllers/submissions_controller.rb (modified) (4 diffs)

branches/gsoc11-statistics/stats-server/app/controllers/submissions_controller.rb

@@ -36 +36 @@
     xcode_version    = os['xcode_version']
    
-    # Try and find an existing entry
+    # Try to find an existing entry
     os_stats = OsStatistic.find_by_user_id(user.id)
      
@@ -59 +59 @@
   end
 
-  def add_port_data(uuid, ports)
-    logger.debug "In add_port_data"
+  def add_port(uuid, macports_port, installed_port, month, year)
+    logger.debug {"Adding installed port #{installed_port['name']}"}
+        
+    portEntry = InstalledPort.new(:uuid => uuid,
+                             :port_id => macports_port.id,
+                             :version => installed_port['version'],
+                             :variants => installed_port['variants'],
+                             :month => month,
+                             :year => year)
+                        
+    if not portEntry.save
+     logger.debug "Unable to save port #{port['name']}"
+     logger.debug "Error message: #{portEntry.errors.full_messages}"
+   end
+ end
+
+  def add_installed_ports(uuid, installed_ports)
+    logger.debug "In add_installed_ports"
     
-    if ports.nil?
+    if installed_ports.nil?
       return
     end
@@ -70 +86 @@
     year = current_time.year
     
-    ports.each do |port|
-      logger.debug {"Adding port #{port}"}
-      port_id = 5
-      portEntry = InstalledPort.new(:uuid => uuid,
-                               :port_id => port_id,
-                               :version => port['version'],
-                               :variants => port['variants'],
-                               :month => month,
-                               :year => year)
-                          
-      if not portEntry.save
-       logger.debug "Unable to save port #{port['name']}"
-       logger.debug "Error message: #{portEntry.errors.full_messages}"
-     end
+    installed_ports.each do |installed_port|
+      # Find the reported port in the MacPorts repository
+      macports_port = Port.find_by_name(installed_port['name'])
+
+      if macports_port.nil?
+        logger.debug {"Skipping unknown port #{installed_port['name']} - Not in MacPorts repository"}
+        next
+      end
+      
+      # Update installed port information
+      add_port(uuid, macports_port, installed_port, month, year)
     end
   end
@@ -97 +110 @@
     
     add_os_data(user, os)
-    add_port_data(json['id'], active_ports)
+    add_installed_ports(json['id'], active_ports)
 
     respond_to do |format|