From d708a3c4f46ec34dd4f6bb8dc0389ed355093f33 Mon Sep 17 00:00:00 2001
From: luxick <git@luxick.com>
Date: Fri, 21 Apr 2017 22:01:06 +0200
Subject: [PATCH] Add .desktop file to install

---
 .gitignore                            | 3 ++-
 cardvault/handlers.py                 | 6 +++---
 cardvault/resources/cardvault.desktop | 8 ++++++++
 cardvault/util.py                     | 3 ++-
 setup.cfg                             | 3 +++
 setup.py                              | 5 ++++-
 6 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 cardvault/resources/cardvault.desktop
 create mode 100644 setup.cfg

diff --git a/.gitignore b/.gitignore
index 7d35891..73a7fd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,4 +89,5 @@ ENV/
 # Rope project settings
 .ropeproject
 
-.idea
\ No newline at end of file
+.idea
+install.txt
diff --git a/cardvault/handlers.py b/cardvault/handlers.py
index 30249d6..51481ad 100644
--- a/cardvault/handlers.py
+++ b/cardvault/handlers.py
@@ -49,9 +49,9 @@ class Handlers:
                                                               "Importing a library will override your current library. "
                                                               "Proceed?")
             if override_question == Gtk.ResponseType.YES:
-                (library, tags) = util.import_library(dialog.get_filename())
-                self.app.library = library
-                self.app.tags = tags
+                imports = util.import_library(dialog.get_filename())
+                self.app.library = imports[0]
+                self.app.tags = imports[1]
                 # Cause current page to reload with imported data
                 self.app.current_page.emit('show')
                 self.app.unsaved_changes = True
diff --git a/cardvault/resources/cardvault.desktop b/cardvault/resources/cardvault.desktop
new file mode 100644
index 0000000..30c8938
--- /dev/null
+++ b/cardvault/resources/cardvault.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=0.5
+Type=Application
+Name=Card Vault
+Comment=Oraganize and plan your MTG card collection
+TryExec=cardvault
+Exec=cardvault %F
+Icon=application-x-executable
diff --git a/cardvault/util.py b/cardvault/util.py
index 6d069ac..da53b30 100644
--- a/cardvault/util.py
+++ b/cardvault/util.py
@@ -209,7 +209,8 @@ def import_library(path):
         tags = imported["tags"]
     except KeyError as err:
         log("Invalid library format " + str(err), LogLevel.Error)
-        return
+        library = {}
+        tags = {}
 
     log("Library imported", LogLevel.Info)
     return (library, tags)
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..224f8b7
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,3 @@
+[install]
+single-version-externally-managed=1
+record=install.txt
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 78eb663..57c7fce 100755
--- a/setup.py
+++ b/setup.py
@@ -12,9 +12,12 @@ setup(
     version=util.VERSION,
     packages=find_packages(),
 
-    # install_requires=['pygobject'],
     package_data={'cardvault': ['resources/images/*', 'resources/mana/*', 'gui/*']},
 
+    data_files=[
+    #('share/icons/hicolor/scalable/apps', ['data/mypackage.svg']),
+    ('share/applications', ['cardvault/resources/cardvault.desktop'])],
+
     author='luxick',
     author_email='cardvoult@luxick.de',
     description='Managing MTG card libraries and decks',