summary refs log tree commit diff stats
path: root/ranger
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2010-11-01 15:38:16 +0100
committerhut <hut@lavabit.com>2010-11-01 15:38:37 +0100
commitba72fe26af4dc8fc1580ac0ea39b831e4368c881 (patch)
treead217b1cf1aed16b008a5e13b6d3ad6a4ed25f66 /ranger
parenta92f6409ab3a5d9bcf87639e5eedaf7c0c483eb6 (diff)
downloadranger-ba72fe26af4dc8fc1580ac0ea39b831e4368c881.tar.gz
fsobject.fsobject: fixed natural sort with python3
Diffstat (limited to 'ranger')
-rw-r--r--ranger/fsobject/fsobject.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/ranger/fsobject/fsobject.py b/ranger/fsobject/fsobject.py
index e513fc21..0e2b46f5 100644
--- a/ranger/fsobject/fsobject.py
+++ b/ranger/fsobject/fsobject.py
@@ -101,13 +101,13 @@ class FileSystemObject(FileManagerAware):
 
 	@lazy_property
 	def basename_natural(self):
-		return [int(c) if c.isdigit() else c or 0 \
-			for c in _extract_number_re.split(self.basename)]
+		return [c if i % 3 == 1 else (int(c) if c else 0) for i, c in \
+			enumerate(_extract_number_re.split(self.basename))]
 
 	@lazy_property
 	def basename_natural_lower(self):
-		return [int(c) if c.isdigit() else c or 0 \
-			for c in _extract_number_re.split(self.basename_lower)]
+		return [c if i % 3 == 1 else (int(c) if c else 0) for i, c in \
+			enumerate(_extract_number_re.split(self.basename_lower))]
 
 	def __str__(self):
 		"""returns a string containing the absolute path"""
65write-buffered.subx?h=hlt&id=22fb844ba4edf14eb85245a35f42e721658c4f8e'>^
bfcc0f85 ^
33352536 ^

a94b60b5 ^
7a583220 ^
33352536 ^

a94b60b5 ^
33352536 ^







71eb22a5 ^
33352536 ^
bfcc0f85 ^
33352536 ^



bfcc0f85 ^
33352536 ^


a94b60b5 ^

33352536 ^
6070c23e ^
bfcc0f85 ^
33352536 ^
6070c23e ^
a94b60b5 ^
33352536 ^
a94b60b5 ^

33352536 ^
a94b60b5 ^


33352536 ^
a94b60b5 ^

33352536 ^

a94b60b5 ^


33352536 ^


a94b60b5 ^



33352536 ^

a94b60b5 ^
33352536 ^
a94b60b5 ^
33352536 ^
a94b60b5 ^
33352536 ^
a94b60b5 ^


33352536 ^
a94b60b5 ^

33352536 ^





7a583220 ^
33352536 ^

a94b60b5 ^










33352536 ^
686a52bd ^
a94b60b5 ^
686a52bd ^
a94b60b5 ^


33352536 ^
a94b60b5 ^






33352536 ^
a94b60b5 ^





33352536 ^
ddd2e989 ^
a94b60b5 ^

ddd2e989 ^

a94b60b5 ^
ddd2e989 ^
a94b60b5 ^
33352536 ^
a94b60b5 ^











33352536 ^
686a52bd ^
a94b60b5 ^
686a52bd ^
a94b60b5 ^


33352536 ^
a94b60b5 ^








33352536 ^
a94b60b5 ^






33352536 ^

a94b60b5 ^


33352536 ^
a94b60b5 ^
ddd2e989 ^
a94b60b5 ^



33352536 ^

a94b60b5 ^


33352536 ^
a94b60b5 ^


e968d773 ^


f1eade72 ^
7e7a8a6e ^
e968d773 ^
686a52bd ^
f0b7e327 ^

e968d773 ^
f0b7e327 ^
e968d773 ^
bfcc0f85 ^
e968d773 ^
f0b7e327 ^
e968d773 ^




a94b60b5 ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226