Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm_main.c
Log Message:
Add FDO spec compliant trash implimentation.
Not actually called from anywhere just yet, committing for potential review.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_main.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- e_fm_main.c 3 Oct 2007 17:19:17 -0000 1.30
+++ e_fm_main.c 10 Oct 2007 17:54:04 -0000 1.31
@@ -1617,8 +1617,87 @@
static int
_e_cb_fop_trash_idler(void *data)
{
- /* FIXME: for now trash == rm - later move to trash */
- return _e_cb_fop_rm_idler(data);
+ E_Fop *fop = NULL;
+ FILE *info = NULL;
+ const char *trash_dir = NULL;
+ const char *filename = NULL;
+ const char *escname = NULL;
+ const char *dest = NULL;
+ char buf[4096];
+ unsigned int i = 0;
+ struct tm *lt;
+ time_t t;
+
+ /* FIXME: For now, this will only implement 'home trash'
+ * Later, implement mount/remote/removable device trash, if wanted. */
+
+ fop = (E_Fop *)data;
+ if (!fop) return 0;
+
+ /* Check that 'home trash' exists, create if not */
+ snprintf(buf, sizeof(buf), "%s/Trash", efreet_data_home_get());
+ trash_dir = evas_stringshare_add(buf);
+ if (!ecore_file_exists(trash_dir)) ecore_file_mkdir(trash_dir);
+
+ /* Create required 'info' and 'files' subdirs if needed */
+ snprintf(buf, sizeof(buf), "%s/files", trash_dir);
+ if (!ecore_file_exists(buf)) ecore_file_mkdir(buf);
+ snprintf(buf, sizeof(buf), "%s/info", trash_dir);
+ if (!ecore_file_exists(buf)) ecore_file_mkdir(buf);
+
+ filename = evas_stringshare_add(strrchr(fop->src, '/'));
+ escname = ecore_file_escape_name(filename);
+ evas_stringshare_del(filename);
+
+ /* Find path for info file. Pointer address is part of the filename to
+ * alleviate some of the looping in case of multiple filenames with the
+ * same name. Also use the name of the file to help */
+ do
+ {
+ snprintf(buf, sizeof(buf), "%s/file%s.%u.%u", trash_dir, escname,
+ fop, i++);
+ }
+ while (ecore_file_exists(buf));
+ dest = evas_stringshare_add(buf);
+
+ /* Try to move the file */
+ if (rename(fop->src, dest))
+ {
+ if (errno == EXDEV)
+ {
+ /* Move failed. Spec says delete files that can't be trashed */
+ ecore_file_unlink(fop->src);
+ return 0;
+ }
+ }
+
+ /* Move worked. Create info file */
+ snprintf(buf, sizeof(buf), "%s/info%s.%u.%u.trashinfo", trash_dir,
+ escname, fop, --i);
+ info = fopen(buf, "w");
+ if (info)
+ {
+ t = time(NULL);
+ lt = localtime(&t);
+
+ /* Insert info for trashed file */
+ fprintf(info,
+ "[Trash
Info]\nPath=%s\nDeletionDate=%04u%02u%02uT%02u:%02u:%02u",
+ fop->src, lt->tm_year+1900, lt->tm_mon+1, lt->tm_mday,
+ lt->tm_hour, lt->tm_min, lt->tm_sec);
+ fclose(info);
+ }
+ else
+ /* Could not create info file. Spec says to put orig file back */
+ rename(dest, fop->src);
+
+ if (dest) evas_stringshare_del(dest);
+ if (trash_dir) evas_stringshare_del(trash_dir);
+ evas_stringshare_del(fop->src);
+ evas_stringshare_del(fop->dst);
+ free(fop);
+ _e_fops = evas_list_remove(_e_fops, fop);
+ return 0;
}
static int
-------------------------------------------------------------------------
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
