[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14396] trunk/blender/source/blender: removed blenders backup feature.

Campbell Barton ideasman42 at gmail.com
Sat Apr 12 17:03:54 CEST 2008


Revision: 14396
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14396
Author:   campbellbarton
Date:     2008-04-12 17:03:47 +0200 (Sat, 12 Apr 2008)

Log Message:
-----------
removed blenders backup feature.
 sprintf(str, "/bin/su root -c 'cd %s; /bin/tar cf - \"%s\" | (/bin/cd %s; /bin/tar xf -)'", from, file, to);
 return system(str);

This would ask for a password in blenders terminal, in ubuntu there is no root user...
If this feature is added back it should be written in a much nicer way.

Also made HKey toggle hidden files in the file selector.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/packedFile.c
    trunk/blender/source/blender/blenlib/BLI_blenlib.h
    trunk/blender/source/blender/blenlib/intern/fileops.c
    trunk/blender/source/blender/blenloader/intern/writefile.c
    trunk/blender/source/blender/src/filesel.c

Modified: trunk/blender/source/blender/blenkernel/intern/packedFile.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/packedFile.c	2008-04-12 14:53:29 UTC (rev 14395)
+++ trunk/blender/source/blender/blenkernel/intern/packedFile.c	2008-04-12 15:03:47 UTC (rev 14396)
@@ -320,11 +320,11 @@
 	
 	if (remove_tmp) {
 		if (ret_value == RET_ERROR) {
-			if (BLI_rename(tempname, name) == RET_ERROR) {
+			if (BLI_rename(tempname, name) != 0) {
 				if(guimode) error("Error restoring tempfile. Check files: '%s' '%s'", tempname, name);
 			}
 		} else {
-			if (BLI_delete(tempname, 0, 0) == RET_ERROR) {
+			if (BLI_delete(tempname, 0, 0) != 0) {
 				if(guimode) error("Error deleting '%s' (ignored)");
 			}
 		}

Modified: trunk/blender/source/blender/blenlib/BLI_blenlib.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_blenlib.h	2008-04-12 14:53:29 UTC (rev 14395)
+++ trunk/blender/source/blender/blenlib/BLI_blenlib.h	2008-04-12 15:03:47 UTC (rev 14396)
@@ -299,7 +299,6 @@
 /* BLI_fileops.h */
 void  BLI_recurdir_fileops(char *dirname);
 int BLI_link(char *file, char *to);
-int BLI_backup(char *file, char *from, char *to);
 int BLI_is_writable(char *filename);
 
 /**

Modified: trunk/blender/source/blender/blenlib/intern/fileops.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/fileops.c	2008-04-12 14:53:29 UTC (rev 14395)
+++ trunk/blender/source/blender/blenlib/intern/fileops.c	2008-04-12 15:03:47 UTC (rev 14396)
@@ -267,12 +267,6 @@
 	return 1;
 }
 
-int BLI_backup(char *file, char *from, char *to) {
-	callLocalErrorCallBack("Backing up files is unsupported on Windows");
-	
-	return 1;
-}
-
 int BLI_exists(char *file) {
 	return (GetFileAttributes(file) != 0xFFFFFFFF);
 }
@@ -364,12 +358,6 @@
 	return system(str);
 }
 
-int BLI_backup(char *file, char *from, char *to) {
-	sprintf(str, "/bin/su root -c 'cd %s; /bin/tar cf - \"%s\" | (/bin/cd %s; /bin/tar xf -)'", from, file, to);
-	
-	return system(str);
-}
-
 int BLI_exists(char *file) {
 	return BLI_exist(file);
 }

Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c	2008-04-12 14:53:29 UTC (rev 14395)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c	2008-04-12 15:03:47 UTC (rev 14396)
@@ -2092,7 +2092,7 @@
 			}
 		}
 		else
-		if(BLI_rename(tempname, dir) < 0) {
+		if(BLI_rename(tempname, dir) != 0) {
 			*error_r= "Can't change old file. File saved with @";
 			return 0;
 		}

Modified: trunk/blender/source/blender/src/filesel.c
===================================================================
--- trunk/blender/source/blender/src/filesel.c	2008-04-12 14:53:29 UTC (rev 14395)
+++ trunk/blender/source/blender/src/filesel.c	2008-04-12 15:03:47 UTC (rev 14396)
@@ -2013,8 +2013,7 @@
 				if (sfile->filelist[i].flags & ACTIVE) {			
 					BLI_make_file_string(G.sce, str, sfile->dir, sfile->filelist[i].relname);
 
-					if(event==BKEY) ret= BLI_backup(sfile->filelist[i].relname, sfile->dir, otherdir);
-					else if(event==CKEY) ret= BLI_copy_fileops(str, otherdir);
+					if(event==CKEY) ret= BLI_copy_fileops(str, otherdir);
 					else if(event==LKEY) ret= BLI_link(str, otherdir);
 					else if(event==MKEY) ret= BLI_move(str, otherdir);
 
@@ -2123,7 +2122,12 @@
 				fs_fake_users(sfile);
 			}
 			break;
-				
+		case HKEY:
+			sfile->flag ^= FILE_HIDE_DOT;
+			BLI_hide_dot_files(sfile->flag & FILE_HIDE_DOT);
+			freefilelist(sfile);
+			scrarea_queue_winredraw(curarea);
+			break;
 		case PADPLUSKEY:
 		case EQUALKEY:
 			if (G.qual & LR_CTRLKEY) BLI_newname(sfile->file, +100);





More information about the Bf-blender-cvs mailing list