add translations for files

Author: silenius

amnesia_multilingual/builders.py

@@ -7,7 +7,6 @@
 
 from sqlalchemy import orm
 from sqlalchemy import sql
-from sqlalchemy import event
 from sqlalchemy.types import String
 from sqlalchemy.orm.collections import attribute_mapped_collection
 from sqlalchemy.ext.hybrid import hybrid_property
@@ -73,7 +72,6 @@ def setup_relationships(content_cls, translation_cls,
             innerjoin=True,
             viewonly=True,
             bake_queries=False,
-            #back_populates='content'
         ),
 
         'translations': orm.relationship(
@@ -96,27 +94,26 @@ def setup_relationships(content_cls, translation_cls,
             ),
         })
 
-
 def setup_hybrids(cls, name, translation_cls,
-                  current_locale=get_current_locale):
+                  current_locale=get_current_locale, default=None):
 
     def _fget(self):
-        return getattr(self.current_translation, name, None)
+        return getattr(self.current_translation, name, default)
 
     def _fset(self, value):
         locale_name = current_locale()
 
         trans = self.translations.setdefault(
-            locale_name, translation_cls(language_id=locale_name)
+            locale_name,
+            translation_cls(language_id=locale_name)
         )
 
         setattr(trans, name, value)
 
     def _expr(_cls):
-        return _cls.translations
-
-    hprop = hybrid_property(fget=_fget, fset=_fset, expr=_expr)
+        return _cls.current_translation
 
     log.info('Adding hybrid attribute: %s.%s', cls, name)
 
-    setattr(cls, name, hprop)
+    setattr(cls, name, hybrid_property(fget=_fget, fset=_fset, expr=_expr))
+

amnesia_multilingual/modules/document/config.py

@@ -10,4 +10,4 @@ def includeme(config):
 
     config.set_translatable_mapping(Document, DocumentTranslation)
     config.set_translatable_attrs(Document, ('title', 'description', 'body',
-                                             'fts' ))
+                                             'fts'))

amnesia_multilingual/modules/document/mapper.py

@@ -6,6 +6,7 @@
 
 from amnesia.modules.content_type.utils import get_type_id
 from amnesia.modules.document import Document
+from amnesia.modules.language import Language
 from amnesia_multilingual.modules.content import ContentTranslation
 from amnesia_multilingual.modules.document import DocumentTranslation
 

amnesia_multilingual/modules/file/config.py

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 
+from webob.compat import cgi_FieldStorage
+
 from amnesia.modules.file import File
+from amnesia.modules.file.events import FileUpdated
 from amnesia_multilingual.modules.file import FileTranslation
 
 
@@ -9,4 +12,18 @@ def includeme(config):
     config.include('.mapper')
 
     config.set_translatable_mapping(File, FileTranslation)
-    config.set_translatable_attrs(File, ('title', 'description', 'fts'))
+    config.set_translatable_attrs(File, ('title', 'description', 'fts',
+                                         'original_name', 'file_size',
+                                         'path_name', 'mime_id'))
+    config.add_subscriber(handle_path_name, FileUpdated)
+
+
+def handle_path_name(event):
+    current_locale = event.request.locale_name
+    entity_locale = event.entity.current_translation.language_id
+
+    from sqlalchemy import orm
+
+    if entity_locale != current_locale:
+        session = orm.object_session(event.entity)
+        session.expire(event.entity, ['current_translation'])

amnesia_multilingual/modules/file/mapper.py

@@ -1,13 +1,19 @@
 
 # -*- coding: utf-8 -*-
 
+import logging
+
 from sqlalchemy import orm
+from sqlalchemy.ext.associationproxy import association_proxy
 
 from amnesia.modules.content_type.utils import get_type_id
 from amnesia.modules.file import File
+from amnesia.modules.mime import Mime
 from amnesia_multilingual.modules.content import ContentTranslation
 from amnesia_multilingual.modules.file import FileTranslation
 
+log = logging.getLogger(__name__)
+
 
 def includeme(config):
     tables = config.registry['metadata'].tables
@@ -17,12 +23,19 @@ def includeme(config):
 
     orm.mapper(
         FileTranslation,
-        tables['amnesia_multilingual.content_translation'],
+        tables['amnesia_multilingual.data_translation'],
         inherits=ContentTranslation,
         polymorphic_identity=get_type_id(config, 'file'),
         properties={
             'content': orm.relationship(
                 File, innerjoin=True, uselist=False
+            ),
+
+            'mime': orm.relationship(
+                 Mime, lazy='joined'
             )
         }
     )
+
+    File.mime = association_proxy('current_translation', 'mime')
+    #File.mime_id = association_proxy('current_translation', 'mime_id')

amnesia_multilingual/scripts/sql/add_translations.sql

@@ -52,6 +52,28 @@ create table amnesia_multilingual.event_translation (
         foreign key(content_id) references event(content_id)
 );
 
+create table amnesia_multilingual.data_translation (
+    language_id     char(2) not null,
+    content_id      integer not null,
+    mime_id         integer not null,
+    original_name   text    not null,
+    file_size       real    not null,
+    path_name       serial  not null,
+
+    constraint pk_data_translation
+        primary key(language_id, content_id),
+
+    constraint fk_data_translation_content_translation
+        foreign key(language_id, content_id) 
+        references amnesia_multilingual.content_translation(language_id, content_id),
+
+    constraint fk_data_translation_data
+        foreign key(content_id) references data(content_id),
+
+    constraint fk_data_translation_mime
+        foreign key(mime_id) references mime(id) deferrable initially deferred
+);
+
 insert into amnesia_multilingual.content_translation(language_id, content_id, title, description) 
 select 'en', id as content_id, title, description from content;
 
@@ -64,3 +86,9 @@ alter table document drop column body;
 
 insert into amnesia_multilingual.event_translation select 'en', content_id, body from event;
 alter table event drop column body;
+
+insert into amnesia_multilingual.data_translation select 'en', content_id, mime_id, original_name, file_size, path_name from data;
+alter table data drop column original_name;
+alter table data drop column file_size;
+alter table data drop column path_name;
+alter table data drop column mime_id;

amnesia_multilingual/tweens.py

@@ -29,6 +29,4 @@ def __call__(self, request):
 
             request._LOCALE_ = lang
 
-        response = self.handler(request)
-
-        return response
+        return self.handler(request)

docs/index.rst

@@ -11,8 +11,9 @@ Content-based content types in AmnesiaCMS.
 How does it work?
 =================
 
-Multilingual support for each Content-based content type will be stored in a
-dedicated translation table.
+Entities which contain translatable fields are splitted. Non-translatable
+fields remain in the base entity table while translatable fields go in a
+dedicated table.
 
 =====
 Usage

setup.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '0.0.1.dev3'
+__version__ = '0.0.2+dev'
 
 import os