summary refs log tree commit diff stats
diff options
context:
space:
mode:
authornfnty <git@nfnty.se>2017-02-06 19:40:15 +0100
committernfnty <git@nfnty.se>2017-02-06 19:40:15 +0100
commit5b1023d5db2952311eb97a381ff3f854f515f57c (patch)
tree3237cd2c10155fb5c1ffa21f16b0541ee4bb4827
parent9a619526f472cce3997b2aa89c13532cf8f005e1 (diff)
downloadranger-5b1023d5db2952311eb97a381ff3f854f515f57c.tar.gz
gui.widgets.browsercolumn.BrowserColumn.draw: Minor refactor
Diffstat
-rw-r--r--ranger/gui/widgets/browsercolumn.py42


1 files changed, 20 insertions, 22 deletions
diff --git a/ranger/gui/widgets/browsercolumn.py b/ranger/gui/widgets/browsercolumn.py
index 2b9f317e..14fde110 100644
--- a/ranger/gui/widgets/browsercolumn.py
+++ b/ranger/gui/widgets/browsercolumn.py
@@ -138,41 +138,39 @@ class BrowserColumn(Pager):  # pylint: disable=too-many-instance-attributes
             tab = self.tab
         self.target = tab.at_level(self.level)
 
-    def _need_redraw(self, boolean):
-        self.need_redraw = boolean or self.need_redraw
-
     def draw(self):
         """Call either _draw_file() or _draw_directory()"""
-        if self.target != self.old_dir:
+        target = self.target
+
+        if target != self.old_dir:
             self.need_redraw = True
-            self.old_dir = self.target
+            self.old_dir = target
 
-        if self.target:
-            self.target.use()
+        if target:
+            target.use()
 
-            if self.target.is_directory and (self.level <= 0 or self.settings.preview_directories):
-                if self.old_thisfile != self.target.pointed_obj:
-                    self.old_thisfile = self.target.pointed_obj
+            if target.is_directory and (self.level <= 0 or self.settings.preview_directories):
+                if self.old_thisfile != target.pointed_obj:
+                    self.old_thisfile = target.pointed_obj
                     self.need_redraw = True
-                self._need_redraw(self.target.load_content_if_outdated())
-                self._need_redraw(self.target.sort_if_outdated())
-                self._need_redraw(self.last_redraw_time < self.target.last_update_time)
-                if self.target.pointed_obj:
-                    self._need_redraw(self.target.pointed_obj.load_if_outdated())
-                    self._need_redraw(
-                        self.last_redraw_time < self.target.pointed_obj.last_load_time)
+                self.need_redraw |= target.load_content_if_outdated()
+                self.need_redraw |= target.sort_if_outdated()
+                self.need_redraw |= self.last_redraw_time < target.last_update_time
+                if target.pointed_obj:
+                    self.need_redraw |= target.pointed_obj.load_if_outdated()
+                    self.need_redraw |= self.last_redraw_time < target.pointed_obj.last_load_time
             else:
-                self._need_redraw(self.target.load_if_outdated())
-                self._need_redraw(self.last_redraw_time < self.target.last_load_time)
+                self.need_redraw |= target.load_if_outdated()
+                self.need_redraw |= self.last_redraw_time < target.last_load_time
 
         if self.need_redraw:
             self.win.erase()
-            if self.target is None:
+            if target is None:
                 pass
-            elif self.target.is_file:
+            elif target.is_file:
                 Pager.open(self)
                 self._draw_file()
-            elif self.target.is_directory:
+            elif target.is_directory:
                 self._draw_directory()
                 Widget.draw(self)
             self.need_redraw = False

 

generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-07-27 16:51:19 +0000


 


;  2013-01-13 00:05:25 +0000
committer  James Booth <boothj5@gmail.com>  2013-01-13 00:05:25 +0000

Changed Jid typedef to be explicit pointer' href='/danisanti/profani-tty/commit/tests/test_jid.c?id=1cc33cc4915b04d08604d959ff3286a753bfc813'>1cc33cc4 ^

07308673 ^

94bcf188 ^


07308673 ^

94bcf188 ^

1cc33cc4 ^

07308673 ^

94bcf188 ^


07308673 ^

94bcf188 ^

