Techsystech
/
server-tools
mirror of https://github.com/OCA/server-tools.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- fix check_duplicated_files in view 

- log info on run completed
pull/2632/head
Giovanni 2020-01-20 13:03:19 +01:00 committed by Florian da Costa
parent 02a85b61b0
commit 31e608993b
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
attachment_synchronize/models/task.py
View File

@ -131,6 +131,7 @@ class StorageTask(models.Model):
relative_path=self.filepath, pattern=self.pattern) relative_path=self.filepath, pattern=self.pattern)
if self.check_duplicated_files: if self.check_duplicated_files:
filenames = self._file_to_import(filenames) filenames = self._file_to_import(filenames)
total_import = 0
for file_name in filenames: for file_name in filenames:
with api.Environment.manage(): with api.Environment.manage():
with odoo.registry( with odoo.registry(
@ -165,11 +166,13 @@ class StorageTask(models.Model):
'delete', 'rename', 'move', 'move_rename' 'delete', 'rename', 'move', 'move_rename'
): ):
backend._delete(full_absolute_path) backend._delete(full_absolute_path)
total_import += 1
except Exception as e: except Exception as e:
new_env.cr.rollback() new_env.cr.rollback()
raise e raise e
else: else:
new_env.cr.commit() new_env.cr.commit()
_logger.info('Run import complete! Imported {0} files'.format(total_import))
def _file_to_import(self, filenames): def _file_to_import(self, filenames):
imported = self.attachment_ids.filtered(lambda r: r.name in filenames).mapped('name') imported = self.attachment_ids.filtered(lambda r: r.name in filenames).mapped('name')

1
attachment_synchronize/views/task_view.xml
View File

@ -20,6 +20,7 @@
<field name="method_type"/> <field name="method_type"/>
<field name="pattern" attrs="{'invisible':[('method_type','!=','import')]}"/> <field name="pattern" attrs="{'invisible':[('method_type','!=','import')]}"/>
<field name="filepath"/> <field name="filepath"/>
<field name="check_duplicated_files" />
</group> </group>
<group name="action" string="Action"> <group name="action" string="Action">
<field name="after_import" attrs="{'invisible':[('method_type','!=','import')]}"/> <field name="after_import" attrs="{'invisible':[('method_type','!=','import')]}"/>