Merge lp:~ballogy/gloobus-preview/gloobus-sushi into lp:gloobus-preview

[Balló György]

Megre gloobus-sushi into gloobus-preview

At the same time, the following changes happened:

- Port gloobus-sushi to pygobject 3.

- Port gloobus-preview-configuration and gloobus-sushi to python 3.

- Rename the service file to 'net.gloobus.Sushi.service', so it will be not in file conflict with sushi.

[lp:~ballogy/gloobus-preview/gloobus-sushi]

299. By Balló György on 2014-12-25

Move gloobus-sushi script to the common gloobus data dir

=== modified file 'configure.ac'
--- configure.ac	2014-12-25 16:21:13 +0000
+++ configure.ac	2014-12-25 16:26:14 +0000
@@ -20,6 +20,7 @@
 AC_PROG_LIBTOOL         # To create libraries
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET        # Compile more than one Makefiles
+AM_PATH_PYTHON([3.0])
 
 # *** checks for boost ******************************************************* #
 AX_BOOST_BASE([1.39.0])
@@ -91,6 +92,7 @@
     src/plugin-xps/Makefile
     src/loaders/PSD/Makefile
     src/loaders/XCF/Makefile
+    src/gloobus-sushi/Makefile
     data/Makefile
     data/images/Makefile
     data/gtkrc/Makefile

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2010-01-13 18:08:07 +0000
+++ data/Makefile.am	2014-12-25 16:26:14 +0000
@@ -3,6 +3,16 @@
 desktopdir = $(datadir)/applications
 desktop_DATA = gloobus-preview.desktop
 
+servicedir = $(datadir)/dbus-1/services
+service_in_files = net.gloobus.Sushi.service.in
+service_DATA = $(service_in_files:.service.in=.service)
+
+net.gloobus.Sushi.service: net.gloobus.Sushi.service.in Makefile
+	$(AM_V_GEN) sed -e "s|\@bindir\@|$(bindir)|" $< > $@
+
 EXTRA_DIST = \
-	$(desktop_DATA)
+	$(desktop_DATA) \
+	$(service_in_files)
 
+CLEANFILES = \
+	$(service_DATA)

=== added file 'data/net.gloobus.Sushi.service.in'
--- data/net.gloobus.Sushi.service.in	1970-01-01 00:00:00 +0000
+++ data/net.gloobus.Sushi.service.in	2014-12-25 16:26:14 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.gnome.NautilusPreviewer
+Exec=@bindir@/gloobus-sushi

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2014-12-25 16:21:13 +0000
+++ src/Makefile.am	2014-12-25 16:26:14 +0000
@@ -1,4 +1,5 @@
 SUBDIRS = \
+    gloobus-sushi \
     loaders/PSD \
     loaders/XCF \
     plugin-comic \

=== modified file 'src/gloobus-preview-configuration'
--- src/gloobus-preview-configuration	2014-12-23 10:46:19 +0000
+++ src/gloobus-preview-configuration	2014-12-25 16:26:14 +0000
@@ -1,8 +1,8 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 #  Gloobus-config by BadChoice <[e-mail]>
 
-import ConfigParser
+import configparser
 import os
 import sys
 import glob
@@ -43,16 +43,16 @@
 	#================= PREDEFINED MACROS =======================#
 	def debug(self,string):
 		if self.debugMode:
-			print self.level('debug') + "[DEBUG] " + self.level('reset') + string
+			print(self.level('debug') + "[DEBUG] " + self.level('reset') + string)
 
 	def info(self,string):
-		print self.level('info') + "[INFO] " + self.level('reset') + string
+		print(self.level('info') + "[INFO] " + self.level('reset') + string)
 	
 	def warning(self,string):
-		print self.level('warning') + "[WARNING] " + self.level('reset') + string
+		print(self.level('warning') + "[WARNING] " + self.level('reset') + string)
 	
 	def error(self,string):
-		print self.level('error') + "[ERROR] " + self.level('reset') + string	
+		print(self.level('error') + "[ERROR] " + self.level('reset') + string)	
 
 
 #=========================== CLASS GUI =======================================================#
@@ -70,9 +70,9 @@
 		
 		schema_source = Gio.SettingsSchemaSource.get_default()
 		wm_schema =Gio.SettingsSchemaSource.lookup(schema_source, "org.gnome.desktop.wm.preferences", False)
-        	if wm_schema:
-                	wm_settings = Gio.Settings.new("org.gnome.desktop.wm.preferences")
-                	self.gsettings_win_layout = wm_settings.get_string("button-layout")
+		if wm_schema:
+			wm_settings = Gio.Settings.new("org.gnome.desktop.wm.preferences")
+			self.gsettings_win_layout = wm_settings.get_string("button-layout")
 
 		#================= Show In Taskbar ================= #
 		self.entry1 = Gtk.CheckButton(label=_("Show in TaskBar"), use_underline=False)  
@@ -163,7 +163,7 @@
 #==================================== GLOBAL FUNCTIONS ===============================================#		
 #=================== DEFAULT CONFIGURATION ================== #			
 def config_default():
