Skip to content
Snippets Groups Projects
Commit 404ddfde authored by Benjamin Becker's avatar Benjamin Becker
Browse files

uses context=None

parent b2b35296
No related branches found
No related tags found
No related merge requests found
...@@ -21,11 +21,11 @@ class ThumbnailPlugin(plugins.SingletonPlugin): ...@@ -21,11 +21,11 @@ class ThumbnailPlugin(plugins.SingletonPlugin):
#IResourceController #IResourceController
def after_create(self, context, resource): def after_create(self, context, resource):
resources = thumbnail.resources_of_containing_package(context, resource) resources = thumbnail.resources_of_containing_package(resource)
thumbnail.create_thumbnail_if_none_in_package(context, resources) thumbnail.create_thumbnail_if_none_in_package(context, resources)
def after_update(self, context, resource): def after_update(self, context, resource):
resources = thumbnail.resources_of_containing_package(context, resource) resources = thumbnail.resources_of_containing_package(resource)
thumbnail.create_thumbnail_if_none_in_package(context, resources) thumbnail.create_thumbnail_if_none_in_package(context, resources)
def after_delete(self, context, resources): def after_delete(self, context, resources):
......
...@@ -33,7 +33,7 @@ def create_thumbnail(context, resource): ...@@ -33,7 +33,7 @@ def create_thumbnail(context, resource):
def _get_filename_from_context(context): def _get_filename_from_context(context):
package = context.get('package') package = context.get('package')
package_id = package.id package_id = package.id
package= toolkit.get_action('package_show')(context, {'id': package_id}) package= toolkit.get_action('package_show')(None, {'id': package_id})
thumbnail = package.get('thumbnail') thumbnail = package.get('thumbnail')
return thumbnail return thumbnail
...@@ -116,13 +116,13 @@ def remove_thumbnail(context): ...@@ -116,13 +116,13 @@ def remove_thumbnail(context):
ThumbnailPath.from_filename_with_extension(old_filename).remove() ThumbnailPath.from_filename_with_extension(old_filename).remove()
def resources_of_containing_package(resource, context): def resources_of_containing_package(resource):
#todo: change arg order #todo: change arg order
''' '''
used by pdf_to_thumbnail.plugin used by pdf_to_thumbnail.plugin
''' '''
package_id = resource.get('package').id package_id = resource.get('package_id')
package = toolkit.get_action('package_show')(context, {'id': package_id}) package = toolkit.get_action('package_show')(None, {'id': package_id})
resources = package.get('resources') resources = package.get('resources')
return resources return resources
...@@ -140,8 +140,8 @@ def create_thumbnail_if_none_in_package(context, resources): ...@@ -140,8 +140,8 @@ def create_thumbnail_if_none_in_package(context, resources):
def _get_package_dict_from_context(context): def _get_package_dict_from_context(context):
package = context.get('package') package_id = context.get('package').as_dict().get('id')
package_dict = toolkit.get_action('package_show')(context, {'id': package.id}) package_dict = toolkit.get_action('package_show')(None, {'id': package_id})
return package_dict return package_dict
...@@ -159,12 +159,10 @@ def _try_create_thumbnail(context, resource): ...@@ -159,12 +159,10 @@ def _try_create_thumbnail(context, resource):
def _write_thumbnail_into_package(context, filename): def _write_thumbnail_into_package(context, filename):
package = context.get('package') package_dict = _get_package_dict_from_context(context)
package_id = package.id
package = toolkit.get_action('package_show')(context, {'id': package_id})
if filename: if filename:
package.update({'thumbnail': filename}) package_dict.update({'thumbnail': filename})
toolkit.get_action('package_update')(context, package) toolkit.get_action('package_update')(None, package_dict)
class ThumbnailPath(object): class ThumbnailPath(object):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment