Write qgis_resources according to current extension schema

Author: pka

examples/small_world.gpkg

@@ -85,11 +85,11 @@ def info(self):
             pass
 
         try:
-            rows = list(cur.execute('''SELECT name, type FROM qgis_resources'''))
+            rows = list(cur.execute('''SELECT name, mime_type FROM qgis_resources'''))
             if len(rows) > 0:
                 print("QGIS recources:")
                 for row in rows:
-                    print(row['name'] + row['type'])
+                    print(row['name'] + ' (%s)' % row['mime_type'])
         except sqlite3.Error:
             pass
 

qgis_plugin/qgpkg/qgpkg.py

@@ -6,6 +6,7 @@
 import os
 import sqlite3
 import tempfile
+import mimetypes
 import logging
 from qgis.core import QgsProject
 from PyQt4.QtCore import QFileInfo
@@ -122,14 +123,15 @@ def write(self, project_path):
             except sqlite3.OperationalError:
                 self.c.execute(
                     """CREATE TABLE IF NOT EXISTS qgis_resources
-                     (name TEXT, type TEXT, blob BLOB)""")
+                     (name TEXT, mime_type TEXT, content BLOB)""")
                 for image in images:
                     with open(image, 'rb') as input_file:
                         blob = input_file.read()
-                        name, type = os.path.splitext(os.path.basename(image))
+                        name = os.path.basename(image)
+                        mime_type = mimetypes.MimeTypes().guess_type(name)[0]
                         self.conn.execute(
                             """INSERT INTO qgis_resources \
-                            VALUES(?, ?, ?)""", (name, type, sqlite3.Binary(blob)))
+                            VALUES(?, ?, ?)""", (name, mime_type, sqlite3.Binary(blob)))
                         self.log(logging.DEBUG, u"Image %s was saved" % name)
         self.conn.commit()
 
@@ -195,11 +197,10 @@ def read(self, gpkg_path):
 
         # and the image will be saved in the same folder as the project
         if images:
-            self.c.execute("SELECT name, type, blob FROM qgis_resources")
+            self.c.execute("SELECT name, mime_type, content FROM qgis_resources")
             images = self.c.fetchall()
             for img in images:
-                name, type, blob = img
-                img_name = name + type
+                img_name, mime_type, blob = img
                 img_path = os.path.join(tmp_folder, img_name)
                 with open(img_path, 'wb') as file:
                     file.write(blob)

qgis_plugin/qgpkg/qgpkg_qgis.py

@@ -85,11 +85,11 @@ def info(self):
             pass
 
         try:
-            rows = list(cur.execute('''SELECT name, type FROM qgis_resources'''))
+            rows = list(cur.execute('''SELECT name, mime_type FROM qgis_resources'''))
             if len(rows) > 0:
                 print("QGIS recources:")
                 for row in rows:
-                    print(row['name'] + row['type'])
+                    print(row['name'] + ' (%s)' % row['mime_type'])
         except sqlite3.Error:
             pass
 

qgisgpkg/qgpkg.py

@@ -6,6 +6,7 @@
 import os
 import sqlite3
 import tempfile
+import mimetypes
 import logging
 from qgis.core import QgsProject
 from PyQt4.QtCore import QFileInfo
@@ -122,14 +123,15 @@ def write(self, project_path):
             except sqlite3.OperationalError:
                 self.c.execute(
                     """CREATE TABLE IF NOT EXISTS qgis_resources
-                     (name TEXT, type TEXT, blob BLOB)""")
+                     (name TEXT, mime_type TEXT, content BLOB)""")
                 for image in images:
                     with open(image, 'rb') as input_file:
                         blob = input_file.read()
-                        name, type = os.path.splitext(os.path.basename(image))
+                        name = os.path.basename(image)
+                        mime_type = mimetypes.MimeTypes().guess_type(name)[0]
                         self.conn.execute(
                             """INSERT INTO qgis_resources \
-                            VALUES(?, ?, ?)""", (name, type, sqlite3.Binary(blob)))
+                            VALUES(?, ?, ?)""", (name, mime_type, sqlite3.Binary(blob)))
                         self.log(logging.DEBUG, u"Image %s was saved" % name)
         self.conn.commit()
 
@@ -195,11 +197,10 @@ def read(self, gpkg_path):
 
         # and the image will be saved in the same folder as the project
         if images:
-            self.c.execute("SELECT name, type, blob FROM qgis_resources")
+            self.c.execute("SELECT name, mime_type, content FROM qgis_resources")
             images = self.c.fetchall()
             for img in images:
-                name, type, blob = img
-                img_name = name + type
+                img_name, mime_type, blob = img
                 img_path = os.path.join(tmp_folder, img_name)
                 with open(img_path, 'wb') as file:
                     file.write(blob)

qgisgpkg/qgpkg_qgis.py

@@ -48,7 +48,7 @@ def test_write():
 QGIS projects:
 small_world.qgs
 QGIS recources:
-qgis.png"""
+qgis.png (image/png)"""
     assert output == info
 
     conn = sqlite3.connect(gpkg_path)
@@ -58,7 +58,7 @@ def test_write():
     assert_equals('small_world.qgs', curs.fetchone()[0], 'small_world.qgs not found')
 
     curs.execute('SELECT name FROM qgis_resources')
-    assert_equals('qgis', curs.fetchone()[0], 'Image not found')
+    assert_equals('qgis.png', curs.fetchone()[0], 'Image not found')
 
     curs.execute("SELECT scope FROM gpkg_extensions WHERE extension_name = 'qgis'")
     assert_equals('read-write', curs.fetchone()[0], 'Extension registration missing')