qmsk.pngtile: titles for items
authorTero Marttila <terom@qmsk.net>
Sat, 04 Oct 2014 16:05:09 +0300
changeset 243 23193918c8a6
parent 242 ce8de8c84e38
child 244 57b717b46dd8
qmsk.pngtile: titles for items
qmsk/pngtile/pngtile.py
--- a/qmsk/pngtile/pngtile.py	Sat Oct 04 16:04:55 2014 +0300
+++ b/qmsk/pngtile/pngtile.py	Sat Oct 04 16:05:09 2014 +0300
@@ -25,10 +25,16 @@
         self.tileserver = tileserver
 
     def title (self, name):
-        if name:
-            return os.path.basename(name)
-        else:
+        if not name:
             return self._title
+        
+        if '/'  in name:
+            _, name = name.rsplit('/', 1)
+
+        if '.' in name:
+            name, ext = name.split('.', 1)
+
+        return name
 
     def breadcrumb (self, name):
         """
@@ -67,7 +73,7 @@
                     item_name = tree_name + '/' + item
                 else:
                     item_name = item
-
+            
                 if type:
                     items.append((item, item_name))
                 else:
@@ -88,9 +94,11 @@
                 item_name = name + '/' + item
             else:
                 item_name = item
+            
+            item_title = self.title(item_name)
 
             if type:
-                yield item, item_name
+                yield item_title, item_name
 
     def tiles_url (self, name=None, **query):
         """