← Back to branch summary

~unity-2d-team/unity-2d/Shell-MultiMonitor

« back to all changes in this revision

Viewing changes to grackle/model.py

  • Committer: William Grant
  • Date: 2012-01-22 10:39:15 UTC
  • Revision ID: william.grant@canonical.com-20120122103915-lqjw4jsaw3ug1q2g
Merge grackle.server into grackle. Alter Makefile to run all the tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
grackle/model.py
113
113
            'date': message.get('date'),
114
114
            'from': message.get('from'),
115
115
            'subject': message.get('subject'),
116
 
            'message-id': message.get('message-id'),
117
116
            }
118
117
 
119
 
    def get_messages(self, archive_uuid, order, count, memo):
 
118
    def get_messages(self, archive_uuid, order, count, start):
120
119
        if order in ("date", "-date"):
121
120
            reversed = order[0] == '-'
122
121
        else:
123
122
            raise AssertionError("Unsupported order.")
124
 
        if memo != '':
125
 
            memo = uuid.UUID(memo)
126
 
        # Get up to n+1 messages from the memo: the last item of the
127
 
        # previous batch (because that's where the memo starts) + this
128
 
        # batch.
129
123
        pairs = self.archive_messages.get(
130
124
            archive_uuid, column_count=count + 1,
131
 
            column_start=memo, column_reversed=reversed).items()
132
 
 
133
 
        if memo and len(pairs) and pairs[0][0] <= memo:
134
 
            pairs = pairs[1:]
135
 
        elif len(pairs) > count:
136
 
            pairs = pairs[:-1]
137
 
 
138
 
        if len(pairs) == 0:
139
 
            return (None, [], None)
140
 
 
141
 
        assert 0 < len(pairs) <= count
142
 
 
 
125
            column_start=start, column_reversed=reversed).items()
143
126
        ids = [v for k, v in pairs]
144
127
        messages = self.messages.multiget(
145
 
            ids, columns=['date', 'from', 'subject', 'message-id'])
146
 
 
 
128
            ids, columns=['date', 'from', 'subject'])
 
129
        actual_count = len(pairs)
 
130
        if len(pairs) > count:
 
131
            assert len(pairs) == count + 1
 
132
            actual_count -= 1
 
133
            next_memo = str(pairs[count][0])
 
134
        else:
 
135
            next_memo = None
147
136
        return (
148
 
            str(pairs[0][0]),
149
 
            [self._format_message(messages[id]) for id in ids],
150
 
            str(pairs[-1][0]),
 
137
            [self._format_message(messages[id]) for id in ids[:actual_count]],
 
138
            next_memo,
151
139
            )