yaffs Yaffs importer is now working with command line arguments.
authorTimothy Manning <tfhmanning@gmail.com>
Fri, 15 Oct 2010 02:05:59 +0000 (15:05 +1300)
committerTimothy Manning <tfhmanning@gmail.com>
Fri, 15 Oct 2010 02:05:59 +0000 (15:05 +1300)
Signed-off-by: Timothy Manning <tfhmanning@gmail.com>
direct/python/yaffs_browser.py
direct/python/yaffs_importer.py
direct/python/yaffsfs.py

index 626bc78..23fa936 100755 (executable)
@@ -96,13 +96,21 @@ def load_dir():
         name_list_box.insert(x,(current_directory_dict[x]["inodes"]+"  "+ current_directory_dict[x]["type"]+"  "+ current_directory_dict[x]["size"]+"  "+ current_directory_dict[x]["path"]+"  "+current_directory_dict[x]["extra_data"]))
     name_list_box.grid(column=0, row=1)
     return current_directory_dict
-
+    
+def remount_yaffs():
+    ##this isn't working. somethihg need to be changed in the config of the simulator to release the handle of the emfile
+    print "remounting yaffs"
+    print"unmounting yaffs:", yaffs_unmount("yaffs2/")
+    print "mounting yaffs", yaffs_mount("/yaffs2/")
+    load_dir()
+    
 def load_file(link=0):
     global open_windows_list
     open_windows_list.append(editor(link))
 
 def load_command(self=0):
-    global current_directory_dict
+    global current_directory_dictls
+    
     print "you loaded a file/dir/link"
     x=name_list_box.curselection()
     x=int(x[0])
@@ -271,8 +279,6 @@ def delete_selected(selected_dir=0):
             output=yaffs_rmdir(path)
             print "rmdir output:", output
             
-    
-    
     load_dir()
 
 
@@ -478,6 +484,8 @@ browser_menu_bar=tk.Menu(root_window)
 browser_file_menu=tk.Menu(browser_menu_bar)
 
 browser_file_menu.add_command(label="Reload", command=load_dir)
+browser_file_menu.add_command(label="Remount yaffs", command=remount_yaffs)
+
 #browser_file_menu.add_command(label="Open")
 #browser_file_menu.add_command(label="Save")
 browser_menu_bar.add_cascade(label="File", menu=browser_file_menu)
index 3444851..089143e 100644 (file)
@@ -2,17 +2,20 @@ import os
 from yaffsfs import *
 import sys
 
-yaffs_StartUp()
-yaffs_mount("/yaffs2/")
-absolute_path = os.path.abspath(os.path.curdir)
-print "absolute path:", absolute_path
 
 dir_in_snapshot=[]
 files_in_snapshot=[]
 symlinks_in_snapshot=[]
 unknown_in_snapshot=[]
 is_mount_in_snapshot=[]
-
+def debug_message(message, debug_level):
+    """notew that debug level 0 will always be printed"""
+    """level 0 error messages"""
+    """level 1 basic tasks are shown(creating, deleating,ect)"""
+    """level 2 all process are shown"""
+    if current_debug_level>=debug_level:
+        print message
+        
 def join_paths(path1, path2):
     new_path=path1
     if path1[len(path1)-1]=="/"and path2[0]=="/":
@@ -34,37 +37,39 @@ def subtract_paths(path1, path2):
         elif path1[1:len (path2)]==path2[1:]:
             new_path=path1[len(path2)-1:]
         else :
-            print "paths do not match:", path1, "  ", path2
+            debug_message("error:could not subtract paths", 0)
+            debug_message( ("paths do not match:"+ path1+ "  "+path2), 0)
             return 0
         return new_path
     else :
-        print "cannot subtract path2(:", path2, ") from path1(", path1, ")because path 2 is too long"
+        debug_message( ("cannot subtract path2(:", path2, ") from path1(", path1, ")because path 2 is too long"), 0)
         return 0
  
     
 def create_file(file):
-    print "\n \n \n"
+    debug_message( "\n \n \n", 2)
     file_path="/yaffs2/"+file["path"][len(path):]
-    print "creating file:", file_path
-    print "mode", file["mode"]
+    debug_message( ("creating file:", file_path), 2)
+    debug_message (("mode", file["mode"]), 2)
     current_handle=yaffs_open(file_path, yaffs_O_CREAT | yaffs_O_TRUNC| yaffs_O_RDWR, file["mode"]) 
     data_file=open(file["path"], "r")
     yaffs_lseek(current_handle, 0, 0)
     data_to_be_written= data_file.read()
     
     
-    #print "data to be saved", data_to_be_written
+    debug_message( ("data to be saved########################################################################/n"+ data_to_be_written), 2)
+    debug_message("###########################################################################################",2)
     length_of_file=len(data_to_be_written)
-    print "length of data to be written",length_of_file 
+    debug_message (("length of data to be written",length_of_file), 2) 
     output=yaffs_write(current_handle,data_to_be_written , length_of_file)
-    print "writing file:", output
+    debug_message(( "writing file:", output), 2)
     yaffs_ftruncate(current_handle, length_of_file)
     
     output=yaffs_close(current_handle)
-    print "created a file", file["path"][len(path):], "  ", output
+    debug_message( ("created a file", file["path"][len(path):], "  ", output), 1)
     
     if output==-1:
-        print "ran out of space exiting"
+        debug_message ("ran out of space exiting", 0)
         return 0
         
         
@@ -74,7 +79,7 @@ def remove_file_from_path(path):
         if path[i]=="/":
             slash_id.append(i)
     new_path=path[:slash_id[len(slash_id)-1]]
-    print "removed file from path", new_path
+    debug_message( ("removed file from path", new_path), 1)
     return new_path
 def is_dir_hidden(dir):
     """this code tests if a directory is hidden (has a ./<name> format) and returns true if it is hidden"""
@@ -95,41 +100,34 @@ def scan_dir(path):
     global search_hidden_directories
     dir_in_current_dir=[]
     if os.path.exists(path)==False:
-        print "error#############################"
-        print "path:", path, "  doesnot exist"
+        debug_message ("error#############################",0)
+        debug_message (("path:", path, "  doesnot exist"), 0)
         return 0
     dir_snapshot=os.listdir(path)
     for i in range(0, len(dir_snapshot)):
-        #print os.path.isdir(dir_snapshot[i])
-        #print os.path.isfile(dir_snapshot[i])
-        #print os.path.islink(dir_snapshot[i])
+
         current_snapshot=os.path.join(path, dir_snapshot[i])
-        #print "current snapshot:", current_snapshot
+        debug_message (("current snapshot:", current_snapshot), 2)
         isDir=os.path.isdir(current_snapshot)
         isFile=os.path.isfile(current_snapshot)
         isLink=os.path.islink(current_snapshot)
         isMount=os.path.ismount(current_snapshot)
-        #print dir_snapshot[i]
 
         stat=os.lstat(current_snapshot)
         
         ##note the order of these if and elif statemens is importaint since a file can be symbloic link and a file
         if isDir:
-            if search_hidden_directories==True or is_dir_hidden(current_snapshot) ==False :
+            if search_hidden_directories==True or (is_dir_hidden(current_snapshot) ==False or search_hidden_directories==True ) :
 #                st_mode ##mode of the folder read/write ect
                 dir_in_snapshot.append({"path":current_snapshot, "mode":stat.st_mode})
                 dir_in_current_dir.append(current_snapshot)
             else :
-                print "file is hidden so it is ingored", current_snapshot
+                debug_message( ("file is hidden so it is ingored", current_snapshot,), 1)
         elif  isLink:
-#            print "symlink:", current_snapshot
-#            print "inode", stat.st_ino
-#            print "symbloic link", stat.s_iflnk
-#            print "mode", stat.st_mode
+
             ##for some reason the os.readlink only gives the target link realative to the directory which the symbloic link is in. change this into a absolute path
             x=current_snapshot
             x=remove_file_from_path(x)
-            print "removed file from path"
             target=join_paths(x,os.readlink(current_snapshot) )
             symlinks_in_snapshot.append({"path":current_snapshot, "target":target})
         elif isFile:
@@ -150,7 +148,7 @@ def scan_dir(path):
 def print_scanned_dir_list():
     global files_in_snapshot
     global symlinks_in_snapshot
-    print "scanned dir"
+    print( "scanning dir", 2)
 
 
     for i in range(0, len(files_in_snapshot)):
@@ -176,55 +174,54 @@ def copy_scanned_files_into_yaffs():
     global files_in_snapshot
     global symlinks_in_snapshot
     global path
-#########################################copy directories into yaffs
-    print"making directories in yaffs"
+#########################################copy directories into yaffs so the files can be created in these directories
+    debug_message("making directories in yaffs", 1)
     for i in range(0, len(dir_in_snapshot)):
-        path2=dir_in_snapshot[i]["path"][len(path):]
-        print"path2", path2
-        dir_path="/yaffs2"+path2
+
+        
+        dir_path=join_paths("/yaffs2/",subtract_paths(dir_in_snapshot[i]["path"], path) )
         output=yaffs_mkdir(dir_path,dir_in_snapshot[i]["mode"] )
-        print"copied", dir_path,   "  output", output
-        print "mode" ,dir_in_snapshot[i]["mode"]
+        debug_message(("made directory:", dir_path,   "  output", output), 1)
+        debug_message(("mode" ,dir_in_snapshot[i]["mode"]), 2)
     
     
     
-#########################################coyp file into yaffs
-    print "copying scanned files into yaffs"
+#########################################copy file into yaffs
+    debug_message("copying scanned files into yaffs", 1)
     list=[]
     inode_blacklist=[]
-    break_flag=0
-    print "file in snapshot##############"
+
+    debug_message("files to be copyied into yaffs", 2)
     for a in range(0, len(files_in_snapshot)):
-        print files_in_snapshot[a]
-    print "\n\n\n"
+        debug_message(files_in_snapshot[a], 2)
+    debug_message("\n\n\n", 2)
     for i in range(0, len(files_in_snapshot)):
         list=[]
         if files_in_snapshot[i]["num_of_hardlinks"]>1 and files_in_snapshot[i]["inode"] not in inode_blacklist :
-            print "found a hard link"
-            print "inode",files_in_snapshot[i]["inode"],"size",files_in_snapshot[i]["size"],"path:", files_in_snapshot[i]["path"], "    num of hard links",  files_in_snapshot[i]["num_of_hardlinks"] 
+            debug_message("found a hard link", 2)
+            debug_message(("inode",files_in_snapshot[i]["inode"],"size",files_in_snapshot[i]["size"],"path:", files_in_snapshot[i]["path"], "    num of hard links",  files_in_snapshot[i]["num_of_hardlinks"] ), 2)
             for a in range(0, len(files_in_snapshot) ) :
                 if files_in_snapshot[a]["inode"] ==files_in_snapshot[i]["inode"]  :
                     ##and os.path.isfile(files_in_snapshot[i])
-                    print "found this file which matches inode",files_in_snapshot[a] 
+                    debug_message(("found this file which matches inode",files_in_snapshot[a]), 2) 
                     list.append(files_in_snapshot[a])
-                    print "length of list", len(list)
+                    debug_message(("length of list", len(list)), 2)
                 if len(list)==files_in_snapshot[i]["num_of_hardlinks"]:
-                    print "trying to break"
-                    break_flag=1
                     break
             for a in range(0, len(list)):
-                print list[a]
+                debug_message(list[a], 2)
             ##add inode to blacklist. all of the indoes in the list should be the same.
             inode_blacklist.append(list[0]["inode"])
             ##create a file from the first hardlink.
             create_file(list[0])
             target_path="/yaffs2/"+list[0]["path"][len(path):]
             for i in range(1, len(list)):
