Ubuntu One Control Panel

Merge lp:~nataliabidart/ubuntuone-control-panel/shares-real-path into lp:ubuntuone-control-panel

  1. shares-real-path
  2. Merge into trunk
Proposed by Natalia Bidart
Status: Merged
Approved by: Natalia Bidart
Approved revision: 222
Merged at revision: 222
Proposed branch: lp:~nataliabidart/ubuntuone-control-panel/shares-real-path
Merge into: lp:ubuntuone-control-panel
Diff against target: 100 lines (+16/-7)
5 files modified
ubuntuone/controlpanel/backend.py (+1/-0)
ubuntuone/controlpanel/gui/qt/folders.py (+7/-4)
ubuntuone/controlpanel/gui/qt/tests/test_folders.py (+3/-1)
ubuntuone/controlpanel/gui/tests/__init__.py (+4/-2)
ubuntuone/controlpanel/tests/test_backend.py (+1/-0)
To merge this branch: bzr merge lp:~nataliabidart/ubuntuone-control-panel/shares-real-path
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Diego Sarmentero (community) Approve
Review via email: mp+74810@code.launchpad.net

Commit message

- Use real path for shares when building the QT UI (LP: #831424).

To post a comment you must log in.
Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/controlpanel/backend.py'
2--- ubuntuone/controlpanel/backend.py 2011-09-07 16:56:39 +0000
3+++ ubuntuone/controlpanel/backend.py 2011-09-09 15:06:40 +0000
4@@ -598,6 +598,7 @@
5 'list (%r).', vid, self._volumes[vid])
6 self._volumes[vid] = share
7
8+ share[u'realpath'] = share[u'path']
9 nicer_path = share[u'path'].replace(shares_dir, shares_dir_link)
10 share[u'path'] = nicer_path
11 share[u'subscribed'] = bool(share[u'subscribed'])
12
13=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
14--- ubuntuone/controlpanel/gui/qt/folders.py 2011-09-08 21:41:09 +0000
15+++ ubuntuone/controlpanel/gui/qt/folders.py 2011-09-09 15:06:40 +0000
16@@ -132,9 +132,15 @@
17 self.ui.folders.addTopLevelItem(item)
18
19 for volume in volumes:
20+ is_root = volume[u'type'] == self.backend.ROOT_TYPE
21+ is_share = volume[u'type'] == self.backend.SHARE_TYPE
22+
23 child = QtGui.QTreeWidgetItem()
24 child.setSizeHint(FOLDER_NAME_COL, QtCore.QSize(-1, 35))
25- child.volume_path = volume['path']
26+ if is_share and 'realpath' in volume:
27+ child.volume_path = volume['realpath']
28+ else:
29+ child.volume_path = volume['path']
30 child.volume_id = volume['volume_id']
31
32 name = self._process_name(volume[u'display_name'])
33@@ -142,9 +148,6 @@
34 child.setToolTip(FOLDER_NAME_COL, name)
35 child.setToolTip(EXPLORE_COL, EXPLORE)
36
37- is_root = volume[u'type'] == self.backend.ROOT_TYPE
38- is_share = volume[u'type'] == self.backend.SHARE_TYPE
39-
40 icon_name = FOLDER_ICON_NAME
41 if is_share:
42 icon_name = SHARE_ICON_NAME
43
44=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
45--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py 2011-09-08 17:32:40 +0000
46+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py 2011-09-09 15:06:40 +0000
47@@ -138,8 +138,10 @@
48 self.assertTrue(item is not None)
49
50 name = volume['path'].replace(USER_HOME + os.path.sep, '')
51+ expected_path = volume['path']
52 if volume['type'] == self.ui.backend.SHARE_TYPE:
53 name = volume['name']
54+ expected_path = volume['realpath']
55 label = item.text(gui.FOLDER_NAME_COL)
56 self.assertEqual(label, name)
57
58@@ -159,7 +161,7 @@
59 self.assertEqual(icon_name, gui.SHARE_ICON_NAME)
60
61 self.assertEqual(item.volume_id, volume['volume_id'])
62- self.assertEqual(item.volume_path, volume['path'])
63+ self.assertEqual(item.volume_path, expected_path)
64
65 # tooltips are correct
66 self.assertEqual(item.toolTip(gui.FOLDER_NAME_COL), name)
67
68=== modified file 'ubuntuone/controlpanel/gui/tests/__init__.py'
69--- ubuntuone/controlpanel/gui/tests/__init__.py 2011-07-19 16:38:07 +0000
70+++ ubuntuone/controlpanel/gui/tests/__init__.py 2011-09-09 15:06:40 +0000
71@@ -66,13 +66,15 @@
72 FAKE_SHARES_INFO = [
73 # backend send this ordered by path
74 {u'volume_id': u'1234', u'name': u'do',
75- u'path': os.path.join(USER_HOME, '.local', 'share', 'ubuntuone',
76+ u'realpath': os.path.join(USER_HOME, '.local', 'share', 'ubuntuone',
77 'shares', 'do from Other User'),
78+ u'path': os.path.join(ROOT_PATH, 'Shared With Me', 'do from Other User'),
79 u'subscribed': u'', u'type': ControlBackend.SHARE_TYPE,
80 u'display_name': u'do'},
81 {u'volume_id': u'5678', u'name': u're',
82- u'path': os.path.join(USER_HOME, '.local', 'share', 'ubuntuone',
83+ u'realpath': os.path.join(USER_HOME, '.local', 'share', 'ubuntuone',
84 'shares', 're from Other User'),
85+ u'path': os.path.join(ROOT_PATH, 'Shared With Me', 're from Other User'),
86 u'subscribed': u'True', u'type': ControlBackend.SHARE_TYPE,
87 u'display_name': u're'},
88 ]
89
90=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
91--- ubuntuone/controlpanel/tests/test_backend.py 2011-08-31 14:46:01 +0000
92+++ ubuntuone/controlpanel/tests/test_backend.py 2011-09-09 15:06:40 +0000
93@@ -811,6 +811,7 @@
94
95 share = share.copy()
96
97+ share[u'realpath'] = share[u'path']
98 nicer_path = share[u'path'].replace(SHARES_PATH, SHARES_PATH_LINK)
99 share[u'path'] = nicer_path
100 share[u'type'] = self.be.SHARE_TYPE

Subscribers

People subscribed via source and target branches