Merge lp:~nataliabidart/magicicada-client/snapping into lp:magicicada-client

[Natalia Bidart]

- Initial work on snapping the client.

[lp:~nataliabidart/magicicada-client/snapping]

1431. By Natalia Bidart on 2016-09-02

Debugging.

Unmerged revisions

1431. By Natalia Bidart on 2016-09-02

Debugging.

1430. By Natalia Bidart on 2016-08-30

Initial work on snapping the client.

=== added file '.snapcraft.yaml'
--- .snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ .snapcraft.yaml	2016-09-02 00:06:46 +0000
@@ -0,0 +1,33 @@
+name: magicicada-client
+version: 0.1
+summary: The client for the Magicicada filesync service (ex-Ubuntu One).
+description: Magicicada is an open source fork of the original Ubuntu One filesync service.
+confinement: devmode
+
+apps:
+  syncdaemon:
+    command: ./bin/ubuntuone-syncdaemon
+    daemon: simple
+
+parts:
+    magicicada-protocol:
+        plugin: python2
+        source: lp:magicicada-protocol
+        build-packages:
+            - protobuf-compiler
+    magicicada-client:
+        plugin: python2
+        source: .
+        stage-packages:
+            - gir1.2-notify-0.7
+            - gir1.2-soup-2.4
+            - python-configglue
+            - python-dirspec
+            - python-distutils-extra
+            - python-gi
+            - python-httplib2
+            - python-protobuf
+            - python-pyinotify
+            - python-qt4-dbus
+            - python-qt4reactor
+            - python-twisted
 
=== modified file 'HACKING'
--- HACKING	2015-09-29 21:05:26 +0000
+++ HACKING	2016-09-02 00:06:46 +0000
@@ -5,7 +5,7 @@
 
 Or you can simply bootstrap and everything will happen automagically:
 
-$: make boostrap
+$: make bootstrap
 
 After configuring, in order to run the tests, all you need to do is run
 make check.
 
=== modified file 'data/com.ubuntuone.SyncDaemon.service.in'
--- data/com.ubuntuone.SyncDaemon.service.in	2009-06-17 16:08:17 +0000
+++ data/com.ubuntuone.SyncDaemon.service.in	2016-09-02 00:06:46 +0000
@@ -1,4 +1,3 @@
 [D-BUS Service]
 Name=com.ubuntuone.SyncDaemon
 Exec=@libexecdir@/ubuntuone-syncdaemon
-
 
=== removed file 'data/logging.conf.in'
--- data/logging.conf.in	2009-12-23 22:05:44 +0000
+++ data/logging.conf.in	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-[logging]
-level.default = @LOG_LEVEL@
-level.parser = log_level
-level.help = Set the log level (TRACE, DEBUG, INFO, WARNING, ERROR, NOTE 
-    CRITICAL, FATAL)
-
-file_size.default = @LOG_FILE_SIZE@
-file_size.parser = int
-file_size.help = max file size (the file will be rotated)
-
-backup_count.default = 5
-backup_count.parser = int
-backup_count.help = number of rotated log files to keep around.
 
=== removed file 'data/source_ubuntuone-client.py'
--- data/source_ubuntuone-client.py	2013-01-31 20:35:21 +0000
+++ data/source_ubuntuone-client.py	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-# Copyright 2009-2013 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Stub for Apport"""
-
-from __future__ import print_function, unicode_literals
-
-import apport
-import os
-
-from apport.hookutils import attach_file_if_exists
-from dirspec.basedir import xdg_cache_home, xdg_config_home
-
-# Paths where things we might want live
-u1_log_path = os.path.join(xdg_cache_home, b"ubuntuone", b"log")
-u1_user_config_path = os.path.join(xdg_config_home, b"ubuntuone")
-# things we may want to collect for the report
-u1_client_log = os.path.join(u1_log_path, b"syncdaemon.log")
-u1_except_log = os.path.join(u1_log_path, b"syncdaemon-exceptions.log")
-u1_invalidnames_log = os.path.join(u1_log_path, b"syncdaemon-invalid-names.log")
-u1_sd_conf = os.path.join(b"etc", b"xdg", b"ubuntuone", b"syncdaemon.conf")
-u1_usersd_conf = os.path.join(u1_user_config_path, b"syncdaemon.conf")
-
-
-def add_info(report):
-    """add report info"""
-    attach_file_if_exists(report, u1_except_log,
-                                  "UbuntuOneSyncdaemonExceptionsLog")
-    attach_file_if_exists(report, u1_invalidnames_log,
-                                  "UbuntuOneSyncdaemonInvalidNamesLog")
-    attach_file_if_exists(report, u1_usersd_conf,
-                                  "UbuntuOneUserSyncdaemonConfig")
-    attach_file_if_exists(report, u1_sd_conf,
-                                  "UbuntuOneSyncdaemonConfig")
-
-    if not apport.packaging.is_distro_package(report['Package'].split()[0]):
-        report['ThirdParty'] = 'True'
-        report['CrashDB'] = 'ubuntuone'
 
=== modified file 'data/syncdaemon.conf'
--- data/syncdaemon.conf	2015-09-29 02:25:44 +0000
+++ data/syncdaemon.conf	2016-09-02 00:06:46 +0000
@@ -52,8 +52,7 @@
 send_events_over_dbus.default = False
 send_events_over_dbus.parser = bool
 send_events_over_dbus.action = store_true
-send_events_over_dbus.help = Enable sending "Event" singals for each internal 
-    event
+send_events_over_dbus.help = Enable sending "Event" singals for each internal event
 
 handshake_timeout.default = 50
 handshake_timeout.parser = int
 
=== removed file 'data/ubuntuone-client-crashdb.conf'
--- data/ubuntuone-client-crashdb.conf	2009-08-05 18:01:19 +0000
+++ data/ubuntuone-client-crashdb.conf	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-ubuntuone = {
-        'impl' : 'launchpad',
-        'project' : 'ubuntuone-client',
-        'bug_pattern_base' : None,
-}
 
=== modified file 'dependencies.txt'
--- dependencies.txt	2016-07-13 22:12:48 +0000
+++ dependencies.txt	2016-09-02 00:06:46 +0000
@@ -1,4 +1,4 @@
-gir1.2-notify
+gir1.2-notify-0.7
 gir1.2-soup-2.4
 protobuf-compiler
 python-configglue
 
=== modified file 'setup.py' (properties changed: +x to -x)
--- setup.py	2016-08-06 20:02:14 +0000
+++ setup.py	2016-09-02 00:06:46 +0000
@@ -1,252 +1,26 @@
-#!/usr/bin/python
-#
-# Copyright 2013 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-#
-# In addition, as a special exception, the copyright holders give
-# permission to link the code of portions of this program with the
-# OpenSSL library under certain conditions as described in each
-# individual source file, and distribute linked combinations
-# including the two.
-# You must obey the GNU General Public License in all respects
-# for all of the code used other than OpenSSL.  If you modify
-# file(s) with this exception, you may extend this exception to your
-# version of the file(s), but you are not obligated to do so.  If you
-# do not wish to do so, delete this exception statement from your
-# version.  If you delete this exception statement from all source
-# files in the program, then also delete it here.
-"""Setup.py: build, distribute, clean."""
-
 import os
-import sys
-
-try:
-    from DistUtilsExtra.command import build_extra, build_i18n
-    import DistUtilsExtra.auto
-except ImportError:
-    print >> sys.stderr, 'To build this program you need '\
-                         'https://launchpad.net/python-distutils-extra'
-    raise
-assert DistUtilsExtra.auto.__version__ >= '2.18', \
-    'needs DistUtilsExtra.auto >= 2.18'
-
-
-PROJECT_NAME = 'magicicada-client'
-VERSION = '1.0'
-
-POT_FILE = 'po/%s.pot' % PROJECT_NAME
-SERVICE_FILES = ['data/com.ubuntuone.Credentials.service',
-                 'data/com.ubuntuone.SyncDaemon.service']
-CONFIG_FILES = ['data/logging.conf']
-CLIENTDEFS = 'ubuntuone/clientdefs.py'
-
-BUILD_FILES = [CLIENTDEFS] + CONFIG_FILES
-CLEANFILES = [POT_FILE, 'MANIFEST'] + BUILD_FILES + SERVICE_FILES
-
-if int(VERSION.split('.')[1]) % 2 != 0:
-    LOG_LEVEL = 'DEBUG'
-    LOG_FILE_SIZE = '10485760'
-else:
-    LOG_LEVEL = 'INFO'
-    LOG_FILE_SIZE = '1048576'
-
-
-def replace_variables(files_to_replace, prefix=None, *args, **kwargs):
-    """Replace the @VERSION@ in the constants file with the actual version."""
-    for fname in files_to_replace:
-        with open(fname + '.in') as in_file:
-            content = in_file.read()
-            with open(fname, 'w') as out_file:
-                content = content.replace('@VERSION@', VERSION)
-                content = content.replace('@PROJECT_NAME@', PROJECT_NAME)
-                content = content.replace('@GETTEXT_PACKAGE@', PROJECT_NAME)
-                content = content.replace('@LOG_LEVEL@', LOG_LEVEL)
-                content = content.replace('@LOG_FILE_SIZE@', LOG_FILE_SIZE)
-                if prefix is not None:
-                    content = content.replace(
-                        '@localedir@', os.path.join(prefix,
-                                                    'share', 'locale'))
-                    content = content.replace(
-                        '@libexecdir@', os.path.join(prefix,
-                                                     'lib', PROJECT_NAME))
-                out_file.write(content)
-
-
-class Install(DistUtilsExtra.auto.install_auto):
-    """Class to install proper files."""
-
-    def run(self):
-        """Do the install.
-
-        Read from *.service.in and generate .service files by replacing
-        @prefix@ by self.prefix.
-
-        """
-
-        # Remove the contrib and tests packages from the packages list
-        # as they are not meant to be installed to the system.
-        pkgs = [x for x in self.distribution.packages if not (
-            x.startswith('contrib') or x.startswith('tests'))]
-        self.distribution.packages = pkgs
-
-        # Remove the input and dev files from the data files list,
-        # as they are not meant to be installed.
-        data_files = [x for x in self.distribution.data_files if not (
-            x[1][0].endswith('.in') or x[1][0].endswith('-dev.conf'))]
-        self.distribution.data_files = data_files
-
-        # Get just the prefix value, without the root
-        prefix = self.install_data.replace(
-            self.root if self.root is not None else '', '')
-        replace_variables(SERVICE_FILES, prefix)
-        DistUtilsExtra.auto.install_auto.run(self)
-        # Replace the CLIENTDEFS paths here, so that we can do it directly in
-        # the installed copy, rather than the lcoal copy. This allows us to
-        # have a semi-generated version for use in tests, and a full version
-        # for use in installed systems.
-        with open(CLIENTDEFS) as in_file:
-            content = in_file.read()
-            with open(os.path.join(self.install_purelib,
-                                   PROJECT_NAME,
-                                   CLIENTDEFS), 'w') as out_file:
-                content = content.replace(
-                    '@localedir@', os.path.join(prefix, 'share', 'locale'))
-                content = content.replace(
-                    '@libexecdir@', os.path.join(prefix, 'lib', PROJECT_NAME))
-                out_file.write(content)
-
-
-class Build(build_extra.build_extra):
-    """Build PyQt (.ui) files and resources."""
-
-    description = "build PyQt GUIs (.ui) and resources (.qrc)"
-
-    def run(self):
-        """Execute the command."""
-        replace_variables(BUILD_FILES)
-        build_extra.build_extra.run(self)
-
-
-class Clean(DistUtilsExtra.auto.clean_build_tree):
-    """Class to clean up after the build."""
-
-    def run(self):
-        """Clean up the built files."""
-        for built_file in CLEANFILES:
-            if os.path.exists(built_file):
-                os.unlink(built_file)
-
-        DistUtilsExtra.auto.clean_build_tree.run(self)
-
-
-class BuildLocale(build_i18n.build_i18n):
-    """Work around a bug in DistUtilsExtra."""
-
-    def run(self):
-        """Magic."""
-        build_i18n.build_i18n.run(self)
-        i = 0
-        for df in self.distribution.data_files:
-            if df[0].startswith('etc/xdg/'):
-                if sys.platform not in ('darwin', 'win32'):
-                    new_df = (df[0].replace('etc/xdg/', '/etc/xdg/'), df[1])
-                    self.distribution.data_files[i] = new_df
-                else:
-                    self.distribution.data_files.pop(i)
-            i += 1
-
-
-def set_py2exe_paths():
-    """Set the path so that py2exe finds the required modules."""
-    # Pylint does not understand same spaced imports
-    import win32com
-    try:
-        import py2exe.mf as modulefinder
-    except ImportError:
-        import modulefinder
-
-    # py2exe 0.6.4 introduced a replacement modulefinder.
-    # This means we have to add package paths there,
-    # not to the built-in one.  If this new modulefinder gets
-    # integrated into Python, then we might be able to revert
-    # this some day. If this doesn't work, try import modulefinder
-    for package_path in win32com.__path__[1:]:
-        modulefinder.AddPackagePath("win32com", package_path)
-    for extra_mod in ["win32com.server", "win32com.client"]:
-        __import__(extra_mod)
-        module = sys.modules[extra_mod]
-        for module_path in module.__path__[1:]:
-            modulefinder.AddPackagePath(extra_mod, module_path)
-
-
-cmdclass = {
-    'install': Install,
-    'build': Build,
-    'clean': Clean,
-    'build_i18n': BuildLocale,
-}
-
-bin_scripts = [
-    'bin/u1sdtool',
-    'bin/ubuntuone-launch',
-]
-
-libexec_scripts = [
-    'bin/ubuntuone-proxy-tunnel',
-    'bin/ubuntuone-syncdaemon',
-]
-
-data_files = []
-scripts = []
-
-if sys.platform == 'win32':
-    set_py2exe_paths()
-    extra = {
-        'options': {
-            'py2exe': {
-                'bundle_files': 1,
-                'skip_archive': 0,
-                'optimize': 1,
-                'dll_excludes': ["mswsock.dll", "powrprof.dll"],
-            },
-        },
-        # add the console script so that py2exe compiles it
-        'console': bin_scripts + libexec_scripts,
-        'zipfile': None,
-    }
-else:
-    data_files.extend([
-        ('lib/%s' % PROJECT_NAME, libexec_scripts),
-        ('share/dbus-1/services', SERVICE_FILES),
-        ('/etc/xdg/ubuntuone', CONFIG_FILES + ['data/syncdaemon.conf']),
-        ('/etc/apport/crashdb.conf.d', ['data/ubuntuone-client-crashdb.conf']),
-        ('share/apport/package-hooks', ['data/source_ubuntuone-client.py']),
-        ('share/man/man1', ['docs/man/u1sdtool.1']),
-    ])
-    scripts.extend(bin_scripts)
-    extra = {}
-
-DistUtilsExtra.auto.setup(
-    name=PROJECT_NAME,
-    version=VERSION,
-    license='GPL v3',
+
+from setuptools import setup, find_packages
+
+# Utility function to read the README file.
+# Used for the long_description.  It's nice, because now 1) we have a top level
+# README file and 2) it's easier to type in the README file than to put a raw
+# string in below ...
+def read(fname):
+    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+
+
+setup(
+    name='magicicada-client',
+    version='0.1',
     author='Chicharreros',
-    author_email='magicicada-hackers@@lists.launchpad.net',
-    description='Magicicada file synchronization client',
-    url='https://launchpad.net/%s' % PROJECT_NAME,
-    extra_path=PROJECT_NAME,
-    scripts=scripts,
-    data_files=data_files,
-    cmdclass=cmdclass,
-    **extra)
+    author_email='[e-mail]',
+    description='Magicicada filesync client',
+    license='GPL',
+    keywords='filesync',
+    url='https://launchpad.net/magicicada',
+    packages=find_packages(),
+    long_description=read('README'),
+    include_package_data=True,
+    scripts=['bin/ubuntuone-syncdaemon', 'bin/u1sdtool'],
+)
 
=== removed file 'ubuntuone-client.pth'
--- ubuntuone-client.pth	2013-06-10 19:27:21 +0000
+++ ubuntuone-client.pth	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-ubuntuone-client
 
=== modified file 'ubuntuone/platform/os_helper/linux.py'
--- ubuntuone/platform/os_helper/linux.py	2013-02-12 23:15:48 +0000
+++ ubuntuone/platform/os_helper/linux.py	2016-09-02 00:06:46 +0000
@@ -36,12 +36,7 @@
 import os
 import shutil
 
-try:
-    from gi.repository import Gio, GLib
-    has_gi = True
-except ImportError:
-    import gio
-    has_gi = False
+from gi.repository import GLib, GObject, Gio
 
 from ubuntuone.platform.os_helper import unix
 
@@ -55,22 +50,13 @@
 
     If had any error, or the system can't do it, just remove it.
     """
-    if has_gi:
-        not_supported = Gio.IOErrorEnum.NOT_SUPPORTED
-        try:
-            return_code = Gio.File.new_for_path(path).trash(None)
-        except GLib.GError:
-            exc = OSError()
-            exc.errno = errno.ENOENT
-            raise exc
-    else:
-        not_supported = gio.ERROR_NOT_SUPPORTED
-        try:
-            return_code = gio.File(path).trash()
-        except gio.Error:
-            exc = OSError()
-            exc.errno = errno.ENOENT
-            raise exc
+    not_supported = Gio.IOErrorEnum.NOT_SUPPORTED
+    try:
+        return_code = Gio.File.new_for_path(path).trash(None)
+    except GLib.GError:
+        exc = OSError()
+        exc.errno = errno.ENOENT
+        raise exc
 
     if not return_code or return_code == not_supported:
         logger.warning("Problems moving to trash! (%s) Removing anyway: %r",
@@ -83,12 +69,7 @@
 
 def set_application_name(app_name):
     """Set the name of the application."""
-    if has_gi:
-        from gi.repository import GObject
-        GObject.set_application_name(app_name)
-    else:
-        import gobject
-        gobject.set_application_name(app_name)
+    GObject.set_application_name(app_name)
 
 
 set_no_rights = unix.set_no_rights