Enlightenment CVS committal
Author : chaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/bin
Modified Files:
evfs_metadata.c evfs_metadata_db.c
Log Message:
* Record file stat as metadata
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_metadata.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- evfs_metadata.c 20 Aug 2007 00:07:01 -0000 1.37
+++ evfs_metadata.c 2 Sep 2007 08:57:24 -0000 1.38
@@ -752,6 +752,7 @@
if (res == 0) {
/*printf("*\n");*/
+ evfs_metadata_db_record_stat(db,
sqlite3_column_int(pStmt,1), &file_stat);
} else {
/*printf("DELETED\n");*/
@@ -808,7 +809,7 @@
} else {
/*printf("...metadata runner executing..\n");*/
- if ((ret = (waitpid(_metadata_fork, &status, WNOHANG) > 0)) ||
+ if ( (ret = (waitpid(_metadata_fork, &status, WNOHANG)) > 0) ||
errno == ECHILD) {
_metadata_fork = 0;
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_metadata_db.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- evfs_metadata_db.c 30 Aug 2007 03:11:42 -0000 1.17
+++ evfs_metadata_db.c 2 Sep 2007 08:57:24 -0000 1.18
@@ -10,7 +10,7 @@
* * Make a 'bulk-run' function to avoid the endless repeated sqlite3_exec
*/
-#define EVFS_METADATA_DB_CONFIG_LATEST 6
+#define EVFS_METADATA_DB_CONFIG_LATEST 7
static char metadata_db[PATH_MAX];
static int loc_init = 0;
static char* homedir;
@@ -165,6 +165,21 @@
return evfs_metadata_db_version_bump(db, "6");
}
+int evfs_metadata_db_upgrade_6_7(sqlite3* db)
+{
+ int ret;
+ char* errMsg = 0;
+
+ printf("Performing upgrade from v.6 to v.7\n");
+
+ ret = sqlite3_exec(db,
+ "CREATE TABLE FileStat (id integer primary key AUTOINCREMENT, File int,
tm_created int, tm_modified int, size int, fowner int, fgroup int);",
+ NULL, 0,&errMsg);
+
+ return evfs_metadata_db_version_bump(db, "7");
+}
+
+
int evfs_metadata_db_version_bump(sqlite3* db, char* ver)
{
int ret;
@@ -204,6 +219,7 @@
ecore_hash_set(db_upgrade_hash, (int*)3, evfs_metadata_db_upgrade_3_4);
ecore_hash_set(db_upgrade_hash, (int*)4, evfs_metadata_db_upgrade_4_5);
ecore_hash_set(db_upgrade_hash, (int*)5, evfs_metadata_db_upgrade_5_6);
+ ecore_hash_set(db_upgrade_hash, (int*)6, evfs_metadata_db_upgrade_6_7);
/*Check if we need to seed the DB*/
if (stat(metadata_db, &config_dir_stat)) {
@@ -425,6 +441,10 @@
ret = sqlite3_exec(db, query, NULL,0,&errMsg);
if (errMsg) printf("ERROR: %s\n", errMsg);
+ snprintf(query, sizeof(query), "delete from FileStat where File = %d",
file);
+ ret = sqlite3_exec(db, query, NULL,0,&errMsg);
+ if (errMsg) printf("ERROR: %s\n", errMsg);
+
/*...And any group memberships*/
snprintf(query, sizeof(query), "delete from FileGroup where File = %d",
file);
ret = sqlite3_exec(db, query, NULL,0,&errMsg);
@@ -629,7 +649,7 @@
ret = sqlite3_prepare(db, query, -1, &pStmt, 0);
if (ret == SQLITE_OK) {
while ((ret = sqlite3_step(pStmt)) == SQLITE_ROW) {
- file = strdup( sqlite3_column_text(pStmt,0));
+ file = strdup((char*)sqlite3_column_text(pStmt,0));
ecore_list_append(files,file);
}
@@ -654,7 +674,7 @@
if (ret == SQLITE_OK) {
while ((ret = sqlite3_step(pStmt)) == SQLITE_ROW) {
EvfsMetaObject* m = NEW(EvfsMetaObject);
- char* mt = strdup(sqlite3_column_text(pStmt,0));
+ char* mt = strdup((char*)sqlite3_column_text(pStmt,0));
m->key = mt;
meta = evas_list_append(meta, m);
@@ -664,4 +684,35 @@
}
return meta;
+}
+
+void evfs_metadata_db_record_stat(sqlite3* db, int file, struct stat* st)
+{
+ char query[1024];
+ int ret;
+ char* errMsg = 0;
+ sqlite3_stmt *pStmt;
+
+ snprintf(query, sizeof(query), "delete from FileStat where File = %d",
file);
+ ret = sqlite3_exec(db, query, NULL,0,&errMsg);
+ if (errMsg) printf("ERROR: %s\n", errMsg);
+
+ snprintf(query, sizeof(query),
+ "insert into FileStat (file, tm_created, tm_modified, size,
fowner, fgroup) select %d, ?, ?, ?, ?, ?", file);
+
+ ret = sqlite3_prepare(db, query, -1, &pStmt, 0);
+
+ if (ret == SQLITE_OK) {
+ sqlite3_bind_int(pStmt, 1, st->st_ctime);
+ sqlite3_bind_int(pStmt, 2, st->st_mtime);
+ sqlite3_bind_int(pStmt, 3, st->st_size);
+ sqlite3_bind_int(pStmt, 4, st->st_uid);
+ sqlite3_bind_int(pStmt, 5, st->st_gid);
+
+ if (sqlite3_step(pStmt) != SQLITE_DONE) {
+ printf("evfs_metadata_db_record_stat: sqlite3 error\n");
+ }
+ sqlite3_reset(pStmt);
+ sqlite3_finalize(pStmt);
+ }
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs