1
=== modified file 'ubuntuone/status/aggregator.py'
2
--- ubuntuone/status/aggregator.py	2012-04-09 20:07:05 +0000
3
+++ ubuntuone/status/aggregator.py	2014-04-16 18:20:57 +0000
4
@@ -49,6 +49,8 @@
5
49
Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
49
Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
6
50
50
7
51
UBUNTUONE_TITLE = Q_("Ubuntu One")
51
UBUNTUONE_TITLE = Q_("Ubuntu One")
8
52
UBUNTUONE_END = Q_("Ubuntu One file services will be "
9
53
                   "shutting down on June 1st, 2014.\nThanks for your support.")
10
52
NEW_UDFS_SENDER = Q_("New cloud folder(s) available")
54
NEW_UDFS_SENDER = Q_("New cloud folder(s) available")
11
53
FINAL_COMPLETED = Q_("File synchronization completed.")
55
FINAL_COMPLETED = Q_("File synchronization completed.")
12
54
56
13
@@ -805,6 +807,12 @@
14
805
        self.notification = self.aggregator.get_notification()
807
        self.notification = self.aggregator.get_notification()
15
806
        self.messaging = Messaging()
808
        self.messaging = Messaging()
16
807
        self.quota_timer = None
809
        self.quota_timer = None
17
810
        self.farewell_ubuntuone_sync()
18
811
19
812
    def farewell_ubuntuone_sync(self):
20
813
        """Show notification about the upcoming end of UbuntuOne sync."""
21
814
        self.notification.send_notification(
22
815
            UBUNTUONE_TITLE, UBUNTUONE_END)
23
808
816
24
809
    def file_published(self, public_url):
817
    def file_published(self, public_url):
25
810
        """A file was published."""
818
        """A file was published."""
26
811
819
27
=== modified file 'ubuntuone/syncdaemon/main.py'
28
--- ubuntuone/syncdaemon/main.py	2012-04-09 20:08:42 +0000
29
+++ ubuntuone/syncdaemon/main.py	2014-04-16 18:20:57 +0000
30
@@ -31,6 +31,7 @@
31
31
import logging
31
import logging
32
32
import os
32
import os
33
33
import sys
33
import sys
34
34
import datetime
35
34
35
36
35
from twisted.internet import defer, reactor, task
36
from twisted.internet import defer, reactor, task
37
36
37
38
@@ -106,53 +107,60 @@
39
106
        if not throttling_enabled:
107
        if not throttling_enabled:
40
107
            throttling_enabled = user_config.get_throttling()
108
            throttling_enabled = user_config.get_throttling()
41
108
109
89
109
        self.logger.info("Starting Ubuntu One client version %s",
110
        end_date = datetime.date(2014, 6, 1)
90
110
                         clientdefs.VERSION)
111
        if datetime.date.today() < end_date:
91
111
        self.logger.info("Using %r as root dir", self.root_dir)
112
            self.logger.info("Starting Ubuntu One client version %s",
92
112
        self.logger.info("Using %r as data dir", self.data_dir)
113
                             clientdefs.VERSION)
93
113
        self.logger.info("Using %r as shares root dir", self.shares_dir)
114
            self.logger.info("Using %r as root dir", self.root_dir)
94
114
        self.db = tritcask.Tritcask(native_path(tritcask_dir))
115
            self.logger.info("Using %r as data dir", self.data_dir)
95
115
        self.vm = volume_manager.VolumeManager(self)
116
            self.logger.info("Using %r as shares root dir", self.shares_dir)
96
116
        self.fs = filesystem_manager.FileSystemManager(
117
            self.db = tritcask.Tritcask(native_path(tritcask_dir))
97
117
            data_dir, partials_dir, self.vm, self.db)
118
            self.vm = volume_manager.VolumeManager(self)
98
118
        self.event_q = event_queue.EventQueue(self.fs, ignore_files)
119
            self.fs = filesystem_manager.FileSystemManager(
99
119
        self.fs.register_eq(self.event_q)
120
                data_dir, partials_dir, self.vm, self.db)
100
120
121
            self.event_q = event_queue.EventQueue(self.fs, ignore_files)
101
121
        # subscribe VM to EQ, to be unsubscribed in shutdown
122
            self.fs.register_eq(self.event_q)
102
122
        self.event_q.subscribe(self.vm)
123
103
123
        self.vm.init_root()
124
            # subscribe VM to EQ, to be unsubscribed in shutdown
104
124
125
            self.event_q.subscribe(self.vm)
105
125
        # we don't have the oauth tokens yet, we 'll get them later
126
            self.vm.init_root()
106
126
        self.action_q = action_queue.ActionQueue(self.event_q, self,
127
107
127
                                                 host, port,
128
            # we don't have the oauth tokens yet, we 'll get them later
108
128
                                                 dns_srv, ssl,
129
            self.action_q = action_queue.ActionQueue(self.event_q, self,
109
129
                                                 disable_ssl_verify,
130
                                                     host, port,
110
130
                                                 read_limit, write_limit,
131
                                                     dns_srv, ssl,
111
131
                                                 throttling_enabled)
132
                                                     disable_ssl_verify,
112
132
        self.hash_q = hash_queue.HashQueue(self.event_q)
133
                                                     read_limit, write_limit,
113
133
        events_nanny.DownloadFinishedNanny(self.fs, self.event_q, self.hash_q)
134
                                                     throttling_enabled)
114
134
135
            self.hash_q = hash_queue.HashQueue(self.event_q)
115
135
        # call StateManager after having AQ
136
            events_nanny.DownloadFinishedNanny(self.fs, self.event_q,
116
136
        self.state_manager = StateManager(self, handshake_timeout)
137
                                               self.hash_q)
117
137
138
118
138
        self.sync = sync.Sync(self)
139
            # call StateManager after having AQ
119
139
        self.lr = local_rescan.LocalRescan(self.vm, self.fs,
140
            self.state_manager = StateManager(self, handshake_timeout)
120
140
                                           self.event_q, self.action_q)
141
121
141
142
            self.sync = sync.Sync(self)
122
142
        self.external = SyncdaemonService(main=self,
143
            self.lr = local_rescan.LocalRescan(self.vm, self.fs,
123
143
                                          send_events=broadcast_events)
144
                                               self.event_q, self.action_q)
124
144
        self.external.oauth_credentials = oauth_credentials
145
125
145
        if user_config.get_autoconnect():
146
            self.external = SyncdaemonService(main=self,
126
146
            self.external.connect(autoconnecting=True)
147
                                              send_events=broadcast_events)
127
147
148
            self.external.oauth_credentials = oauth_credentials
128
148
        self.eventlog_listener = None
149
            if user_config.get_autoconnect():
129
149
        self.start_event_logger()
150
                self.external.connect(autoconnecting=True)
130
150
151
131
151
        self.status_listener = None
152
            self.eventlog_listener = None
132
152
        self.start_status_listener()
153
            self.start_event_logger()
133
153
154
134
154
        self.mark = task.LoopingCall(self.log_mark)
155
            self.status_listener = None
135
155
        self.mark.start(mark_interval)
156
            self.start_status_listener()
136
157
137
158
            self.mark = task.LoopingCall(self.log_mark)
138
159
            self.mark.start(mark_interval)
139
160
        else:
140
161
            if reactor.running:
141
162
                reactor.stop()
142
163
            sys.exit(0)
143
156
164
144
157
    def start_event_logger(self):
165
    def start_event_logger(self):
145
158
        """Start the event logger if it's available for this platform."""
166
        """Start the event logger if it's available for this platform."""
Reviewer	Review Type	Date Requested	Status
dobey (community)		2014-04-16	Approve on 2014-04-16
Review via email: mp+216181@code.launchpad.net