Added a handler for script names. As well as tests.

Author: Sam Stelle

splunklib/client.py

@@ -2018,6 +2018,13 @@ def __getitem__(self, key):
         if isinstance(key, tuple) and len(key) == 2:
             # Fetch a single kind
             key, kind = key
+            if kind == "script":
+                keylist = key.split('/')
+                applist = [app.name for app in self.service.apps]
+                for i in range(len(keylist)):
+                    if keylist[i] == "apps" and keylist[i+1] in applist:
+                        newkey = [keylist[x] for x in range(i + 2, len(keylist))]
+                        key = "./" + ('/').join(newkey)
             key = UrlEncoded(key, encode_slash=True)
             try:
                 response = self.get(self.kindpath(kind) + "/" + key)
@@ -2037,6 +2044,12 @@ def __getitem__(self, key):
             # Iterate over all the kinds looking for matches.
             kind = None
             candidate = None
+            keylist = key.split('/')
+            applist = [app.name for app in self.service.apps]
+            for i in range(len(keylist)):
+                if keylist[i] == "apps" and keylist[i+1] in applist:
+                    newkey = [keylist[x] for x in range(i + 2, len(keylist))]
+                    key = "./" + ('/').join(newkey)
             key = UrlEncoded(key, encode_slash=True)
             for kind in self.kinds:
                 try:
@@ -2213,7 +2226,7 @@ def itemmeta(self, kind):
     def _get_kind_list(self, subpath=None):
         if subpath is None:
             subpath = []
-        
+            
         kinds = []
         response = self.get('/'.join(subpath))
         content = _load_atom_entries(response)

tests/test_collection.py

@@ -244,6 +244,17 @@ def test_getitem_with_namespace_sample_in_changelog(self):
         ns = client.namespace(owner='nobody', app='search')
         result = self.service.saved_searches['Top five sourcetypes', ns]
 
+    def test_collection_search_get(self):
+        for search in self.service.saved_searches:
+            self.assertEqual(self.service.saved_searches[search.name].path, search.path)
+            self.assertEqual(200, self.service.saved_searches.get(search.name).status)
+
+    def test_collection_inputs_getitem(self):
+        for inp in self.service.inputs:
+            self.assertTrue(self.service.inputs[inp.name])
+
+
+
 if __name__ == "__main__":
     try:
         import unittest2 as unittest