Mercurial > libervia-backend
comparison src/plugins/plugin_comp_file_sharing.py @ 2519:353880a5c363
component file sharing: fixed hash handling (key has been renamed to "file_hash")
author | Goffi <goffi@goffi.org> |
---|---|
date | Wed, 14 Mar 2018 08:08:42 +0100 |
parents | 4440ea7047bd |
children | 95c31756944c |
comparison
equal
deleted
inserted
replaced
2518:e4de2f16a284 | 2519:353880a5c363 |
---|---|
138 peer_jid = session[u'peer_jid'] | 138 peer_jid = session[u'peer_jid'] |
139 try: | 139 try: |
140 found_files = yield self.host.memory.getFiles(client, | 140 found_files = yield self.host.memory.getFiles(client, |
141 peer_jid=peer_jid, | 141 peer_jid=peer_jid, |
142 name=file_data.get(u'name'), | 142 name=file_data.get(u'name'), |
143 file_hash=file_data.get(u'hash'), | 143 file_hash=file_data.get(u'file_hash'), |
144 hash_algo=file_data.get(u'hash_algo'), | 144 hash_algo=file_data.get(u'hash_algo'), |
145 path=file_data.get(u'path'), | 145 path=file_data.get(u'path'), |
146 namespace=file_data.get(u'namespace')) | 146 namespace=file_data.get(u'namespace')) |
147 except exceptions.NotFound: | 147 except exceptions.NotFound: |
148 found_files = None | 148 found_files = None |
155 log.warning(_(u"no matching file found ({file_data})").format(file_data=file_data)) | 155 log.warning(_(u"no matching file found ({file_data})").format(file_data=file_data)) |
156 defer.returnValue(False) | 156 defer.returnValue(False) |
157 | 157 |
158 # we only use the first found file | 158 # we only use the first found file |
159 found_file = found_files[0] | 159 found_file = found_files[0] |
160 file_hash = found_file[u'hash'] | 160 file_hash = found_file[u'file_hash'] |
161 file_path = os.path.join(self.files_path, file_hash) | 161 file_path = os.path.join(self.files_path, file_hash) |
162 file_data[u'hash_hasher'] = hasher = self._h.getHasher(found_file[u'hash_algo']) | 162 file_data[u'hash_hasher'] = hasher = self._h.getHasher(found_file[u'hash_algo']) |
163 size = file_data[u'size'] = found_file[u'size'] | 163 size = file_data[u'size'] = found_file[u'size'] |
164 file_data[u'file_hash'] = file_hash | 164 file_data[u'file_hash'] = file_hash |
165 file_data[u'hash_algo'] = found_file[u'hash_algo'] | 165 file_data[u'hash_algo'] = found_file[u'hash_algo'] |