-                print "target path", target_path
+                debug_message("creating_symlink", 2)
+                debug_message(("target path", target_path), 2)
                 hardlink_path="/yaffs2/"+list[i]["path"][len(path):]
-                print "hardlink path", hardlink_path
+                debug_message(("hardlink path", hardlink_path), 2)
                 output=yaffs_link(target_path,hardlink_path)
-                print"creating hardlink:", list[i]["path"], "output:", output
+                debug_message(("creating hardlink:", list[i]["path"], "output:", output), 1)
         elif files_in_snapshot[i]["inode"] not in inode_blacklist :
             create_file(files_in_snapshot[i])
 
@@ -232,33 +229,40 @@ def copy_scanned_files_into_yaffs():
 ############################copy symlinks into yaffs
 
     for i in range(0, len(symlinks_in_snapshot)):
-        print "symlinks in snapshot:", symlinks_in_snapshot[i]
+        debug_message(("symlinks in snapshot:", symlinks_in_snapshot[i]), 2)
         target_path=join_paths("/yaffs2/", subtract_paths(symlinks_in_snapshot[i]["target"],  path))
         new_path=join_paths("/yaffs2/", subtract_paths(symlinks_in_snapshot[i]["path"], path))
         output=yaffs_symlink(target_path, new_path)
-        print "created symlink",new_path , " > ", target_path, "  output:", output
+        debug_message(("created symlink",new_path , " > ", target_path, "  output:", output), 1)
         ##yaffs_symlink(const YCHAR *oldpath, const YCHAR *newpath);
    
-  
-    for i in range(0, len(dir_in_snapshot)):
-        print "directories in snapshot:", dir_in_snapshot[i]
+    
     for i in range(0, len(unknown_in_snapshot)):
-        print "unknown objects in snapshot:", unknown_in_snapshot[i]
+        debug_message( ("unknown object in snapshot:", unknown_in_snapshot[i]), 0)
 
 if __name__=="__main__":
-    print sys.argv
+    yaffs_StartUp()
+    yaffs_mount("/yaffs2/")
+    yaffs_set_trace(0)
+    absolute_path = os.path.abspath(os.path.curdir)
+    #print "absolute path:", absolute_path
+    current_debug_level=1
+    search_hidden_directories=True
+
+    #print sys.argv
     path=sys.argv[1]
+    for i in range(2, len(sys.argv)):
+        if sys.argv[i]=="-d":
+            current_debug_level=int( sys.argv[i+1])
+        if sys.argv[i]=="-ignore_hidden_directories":
+            search_hidden_directories=False
 #
 #
 #    path="/home/timothy/work/yaffs/git/yaffs2"
 #    path="/home/timothy/my_stuff/old_laptop/timothy/programming_lejos/"
 
 
-    x="n"
-    if x=="y" or x=="yes":
-        search_hidden_directories=True
-    else :
-        search_hidden_directories=False
+
     scan_dir(path)
     copy_scanned_files_into_yaffs()
     #print_scanned_dir_list()
index 7704820..986f358 100644 (file)
@@ -245,6 +245,16 @@ yaffs_StartUp = ylib.yaffs_StartUp
 yaffs_StartUp.argtypes = []
 yaffs_StartUp.restype = c_int
 
+#int yaffs_set_trace(unsigned int tm) { return yaffs_traceMask=tm; }
+yaffs_set_trace=ylib.yaffs_set_trace
+yaffs_set_trace.argtypes=[c_uint]
+yaffs_set_trace.restype=c_uint
+
+#int yaffs_get_trace(void) { return yaffs_traceMask; }
+yaffs_get_trace=ylib.yaffs_get_trace
+yaffs_get_trace.argtypes=[]
+yaffs_get_trace.restypes=c_uint
+
 yaffs_O_CREAT=ylib.yaffs_O_CREAT()
 yaffs_O_RDONLY=ylib.yaffs_O_RDONLY()
 yaffs_O_WRONLY=ylib.yaffs_O_WRONLY()