-	config = ConfigParser.SafeConfigParser()
+	config = configparser.SafeConfigParser()
 
 	config.add_section('Main')
 	config.add_section('Theme')
@@ -177,17 +177,17 @@
 	return config
 
 def config_save(conf):
-    if not os.path.isfile(CONFIG_PATH):
-        p = os.path.dirname(CONFIG_PATH)
-        g.debug(_('Configuration dir path') + ": " + p)
-        if not os.path.exists(p):
-            g.warning(_("Creating configuration directory"))
-            os.makedirs(p)
-    
-    f = open(CONFIG_PATH, 'wb')
-    conf.write(f)
-    f.close()
-    g.debug('Configuration saved')
+	if not os.path.isfile(CONFIG_PATH):
+		p = os.path.dirname(CONFIG_PATH)
+		g.debug(_('Configuration dir path') + ": " + p)
+		if not os.path.exists(p):
+			g.warning(_("Creating configuration directory"))
+			os.makedirs(p)
+
+	f = open(CONFIG_PATH, 'w')
+	conf.write(f)
+	f.close()
+	g.debug('Configuration saved')
 
 # ================== LOAD CONFIG ================#
 def config_load():
@@ -221,12 +221,12 @@
 
 
 
-try:        
+try:
 	if sys.argv[1] == "--debug":
-        	g.set_debug(True)
+		g.set_debug(True)
 		debug=True
 		g.info(_("MODE DEBUG:ON"))
-               
+
 except:
 	g.info(_("MODE DEBUG:OFF"))
 

=== added directory 'src/gloobus-sushi'
=== added file 'src/gloobus-sushi/Makefile.am'
--- src/gloobus-sushi/Makefile.am	1970-01-01 00:00:00 +0000
+++ src/gloobus-sushi/Makefile.am	2014-12-25 16:26:14 +0000
@@ -0,0 +1,22 @@
+do_subst = sed \
+	-e s![@]PYTHON[@]![@]PYTHON[@]! 	\
+	-e s![@]prefix[@]!$(prefix)!g		\
+	-e s![@]sysconfdir[@]!$(sysconfdir)!g		\
+	-e s![@]datadir[@]!$(datadir)!g		\
+	-e s![@]pkgdatadir[@]!$(pkgdatadir)!g	\
+	-e s![@]libexecdir[@]!$(libexecdir)!g	\
+	-e s![@]libdir[@]!$(libdir)!g		\
+	-e s![@]PACKAGE[@]!$(PACKAGE)!g		\
+	-e s![@]VERSION[@]!$(VERSION)!g		\
+	-e s![@]REVNO[@]!$(REVNO)!g
+	
+bin_SCRIPTS = gloobus-sushi
+
+gloobussushidir = $(datadir)/gloobus
+gloobussushi_PYTHON = gloobus-sushi.py
+
+EXTRA_DIST = gloobus-sushi.in
+
+gloobus-sushi: gloobus-sushi.in
+	$(AM_V_GEN) $(do_subst) $< > $@
+	chmod +x $@

=== added file 'src/gloobus-sushi/gloobus-sushi.in'
--- src/gloobus-sushi/gloobus-sushi.in	1970-01-01 00:00:00 +0000
+++ src/gloobus-sushi/gloobus-sushi.in	2014-12-25 16:26:14 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+python3 @datadir@/gloobus/gloobus-sushi.py

=== added file 'src/gloobus-sushi/gloobus-sushi.py'
--- src/gloobus-sushi/gloobus-sushi.py	1970-01-01 00:00:00 +0000
+++ src/gloobus-sushi/gloobus-sushi.py	2014-12-25 16:26:14 +0000
@@ -0,0 +1,51 @@
+# Copyright (C) 2009-2010 Gloobus Developers
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version 2
+#of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+import dbus
+import dbus.service
+from gi.repository import GObject
+import os
+
+from dbus.mainloop.glib import DBusGMainLoop
+
+DBUS_NAME = 'org.gnome.NautilusPreviewer'
+DBUS_PATH = '/org/gnome/NautilusPreviewer'
+
+class DBusWrapper(dbus.service.Object):
+    def __init__(self):
+        bus_name = dbus.service.BusName(DBUS_NAME, bus=dbus.SessionBus())
+        super(DBusWrapper, self).__init__(bus_name, DBUS_PATH)
+        self.loop = GObject.MainLoop()
+        self.loop.run()
+
+    @dbus.service.method(DBUS_NAME)
+    def Activate(self):
+        print('gloobus-sushi: activate')
+
+    @dbus.service.method(DBUS_NAME, in_signature='sib')
+    def ShowFile(self, uri, xid, closeIfAlreadyShown):
+        print('gloobus-sushi:', uri)
+        os.system('gloobus-preview "%s" &' % uri)
+
+    @dbus.service.method(DBUS_NAME)
+    def Close(self):
+        print('gloobus-sushi: quit')
+        self.loop.quit()
+
+
+if __name__ == '__main__':
+    DBusGMainLoop(set_as_default=True)
+    wrapper = DBusWrapper()