1cc33cc4 ^

07308673 ^

94bcf188 ^


07308673 ^

94bcf188 ^

1cc33cc4 ^

07308673 ^

94bcf188 ^


07308673 ^

94bcf188 ^

1cc33cc4 ^

07308673 ^

94bcf188 ^


07308673 ^

94bcf188 ^

1cc33cc4 ^

07308673 ^

94bcf188 ^


07308673 ^

94bcf188 ^

1cc33cc4 ^

07308673 ^

94bcf188 ^


07308673 ^

94bcf188 ^

1cc33cc4 ^

07308673 ^

94bcf188 ^


07308673 ^

94bcf188 ^

1cc33cc4 ^

07308673 ^

94bcf188 ^


07308673 ^

94bcf188 ^

1cc33cc4 ^

07308673 ^

94bcf188 ^


07308673 ^

94bcf188 ^

1cc33cc4 ^

07308673 ^

94bcf188 ^


07308673 ^

94bcf188 ^

1cc33cc4 ^

07308673 ^

94bcf188 ^


07308673 ^

94bcf188 ^

1cc33cc4 ^

07308673 ^

94bcf188 ^


07308673 ^

94bcf188 ^

1cc33cc4 ^

07308673 ^

94bcf188 ^


07308673 ^

94bcf188 ^

1cc33cc4 ^

07308673 ^

94bcf188 ^


07308673 ^

3a22719b ^

8bdab23e ^

3a22719b ^

07308673 ^

3a22719b ^


07308673 ^

3a22719b ^

8bdab23e ^

3a22719b ^

07308673 ^

3a22719b ^


07308673 ^

d239a127 ^



07308673 ^





d239a127 ^


07308673 ^

d239a127 ^



07308673 ^





d239a127 ^


07308673 ^

d239a127 ^



07308673 ^





d239a127 ^


07308673 ^

d239a127 ^



07308673 ^





94bcf188 ^



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






                   
                   
 

                
                                                    
 
                                   
                        

 
                                                            
 
                                 
                        

 
                                                    
 
                                                       
                                                                   

 
                                                    
 
                                                       
                                                            

 
                                                            
 
                                                       
                                                        

 
                                                         
 
                                                       
                                                     

 
                                                          
 
                                                       
                                                        

 
                                                            
 
                                                
                                                            

 
                                                            
 
                                                
                                                     

 
                                                                    
 
                                                
                                                        

 
                                                                  
 
                                                
                                                        

 
                                                                      
 
                                                
                                   

 
                                                         
 
                                                
                                 

 
                                                             
 
                                                
                                      

 
                                                    
 
                                                
                                                            

 
                                                         
 
                                                
                                                     

 
                                                          
 
                                                
                                                        

 
                                               
 
                                                                                            
 
                                                                       

 
                                               
 
                                                                                            
 
                                                        

 
                                                


                                                                   




                                                                               

 
                                             


                                                                   




                                                                               

 
                                                       


                                                                             




                                                                                         

 
                                                  


                                                                 




                                                                             
 
#include <stdarg.h>
#include <stddef.h>
#include <setjmp.h>
#include <cmocka.h>
#include <stdlib.h>

#include "jid.h"

void create_jid_from_null_returns_null(void **state)
{
    Jid *result = jid_create(NULL);
    assert_null(result);
}

void create_jid_from_empty_string_returns_null(void **state)
{
    Jid *result = jid_create("");
    assert_null(result);
}

void create_jid_from_full_returns_full(void **state)
{
    Jid *result = jid_create("myuser@mydomain/laptop");
    assert_string_equal("myuser@mydomain/laptop", result->fulljid);
}

void create_jid_from_full_returns_bare(void **state)
{
    Jid *result = jid_create("myuser@mydomain/laptop");
    assert_string_equal("myuser@mydomain", result->barejid);
}

void create_jid_from_full_returns_resourcepart(void **state)
{
    Jid *result = jid_create("myuser@mydomain/laptop");
    assert_string_equal("laptop", result->resourcepart);
}

void create_jid_from_full_returns_localpart(void **state)
{
    Jid *result = jid_create("myuser@mydomain/laptop");
    assert_string_equal("myuser", result->localpart);
}

