Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
filesystem.c remote_thumbnailer.c
Log Message:
* Sync with changed evfs api
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/filesystem.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- filesystem.c 31 Jan 2006 07:17:48 -0000 1.35
+++ filesystem.c 1 Feb 2006 05:02:24 -0000 1.36
@@ -60,7 +60,7 @@
(((evfs_file_uri_path *)
ecore_hash_get (folder_monitor_hash, key))->files[0]->path,
folder)) {
- char *md5 = md5_entropy_path_file (folder, pos + 1);
+ char *md5 = md5_entropy_path_file (data->file_monitor.plugin, folder,
pos + 1);
entropy_file_listener *listener;
@@ -148,7 +148,7 @@
*pos = '\0';
//printf("Folder: '%s'\nFilename: '%s'\n", folder, pos+1);
- md5 = md5_entropy_path_file (folder, pos + 1);
+ md5 = md5_entropy_path_file
(data->resp_command.file_command.files[0]->plugin_uri, folder, pos + 1);
instance = ecore_hash_get (stat_request_hash, md5);
//printf("Got an instance for this stat request: '%p'\n", instance);
@@ -225,8 +225,6 @@
ecore_list_goto_first (data->file_list.list);
while ((ref = ecore_list_next (data->file_list.list))) {
-
-
/*printf("(%s) Received file type for file: %d\n", ref->path,
ref->file_type); */
folder = strdup ((char *) ref->path);
@@ -260,7 +258,7 @@
//printf("Folder name: '%s', filename '%s'\n", folder, pos+1);
/*Look for an existing file we have cached */
- char *md5 = md5_entropy_path_file (folder, filename);
+ char *md5 = md5_entropy_path_file (ref->plugin_uri, folder, filename);
/*Now create, or grab, a file */
if (!(listener = entropy_core_file_cache_retrieve (md5))) {
@@ -348,8 +346,10 @@
//printf("Progress for file '%s' is %f percent\n",
// (char*)data->resp_command.file_command.files[0]->path,
data->progress.file_progress);
- request->file_from = strdup (data->progress->file_from);
- request->file_to = strdup (data->progress->file_to);
+ ecore_list_goto_first(data->file_list.list);
+ request->file_from = strdup (
((evfs_filereference*)ecore_list_current(data->file_list.list))->path );
+ ecore_list_next(data->file_list.list);
+ request->file_to = strdup (
((evfs_filereference*)ecore_list_current(data->file_list.list))->path);
request->progress = data->progress->file_progress;
if (data->progress->type == EVFS_PROGRESS_TYPE_CONTINUE)
@@ -509,7 +509,7 @@
path = evfs_parse_uri (uri);
char *md5 =
- md5_entropy_path_file (request->file->path, request->file->filename);
+ md5_entropy_path_file (request->file->uri_base, request->file->path,
request->file->filename);
ecore_hash_set (stat_request_hash, md5, request->requester);
evfs_client_file_stat (con, path->files[0]);
@@ -592,7 +592,7 @@
if (request->file_type == FILE_ALL || filetype == request->file_type) {
/*printf ("Adding..\n"); */
- md5 = md5_entropy_path_file (dire, de->d_name);
+ md5 = md5_entropy_path_file ("posix", dire, de->d_name);
/*printf("Looking for key %s\n", md5); */
if (!(listener = entropy_core_file_cache_retrieve (md5))) {
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/remote_thumbnailer.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- remote_thumbnailer.c 31 Jan 2006 07:17:48 -0000 1.3
+++ remote_thumbnailer.c 1 Feb 2006 05:02:25 -0000 1.4
@@ -127,7 +127,9 @@
*pos = '\0';
pos++;
- md5 = md5_entropy_path_file (copy, pos);
+ printf("From: %s\n", progress->file_from);
+
+ md5 = md5_entropy_path_file ("smb", copy, pos);
instance = ecore_hash_get (file_instance_hash, md5);
//printf("Remote thumbnailer file copy finish! - %p\n", instance);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
