Pasaffe

Merge lp:~stan/pasaffe/mime_support into lp:~mdeslaur/pasaffe/trunk

  1. mime_support
  2. Merge into trunk
Proposed by Tristan Hill
Status: Merged
Merge reported by: Marc Deslauriers
Merged at revision: not available
Proposed branch: lp:~stan/pasaffe/mime_support
Merge into: lp:~mdeslaur/pasaffe/trunk
Diff against target: 52 lines (+15/-4)
3 files modified
mime/pasaffe.xml (+8/-0)
pasaffe.desktop.in (+2/-1)
pasaffe/__init__.py (+5/-3)
To merge this branch: bzr merge lp:~stan/pasaffe/mime_support
Reviewer Review Type Date Requested Status
Marc Deslauriers Approve
Review via email: mp+311397@code.launchpad.net

Description of the change

Add support for opening psafe3 files from the file manager.

Left the mime file install as a packaging task, couldn't see any special support in python-distutils-extra for this.

To post a comment you must log in.
Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

Looks good, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'mime'
2=== added file 'mime/pasaffe.xml'
3--- mime/pasaffe.xml 1970-01-01 00:00:00 +0000
4+++ mime/pasaffe.xml 2016-11-21 14:37:54 +0000
5@@ -0,0 +1,8 @@
6+<?xml version="1.0" encoding="UTF-8"?>
7+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
8+ <mime-type type="application/x-psafe3">
9+ <comment>PasswordSafe v3 database</comment>
10+ <glob pattern="*.psafe3"/>
11+ <icon name="pasaffe"/>
12+ </mime-type>
13+</mime-info>
14
15=== modified file 'pasaffe.desktop.in'
16--- pasaffe.desktop.in 2015-06-18 19:49:10 +0000
17+++ pasaffe.desktop.in 2016-11-21 14:37:54 +0000
18@@ -2,7 +2,8 @@
19 _Name=Pasaffe
20 _Comment=Pasaffe password manager
21 Categories=GNOME;Utility;
22-Exec=pasaffe
23+Exec=pasaffe %f
24 Icon=pasaffe
25 Terminal=false
26 Type=Application
27+MimeType=application/x-psafe3
28
29=== modified file 'pasaffe/__init__.py'
30--- pasaffe/__init__.py 2016-02-17 23:57:19 +0000
31+++ pasaffe/__init__.py 2016-11-21 14:37:54 +0000
32@@ -33,7 +33,8 @@
33
34 def parse_options():
35 """Support for command line options"""
36- parser = optparse.OptionParser(version="%%prog %s" % get_version())
37+ parser = optparse.OptionParser(usage="Usage: %prog [filename] [options]",
38+ version="%%prog %s" % get_version())
39 parser.add_option(
40 "-v", "--verbose", action="count", dest="verbose",
41 help=_("Show debug messages (-vv debugs pasaffe_lib also)"))
42@@ -43,8 +44,9 @@
43 parser.add_option(
44 "-s", "--set-default", dest="set_default",
45 help=_("set database as default"), action='store_true')
46- (options, _args) = parser.parse_args()
47-
48+ (options, args) = parser.parse_args()
49+ if len(args) > 0 and options.filename is None:
50+ options.filename = args[0]
51 set_up_logging(options)
52 return options
53

Subscribers

People subscribed via source and target branches

to all changes: