summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--doc/ranger.17
-rw-r--r--doc/ranger.pod6
-rw-r--r--ranger/config/commands.py12
-rw-r--r--ranger/config/rc.conf2
-rw-r--r--ranger/config/rifle.conf11
-rw-r--r--ranger/data/mime.types22
6 files changed, 37 insertions, 23 deletions
diff --git a/doc/ranger.1 b/doc/ranger.1
index 7f5be704..49339bf2 100644
--- a/doc/ranger.1
+++ b/doc/ranger.1
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "RANGER 1"
-.TH RANGER 1 "ranger-1.6.1" "12/11/2014" "ranger manual"
+.TH RANGER 1 "ranger-1.6.1" "01/01/2015" "ranger manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -834,6 +834,7 @@ ranger.  For your convenience, this is a list of the \*(L"public\*(R" commands i
 \& quit
 \& quit!
 \& relink newpath
+\& rename_append
 \& rename newname
 \& save_copy_buffer
 \& scout [\-FLAGS] pattern
@@ -1057,6 +1058,10 @@ it by typing `` or '' the next time you start ranger.
 .IX Item "relink newpath"
 Change the link destination of the current symlink file to <newpath>. First
 <tab> will load the original link.
+.IP "rename_append" 2
+.IX Item "rename_append"
+Opens the console with \*(L":rename <current file>\*(R" with the cursor automatically
+placed before the file extension
 .IP "rename \fInewname\fR" 2
 .IX Item "rename newname"
 Rename the current file.  If a file with that name already exists, the renaming
diff --git a/doc/ranger.pod b/doc/ranger.pod
index ee20ef9f..279e44fd 100644
--- a/doc/ranger.pod
+++ b/doc/ranger.pod
@@ -851,6 +851,7 @@ ranger.  For your convenience, this is a list of the "public" commands including
  quit
  quit!
  relink newpath
+ rename_append
  rename newname
  save_copy_buffer
  scout [-FLAGS] pattern
@@ -1112,6 +1113,11 @@ it by typing `` or '' the next time you start ranger.
 Change the link destination of the current symlink file to <newpath>. First
 <tab> will load the original link.
 
+=item rename_append
+
+Opens the console with ":rename <current file>" with the cursor automatically
+placed before the file extension
+
 =item rename I<newname>
 
 Rename the current file.  If a file with that name already exists, the renaming
diff --git a/ranger/config/commands.py b/ranger/config/commands.py
index c496f71e..a8813de2 100644
--- a/ranger/config/commands.py
+++ b/ranger/config/commands.py
@@ -722,18 +722,18 @@ class rename(Command):
     def tab(self):
         return self._tab_directory_content()
 
-class renameConsole(Command):
-    """:renameConsole
+class rename_append(Command):
+    """:rename_append
 
     Creates an open_console for the rename command, automatically placing the cursor before the file extension.
     """
 
     def execute(self):
-        if "." in self.fm.thisfile.basename:
-            offset = 6 + len(self.fm.thisfile.basename) - self.fm.thisfile.basename[::-1].index('.')
-            self.fm.open_console('rename ' + self.fm.thisfile.basename, position=offset)
+        cf = self.fm.thisfile
+        if cf.basename.find('.') != 0 and cf.basename.rfind('.') != -1 and not cf.is_directory:
+            self.fm.open_console('rename ' + cf.basename, position=(7 + cf.basename.rfind('.')))
         else:
-            self.fm.open_console('rename ' + self.fm.thisfile.basename)
+            self.fm.open_console('rename ' + cf.basename)
 
 class chmod(Command):
     """:chmod <octal number>
diff --git a/ranger/config/rc.conf b/ranger/config/rc.conf
index 12fd2a32..4c8fd799 100644
--- a/ranger/config/rc.conf
+++ b/ranger/config/rc.conf
@@ -325,7 +325,7 @@ map yn shell -f echo -n %f    | xsel -i; xsel -o | xsel -i -b
 map =  chmod
 
 map cw console rename 
-map a  renameConsole
+map a  rename_append
 map A  eval fm.open_console('rename ' + fm.thisfile.basename)
 map I  eval fm.open_console('rename ' + fm.thisfile.basename, position=7)
 
diff --git a/ranger/config/rifle.conf b/ranger/config/rifle.conf
index 4776cdf9..ef3a5b63 100644
--- a/ranger/config/rifle.conf
+++ b/ranger/config/rifle.conf
@@ -82,8 +82,8 @@ ext x?html?, has w3m,             terminal = w3m "$@"
 # Define the "editor" for text files as first action
 mime ^text,  label editor = $EDITOR -- "$@"
 mime ^text,  label pager  = "$PAGER" -- "$@"
-!mime ^text, label editor, ext xml|csv|tex|py|pl|rb|sh|php = $EDITOR -- "$@"
-!mime ^text, label pager,  ext xml|csv|tex|py|pl|rb|sh|php = "$PAGER" -- "$@"
+!mime ^text, label editor, ext xml|csv|tex|py|pl|rb|js|sh|php = $EDITOR -- "$@"
+!mime ^text, label pager,  ext xml|csv|tex|py|pl|rb|js|sh|php = "$PAGER" -- "$@"
 
 ext 1                         = man "$1"
 ext s[wmf]c, has zsnes, X     = zsnes "$1"
@@ -98,6 +98,7 @@ name ^[mM]akefile$            = make
 ext py  = python -- "$1"
 ext pl  = perl -- "$1"
 ext rb  = ruby -- "$1"
+ext js  = node -- "$1"
 ext sh  = sh -- "$1"
 ext php = php -- "$1"
 
@@ -188,6 +189,6 @@ label wallpaper, number 13, mime ^image, X = feh --bg-center "$1"
 label wallpaper, number 14, mime ^image, X = feh --bg-fill "$1"
 
 # Define the editor for non-text files + pager as last action
-              !mime ^text, !ext xml|csv|tex|py|pl|rb|sh|php  = ask
-label editor, !mime ^text, !ext xml|csv|tex|py|pl|rb|sh|php  = $EDITOR -- "$@"
-label pager,  !mime ^text, !ext xml|csv|tex|py|pl|rb|sh|php  = "$PAGER" -- "$@"
+              !mime ^text, !ext xml|csv|tex|py|pl|rb|js|sh|php  = ask
+label editor, !mime ^text, !ext xml|csv|tex|py|pl|rb|js|sh|php  = $EDITOR -- "$@"
+label pager,  !mime ^text, !ext xml|csv|tex|py|pl|rb|js|sh|php  = "$PAGER" -- "$@"
diff --git a/ranger/data/mime.types b/ranger/data/mime.types
index 2adc2e99..b3c3e8dc 100644
--- a/ranger/data/mime.types
+++ b/ranger/data/mime.types
@@ -10,15 +10,17 @@
 #
 ###############################################################################
 
-audio/flac       flac
-audio/musepack   mpc mpp mp+
-audio/ogg        oga ogg spx
-audio/wavpack    wv wvc
+audio/flac              flac
+audio/musepack          mpc mpp mp+
+audio/ogg               oga ogg spx
+audio/wavpack           wv wvc
 
-video/mkv        mkv
-video/webm       webm
-video/flash      flv
-video/ogg        ogv ogm
-video/divx       div divx
+video/mkv               mkv
+video/webm              webm
+video/flash             flv
+video/ogg               ogv ogm
+video/divx              div divx
+
+text/x-ruby             rb
+application/javascript  js
 
-text/x-ruby      rb
ref='/akkartik/mu/blame/html/018jump_disp32.cc.html?h=main&id=a56d969ec99ef66ab21709b3aa61d49d9a3dfd10'>^
52daf072 ^
c8a3ccbe ^
9c1056f5 ^





c8a3ccbe ^
9c1056f5 ^


52daf072 ^
c8a3ccbe ^
52daf072 ^
9c1056f5 ^




695f9bf8 ^
9c1056f5 ^



695f9bf8 ^
9c1056f5 ^



c8a3ccbe ^
52daf072 ^
ce2c1efc ^
c8a3ccbe ^
9c1056f5 ^


d1c9392a ^
9c1056f5 ^

52daf072 ^
c8a3ccbe ^
52daf072 ^
9c1056f5 ^




695f9bf8 ^
9c1056f5 ^



695f9bf8 ^
9c1056f5 ^




c8a3ccbe ^
9c1056f5 ^


52daf072 ^
c8a3ccbe ^
52daf072 ^
9c1056f5 ^




695f9bf8 ^
9c1056f5 ^



695f9bf8 ^
9c1056f5 ^
d1c9392a ^
9c1056f5 ^

c8a3ccbe ^
9c1056f5 ^
ce2c1efc ^
c8a3ccbe ^
9c1056f5 ^





52daf072 ^
c8a3ccbe ^
52daf072 ^
9c1056f5 ^




695f9bf8 ^
9c1056f5 ^



695f9bf8 ^
9c1056f5 ^




c8a3ccbe ^

ce2c1efc ^





c8a3ccbe ^
ce2c1efc ^





695f9bf8 ^
ce2c1efc ^



695f9bf8 ^
ce2c1efc ^



c8a3ccbe ^
ce2c1efc ^

c8a3ccbe ^
ce2c1efc ^



c8a3ccbe ^
ce2c1efc ^

c8a3ccbe ^
ce2c1efc ^








c8a3ccbe ^
ce2c1efc ^





695f9bf8 ^
ce2c1efc ^



695f9bf8 ^
ce2c1efc ^




c8a3ccbe ^

ce2c1efc ^




c8a3ccbe ^
ce2c1efc ^





695f9bf8 ^
ce2c1efc ^



695f9bf8 ^
9c1056f5 ^

ce2c1efc ^

c8a3ccbe ^
ce2c1efc ^

c8a3ccbe ^
ce2c1efc ^



c8a3ccbe ^
ce2c1efc ^

c8a3ccbe ^
ce2c1efc ^







c8a3ccbe ^
ce2c1efc ^





695f9bf8 ^
ce2c1efc ^



695f9bf8 ^
ce2c1efc ^




c8a3ccbe ^

ce2c1efc ^





c8a3ccbe ^
ce2c1efc ^





695f9bf8 ^
ce2c1efc ^



695f9bf8 ^
ce2c1efc ^



c8a3ccbe ^
ce2c1efc ^

c8a3ccbe ^
ce2c1efc ^



c8a3ccbe ^
ce2c1efc ^

c8a3ccbe ^
ce2c1efc ^








c8a3ccbe ^
ce2c1efc ^





695f9bf8 ^
ce2c1efc ^



695f9bf8 ^
ce2c1efc ^




c8a3ccbe ^

ce2c1efc ^





c8a3ccbe ^
ce2c1efc ^





695f9bf8 ^
ce2c1efc ^



695f9bf8 ^
ce2c1efc ^






c8a3ccbe ^
ce2c1efc ^





695f9bf8 ^
ce2c1efc ^



695f9bf8 ^
ce2c1efc ^



c8a3ccbe ^
ce2c1efc ^

c8a3ccbe ^
ce2c1efc ^



c8a3ccbe ^
ce2c1efc ^

c8a3ccbe ^
ce2c1efc ^








c8a3ccbe ^
ce2c1efc ^





695f9bf8 ^
ce2c1efc ^



695f9bf8 ^
ce2c1efc ^
d1c9392a ^



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
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470