summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ranger/actions.py28
-rw-r--r--ranger/colorschemes/default.py3
-rw-r--r--ranger/container/tags.py68
-rw-r--r--ranger/defaults/keys.py2
-rw-r--r--ranger/fm.py7
-rw-r--r--ranger/fsobject/fsobject.py3
-rw-r--r--ranger/gui/colorscheme.py2
-rw-r--r--ranger/gui/widgets/filelist.py19
8 files changed, 124 insertions, 8 deletions
diff --git a/ranger/actions.py b/ranger/actions.py
index b9ec2204..d500f18a 100644
--- a/ranger/actions.py
+++ b/ranger/actions.py
@@ -39,6 +39,34 @@ class Actions(EnvironmentAware, SettingsAware):
 		"""Enter the directory at the given path"""
 		return self.env.enter_dir(path)
 
+	def tag_toggle(self, movedown=None):
+		try:
+			toggle = self.tags.toggle
+		except AttributeError:
+			return
+
+		sel = self.env.get_selection()
+		toggle(*tuple(map(lambda x: x.realpath, sel)))
+
+		if movedown is None:
+			movedown = len(sel) == 1
+		if movedown:
+			self.move_pointer(relative=1)
+	
+	def tag_remove(self, movedown=None):
+		try:
+			remove = self.tags.remove
+		except AttributeError:
+			return
+
+		sel = self.env.get_selection()
+		remove(*tuple(map(lambda x: x.realpath, sel)))
+
+		if movedown is None:
+			movedown = len(sel) == 1
+		if movedown:
+			self.move_pointer(relative=1)
+
 	def enter_bookmark(self, key):
 		"""Enter the bookmark with the name <key>"""
 		from ranger.container.bookmarks import NonexistantBookmark
diff --git a/ranger/colorschemes/default.py b/ranger/colorschemes/default.py
index e4c81e14..65441393 100644
--- a/ranger/colorschemes/default.py
+++ b/ranger/colorschemes/default.py
@@ -40,6 +40,9 @@ class Default(ColorScheme):
 			if context.link:
 				fg = context.good and cyan or magenta
 
+			if context.tag_marker and not context.selected:
+				attr |= bold
+
 			if context.maindisplay:
 				if context.selected:
 					attr |= bold
diff --git a/ranger/container/tags.py b/ranger/container/tags.py
new file mode 100644
index 00000000..7a941843
--- /dev/null
+++ b/ranger/container/tags.py
@@ -0,0 +1,68 @@
+class Tags(object):
+	def __init__(self, filename):
+		from os.path import isdir, exists, dirname, abspath, realpath, expanduser
+
+		self._filename = realpath(abspath(expanduser(filename)))
+
+		if isdir(dirname(self._filename)) and not exists(self._filename):
+			open(self._filename, 'w')
+
+		self.sync()
+	
+	def __contains__(self, item):
+		return item in self.tags
+
+	def add(self, *items):
+		self.sync()
+		for item in items:
+			self.tags.add(item)
+		self.dump()
+
+	def remove(self, *items):
+		self.sync()
+		for item in items:
+			try:
+				self.tags.remove(item)
+			except KeyError:
+				pass
+		self.dump()
+
+	def toggle(self, *items):
+		self.sync()
+		for item in items:
+			if item in self:
+				try:
+					self.tags.remove(item)
+				except KeyError:
+					pass
+			else:
+				self.tags.add(item)
+		self.dump()
+	
+	def sync(self):
+		try:
+			f = open(self._filename, 'r')
+		except OSError:
+			pass
+		else:
+			self.tags = self._parse(f)
+			f.close()
+	
+	def dump(self):
+		try:
+			f = open(self._filename, 'w')
+		except OSError:
+			pass
+		else:
+			self._compile(f)
+			f.close()
+	
+	def _compile(self, f):
+		for line in self.tags:
+			f.write(line + '\n')
+
+	def _parse(self, f):
+		result = set()
+		for line in f:
+			result.add(line.strip())
+		return result
diff --git a/ranger/defaults/keys.py b/ranger/defaults/keys.py
index 9fbc5b96..faa85388 100644
--- a/ranger/defaults/keys.py
+++ b/ranger/defaults/keys.py
@@ -33,6 +33,8 @@ def initialize_commands(command_list):
 	bind('K', do('move_pointer_by_pages', -0.5))
 	bind('E', do('edit_file'))
 #	bind('o', do('force_load_preview'))