void create_jid_from_full_returns_domainpart(void **state)
{
    Jid *result = jid_create("myuser@mydomain/laptop");
    assert_string_equal("mydomain", result->domainpart);
}

void create_jid_from_full_nolocal_returns_full(void **state)
{
    Jid *result = jid_create("mydomain/laptop");
    assert_string_equal("mydomain/laptop", result->fulljid);
}

void create_jid_from_full_nolocal_returns_bare(void **state)
{
    Jid *result = jid_create("mydomain/laptop");
    assert_string_equal("mydomain", result->barejid);
}

void create_jid_from_full_nolocal_returns_resourcepart(void **state)
{
    Jid *result = jid_create("mydomain/laptop");
    assert_string_equal("laptop", result->resourcepart);
}

void create_jid_from_full_nolocal_returns_domainpart(void **state)
{
    Jid *result = jid_create("mydomain/laptop");
    assert_string_equal("mydomain", result->domainpart);
}

void create_jid_from_full_nolocal_returns_null_localpart(void **state)
{
    Jid *result = jid_create("mydomain/laptop");
    assert_null(result->localpart);
}

void create_jid_from_bare_returns_null_full(void **state)
{
    Jid *result = jid_create("myuser@mydomain");
    assert_null(result->fulljid);
}

void create_jid_from_bare_returns_null_resource(void **state)
{
    Jid *result = jid_create("myuser@mydomain");
    assert_null(result->resourcepart);
}

void create_jid_from_bare_returns_bare(void **state)
{
    Jid *result = jid_create("myuser@mydomain");
    assert_string_equal("myuser@mydomain", result->barejid);
}

void create_jid_from_bare_returns_localpart(void **state)
{
    Jid *result = jid_create("myuser@mydomain");
    assert_string_equal("myuser", result->localpart);
}

void create_jid_from_bare_returns_domainpart(void **state)
{
    Jid *result = jid_create("myuser@mydomain");
    assert_string_equal("mydomain", result->domainpart);
}

void create_room_jid_returns_room(void **state)
{
    Jid *result = jid_create_from_bare_and_resource("room@conference.domain.org", "myname");

    assert_string_equal("room@conference.domain.org", result->barejid);
}

void create_room_jid_returns_nick(void **state)
{
    Jid *result = jid_create_from_bare_and_resource("room@conference.domain.org", "myname");

    assert_string_equal("myname", result->resourcepart);
}

void create_with_slash_in_resource(void **state)
{
    Jid *result = jid_create("room@conference.domain.org/my/nick");

    assert_string_equal("room", result->localpart);
    assert_string_equal("conference.domain.org", result->domainpart);
    assert_string_equal("my/nick", result->resourcepart);
    assert_string_equal("room@conference.domain.org", result->barejid);
    assert_string_equal("room@conference.domain.org/my/nick", result->fulljid);
}

void create_with_at_in_resource(void **state)
{
    Jid *result = jid_create("room@conference.domain.org/my@nick");

    assert_string_equal("room", result->localpart);
    assert_string_equal("conference.domain.org", result->domainpart);
    assert_string_equal("my@nick", result->resourcepart);
    assert_string_equal("room@conference.domain.org", result->barejid);
    assert_string_equal("room@conference.domain.org/my@nick", result->fulljid);
}

void create_with_at_and_slash_in_resource(void **state)
{
    Jid *result = jid_create("room@conference.domain.org/my@nick/something");

    assert_string_equal("room", result->localpart);
    assert_string_equal("conference.domain.org", result->domainpart);
    assert_string_equal("my@nick/something", result->resourcepart);
    assert_string_equal("room@conference.domain.org", result->barejid);
    assert_string_equal("room@conference.domain.org/my@nick/something", result->fulljid);
}

void create_full_with_trailing_slash(void **state)
{
    Jid *result = jid_create("room@conference.domain.org/nick/");

    assert_string_equal("room", result->localpart);
    assert_string_equal("conference.domain.org", result->domainpart);
    assert_string_equal("nick/", result->resourcepart);
    assert_string_equal("room@conference.domain.org", result->barejid);
    assert_string_equal("room@conference.domain.org/nick/", result->fulljid);
}






 

generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-07-27 16:51:19 +0000