v3.5.9 site-level search namespaces option

Changelog.mediawiki

@@ -607,3 +607,6 @@ Support folding/unfolding for:
 
 == Mediawikier 3.5.8 ==
 * Fixed command {{Command|Open page in browser}} for child hosts (parent wiki settings ignoring).
+
+== Mediawikier 3.5.9 ==
+* Site-level option {{Property|search_namespaces}}, it overrides the global value.

messages.json

@@ -1,4 +1,4 @@
 {
     "install": "messages/install.txt",
-    "3.5.8": "messages/latest_version.txt"
+    "3.5.9": "messages/latest_version.txt"
 }

messages/latest_version.txt

@@ -1,3 +1,3 @@
-## Mediawiker 3.5.8
+## Mediawiker 3.5.9
 
 Please, check the release-notes in `Preferences / Package Settings / Mediawiker / Changelog`.

mwcommands/mw_events.py

@@ -136,7 +136,7 @@ def on_query_completions(self, view, prefix, locations):
                     ns_text, internal_link = internal_link.split(utils.api.NAMESPACE_SPLITTER)
 
                 if len(internal_link) >= word_cursor_min_len:
-                    namespaces_search = [ns.strip() for ns in utils.props.get_setting('search_namespaces').split(',')]
+                    namespaces_search = utils.get_search_ns()
                     if ns_text:
                         ns_text_number = utils.api.call('get_namespace_number', name=ns_text)
 

mwcommands/mw_properties.py

@@ -131,7 +131,8 @@ class MediawikerProperties(object):
         'preview_custom_head': {'text': 'Custom html head tags for preview', 'type': list, 'default': []},
         'preview_sandbox': {'text': 'Special rewritable page for preview', 'type': str, 'default': ''},
         'show_red_links': {'text': 'Mark red links in page text', 'type': bool, 'default': False},
-        'parent': {'text': 'Parent site name', 'type': str, 'default': ''}
+        'parent': {'text': 'Parent site name', 'type': str, 'default': ''},
+        'search_namespaces': {'text': 'Site level option: namespaces to search ', 'type': str, 'default': ''}
     }
 
     def __init__(self):

mwcommands/mw_search_string.py

@@ -28,7 +28,7 @@ def run(self, edit):
         sublime.active_window().show_input_panel('Wiki search:', search_pre, self.show_results, None, None)
 
     def do_search(self, string_value):
-        namespace = utils.props.get_setting('search_namespaces')
+        namespace = '|'.join(utils.get_search_ns())
         search_limit = utils.props.get_setting('search_results_count', 20)
         return utils.api.call('get_search_result', search=string_value, limit=search_limit, namespace=namespace)
 

mwcommands/mw_utils.py

@@ -258,6 +258,19 @@ def get_page_url(page_name=None):
     return ''
 
 
+def get_search_ns():
+    '''
+    Returns 'search_namespaces':
+    * if defined on site level, then site-level-namespaces
+    * else global option
+    '''
+
+    nses = props.get_site_setting(get_view_site(), 'search_namespaces')
+    if not nses:
+        nses = props.get_setting('search_namespaces')
+    return [ns.strip() for ns in nses.split(',')]
+
+
 def status_message(message, replace_patterns=None, is_panel=None, new_line=True, panel_name=None, syntax=None, new=False):
 
     def status_message_sublime(message, replace_patterns=None):