Merge lp:~mterry/deja-dup/drop-u1 into lp:deja-dup/30

[Michael Terry]

Drop support for Ubuntu One.

Now that Ubuntu One is going away, we shouldn't act like it's available for users. This branch removes it from the UI, unless the user is already configured for it. Then, we continue to show it, but with a warning message in the preference dialog and an error when the user tries to back up or restore.

[lp:~mterry/deja-dup/drop-u1]

1536. By Michael Terry on 2014-04-02

Drop ubuntuone backend package

[Robert Bruce Park (robru)]

A surgical extraction of U1, indeed.

review: Approve

=== modified file 'data/org.gnome.DejaDup.gschema.xml.in'
--- data/org.gnome.DejaDup.gschema.xml.in	2013-10-15 04:36:06 +0000
+++ data/org.gnome.DejaDup.gschema.xml.in	2014-04-02 18:47:53 +0000
@@ -75,7 +75,6 @@
     </key>
     <child name="rackspace" schema="org.gnome.DejaDup.Rackspace"/>
     <child name="s3" schema="org.gnome.DejaDup.S3"/>
-    <child name="u1" schema="org.gnome.DejaDup.U1"/>
     <child name="file" schema="org.gnome.DejaDup.File"/>
   </schema>
   <schema id="org.gnome.DejaDup.S3" path="/org/gnome/deja-dup/s3/">
@@ -107,13 +106,6 @@
       <_description>This is your username for the Rackspace Cloud Files service.</_description>
     </key>
   </schema>
-  <schema id="org.gnome.DejaDup.U1" path="/org/gnome/deja-dup/u1/">
-    <key name="folder" type="s">
-      <default>'/deja-dup/$HOSTNAME'</default>
-      <_summary>The Ubuntu One folder</_summary>
-      <_description>The folder name to store files in.  If ‘$HOSTNAME’, it will default to a folder based on the name of the computer.</_description>
-    </key>
-  </schema>
   <schema id="org.gnome.DejaDup.File" path="/org/gnome/deja-dup/file/">
     <key name="path" type="s">
       <default>''</default>
 
=== modified file 'debian/control'
--- debian/control	2014-01-24 16:07:59 +0000
+++ debian/control	2014-04-02 18:47:53 +0000
@@ -36,15 +36,14 @@
             policykit-1,
 Suggests: deja-dup-backend-cloudfiles,
           deja-dup-backend-s3,
-          deja-dup-backend-ubuntuone,
 Description: Back up your files
  Déjà Dup is a simple backup tool. It hides the complexity of backing up the
  Right Way (encrypted, off-site, and regular) and uses duplicity as the
  backend.
  .
  Features:
-  * Support for local, remote, or cloud backup locations, such as Amazon S3,
-    Rackspace Cloud Files, and Ubuntu One
+  * Support for local, remote, or cloud backup locations, such as Amazon S3 and
+    Rackspace Cloud Files
   * Securely encrypts and compresses your data
   * Incrementally backs up, letting you restore from any particular backup
   * Schedules regular backups
@@ -85,18 +84,3 @@
  backend.
  .
  This package adds Amazon S3 support to Déjà Dup.
-
-Package: deja-dup-backend-ubuntuone
-Architecture: all
-Depends: ${misc:Depends},
-         deja-dup,
-         python-httplib2,
-         python-oauthlib,
-         ubuntuone-client,
-         ubuntuone-control-panel,
-Description: Ubuntu One support for Déjà Dup
- Déjà Dup is a simple backup tool. It hides the complexity of backing up the
- Right Way (encrypted, off-site, and regular) and uses duplicity as the
- backend.
- .
- This package adds Ubuntu One support to Déjà Dup.
 
=== modified file 'deja-dup/MountOperationAssistant.vala'
--- deja-dup/MountOperationAssistant.vala	2013-10-18 18:36:51 +0000
+++ deja-dup/MountOperationAssistant.vala	2014-04-02 18:47:53 +0000
@@ -26,7 +26,7 @@
  * 2) Or by driving the authentication themselves in some secret way.  If so,
  *    they will ask for a button to be shown to start the authentication.
  *    When they are done, they will set the 'go_forward' property to true.
- *    This is used by the U1 backend.
+ *    This was used by the U1 backend.
  */
 
 public class MountOperationAssistant : MountOperation
 
=== modified file 'deja-dup/deja-dup.appdata.xml.in'
--- deja-dup/deja-dup.appdata.xml.in	2013-11-08 03:25:36 +0000
+++ deja-dup/deja-dup.appdata.xml.in	2014-04-02 18:47:53 +0000
@@ -7,7 +7,7 @@
     <description>
         <_p>Déjà Dup is a simple backup tool. It hides the complexity of backing up the Right Way (encrypted, off-site, and regular) and uses duplicity as the backend.</_p>
         <ul>
-            <_li>Support for local, remote, or cloud backup locations, such as Amazon S3, Rackspace Cloud Files, and Ubuntu One</_li>
+            <_li>Support for local, remote, or cloud backup locations, such as Amazon S3 and Rackspace Cloud Files</_li>
             <_li>Securely encrypts and compresses your data</_li>
             <_li>Incrementally backs up, letting you restore from any particular backup</_li>
             <_li>Schedules regular backups</_li>
 
=== modified file 'deja-dup/widgets/ConfigLabelLocation.vala'
--- deja-dup/widgets/ConfigLabelLocation.vala	2013-01-27 20:30:52 +0000
+++ deja-dup/widgets/ConfigLabelLocation.vala	2014-04-02 18:47:53 +0000
@@ -26,7 +26,6 @@
   Gtk.Image img;
   FilteredSettings file_root;
   FilteredSettings s3_root;
-  FilteredSettings u1_root;
   FilteredSettings rackspace_root;
 
   public ConfigLabelLocation()
@@ -40,7 +39,6 @@
     watch_key(BACKEND_KEY);
     watch_key(null, (file_root = DejaDup.get_settings(FILE_ROOT)));
     watch_key(null, (s3_root = DejaDup.get_settings(S3_ROOT)));
-    watch_key(null, (u1_root = DejaDup.get_settings(U1_ROOT)));
     watch_key(null, (rackspace_root = DejaDup.get_settings(RACKSPACE_ROOT)));
     set_from_config.begin();
   }
 
=== modified file 'deja-dup/widgets/ConfigLocation.vala'
--- deja-dup/widgets/ConfigLocation.vala	2013-10-19 17:43:57 +0000
+++ deja-dup/widgets/ConfigLocation.vala	2014-04-02 18:47:53 +0000
@@ -179,7 +179,9 @@
   }
 
   void insert_u1() {
-    insert_cloud_if_available("u1", BackendU1.get_checker(),
+    // No longer functional.
+    // Only shown if user already had it configured, for migration purposes.
+    insert_cloud_if_available("u1", null,
                               new ThemedIcon.from_names({"ubuntuone",
                                                          "ubuntuone-installer",
                                                          "deja-dup-cloud"}),
@@ -196,18 +198,18 @@
                               ref index_rackspace, insert_rackspace);
   }
 
-  void insert_cloud_if_available(string id, Checker checker,
+  void insert_cloud_if_available(string id, Checker? checker,
                                  Icon icon, string name,
-                                 Gtk.Widget w, ref int index,
+                                 Gtk.Widget? w, ref int index,
                                  CloudCallback cb)
   {
     var backend = Backend.get_default_type();
-    if (backend == id || (checker.complete && checker.available)) {
+    if (backend == id || (checker != null && checker.complete && checker.available)) {
       index = add_entry(icon, name, Group.CLOUD, w);
       if (index_cloud_sep == -2)
         index_cloud_sep = add_separator(Group.CLOUD_SEP);
     }
-    else if (!checker.complete) {
+    else if (checker != null && !checker.complete) {
       // Call ourselves when we've got enough information.  Also make sure to
       // set from config again, in case in a previous set_from_config, we
       // weren't available in the combo yet.
 
=== modified file 'deja-dup/widgets/ConfigLocationU1.vala'
--- deja-dup/widgets/ConfigLocationU1.vala	2012-03-17 04:02:46 +0000
+++ deja-dup/widgets/ConfigLocationU1.vala	2014-04-02 18:47:53 +0000
@@ -28,9 +28,10 @@
   }
 
   construct {
-    var entry = new ConfigFolder(DejaDup.U1_FOLDER_KEY, DejaDup.U1_ROOT);
-    entry.set_accessible_name("U1Folder");
-    add_widget(_("_Folder"), entry);
+    var label = new Gtk.Label("");
+    label.set_markup("<b><big>%s</big></b>".printf(_("Ubuntu One has shut down.  Please choose another storage location.")));
+    label.margin_top = 20;
+    add_wide_widget(label);
   }
 }
 
 
=== modified file 'libdeja/BackendAuto.vala'
--- libdeja/BackendAuto.vala	2012-03-21 03:01:36 +0000
+++ libdeja/BackendAuto.vala	2014-04-02 18:47:53 +0000
@@ -50,7 +50,6 @@
 
   static bool started = false;
   static bool done = false;
-  Checker u1checker;
   Checker s3checker;
   construct {
     if (!started) {
@@ -59,10 +58,7 @@
       started = true;
       ref(); // Give us time to finish
 
-      // List is (in order): u1, s3, file
-      u1checker = BackendU1.get_checker();
-      u1checker.notify["complete"].connect(examine_checkers);
-
+      // List is (in order): s3, file
       s3checker = BackendS3.get_checker();
       s3checker.notify["complete"].connect(examine_checkers);
 
@@ -75,16 +71,11 @@
     if (done)
       return;
 
-    if (u1checker.complete) {
-      if (u1checker.available) {
-        finish("u1");
-      }
-      else if (s3checker.complete) {
-        if (s3checker.available)
-          finish("s3");
-        else
-          finish("file");
-      }
+    if (s3checker.complete) {
+      if (s3checker.available)
+        finish("s3");
+      else
+        finish("file");
     }
   }
 
 
=== modified file 'libdeja/BackendU1.vala'
--- libdeja/BackendU1.vala	2012-11-05 15:17:28 +0000
+++ libdeja/BackendU1.vala	2014-04-02 18:47:53 +0000
@@ -21,295 +21,33 @@
 
 namespace DejaDup {
 
-public const string U1_ROOT = "U1";
-public const string U1_FOLDER_KEY = "folder";
-
-class Listener : Object
-{
-  public delegate void Handler(string name, Variant args);
-  public DBusProxy proxy {get; construct;}
-  public string method {get; construct;}
-  public Variant args {get; construct;}
-  public unowned Handler handler {get; set;}
-
-  public Listener(DBusProxy proxy, string method, Variant? args, Handler handler)
-  {
-    Object(proxy: proxy, method: method, args: args);
-    this.handler = handler;
-  }
-
-  MainLoop loop;
-  construct {
-    loop = new MainLoop(null, false);
-  }
-
-  public void run()
-  {
-    Idle.add(() => {
-      call_but_quit_on_fail.begin();
-      return false;
-    });
-    proxy.g_signal.connect(handle_dbus_signal);
-    loop.run();
-    proxy.g_signal.disconnect(handle_dbus_signal);
-  }
-
-  async void call_but_quit_on_fail()
-  {
-    try {
-      yield proxy.call(method, args, DBusCallFlags.NONE, -1, null);
-    }
-    catch (Error e) {
-      warning("%s\n", e.message);
-      loop.quit();
-    }
-  }
-
-  void handle_dbus_signal(DBusProxy obj, string? sender, string name, Variant args)
-  {
-    // Stop on first signal
-    handler(name, args);
-    loop.quit();
-  }
-}
-
-class U1Checker : Checker
-{
-  PythonChecker pyu1;
-  construct {
-    try {
-      var proxy = BackendU1.get_creds_proxy();
-      if (proxy.get_name_owner() == null) {
-        available = false;
-        complete = true;
-      }
-    }
-    catch (Error e) {
-      warning("%s\n", e.message);
-      available = false;
-      complete = true;
-    }
-
-    if (!complete) {
-      // A bit of abstraction leakage here; we have to keep these imports in
-      // line with what duplicity uses.  Maybe we should add to duplicity a way
-      // to ask 'can I use this backend?'
-      pyu1 = PythonChecker.get_checker("oauthlib, httplib2");
-      if (pyu1.complete) {
-        available = pyu1.available;
-        complete = pyu1.complete;
-      }
-      else {
-        pyu1.notify["complete"].connect(() => {
-          available = pyu1.available;
-          complete = pyu1.complete;
-          pyu1 = null;
-        });
-      }
-    }
-  }
-}
-
 public class BackendU1 : Backend
 {
-  ulong button_handler = 0;
-
-  static Checker checker_instance = null;
-  public static Checker get_checker()
-  {
-    if (checker_instance == null)
-      checker_instance = new U1Checker();
-    return checker_instance;
-  }
-
   public override Backend clone() {
     return new BackendU1();
   }
 
-  ~BackendU1()
-  {
-    if (button_handler > 0) {
-      mount_op.disconnect(button_handler);
-      button_handler = 0;
-    }
-  }
-
   public override bool is_native() {
     return false;
   }
 
-  public override bool space_can_be_infinite() {
-    return false;
-  }
-
   public override Icon? get_icon() {
     return new ThemedIcon.from_names({"ubuntuone", "ubuntuone-installer", "deja-dup-cloud"});
   }
 
-  public override async bool is_ready(out string when) {
-    when = _("Backup will begin when a network connection becomes available.");
-    return yield Network.get().can_reach ("https://one.ubuntu.com/");
-  }
-
   public override string get_location(ref bool as_root)
   {
-    // The UI backend for duplicity needs to talk to our session dbus, but it
-    // can't as root.
-    as_root = false;
-
-    var settings = get_settings(U1_ROOT);
-    var folder = get_folder_key(settings, U1_FOLDER_KEY);
-    return "u1+http://%s".printf(folder);
+    return "";
   }
 
   public override string get_location_pretty()
   {
-    var settings = get_settings(U1_ROOT);
-    var folder = get_folder_key(settings, U1_FOLDER_KEY);
-    if (folder == "")
-      return _("Ubuntu One");
-    else
-      // Translators: %s is a folder.
-      return _("%s on Ubuntu One").printf(folder);
-  }
-
-  public override async uint64 get_space(bool free = true)
-  {
-    DBusProxy obj = null;
-    try {
-      obj = get_prefs_proxy();
-    }
-    catch (Error e) {
-      warning("%s\n", e.message);
-      return INFINITE_SPACE;
-    }
-
-    if (obj.get_name_owner() == null)
-      return INFINITE_SPACE;
-
-    uint64 total = INFINITE_SPACE;
-    uint64 used = 0;
-    var listener = new Listener(obj, "account_info", null, (name, args) => {
-      if (name == "AccountInfoReady") {
-        VariantIter iter;
-        args.get("(a{ss})", out iter);
-        string key, val;
-        while (iter.next("{ss}", out key, out val)) {
-          if (key == "quota_total")
-            total = uint64.parse(val);
-          else if (key == "quota_used")
-            used = uint64.parse(val);
-        }
-      }
-    });
-    listener.run();
-
-    if (free)
-      return (total > used) ? (total - used) : 0;
-    else
-      return total;
+    return _("Ubuntu One");
   }
 
   public override async void get_envp() throws Error
   {
-    var obj = get_creds_proxy();
-    if (obj.get_name_owner() == null) {
-      ask_password();
-      return;
-    }
-
-    var found = false;
-    var envp = new List<string>();
-    var listener = new Listener(obj, "find_credentials", null, (name, args) => {
-      if (name == "CredentialsFound") {
-        VariantIter iter;
-        args.get("(a{ss})", out iter);
-        string key, val;
-        string consumer_key = null, consumer_secret = null, token = null, token_secret = null;
-        while (iter.next("{ss}", out key, out val)) {
-          if (key == "consumer_key")
-            consumer_key = val;
-          else if (key == "consumer_secret")
-            consumer_secret = val;
-          else if (key == "token")
-            token = val;
-          else if (key == "token_secret")
-            token_secret = val;
-        }
-        if (consumer_key != null && consumer_secret != null && token != null && token_secret != null) {
-          envp.append("FTP_PASSWORD=%s:%s:%s:%s".printf(consumer_key, consumer_secret, token, token_secret));
-          found = true;
-        }
-      }
-    });
-    listener.run();
-
-    if (found)
-      envp_ready(true, envp);
-    else
-      ask_password();
-  }
-
-  void button_clicked()
-  {
-    sign_in.begin();
-  }
-
-  void ask_password() {
-    mount_op.set("label_title", _("Connect to Ubuntu One"));
-    mount_op.set("label_button", _("Sign into Ubuntu One…"));
-    if (button_handler == 0)
-      button_handler = Signal.connect_swapped(mount_op, "button-clicked",
-                                              (Callback)button_clicked, this);
-    mount_op.ask_password("", "", "", 0);
-  }
-
-  async void sign_in()
-  {
-    try {
-      var obj = get_creds_proxy();
-      if (obj.get_name_owner() == null) {
-        envp_ready(false, null);
-        return;
-      }
-
-      var listener = new Listener(obj, "login", new Variant("(a{ss})", null),
-                                  (name, args) => {
-        if (name == "CredentialsFound") {
-          mount_op.set("go_forward", true);
-          envp_ready(true, null);
-        }
-      });
-      listener.run();
-    }
-    catch (Error e) {
-      warning("%s\n", e.message);
-      envp_ready(false, null);
-    }
-  }
-
-  public static DBusProxy get_creds_proxy() throws Error
-  {
-    DBusProxy creds_proxy;
-    creds_proxy = new DBusProxy.for_bus_sync(BusType.SESSION,
-                                             DBusProxyFlags.NONE, null, 
-                                             "com.ubuntuone.Credentials",
-                                             "/credentials",
-                                             "com.ubuntuone.CredentialsManagement",
-                                             null);
-    return creds_proxy;
-  }
-
-  public static DBusProxy get_prefs_proxy() throws Error
-  {
-    DBusProxy prefs_proxy;
-    prefs_proxy = new DBusProxy.for_bus_sync(BusType.SESSION,
-                                             DBusProxyFlags.NONE, null, 
-                                             "com.ubuntuone.controlpanel",
-                                             "/preferences",
-                                             "com.ubuntuone.controlpanel.Preferences",
-                                             null);
-    return prefs_proxy;
+    throw new BackupError.BAD_CONFIG(_("Ubuntu One has shut down.  Please choose another storage location."));
   }
 }
 
 
=== modified file 'libdeja/tests/runner.vala'
--- libdeja/tests/runner.vala	2013-10-01 02:02:26 +0000
+++ libdeja/tests/runner.vala	2014-04-02 18:47:53 +0000
@@ -418,13 +418,6 @@
   if (keyfile.has_key(group, "RestoreDate"))
     br.restore_date = keyfile.get_string(group, "RestoreDate");
 
-  var type = keyfile.get_string(group, "Type");
-  if (type == "backup")
-    br.op = new DejaDup.OperationBackup();
-  else if (type == "restore")
-    br.op = new DejaDup.OperationRestore(restoredir, br.restore_date, br.restore_files);
-  else
-    assert_not_reached();
   if (keyfile.has_key(group, "Success"))
     br.success = keyfile.get_boolean(group, "Success");
   if (keyfile.has_key(group, "Canceled"))
@@ -465,6 +458,13 @@
       }
     }
   }
+  var type = keyfile.get_string(group, "Type");
+  if (type == "backup")
+    br.op = new DejaDup.OperationBackup();
+  else if (type == "restore")
+    br.op = new DejaDup.OperationRestore(restoredir, br.restore_date, br.restore_files);
+  else
+    assert_not_reached();
 }
 
 string get_string_field(KeyFile keyfile, string group, string key) throws Error
 
=== added file 'libdeja/tests/scripts/u1.test'
--- libdeja/tests/scripts/u1.test	1970-01-01 00:00:00 +0000
+++ libdeja/tests/scripts/u1.test	2014-04-02 18:47:53 +0000
@@ -0,0 +1,5 @@
+[Operation]
+Settings=backend='u1';
+Type=backup
+Success=false
+Error=Ubuntu One has shut down.  Please choose another storage location.