diff --git a/tren.py b/tren.py index fb6538d..97fdbd3 100755 --- a/tren.py +++ b/tren.py @@ -8,7 +8,7 @@ PROGNAME = "tren.py" BASENAME = PROGNAME.split(".py")[0] PROGENV = BASENAME.upper() -RCSID = "$Id: tren.py,v 1.195 2010/03/16 21:00:20 tundra Exp $" +RCSID = "$Id: tren.py,v 1.196 2010/03/16 21:28:12 tundra Exp $" VERSION = RCSID.split()[2] # Copyright Information @@ -140,7 +140,6 @@ # Shared File Attribute And Sequence Renaming Tokens -TOKFILALPHA = "ALPHA" TOKFILATIME = "ATIME" TOKFILCMD = "CMDLINE" TOKFILCTIME = "CTIME" @@ -228,11 +227,11 @@ # 1) They are used as the type indicator in a Sequence Renaming Token # 2) They are keys to the SortViews dictionary that stores the prestorted views -ORDERBYALPHA = TOKFILALPHA ORDERBYATIME = TOKFILATIME ORDERBYCMDLINE = TOKFILCMD ORDERBYCTIME = TOKFILCTIME ORDERBYDEV = TOKFILDEV +ORDERBYFNAME = TOKFILFNAME ORDERBYGID = TOKFILGID ORDERBYINODE = TOKFILINODE ORDERBYMODE = TOKFILMODE @@ -458,18 +457,18 @@ self.SortViews = { - ORDERBYCMDLINE : [fullnames in command line order], - ORDERBYALPHA : [fullnames in alphabetic order], - ORDERBYMODE : [fullnames in mode order], - ORDERBYINODE : [fullnames in inode order], - ORDERBYDEV : [fullnames in devs order], - ORDERBYNLINK : [fullnames in nlinks order], - ORDERBYUID : [fullnames in uids order], - ORDERBYGID : [fullnames in gids order], ORDERBYATIME : [fullnames in atimes order], + ORDERBYCMDLINE : [fullnames in command line order], ORDERBYCTIME : [fullnames in ctimes order], + ORDERBYDEV : [fullnames in devs order], + ORDERBYFNAME : [fullnames in alphabetic order], + ORDERBYGID : [fullnames in gids order], + ORDERBYINODE : [fullnames in inode order], + ORDERBYMODE : [fullnames in mode order], ORDERBYMTIME : [fullnames in mtimes order], - ORDERBYSIZE : [fullnames in size order] + ORDERBYNLINK : [fullnames in nlinks order], + ORDERBYSIZE : [fullnames in size order], + ORDERBYUID : [fullnames in uids order] } self.RenRequests = [ @@ -520,7 +519,7 @@ alpha = targs[:] alpha.sort() - self.SortViews = {ORDERBYCMDLINE : targs, ORDERBYALPHA : alpha} + self.SortViews = {ORDERBYCMDLINE : targs, ORDERBYFNAME : alpha} del alpha # Dictionary of all the renaming requests - will be filled in