summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--ranger/defaults/options.py3
-rw-r--r--ranger/gui/widgets/browserview.py2
-rw-r--r--ranger/shared/settings.py1
3 files changed, 5 insertions, 1 deletions
diff --git a/ranger/defaults/options.py b/ranger/defaults/options.py
index a9dd8bde..43129652 100644
--- a/ranger/defaults/options.py
+++ b/ranger/defaults/options.py
@@ -39,6 +39,9 @@ hidden_filter = regexp(
 	r'lost\+found|^\.|~$|\.(:?pyc|pyo|bak|swp)$')
 show_hidden = False
 
+# Show dotfiles in the bookmark preview box?
+show_hidden_bookmarks = True
+
 # Which colorscheme to use?  These colorschemes are available by default:
 # default, default88, texas, jungle, snow
 # Snow is monochrome, texas and default88 use 88 colors.
diff --git a/ranger/gui/widgets/browserview.py b/ranger/gui/widgets/browserview.py
index 7f2ea5fb..f586596e 100644
--- a/ranger/gui/widgets/browserview.py
+++ b/ranger/gui/widgets/browserview.py
@@ -121,7 +121,7 @@ class BrowserView(Widget, DisplayableContainer):
 		self.need_clear = True
 
 		sorted_bookmarks = sorted(item for item in self.fm.bookmarks \
-				if '/.' not in item[1].path)
+			if self.settings.show_hidden_bookmarks or '/.' not in item[1].path)
 
 		def generator():
 			return zip(range(self.hei-1), sorted_bookmarks)
diff --git a/ranger/shared/settings.py b/ranger/shared/settings.py
index 692d06d2..42e3502a 100644
--- a/ranger/shared/settings.py
+++ b/ranger/shared/settings.py
@@ -19,6 +19,7 @@ from ranger.ext.openstruct import OpenStruct
 
 ALLOWED_SETTINGS = {
 	'show_hidden': bool,
+	'show_hidden_bookmarks': bool,
 	'show_cursor': bool,
 	'autosave_bookmarks': bool,
 	'save_console_history': bool,
oothj5@gmail.com> 2015-07-27 00:04:48 +0100 committer James Booth <boothj5@gmail.com> 2015-07-27 00:04:48 +0100 Fixed tests for new command format' href='/danisanti/profani-tty/commit/tests/unittests/test_cmd_rooms.c?id=8119025120b0b511aea8bc3f477d2aff835bd24b'>81190251 ^
447d2358 ^
71577c1f ^
3bb1f124 ^
7db1bcee ^
d56f6dc3 ^
5c65599e ^
81190251 ^
447d2358 ^
447d2358 ^
















447d2358 ^

5c65599e ^
49661625 ^

1d23d646 ^
447d2358 ^
3bb1f124 ^
88f423af ^
7db1bcee ^

00a475cf ^
8db2389d ^


7db1bcee ^
e571ccd8 ^
5c65599e ^
81190251 ^
3e3786eb ^
71577c1f ^

e571ccd8 ^
447d2358 ^
e571ccd8 ^
447d2358 ^
3bb1f124 ^
00a475cf ^
8db2389d ^


7db1bcee ^
e571ccd8 ^









1d23d646 ^
e571ccd8 ^
1d23d646 ^
e571ccd8 ^





8db2389d ^


e571ccd8 ^

5c65599e ^
81190251 ^
447d2358 ^
447d2358 ^
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




                   
                   
                 

                      
 
                  
                       
 
                            
                              
 

                          
                                                                    
 
                                               
 
                                                         
 
                                                       
                        
















                                                             

                                                             
                             

                                                                                                        
                                                                                                                      
 
                                                         
                                                          

                                               
 


                                                                    
                                                                              
                                             
 
                                                       
                        

 
                                                         
 
                                                           
 
                                                         
 


                                                                
                                                                          









                                                        
 
                                                                                                        
                                                                                                                      





                                                          


                                                                                    

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

#include "xmpp/xmpp.h"

#include "ui/ui.h"
#include "ui/stub_ui.h"

#include "config/accounts.h"
#include "command/cmd_funcs.h"

#define CMD_ROOMS "/rooms"

static void test_with_connection_status(jabber_conn_status_t status)
{
    will_return(connection_get_status, status);

    expect_cons_show("You are not currently connected.");

    gboolean result = cmd_rooms(NULL, CMD_ROOMS, NULL);
    assert_true(result);
}

void cmd_rooms_shows_message_when_disconnected(void **state)
{
    test_with_connection_status(JABBER_DISCONNECTED);
}

void cmd_rooms_shows_message_when_disconnecting(void **state)
{
    test_with_connection_status(JABBER_DISCONNECTING);
}

void cmd_rooms_shows_message_when_connecting(void **state)
{
    test_with_connection_status(JABBER_CONNECTING);
}

void cmd_rooms_uses_account_default_when_no_arg(void **state)
{
    gchar *args[] = { NULL };

    ProfAccount *account = account_new("testaccount", NULL, NULL, NULL, TRUE, NULL, 0, NULL, NULL, NULL,
        0, 0, 0, 0, 0, "default_conf_server", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);

    will_return(connection_get_status, JABBER_CONNECTED);
    will_return(session_get_account_name, "account_name");
    expect_any(accounts_get_account, name);
    will_return(accounts_get_account, account);

    expect_cons_show("");
    expect_cons_show("Room list request sent: default_conf_server");

    expect_string(iq_room_list_request, conferencejid, "default_conf_server");
    expect_any(iq_room_list_request, filter);

    gboolean result = cmd_rooms(NULL, CMD_ROOMS, args);
    assert_true(result);
}

void cmd_rooms_service_arg_used_when_passed(void **state)
{
    gchar *args[] = { "service", "conf_server_arg", NULL };

    will_return(connection_get_status, JABBER_CONNECTED);

    expect_cons_show("");
    expect_cons_show("Room list request sent: conf_server_arg");

    expect_string(iq_room_list_request, conferencejid, "conf_server_arg");
    expect_any(iq_room_list_request, filter);

    gboolean result = cmd_rooms(NULL, CMD_ROOMS, args);
    assert_true(result);
}

void cmd_rooms_filter_arg_used_when_passed(void **state)
{
    gchar *args[] = { "filter", "text", NULL };


    ProfAccount *account = account_new("testaccount", NULL, NULL, NULL, TRUE, NULL, 0, NULL, NULL, NULL,
        0, 0, 0, 0, 0, "default_conf_server", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);

    will_return(connection_get_status, JABBER_CONNECTED);
    will_return(session_get_account_name, "account_name");
    expect_any(accounts_get_account, name);
    will_return(accounts_get_account, account);

    expect_cons_show("");
    expect_cons_show("Room list request sent: default_conf_server, filter: 'text'");

    expect_any(iq_room_list_request, conferencejid);
    expect_string(iq_room_list_request, filter, "text");

    gboolean result = cmd_rooms(NULL, CMD_ROOMS, args);
    assert_true(result);
}