StatsCollect 0.1.0.20101220 → 0.1.1.20101220

data/Credits

@@ -5,6 +5,11 @@
 * http://www.ruby-lang.org/
 * Thanks a lot Matz for this truly wonderful language !
 
+== rUtilAnts
+* Muriel Salvan (http://murielsalvan.users.sourceforge.net)
+* http://rutilants.sourceforge.net
+* Used for plugins and logging handling.
+
 = Projects used by StatsCollect plugins
 
 == Plugin Backends/MySQL

data/ReleaseInfo

@@ -2,7 +2,7 @@
 # This file has been generated by RubyPackager during a delivery.
 # More info about RubyPackager: http://rubypackager.sourceforge.net
 {
-  :Version => '0.1.0.20101220',
+  :Version => '0.1.1.20101220',
   :Tags => [ 'Beta' ],
   :DevStatus => 'Beta'
 }

data/TODO

@@ -1 +1,2 @@
-* MySpace: Get the user ID by parsing the Profile URL and remove :MySpaceName configuration option.
+* MySpace: Get the user ID by parsing the Profile URL and remove :MySpaceName configuration option.
+* Get all the orders at once, and merge them to call Locations just once per execution.

data/bin/StatsCollect.rb

@@ -4,11 +4,6 @@
 # Licensed under the terms specified in LICENSE file. No warranty is provided.
 #++
 
-# Uncomment for PlanetHoster
-#require 'rubygems'
-#ENV['GEM_PATH'] = "/home/murieles/ruby/gems:/home/murieles/.gem/ruby/1.8:/usr/lib/ruby/gems/1.8"
-#Gem.clear_paths
-
 require 'rUtilAnts/Logging'
 RUtilAnts::Logging::initializeLogging('','')
 require 'tmpdir'

data/lib/StatsCollect/Backends/MySQL.rb

@@ -36,7 +36,10 @@ module StatsCollect
         rStatus = nil
 
         if (defined?(@LstStatsOrders) == nil)
-          @LstStatsOrders = @MySQLConnection.query('SELECT id, timestamp, objects_list, categories_list, locations_list, status FROM stats_orders WHERE status=0 OR status=1 ORDER BY timestamp DESC')
+          @LstStatsOrders = []
+          @MySQLConnection.query('SELECT id, timestamp, objects_list, categories_list, locations_list, status FROM stats_orders WHERE status=0 OR status=1 ORDER BY timestamp DESC').each do |iRow|
+            @LstStatsOrders << iRow.clone
+          end
         end
         if (!@LstStatsOrders.empty?)
           lID, rTimeStamp, lStrLocations, lStrObjects, lStrCategories, rStatus = @LstStatsOrders.pop
@@ -115,7 +118,7 @@ module StatsCollect
       # Return:
       # * _Integer_: Its resulting ID
       def addCategory(iCategory, iValueType)
-        @MySQLConnection.query("INSERT INTO stats_categories (name, value_type) VALUES ('#{@MySQLConnection.escape_string(iLocation)}', #{iValueType})")
+        @MySQLConnection.query("INSERT INTO stats_categories (name, value_type) VALUES ('#{@MySQLConnection.escape_string(iCategory)}', #{iValueType})")
 
         return @MySQLConnection.insert_id
       end

data/lib/StatsCollect/Locations/Facebook.rb

@@ -42,7 +42,9 @@ module StatsCollect
         lProfilePage = iMechanizeAgent.get('http://www.facebook.com/profile.php')
         lNbrFriends = nil
         lProfilePage.root.css('script').each do |iScriptNode|
-          lMatch = iScriptNode.content.match(/>(\d*) friends<\\\/a><\\\/span>/)
+          lMatch = iScriptNode.content.match(/>Friends \((\d*)\)<\\\/a><\\\/span>/)
+          # The following line is valid for old profiles only
+          #lMatch = iScriptNode.content.match(/>(\d*) friends<\\\/a><\\\/span>/)
           if (lMatch != nil)
             lNbrFriends = Integer(lMatch[1])
             break

data/lib/StatsCollect/Locations/Youtube.rb

@@ -23,8 +23,8 @@ module StatsCollect
         require 'mechanize'
         lMechanizeAgent = Mechanize.new
         lLoginForm = lMechanizeAgent.get('http://www.youtube.com').link_with(:text => 'Sign In').click.forms[1]
-        lLoginForm.Email = 'Muriel.Esteban@GMail.com'
-        lLoginForm.Passwd = 'M[K2LBVu0}xT|b<[<Q")'
+        lLoginForm.Email = iConf[:LoginEMail]
+        lLoginForm.Passwd = iConf[:LoginPassword]
         lMechanizeAgent.submit(lLoginForm, lLoginForm.buttons.first).meta.first.click
         if ((oStatsProxy.isCategoryIncluded?('Video plays')) or
             (oStatsProxy.isCategoryIncluded?('Video likes')) or
@@ -33,6 +33,19 @@ module StatsCollect
             (oStatsProxy.isCategoryIncluded?('Video responses')))
           getVideos(oStatsProxy, lMechanizeAgent)
         end
+        if ((oStatsProxy.isObjectIncluded?('Global')) and
+            ((oStatsProxy.isCategoryIncluded?('Visits')) or
+             (oStatsProxy.isCategoryIncluded?('Followers'))))
+          getOverview(oStatsProxy, lMechanizeAgent)
+        end
+        if ((oStatsProxy.isObjectIncluded?('Global')) and
+            (oStatsProxy.isCategoryIncluded?('Friends')))
+          getFriends(oStatsProxy, lMechanizeAgent)
+        end
+        if ((oStatsProxy.isObjectIncluded?('Global')) and
+            (oStatsProxy.isCategoryIncluded?('Following')))
+          getSubscriptions(oStatsProxy, lMechanizeAgent)
+        end
       end
 
       # Get the videos statistics
@@ -62,6 +75,61 @@ module StatsCollect
         logDebug "#{lLstVideosRead.size} videos read: #{lLstVideosRead.join(', ')}"
       end
 
+      # Get the overview statistics
+      #
+      # Parameters:
+      # * *oStatsProxy* (_StatsProxy_): The stats proxy to be used to populate stats
+      # * *iMechanizeAgent* (_Mechanize_): The agent reading pages
+      def getOverview(oStatsProxy, iMechanizeAgent)
+        lOverviewPage = iMechanizeAgent.get('http://www.youtube.com/account_overview')
+        lNbrVisits = nil
+        lNbrFollowers = nil
+        lOverviewPage.root.css('div.statBlock').each do |iStatsSectionNode|
+          lChildrenNodes = iStatsSectionNode.children
+          lChildrenNodes.each_with_index do |iNode, iIdx|
+            if (iNode.content == 'Channel Views:')
+              lNbrVisits = Integer(lChildrenNodes[iIdx+1].content.strip)
+            elsif (iNode.content == 'Subscribers:')
+              lNbrFollowers = Integer(lChildrenNodes[iIdx+1].content.strip)
+            end
+          end
+          if ((lNbrVisits != nil) and
+              (lNbrFollowers != nil))
+            break
+          end
+        end
+        if (lNbrVisits == nil)
+          logErr "Unable to get number of visits: #{lOverviewPage}"
+        elsif (lNbrFollowers == nil)
+          logErr "Unable to get number of followers: #{lOverviewPage}"
+        else
+          oStatsProxy.addStat('Global', 'Visits', lNbrVisits)
+          oStatsProxy.addStat('Global', 'Followers', lNbrFollowers)
+        end
+      end
+
+      # Get the friends statistics
+      #
+      # Parameters:
+      # * *oStatsProxy* (_StatsProxy_): The stats proxy to be used to populate stats
+      # * *iMechanizeAgent* (_Mechanize_): The agent reading pages
+      def getFriends(oStatsProxy, iMechanizeAgent)
+        lOverviewPage = iMechanizeAgent.get('http://www.youtube.com/profile?view=friends')
+        lNbrFriends = Integer(lOverviewPage.root.xpath('//span[@name="channel-box-item-count"]').first.content)
+        oStatsProxy.addStat('Global', 'Friends', lNbrFriends)
+      end
+
+      # Get the friends statistics
+      #
+      # Parameters:
+      # * *oStatsProxy* (_StatsProxy_): The stats proxy to be used to populate stats
+      # * *iMechanizeAgent* (_Mechanize_): The agent reading pages
+      def getSubscriptions(oStatsProxy, iMechanizeAgent)
+        lOverviewPage = iMechanizeAgent.get('http://www.youtube.com/profile?view=subscriptions')
+        lNbrFollowing = Integer(lOverviewPage.root.xpath('//span[@name="channel-box-item-count"]').first.content)
+        oStatsProxy.addStat('Global', 'Following', lNbrFollowing)
+      end
+
     end
 
   end

data/lib/StatsCollect/Stats.rb

@@ -10,12 +10,10 @@ require 'StatsCollect/StatsProxy'
 module StatsCollect
 
   # Stats orders statuses
-  # !!! Those constants are also defined in the RoR website.
   STATS_ORDER_STATUS_TOBEPROCESSED = 0
   STATS_ORDER_STATUS_RECOVERABLE_ERROR = 1
   STATS_ORDER_STATUS_UNRECOVERABLE_ERROR = 2
   # Value types
-  # !!! Those constants are also defined in the RoR website.
   STATS_VALUE_TYPE_INTEGER = 0
   STATS_VALUE_TYPE_FLOAT = 1
   STATS_VALUE_TYPE_PERCENTAGE = 2
@@ -33,6 +31,7 @@ module StatsCollect
       parsePluginsFromDir('Notifiers', "#{File.expand_path(File.dirname(__FILE__))}/Notifiers", 'StatsCollect::Notifiers')
 
       @Backend = nil
+      @BackendInit = false
       @Notifier = nil
       @ConfigFile = nil
       @DisplayHelp = false
@@ -183,7 +182,10 @@ module StatsCollect
         begin
           # Collect statistics
           logInfo "[#{DateTime.now.strftime('%Y-%m-%d %H:%M:%S')}] - Begin collecting stats..."
-          @BackendInstance.initSession(@Conf[:Backends][@Backend])
+          if (!@BackendInit)
+            @BackendInstance.initSession(@Conf[:Backends][@Backend])
+            @BackendInit = true
+          end
           # Get the stats orders to process
           lFoundOrder = false
           lTimeStamp, lLstLocations, lLstObjects, lLstCategories, lStatus = @BackendInstance.getNextStatsOrder
@@ -245,6 +247,20 @@ module StatsCollect
       end
     end
 
+    # Enqueue a new stats order
+    #
+    # Parameters:
+    # * *iLstLocations* (<em>list<String></em>): Locations list (can be empty for all locations)
+    # * *iLstObjects* (<em>list<String></em>): Objects list (can be empty for all objects)
+    # * *iLstCategories* (<em>list<String></em>): Categories list (can be empty for all categories)
+    def pushStatsOrder(iLstLocations, iLstObjects, iLstCategories)
+      if (!@BackendInit)
+        @BackendInstance.initSession(@Conf[:Backends][@Backend])
+        @BackendInit = true
+      end
+      @BackendInstance.putNewStatsOrder(DateTime.now, iLstLocations, iLstObjects, iLstCategories, STATS_ORDER_STATUS_TOBEPROCESSED)
+    end
+
     private
 
     # Process an order

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
+  - 1
   - 20101220
-  version: 0.1.0.20101220
+  version: 0.1.1.20101220
 platform: ruby
 authors: 
 - Muriel Salvan