+	bind('i', do('tag_toggle'))
+	bind('I', do('tag_remove'))
 
 	bind(' ', do('mark', toggle=True))
 	bind('v', do('mark', all=True, toggle=True))
diff --git a/ranger/fm.py b/ranger/fm.py
index a68c0f15..45a419a5 100644
--- a/ranger/fm.py
+++ b/ranger/fm.py
@@ -13,11 +13,12 @@ class FM(Actions):
 	input_blocked = False
 	input_blocked_until = 0
 	stderr_to_out = False
-	def __init__(self, ui = None, bookmarks = None):
+	def __init__(self, ui=None, bookmarks=None, tags=None):
 		"""Initialize FM."""
 		Actions.__init__(self)
 		self.ui = ui
 		self.bookmarks = bookmarks
+		self.tags = tags
 		self.loader = Loader()
 		self.apps = self.settings.apps.CustomApplications()
 
@@ -38,6 +39,10 @@ class FM(Actions):
 		else:
 			self.bookmarks = bookmarks
 
+		from ranger.container.tags import Tags
+		if self.tags is None:
+			self.tags = Tags('~/.ranger/tagged')
+
 		if self.ui is None:
 			from ranger.gui.defaultui import DefaultUI
 			self.ui = DefaultUI()
diff --git a/ranger/fsobject/fsobject.py b/ranger/fsobject/fsobject.py
index f7d9772c..28ef5c5b 100644
--- a/ranger/fsobject/fsobject.py
+++ b/ranger/fsobject/fsobject.py
@@ -43,12 +43,13 @@ class FileSystemObject(MimeTypeAware, FileManagerAware):
 		if type(self) == FileSystemObject:
 			raise TypeError("Cannot initialize abstract class FileSystemObject")
 
-		from os.path import basename, dirname
+		from os.path import basename, dirname, realpath
 
 		self.path = path
 		self.basename = basename(path)
 		self.basename_lower = self.basename.lower()
 		self.dirname = dirname(path)
+		self.realpath = realpath(path)
 
 		try:
 			self.extension = self.basename[self.basename.rindex('.') + 1:]
diff --git a/ranger/gui/colorscheme.py b/ranger/gui/colorscheme.py
index 227051f9..bf8194ea 100644
--- a/ranger/gui/colorscheme.py
+++ b/ranger/gui/colorscheme.py
@@ -8,7 +8,7 @@ CONTEXT_KEYS = [ 'reset', 'error',
 		'good', 'bad',
 		'space', 'permissions', 'owner', 'group', 'mtime', 'nlink',
 		'scroll', 'all', 'bot', 'top', 'percentage',
-		'marked',
+		'marked', 'tagged', 'tag_marker',
 		'title', 'text', 'highlight',
 		'keybuffer']
 
diff --git a/ranger/gui/widgets/filelist.py b/ranger/gui/widgets/filelist.py
index 457c9856..c6b654b4 100644
--- a/ranger/gui/widgets/filelist.py
+++ b/ranger/gui/widgets/filelist.py
@@ -170,6 +170,8 @@ class FileList(Widget):
 				break
 
 			this_color = base_color + list(drawed.mimetype_tuple)
+			text = drawed.basename
+			tagged = drawed.realpath in self.fm.tags
 
 			if i == selected_i:
 				this_color.append('selected')
@@ -177,6 +179,11 @@ class FileList(Widget):
 			if drawed.marked:
 				this_color.append('marked')
 
+			if tagged:
+				this_color.append('tagged')
+				if self.main_display:
+					text = '* ' + text
+
 			if isinstance(drawed, Directory):
 				this_color.append('directory')
 			else:
@@ -192,12 +199,10 @@ class FileList(Widget):
 			string = drawed.basename
 			if self.main_display:
 				if self.wid > 2:
-					self.win.addnstr(
-							self.y + line, self.x + 1,
-							drawed.basename, self.wid - 2)
+					self.win.addnstr(self.y + line, self.x + 1,
+							text, self.wid - 2)
 			else:
-				self.win.addnstr(
-						self.y + line, self.x, drawed.basename, self.wid)
+				self.win.addnstr(self.y + line, self.x, text, self.wid)
 
 			if self.display_infostring and drawed.infostring:
 				info = drawed.infostring
@@ -207,6 +212,10 @@ class FileList(Widget):
 
 			self.color_at(self.y + line, self.x, self.wid, this_color)
 
+			if self.main_display and tagged and self.wid > 2:
+				this_color.append('tag_marker')
+				self.color_at(self.y + line, self.x + 1, 1, this_color)
+
 			self.color_reset()
 
 	def get_scroll_begin(self):
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-12-26 20:02:25 +0000
ization?h=main&id=6042828bdea2a1ed1da1b0d2013a4479fb3d005a'>^ 
4ea9905f ^



6e1eeeeb ^

455f0338 ^

6e1eeeeb ^

385ff136 ^

455f0338 ^



6e1eeeeb ^







455f0338 ^

6573fe1f ^

ec99eb7a ^

51530916 ^

6e1eeeeb ^












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


                                                                            

                                                                        








                                                                               

                                                                              
                            

                                                                        
   




                                                                              













































                                                                                
                    
   


                                                                              
                                                                       
                                                                       
                                                


                                                                      



                                                                             



                                                                             






               
                                                                            


                                                                              


                                                                                        
  
                                                                             
                                                                            


                                                                              
  


                                  
                



                                             
 
                       
 
                        

                            


             

 


                 
                                                                                 
                        
                   
                   


                                                                            






                                                                           
       
              
              
 











                                                                                                    
//: You guessed right: the '000' prefix means you should start reading here.
//:
//: This project is set up to load all files with a numeric prefix. Just
//: create a new file and start hacking.
//:
//: The first few files (00*) are independent of what this program does, an
//: experimental skeleton that will hopefully make it both easier for others to
//: understand and more malleable, easier to rewrite and remould into radically
//: different shapes without breaking in subtle corner cases. The premise is
//: that understandability and rewrite-friendliness are related in a virtuous
//: cycle. Doing one well makes it easier to do the other.
//:
//: Lower down, this file contains a legal, bare-bones C++ program. It doesn't
//: do anything yet; subsequent files will contain :(...) directives to insert
//: lines into it. For example:
//:   :(after "more events")
//: This directive means: insert the following lines after a line in the
//: program containing the words "more events".
//:
//: A simple tool is included to 'tangle' all the files together in sequence
//: according to their directives into a single source file containing all the
//: code for the project, and then feed the source file to the compiler.
//: (It'll drop these comments starting with a '//:' prefix that only make
//: sense before tangling.)
//:
//: Directives free up the programmer to order code for others to read rather
//: than as forced by the computer or compiler. Each individual feature can be
//: organized in a self-contained 'layer' that adds code to many different data
//: structures and functions all over the program. The right decomposition into
//: layers will let each layer make sense in isolation.
//:
//:   "If I look at any small part of it, I can see what is going on -- I don't
//:   need to refer to other parts to understand what something is doing.
//:
//:   If I look at any large part in overview, I can see what is going on -- I
//:   don't need to know all the details to get it.
//:
//:   Every level of detail is as locally coherent and as well thought-out as
//:   any other level."
//:
//:       -- Richard Gabriel, "The Quality Without A Name"
//:          (http://dreamsongs.com/Files/PatternsOfSoftware.pdf, page 42)
//:
//: Directives are powerful; they permit inserting or modifying any point in
//: the program. Using them tastefully requires mapping out specific lines as
//: waypoints for future layers to hook into. Often such waypoints will be in
//: comments, capitalized to hint that other layers rely on their presence.
//:
//: A single waypoint might have many different code fragments hooking into
//: it from all over the codebase. Use 'before' directives to insert
//: code at a location in order, top to bottom, and 'after' directives to
//: insert code in reverse order. By convention waypoints intended for insertion
//: before begin with 'End'. Notice below how the layers line up above the "End
//: Foo" waypoint.
//:
//:   File 001          File 002                File 003
//:   ============      ===================     ===================
//:   // Foo
//:   ------------
//:              <----  :(before "End Foo")
//:                     ....
//:                     ...
//:   ------------
//:              <----------------------------  :(before "End Foo")
//:                                             ....
//:                                             ...
//:   // End Foo
//:   ============
//:
//: Here's part of a layer in color: http://i.imgur.com/0eONnyX.png. Directives
//: are shaded dark.
//:
//: Layers do more than just shuffle code around. In a well-organized codebase
//: it should be possible to stop loading after any file/layer, build and run
//: the program, and pass all tests for loaded features. (Relevant is
//: http://youtube.com/watch?v=c8N72t7aScY, a scene from "2001: A Space
//: Odyssey".) Get into the habit of running the included script called
//: 'test_layers' before you commit any changes.
//:
//: This 'subsetting guarantee' ensures that this directory contains a
//: cleaned-up narrative of the evolution of this codebase. Organizing
//: autobiographically allows newcomers to rapidly orient themselves, reading
//: the first few files to understand a simple gestalt of a program's core
//: purpose and features, and later gradually working their way through other
//: features as the need arises.
//:
//: Programmers shouldn't need to understand everything about a program to
//: hack on it. But they shouldn't be prevented from a thorough understanding
//: of each aspect either. The goal of layers is to reward curiosity.

