Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo <gustavo@gustavo-HP.(none)>2013-02-01 19:43:37 (GMT)
committer Gustavo <gustavo@gustavo-HP.(none)>2013-02-01 19:43:37 (GMT)
commit7b76144318a26fbd672232046fa94914826a51b9 (patch)
tree210531d8ef156c7e1baa7e69aab7737bf02fd12b
parente92e7a75149d62b18b378334efd4da1fb24eac90 (diff)
Rename src folder to stats_consolidation.
Rename package name to sugar-stats-consolidation in order to keep the same line of sugar-stats.
-rw-r--r--src/stats_consolidation/build/lib.linux-x86_64-2.7/consolidation.py34
-rw-r--r--src/stats_consolidation/build/lib.linux-x86_64-2.7/db.py202
-rw-r--r--src/stats_consolidation/build/lib.linux-x86_64-2.7/rrd_files.py133
-rw-r--r--sugar_stats_consolidation/__init__.py (renamed from src/stats_consolidation/__init__.py)0
-rw-r--r--sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/__init__.py (renamed from src/build/lib.linux-x86_64-2.7/stats_consolidation/__init__.py)0
-rw-r--r--sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/consolidation.py (renamed from src/build/lib.linux-x86_64-2.7/stats_consolidation/consolidation.py)0
-rw-r--r--sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/db.py (renamed from src/build/lib.linux-x86_64-2.7/stats_consolidation/db.py)0
-rw-r--r--sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/rrd_files.py (renamed from src/build/lib.linux-x86_64-2.7/stats_consolidation/rrd_files.py)0
-rw-r--r--sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/setup.py (renamed from src/build/lib.linux-x86_64-2.7/stats_consolidation/setup.py)0
-rw-r--r--sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/test_cons.py (renamed from src/build/lib.linux-x86_64-2.7/stats_consolidation/test_cons.py)0
-rw-r--r--sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/test_db.py (renamed from src/build/lib.linux-x86_64-2.7/stats_consolidation/test_db.py)0
-rw-r--r--sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/test_rrd.py (renamed from src/build/lib.linux-x86_64-2.7/stats_consolidation/test_rrd.py)0
-rw-r--r--sugar_stats_consolidation/consolidation.py (renamed from src/stats_consolidation/consolidation.py)0
-rwxr-xr-xsugar_stats_consolidation/consolidation_run (renamed from src/consolidation_run)0
-rw-r--r--sugar_stats_consolidation/db.py (renamed from src/stats_consolidation/db.py)0
-rw-r--r--sugar_stats_consolidation/rrd_files.py (renamed from src/stats_consolidation/rrd_files.py)0
-rw-r--r--sugar_stats_consolidation/test_cons.py (renamed from src/stats_consolidation/test_cons.py)0
-rw-r--r--sugar_stats_consolidation/test_db.py (renamed from src/stats_consolidation/test_db.py)0
-rwxr-xr-xsugar_stats_consolidation/test_rrd.py (renamed from src/stats_consolidation/test_rrd.py)0
-rwxr-xr-xsugar_stats_consolidation/test_rrds_content.py (renamed from src/stats_consolidation/test_rrds_content.py)0
20 files changed, 0 insertions, 369 deletions
diff --git a/src/stats_consolidation/build/lib.linux-x86_64-2.7/consolidation.py b/src/stats_consolidation/build/lib.linux-x86_64-2.7/consolidation.py
deleted file mode 100644
index 4003594..0000000
--- a/src/stats_consolidation/build/lib.linux-x86_64-2.7/consolidation.py
+++ /dev/null
@@ -1,34 +0,0 @@
-import os
-import stats_consolidation
-import argparse
-
-from rrd_files import *
-from db import *
-
-class Consolidation:
-
- def __init__(self, path, db):
- self.base_path = path
- self.date_start = db.get_date_last_record()
- self.db = db
- def process_rrds (self):
- id_hash_list = os.listdir(unicode(self.base_path))
- if id_hash_list:
- for id_hash in id_hash_list:
- user_hash_list = os.listdir( unicode( os.path.join(self.base_path, id_hash) ) )
- if user_hash_list:
- for user_hash in user_hash_list:
- rrd_list = os.listdir( unicode(os.path.join(self.base_path, id_hash, user_hash)) )
- if rrd_list:
- for rrd in rrd_list:
- rrd_path = unicode (os.path.join(self.base_path, id_hash, user_hash) )
- rrd_obj = RRD (path=rrd_path, name=rrd, date_start=self.date_start, date_end=None)
- self.db.store_activity_uptime(rrd_obj)
- else:
- print "None rrd file found" + os.path.join(self.base_path, id_hash, user_hash)
- else:
- print "None hash user found on: " + os.path.join(self.base_path, id_hash)
- else:
- print "None hash ids found on: " + self.base_path
-
-
diff --git a/src/stats_consolidation/build/lib.linux-x86_64-2.7/db.py b/src/stats_consolidation/build/lib.linux-x86_64-2.7/db.py
deleted file mode 100644
index a8939e5..0000000
--- a/src/stats_consolidation/build/lib.linux-x86_64-2.7/db.py
+++ /dev/null
@@ -1,202 +0,0 @@
-from __future__ import print_function
-import mysql.connector
-from mysql.connector import errorcode
-from datetime import datetime
-
-class DB_Stats:
- TABLES={}
-
- TABLES['Usages'] = (
- "CREATE TABLE `Usages` ("
- " `ts` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,"
- " `user_hash` CHAR(40) NOT NULL,"
- " `resource_name` CHAR(80),"
- " `start_date` TIMESTAMP NOT NULL,"
- " `data_type` CHAR (30) NOT NULL,"
- " `data` INTEGER NOT NULL,"
- " PRIMARY KEY (`user_hash`,`start_date`,`resource_name`, `data_type`)"
- " )")
-
- TABLES['Resources'] = (
- "CREATE TABLE Resources ("
- " `name` CHAR(250),"
- " PRIMARY KEY (name)"
- " )")
-
- TABLES['Users'] = (
- "CREATE TABLE Users("
- " `hash` CHAR (40) NOT NULL,"
- " `uuid` CHAR (32) NOT NULL,"
- " `machine_sn` CHAR(80),"
- " `age` INTEGER NOT NULL,"
- " `school` CHAR(80),"
- " `sw_version` CHAR (80),"
- " `ts` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,"
- " PRIMARY KEY (hash)"
- " )")
-
- TABLES['Runs'] = (
- "CREATE TABLE Runs("
- " `last_ts` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP "
- ")")
-
-
-
- def __init__(self, db_name, user, password):
- self.db_name = db_name
- self.user = user
- self.password = password
-
-
- def create_database(self, cursor):
- try:
- cursor.execute(
- "CREATE DATABASE {} DEFAULT CHARACTER SET 'utf8'".format(self.db_name))
- except mysql.connector.Error as err:
- raise Exception ("Failed creating database: {}".format(err))
-
- def create_tables(self, cursor):
- for name, ddl in self.TABLES.iteritems():
- try:
- print("Creating table {}: ".format(name), end='')
- cursor.execute(ddl)
- except mysql.connector.Error as err:
- if err.errno == errorcode.ER_TABLE_EXISTS_ERROR:
- print("already exists.")
- else:
- raise Exception ("Error: {}".format(err))
- else:
- print("OK")
-
- def create (self):
- self.cnx = mysql.connector.connect(user=self.user, password=self.password)
- cursor = self.cnx.cursor()
- """Try connect to db """
- try:
- self.cnx.database = self.db_name
- print("DB ["+self.db_name+"] created already, will try create tables:" )
- self.create_tables(cursor)
- except mysql.connector.Error as err:
- """If db not exist, then create"""
- if err.errno == errorcode.ER_BAD_DB_ERROR:
- self.create_database(cursor)
- self.cnx.database = self.db_name
- self.create_tables(cursor)
- else:
- raise Exception ("Error: {}".format(err))
- cursor.close()
-
-
-
- def close (self):
- self.cnx.close()
-
-
-
- def store_activity_uptime(self, rrd):
-
- self.store_resource(rrd.get_name())
- self.store_user(rrd)
-
- cursor = self.cnx.cursor()
- insert = ("INSERT INTO Usages "
- "(user_hash, "
- "resource_name, "
- "start_date, "
- "data_type, "
- "data) "
- "VALUES (%s, %s, %s, %s ,%s) ")
-
- for d in rrd.get_uptime_by_interval():
- info = (rrd.get_user_hash(), rrd.get_name() , datetime.fromtimestamp(float(d[0])), 'uptime', d[1])
- try:
- cursor.execute(insert, info)
- if self.update_last_record(rrd.get_date_last_record()) == 0:
- self.cnx.commit()
-
- except mysql.connector.Error as err:
- print("Fail {}: {}".format(cursor.statement, err))
- cursor.close()
-
-
- def store_resource(self, resource_name):
- cursor = self.cnx.cursor()
- op = ("SELECT name FROM Resources WHERE name = %s")
- params = (resource_name,)
- try:
- cursor.execute(op, params)
- result = cursor.fetchone()
- if result != None:
- print("Resource {} already in db".format(resource_name))
- else:
- insert = ("INSERT INTO Resources (name) VALUES (%s)")
- info = (resource_name, )
- cursor.execute(insert, info)
- self.cnx.commit()
- except mysql.connector.Error as err:
- print("Fail {}: {}".format(cursor.statement, err))
-
- cursor.close()
-
- def store_user (self, rrd):
- cursor = self.cnx.cursor()
- op = ("SELECT hash FROM Users WHERE hash = %s")
- params = (rrd.get_user_hash(), )
- try:
- cursor.execute(op, params)
- result = cursor.fetchone()
- if result != None:
- print("User {} already in db".format(rrd.user_hash))
- else:
- """FIXME change hardcoded values """
- insert = ("INSERT INTO Users (hash, uuid, machine_sn, age, school, sw_version) VALUES (%s, %s, %s, %s, %s, %s)")
- params = (rrd.get_user_hash(), rrd.get_uuid(), "unk_machine_sn", 0, "unk_escuela", "1.0.0")
- cursor.execute(insert, params)
- self.cnx.commit()
- except mysql.connector.Error as err:
- print("Fail {}: {}".format(cursor.statement, err))
-
- cursor.close()
-
-
-
- def update_last_record (self, ts):
- cursor = self.cnx.cursor()
- res = 0
- op = ("SELECT * FROM Runs")
- params = (datetime.fromtimestamp(float(ts)),)
- try:
- cursor.execute(op)
- result = cursor.fetchone()
-
- if result != None:
- op = ("UPDATE Runs SET last_ts = %s")
- cursor.execute(op, params)
- self.cnx.commit()
- else:
- op = ("INSERT INTO Runs VALUES(%s)")
- cursor.execute(op, params)
- self.cnx.commit()
-
- except mysql.connector.Error as err:
- print("Fail {}: {}".format(cursor.statement, err))
- res = -1
-
- cursor.close()
- return res
-
- def get_date_last_record (self):
- cursor = self.cnx.cursor()
- op = ("SELECT UNIX_TIMESTAMP ((SELECT last_ts FROM Runs))")
- try:
- cursor.execute(op)
- result = cursor.fetchone()
- if result != None:
- print ("last record: {}".format(result[0]))
- return result[0]
- else:
- print ("Last date record is None")
- return 0
- except mysql.connector.Error as err:
- print("Fail {}: {}".format(cursor.statement, err))
- cursor.close()
diff --git a/src/stats_consolidation/build/lib.linux-x86_64-2.7/rrd_files.py b/src/stats_consolidation/build/lib.linux-x86_64-2.7/rrd_files.py
deleted file mode 100644
index a437e0d..0000000
--- a/src/stats_consolidation/build/lib.linux-x86_64-2.7/rrd_files.py
+++ /dev/null
@@ -1,133 +0,0 @@
-import rrdtool
-import os
-import sys
-
-class RRD:
-
- hdr_item = 0
- ds_item = 1
- data_item = 2
- DS = {'active':0, 'buddies':0, 'instances':0, 'new':0, 'resumed':0, 'uptime':0}
-
- def __init__(self, path, name, date_start, date_end):
-
- self.rrd_name = name
-
- if date_start == None:
- self.date_start = str(rrdtool.first(str(os.path.join (path,name))))
- else:
- self.date_start = str(date_start)
-
-
- if date_end == None:
- self.date_end = str(rrdtool.last(str(os.path.join(path, name))))
- else:
- self.date_end = str(date_end)
-
- self.user_hash = os.path.split(path)[1]
-
- self.user_path = os.path.join (
- self.get_first_part_path(path, 3),
- "users",
- "user",
- self.user_hash[:2],
- self.user_hash
- )
-
- self.uuid = self.get_uuid_from_file(self.user_path)
-
-
- print "*******************************************"
- print " RRD "
- print "start: " + self.date_start
- print "end: " + self.date_end
- print "PATH: " + path
- print "RRD NAME: " + name
- print "\n"
- try:
- self.rrd = rrdtool.fetch (str(os.path.join(path,name)), 'AVERAGE', '-r 60', '-s '+ self.date_start, '-e '+self.date_end)
- except:
- raise
-
- print " DS "
- for item in self.DS.keys():
- idx = self.get_ds_index (item)
- if idx != -1:
- self.DS[item] = idx
- print "DS "+ item + ": " + str(self.DS[item])
- else:
- print "DS "+ item + " not found in header"
- print "***********************************************"
-
- def get_ds_index(self, ds):
- i=0
- for i in range (len (self.rrd[self.ds_item])):
- if self.rrd[self.ds_item][i] == ds:
- return i
- i=+1
- return -1
-
- def get_uptime_by_interval (self):
- ds_name = "uptime"
- res=list()
-
- print "-------Calcule "+ ds_name +"-------"
- i=0
- found = False
- while i < len(self.rrd[self.data_item]):
- value = str(self.rrd[self.data_item][i][self.DS[ds_name]])
- if value != "None":
- uptime = value
- end = str (long(self.date_start) + ((i+1) * 60))
- if found == False:
- found = True
- start = str (long (self.date_start) + ((i+1) * 60))
- else:
- if found:
- print start + "->" + end + ": " + uptime
- if float(uptime) > 0:
- res.append((start, uptime))
- found = False
- i=i+1
- return res
- print "---------------------------------------------------"
-
-
- def get_name(self):
- return self.rrd_name.partition(".rrd")[0]
-
- def show_valid_ds(self, ds_name):
- print "------------------- DS "+ ds_name +"---------------------"
- i=0
- while i < len(self.rrd[self.data_item]):
- timestamp = str (long (self.date_start) + ((i+1) * 60))
- value = str (self.rrd[self.data_item][i][self.DS[ds_name]])
-
- if value != "None":
- print timestamp+ ": " + value
- i=i+1
- print "---------------------------------------------------"
-
-
- def get_date_last_record(self):
- return self.date_end
-
- def set_user_hash(self, u_hash):
- self.user_hash = u_hash
-
- def get_first_part_path (self, path, idx):
- l=list()
- l.append(path)
- for i in range (idx):
- l.append(os.path.split(l[i])[0])
- return l[idx]
-
- def get_uuid_from_file(self,path):
- return open (os.path.join(path, "machine_uuid")).next()
-
-
- def get_user_hash(self):
- return self.user_hash
-
- def get_uuid (self):
- return self.uuid
diff --git a/src/stats_consolidation/__init__.py b/sugar_stats_consolidation/__init__.py
index c06c47d..c06c47d 100644
--- a/src/stats_consolidation/__init__.py
+++ b/sugar_stats_consolidation/__init__.py
diff --git a/src/build/lib.linux-x86_64-2.7/stats_consolidation/__init__.py b/sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/__init__.py
index dd6e324..dd6e324 100644
--- a/src/build/lib.linux-x86_64-2.7/stats_consolidation/__init__.py
+++ b/sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/__init__.py
diff --git a/src/build/lib.linux-x86_64-2.7/stats_consolidation/consolidation.py b/sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/consolidation.py
index 4003594..4003594 100644
--- a/src/build/lib.linux-x86_64-2.7/stats_consolidation/consolidation.py
+++ b/sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/consolidation.py
diff --git a/src/build/lib.linux-x86_64-2.7/stats_consolidation/db.py b/sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/db.py
index a8939e5..a8939e5 100644
--- a/src/build/lib.linux-x86_64-2.7/stats_consolidation/db.py
+++ b/sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/db.py
diff --git a/src/build/lib.linux-x86_64-2.7/stats_consolidation/rrd_files.py b/sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/rrd_files.py
index a437e0d..a437e0d 100644
--- a/src/build/lib.linux-x86_64-2.7/stats_consolidation/rrd_files.py
+++ b/sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/rrd_files.py
diff --git a/src/build/lib.linux-x86_64-2.7/stats_consolidation/setup.py b/sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/setup.py
index 00585ee..00585ee 100644
--- a/src/build/lib.linux-x86_64-2.7/stats_consolidation/setup.py
+++ b/sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/setup.py
diff --git a/src/build/lib.linux-x86_64-2.7/stats_consolidation/test_cons.py b/sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/test_cons.py
index 00f43b5..00f43b5 100644
--- a/src/build/lib.linux-x86_64-2.7/stats_consolidation/test_cons.py
+++ b/sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/test_cons.py
diff --git a/src/build/lib.linux-x86_64-2.7/stats_consolidation/test_db.py b/sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/test_db.py
index 197510a..197510a 100644
--- a/src/build/lib.linux-x86_64-2.7/stats_consolidation/test_db.py
+++ b/sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/test_db.py
diff --git a/src/build/lib.linux-x86_64-2.7/stats_consolidation/test_rrd.py b/sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/test_rrd.py
index 657ce18..657ce18 100644
--- a/src/build/lib.linux-x86_64-2.7/stats_consolidation/test_rrd.py
+++ b/sugar_stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/test_rrd.py
diff --git a/src/stats_consolidation/consolidation.py b/sugar_stats_consolidation/consolidation.py
index a1fd79a..a1fd79a 100644
--- a/src/stats_consolidation/consolidation.py
+++ b/sugar_stats_consolidation/consolidation.py
diff --git a/src/consolidation_run b/sugar_stats_consolidation/consolidation_run
index 6b41880..6b41880 100755
--- a/src/consolidation_run
+++ b/sugar_stats_consolidation/consolidation_run
diff --git a/src/stats_consolidation/db.py b/sugar_stats_consolidation/db.py
index 33b42c3..33b42c3 100644
--- a/src/stats_consolidation/db.py
+++ b/sugar_stats_consolidation/db.py
diff --git a/src/stats_consolidation/rrd_files.py b/sugar_stats_consolidation/rrd_files.py
index 5ef1d55..5ef1d55 100644
--- a/src/stats_consolidation/rrd_files.py
+++ b/sugar_stats_consolidation/rrd_files.py
diff --git a/src/stats_consolidation/test_cons.py b/sugar_stats_consolidation/test_cons.py
index 00f43b5..00f43b5 100644
--- a/src/stats_consolidation/test_cons.py
+++ b/sugar_stats_consolidation/test_cons.py
diff --git a/src/stats_consolidation/test_db.py b/sugar_stats_consolidation/test_db.py
index 197510a..197510a 100644
--- a/src/stats_consolidation/test_db.py
+++ b/sugar_stats_consolidation/test_db.py
diff --git a/src/stats_consolidation/test_rrd.py b/sugar_stats_consolidation/test_rrd.py
index 81dd3c8..81dd3c8 100755
--- a/src/stats_consolidation/test_rrd.py
+++ b/sugar_stats_consolidation/test_rrd.py
diff --git a/src/stats_consolidation/test_rrds_content.py b/sugar_stats_consolidation/test_rrds_content.py
index 959b618..959b618 100755
--- a/src/stats_consolidation/test_rrds_content.py
+++ b/sugar_stats_consolidation/test_rrds_content.py