// Includes
// End Includes

// Types
// End Types

// Function prototypes are auto-generated in the 'build' script; define your
// functions in any order. Just be sure to declare each function header all on
// one line, ending with the '{'. Our auto-generation scripts are too minimal
// and simple-minded to handle anything else.
#include "function_list"  // by convention, files ending with '_list' are auto-generated

// Globals
//
// All statements in this section should always define a single variable on a
// single line. The 'build' script will simple-mindedly auto-generate extern
// declarations for them. Remember to define (not just declare) constants with
// extern linkage in this section, since C++ global constants have internal
// linkage by default.
//
// End Globals

int main(int argc, char* argv[]) {
  atexit(reset);
  // we require a 32-bit little-endian system
  assert(sizeof(int) == 4);
  assert(sizeof(float) == 4);
  assert_little_endian();

  // End One-time Setup

  // Commandline Parsing
  // End Commandline Parsing

  // End Main

  return 0;
}

// Unit Tests
// End Unit Tests

//: our first directive; insert the following headers at the start of the program
:(before "End Includes")
#include <assert.h>
#include <stdlib.h>

//: Without directives or with the :(code) directive, lines get added at the
//: end.
//:
//: Regardless of where functions are defined, we can call them anywhere we
//: like as long as we format the function header in a specific way: put it
//: all on a single line without indent, end the line with ') {' and no
//: trailing whitespace. As long as functions uniformly start this way, our
//: 'build' script contains a little command to automatically generate
//: declarations for them.
:(code)
void reset() {
  // End Reset
}

void assert_little_endian() {
  const int x = 1;
  const char* y = reinterpret_cast<const char*>(&x);
  if (*y != 1) {
    cerr << "SubX requires a little-endian processor. Do you have Intel (or AMD or Atom) inside?\n";
    exit(1);
  }
}
:(before "End Includes")
#include<iostream>
using std::cerr;