|
|
@@ -1,38 +1,36 @@
|
|
1
|
1
|
# -*- coding: utf-8 -*-
|
|
2
|
2
|
|
|
3
|
|
-import tg
|
|
4
|
|
-from datetime import datetime
|
|
5
|
|
-from babel.dates import format_timedelta
|
|
6
|
|
-
|
|
7
|
|
-from bs4 import BeautifulSoup
|
|
8
|
3
|
import datetime as datetime_root
|
|
9
|
4
|
import json
|
|
|
5
|
+from datetime import datetime
|
|
10
|
6
|
|
|
11
|
|
-from sqlalchemy.ext.associationproxy import association_proxy
|
|
12
|
|
-from sqlalchemy import Column
|
|
13
|
|
-from sqlalchemy import func
|
|
|
7
|
+import tg
|
|
|
8
|
+from babel.dates import format_timedelta
|
|
|
9
|
+from bs4 import BeautifulSoup
|
|
|
10
|
+from decorator import contextmanager
|
|
|
11
|
+from sqlalchemy import Column, inspect
|
|
14
|
12
|
from sqlalchemy import ForeignKey
|
|
15
|
13
|
from sqlalchemy import Sequence
|
|
16
|
|
-
|
|
|
14
|
+from sqlalchemy import func
|
|
|
15
|
+from sqlalchemy.ext.associationproxy import association_proxy
|
|
17
|
16
|
from sqlalchemy.ext.hybrid import hybrid_property
|
|
18
|
|
-
|
|
19
|
17
|
from sqlalchemy.orm import backref
|
|
20
|
|
-from sqlalchemy.orm import relationship
|
|
21
|
18
|
from sqlalchemy.orm import deferred
|
|
|
19
|
+from sqlalchemy.orm import relationship
|
|
22
|
20
|
from sqlalchemy.orm.collections import attribute_mapped_collection
|
|
23
|
|
-
|
|
24
|
21
|
from sqlalchemy.types import Boolean
|
|
25
|
22
|
from sqlalchemy.types import DateTime
|
|
26
|
23
|
from sqlalchemy.types import Integer
|
|
27
|
24
|
from sqlalchemy.types import LargeBinary
|
|
28
|
25
|
from sqlalchemy.types import Text
|
|
29
|
26
|
from sqlalchemy.types import Unicode
|
|
30
|
|
-
|
|
31
|
27
|
from tg.i18n import lazy_ugettext as l_, ugettext as _
|
|
32
|
28
|
|
|
33
|
|
-from tracim.model import DeclarativeBase
|
|
|
29
|
+from tracim.lib.exception import ContentRevisionUpdateError
|
|
|
30
|
+from tracim.model import DeclarativeBase, DBSession, RevisionsIntegrity
|
|
34
|
31
|
from tracim.model.auth import User
|
|
35
|
32
|
|
|
|
33
|
+
|
|
36
|
34
|
class BreadcrumbItem(object):
|
|
37
|
35
|
|
|
38
|
36
|
def __init__(self, icon_string: str, label: str, url: str, is_active: bool = False):
|
|
|
@@ -54,11 +52,18 @@ class Workspace(DeclarativeBase):
|
|
54
|
52
|
label = Column(Unicode(1024), unique=False, nullable=False, default='')
|
|
55
|
53
|
description = Column(Text(), unique=False, nullable=False, default='')
|
|
56
|
54
|
|
|
57
|
|
- created = Column(DateTime, unique=False, nullable=False)
|
|
58
|
|
- updated = Column(DateTime, unique=False, nullable=False)
|
|
|
55
|
+ created = Column(DateTime, unique=False, nullable=False, default=datetime.now())
|
|
|
56
|
+ updated = Column(DateTime, unique=False, nullable=False, default=datetime.now())
|
|
59
|
57
|
|
|
60
|
58
|
is_deleted = Column(Boolean, unique=False, nullable=False, default=False)
|
|
61
|
59
|
|
|
|
60
|
+ revisions = relationship("ContentRevisionRO")
|
|
|
61
|
+
|
|
|
62
|
+ @hybrid_property
|
|
|
63
|
+ def contents(self):
|
|
|
64
|
+ # Return a list of unique revisions parent content
|
|
|
65
|
+ return list(set([revision.node for revision in self.revisions]))
|
|
|
66
|
+
|
|
62
|
67
|
def get_user_role(self, user: User) -> int:
|
|
63
|
68
|
for role in user.roles:
|
|
64
|
69
|
if role.workspace.workspace_id==self.workspace_id:
|
|
|
@@ -435,48 +440,511 @@ class ContentType(object):
|
|
435
|
440
|
label=self.label,
|
|
436
|
441
|
priority=self.priority)
|
|
437
|
442
|
|
|
438
|
|
-class Content(DeclarativeBase):
|
|
439
|
443
|
|
|
440
|
|
- __tablename__ = 'contents'
|
|
|
444
|
+class ContentChecker(object):
|
|
441
|
445
|
|
|
442
|
|
- revision_to_serialize = -0 # This flag allow to serialize a given revision if required by the user
|
|
|
446
|
+ @classmethod
|
|
|
447
|
+ def check_properties(cls, item):
|
|
|
448
|
+ if item.type==ContentType.Folder:
|
|
|
449
|
+ properties = item.properties
|
|
|
450
|
+ if 'allowed_content' not in properties.keys():
|
|
|
451
|
+ return False
|
|
|
452
|
+ if 'folders' not in properties['allowed_content']:
|
|
|
453
|
+ return False
|
|
|
454
|
+ if 'files' not in properties['allowed_content']:
|
|
|
455
|
+ return False
|
|
|
456
|
+ if 'pages' not in properties['allowed_content']:
|
|
|
457
|
+ return False
|
|
|
458
|
+ if 'threads' not in properties['allowed_content']:
|
|
|
459
|
+ return False
|
|
443
|
460
|
|
|
444
|
|
- content_id = Column(Integer, Sequence('seq__contents__content_id'), autoincrement=True, primary_key=True)
|
|
445
|
|
- parent_id = Column(Integer, ForeignKey('contents.content_id'), nullable=True, default=None)
|
|
446
|
|
- owner_id = Column(Integer, ForeignKey('users.user_id'), nullable=True, default=None)
|
|
|
461
|
+ return True
|
|
447
|
462
|
|
|
448
|
|
- type = Column(Unicode(32), unique=False, nullable=False)
|
|
449
|
|
- status = Column(Unicode(32), unique=False, nullable=False, default=ContentStatus.OPEN)
|
|
|
463
|
+ raise NotImplementedError
|
|
450
|
464
|
|
|
451
|
|
- created = Column(DateTime, unique=False, nullable=False)
|
|
452
|
|
- updated = Column(DateTime, unique=False, nullable=False)
|
|
|
465
|
+ @classmethod
|
|
|
466
|
+ def reset_properties(cls, item):
|
|
|
467
|
+ if item.type==ContentType.Folder:
|
|
|
468
|
+ item.properties = dict(
|
|
|
469
|
+ allowed_content = dict (
|
|
|
470
|
+ folder = True,
|
|
|
471
|
+ file = True,
|
|
|
472
|
+ page = True,
|
|
|
473
|
+ thread = True
|
|
|
474
|
+ )
|
|
|
475
|
+ )
|
|
|
476
|
+ return
|
|
453
|
477
|
|
|
454
|
|
- workspace_id = Column(Integer, ForeignKey('workspaces.workspace_id'), unique=False, nullable=True)
|
|
|
478
|
+ raise NotImplementedError
|
|
455
|
479
|
|
|
456
|
|
- workspace = relationship('Workspace', remote_side=[Workspace.workspace_id], backref='contents')
|
|
457
|
480
|
|
|
|
481
|
+class ContentRevisionRO(DeclarativeBase):
|
|
|
482
|
+ """
|
|
|
483
|
+ Revision of Content. It's immutable, update or delete an existing ContentRevisionRO will throw
|
|
|
484
|
+ ContentRevisionUpdateError errors.
|
|
|
485
|
+ """
|
|
458
|
486
|
|
|
459
|
|
- is_deleted = Column(Boolean, unique=False, nullable=False, default=False)
|
|
460
|
|
- is_archived = Column(Boolean, unique=False, nullable=False, default=False)
|
|
|
487
|
+ __tablename__ = 'content_revisions'
|
|
461
|
488
|
|
|
462
|
|
- label = Column(Unicode(1024), unique=False, nullable=False, default='')
|
|
463
|
|
- description = Column(Text(), unique=False, nullable=False, default='')
|
|
464
|
|
- _properties = Column('properties', Text(), unique=False, nullable=False, default='')
|
|
|
489
|
+ revision_id = Column(Integer, primary_key=True)
|
|
|
490
|
+ content_id = Column(Integer, ForeignKey('content.id'))
|
|
|
491
|
+ owner_id = Column(Integer, ForeignKey('users.user_id'), nullable=True)
|
|
465
|
492
|
|
|
|
493
|
+ label = Column(Unicode(1024), unique=False, nullable=False)
|
|
|
494
|
+ description = Column(Text(), unique=False, nullable=False, default='')
|
|
466
|
495
|
file_name = Column(Unicode(255), unique=False, nullable=False, default='')
|
|
467
|
496
|
file_mimetype = Column(Unicode(255), unique=False, nullable=False, default='')
|
|
468
|
|
- file_content = deferred(Column(LargeBinary(), unique=False, nullable=False, default=None))
|
|
|
497
|
+ file_content = deferred(Column(LargeBinary(), unique=False, nullable=True))
|
|
|
498
|
+ properties = Column('properties', Text(), unique=False, nullable=False, default='')
|
|
469
|
499
|
|
|
|
500
|
+ type = Column(Unicode(32), unique=False, nullable=False)
|
|
|
501
|
+ status = Column(Unicode(32), unique=False, nullable=False, default=ContentStatus.OPEN)
|
|
|
502
|
+ created = Column(DateTime, unique=False, nullable=False, default=datetime.now())
|
|
|
503
|
+ updated = Column(DateTime, unique=False, nullable=False, default=datetime.now())
|
|
|
504
|
+ is_deleted = Column(Boolean, unique=False, nullable=False, default=False)
|
|
|
505
|
+ is_archived = Column(Boolean, unique=False, nullable=False, default=False)
|
|
470
|
506
|
revision_type = Column(Unicode(32), unique=False, nullable=False, default='')
|
|
471
|
507
|
|
|
472
|
|
- parent = relationship('Content', remote_side=[content_id], backref='children')
|
|
|
508
|
+ workspace_id = Column(Integer, ForeignKey('workspaces.workspace_id'), unique=False, nullable=True)
|
|
|
509
|
+ workspace = relationship('Workspace', remote_side=[Workspace.workspace_id])
|
|
|
510
|
+
|
|
|
511
|
+ parent_id = Column(Integer, ForeignKey('content.id'), nullable=True, default=None)
|
|
|
512
|
+ parent = relationship("Content", foreign_keys=[parent_id], back_populates="children_revisions")
|
|
|
513
|
+
|
|
|
514
|
+ node = relationship("Content", foreign_keys=[content_id], back_populates="revisions")
|
|
473
|
515
|
owner = relationship('User', remote_side=[User.user_id])
|
|
474
|
516
|
|
|
|
517
|
+ """ List of column copied when make a new revision from another """
|
|
|
518
|
+ _cloned_columns = (
|
|
|
519
|
+ 'content_id', 'owner_id', 'label', 'description', 'file_name', 'file_mimetype',
|
|
|
520
|
+ 'file_content', 'type', 'status', 'created', 'updated', 'is_deleted', 'is_archived',
|
|
|
521
|
+ 'revision_type', 'workspace_id', 'workspace', 'parent_id', 'parent', 'node', 'owner'
|
|
|
522
|
+ )
|
|
|
523
|
+
|
|
|
524
|
+ @classmethod
|
|
|
525
|
+ def new_from(cls, revision):
|
|
|
526
|
+ """
|
|
|
527
|
+
|
|
|
528
|
+ Return new instance of ContentRevisionRO where properties are copied from revision parameter.
|
|
|
529
|
+ Look at ContentRevisionRO._cloned_columns to see what columns are copieds.
|
|
|
530
|
+
|
|
|
531
|
+ :param revision: revision to copy
|
|
|
532
|
+ :type revision: ContentRevisionRO
|
|
|
533
|
+ :return: new revision from revision parameter
|
|
|
534
|
+ :rtype: ContentRevisionRO
|
|
|
535
|
+ """
|
|
|
536
|
+ new_rev = cls()
|
|
|
537
|
+
|
|
|
538
|
+ for column_name in cls._cloned_columns:
|
|
|
539
|
+ column_value = getattr(revision, column_name)
|
|
|
540
|
+ setattr(new_rev, column_name, column_value)
|
|
|
541
|
+
|
|
|
542
|
+ return new_rev
|
|
|
543
|
+
|
|
|
544
|
+ def __setattr__(self, key, value):
|
|
|
545
|
+ """
|
|
|
546
|
+ ContentRevisionUpdateError is raised if tried to update column and revision own identity
|
|
|
547
|
+ :param key: attribute name
|
|
|
548
|
+ :param value: attribute value
|
|
|
549
|
+ :return:
|
|
|
550
|
+ """
|
|
|
551
|
+ if key in ('_sa_instance_state', ): # Prevent infinite loop from SQLAlchemy code and altered set
|
|
|
552
|
+ return super().__setattr__(key, value)
|
|
|
553
|
+
|
|
|
554
|
+ if inspect(self).has_identity \
|
|
|
555
|
+ and key in self._cloned_columns \
|
|
|
556
|
+ and not RevisionsIntegrity.is_updatable(self):
|
|
|
557
|
+ raise ContentRevisionUpdateError(
|
|
|
558
|
+ "Can't modify revision. To work on new revision use tracim.model.data.new_revision " +
|
|
|
559
|
+ "context manager.")
|
|
|
560
|
+
|
|
|
561
|
+ super().__setattr__(key, value)
|
|
|
562
|
+
|
|
|
563
|
+ def get_status(self):
|
|
|
564
|
+ return ContentStatus(self.status)
|
|
|
565
|
+
|
|
|
566
|
+ def get_label(self):
|
|
|
567
|
+ return self.label if self.label else self.file_name if self.file_name else ''
|
|
|
568
|
+
|
|
|
569
|
+ def get_last_action(self) -> ActionDescription:
|
|
|
570
|
+ return ActionDescription(self.revision_type)
|
|
|
571
|
+
|
|
|
572
|
+ # Read by must be used like this:
|
|
|
573
|
+ # read_datetime = revision.ready_by[<User instance>]
|
|
|
574
|
+ # if user did not read the content, then a key error is raised
|
|
|
575
|
+ read_by = association_proxy(
|
|
|
576
|
+ 'revision_read_statuses', # name of the attribute
|
|
|
577
|
+ 'view_datetime', # attribute the value is taken from
|
|
|
578
|
+ creator=lambda k, v: \
|
|
|
579
|
+ RevisionReadStatus(user=k, view_datetime=v)
|
|
|
580
|
+ )
|
|
|
581
|
+
|
|
|
582
|
+ def has_new_information_for(self, user: User) -> bool:
|
|
|
583
|
+ """
|
|
|
584
|
+ :param user: the session current user
|
|
|
585
|
+ :return: bool, True if there is new information for given user else False
|
|
|
586
|
+ False if the user is None
|
|
|
587
|
+ """
|
|
|
588
|
+ if not user:
|
|
|
589
|
+ return False
|
|
|
590
|
+
|
|
|
591
|
+ if user not in self.read_by.keys():
|
|
|
592
|
+ return True
|
|
|
593
|
+
|
|
|
594
|
+ return False
|
|
|
595
|
+
|
|
|
596
|
+
|
|
|
597
|
+class Content(DeclarativeBase):
|
|
|
598
|
+ """
|
|
|
599
|
+ Content is used as a virtual representation of ContentRevisionRO.
|
|
|
600
|
+ content.PROPERTY (except for content.id, content.revisions, content.children_revisions) will return
|
|
|
601
|
+ value of most recent revision of content.
|
|
|
602
|
+
|
|
|
603
|
+ # UPDATE A CONTENT
|
|
|
604
|
+
|
|
|
605
|
+ To update an existing Content, you must use tracim.model.data.new_revision context manager:
|
|
|
606
|
+ content = my_sontent_getter_method()
|
|
|
607
|
+ with new_revision(content):
|
|
|
608
|
+ content.description = 'foo bar baz'
|
|
|
609
|
+ DBSession.flush()
|
|
|
610
|
+
|
|
|
611
|
+ # QUERY CONTENTS
|
|
|
612
|
+
|
|
|
613
|
+ To query contents you will need to join your content query with ContentRevisionRO. Join
|
|
|
614
|
+ condition is available at tracim.lib.content.ContentApi#get_revision_join:
|
|
|
615
|
+
|
|
|
616
|
+ content = DBSession.query(Content).join(ContentRevisionRO, ContentApi.get_revision_join())
|
|
|
617
|
+ .filter(Content.label == 'foo')
|
|
|
618
|
+ .one()
|
|
|
619
|
+
|
|
|
620
|
+ ContentApi provide also prepared Content at tracim.lib.content.ContentApi#get_base_query:
|
|
|
621
|
+
|
|
|
622
|
+ content = ContentApi.get_base_query()
|
|
|
623
|
+ .filter(Content.label == 'foo')
|
|
|
624
|
+ .one()
|
|
|
625
|
+ """
|
|
|
626
|
+
|
|
|
627
|
+ __tablename__ = 'content'
|
|
|
628
|
+
|
|
|
629
|
+ revision_to_serialize = -0 # This flag allow to serialize a given revision if required by the user
|
|
|
630
|
+
|
|
|
631
|
+ id = Column(Integer, primary_key=True)
|
|
|
632
|
+ revisions = relationship("ContentRevisionRO",
|
|
|
633
|
+ foreign_keys=[ContentRevisionRO.content_id],
|
|
|
634
|
+ back_populates="node")
|
|
|
635
|
+ children_revisions = relationship("ContentRevisionRO",
|
|
|
636
|
+ foreign_keys=[ContentRevisionRO.parent_id],
|
|
|
637
|
+ back_populates="parent")
|
|
|
638
|
+
|
|
|
639
|
+ @hybrid_property
|
|
|
640
|
+ def content_id(self):
|
|
|
641
|
+ return self.revision.content_id
|
|
|
642
|
+
|
|
|
643
|
+ @content_id.setter
|
|
|
644
|
+ def content_id(self, value):
|
|
|
645
|
+ self.revision.content_id = value
|
|
|
646
|
+
|
|
|
647
|
+ @content_id.expression
|
|
|
648
|
+ def content_id(cls):
|
|
|
649
|
+ return ContentRevisionRO.content_id
|
|
|
650
|
+
|
|
|
651
|
+ @hybrid_property
|
|
|
652
|
+ def revision_id(self):
|
|
|
653
|
+ return self.revision.revision_id
|
|
|
654
|
+
|
|
|
655
|
+ @revision_id.setter
|
|
|
656
|
+ def revision_id(self, value):
|
|
|
657
|
+ self.revision.revision_id = value
|
|
|
658
|
+
|
|
|
659
|
+ @revision_id.expression
|
|
|
660
|
+ def revision_id(cls):
|
|
|
661
|
+ return ContentRevisionRO.revision_id
|
|
|
662
|
+
|
|
|
663
|
+ @hybrid_property
|
|
|
664
|
+ def owner_id(self):
|
|
|
665
|
+ return self.revision.owner_id
|
|
|
666
|
+
|
|
|
667
|
+ @owner_id.setter
|
|
|
668
|
+ def owner_id(self, value):
|
|
|
669
|
+ self.revision.owner_id = value
|
|
|
670
|
+
|
|
|
671
|
+ @owner_id.expression
|
|
|
672
|
+ def owner_id(cls):
|
|
|
673
|
+ return ContentRevisionRO.owner_id
|
|
|
674
|
+
|
|
|
675
|
+ @hybrid_property
|
|
|
676
|
+ def label(self):
|
|
|
677
|
+ return self.revision.label
|
|
|
678
|
+
|
|
|
679
|
+ @label.setter
|
|
|
680
|
+ def label(self, value):
|
|
|
681
|
+ self.revision.label = value
|
|
|
682
|
+
|
|
|
683
|
+ @label.expression
|
|
|
684
|
+ def label(cls):
|
|
|
685
|
+ return ContentRevisionRO.label
|
|
|
686
|
+
|
|
|
687
|
+ @hybrid_property
|
|
|
688
|
+ def description(self):
|
|
|
689
|
+ return self.revision.description
|
|
|
690
|
+
|
|
|
691
|
+ @description.setter
|
|
|
692
|
+ def description(self, value):
|
|
|
693
|
+ self.revision.description = value
|
|
|
694
|
+
|
|
|
695
|
+ @description.expression
|
|
|
696
|
+ def description(cls):
|
|
|
697
|
+ return ContentRevisionRO.description
|
|
|
698
|
+
|
|
|
699
|
+ @hybrid_property
|
|
|
700
|
+ def file_name(self):
|
|
|
701
|
+ return self.revision.file_name
|
|
|
702
|
+
|
|
|
703
|
+ @file_name.setter
|
|
|
704
|
+ def file_name(self, value):
|
|
|
705
|
+ self.revision.file_name = value
|
|
|
706
|
+
|
|
|
707
|
+ @file_name.expression
|
|
|
708
|
+ def file_name(cls):
|
|
|
709
|
+ return ContentRevisionRO.file_name
|
|
|
710
|
+
|
|
|
711
|
+ @hybrid_property
|
|
|
712
|
+ def file_mimetype(self):
|
|
|
713
|
+ return self.revision.file_mimetype
|
|
|
714
|
+
|
|
|
715
|
+ @file_mimetype.setter
|
|
|
716
|
+ def file_mimetype(self, value):
|
|
|
717
|
+ self.revision.file_mimetype = value
|
|
|
718
|
+
|
|
|
719
|
+ @file_mimetype.expression
|
|
|
720
|
+ def file_mimetype(cls):
|
|
|
721
|
+ return ContentRevisionRO.file_mimetype
|
|
|
722
|
+
|
|
|
723
|
+ @hybrid_property
|
|
|
724
|
+ def file_content(self):
|
|
|
725
|
+ return self.revision.file_content
|
|
|
726
|
+
|
|
|
727
|
+ @file_content.setter
|
|
|
728
|
+ def file_content(self, value):
|
|
|
729
|
+ self.revision.file_content = value
|
|
|
730
|
+
|
|
|
731
|
+ @file_content.expression
|
|
|
732
|
+ def file_content(cls):
|
|
|
733
|
+ return ContentRevisionRO.file_content
|
|
|
734
|
+
|
|
|
735
|
+ @hybrid_property
|
|
|
736
|
+ def _properties(self):
|
|
|
737
|
+ return self.revision.properties
|
|
|
738
|
+
|
|
|
739
|
+ @_properties.setter
|
|
|
740
|
+ def _properties(self, value):
|
|
|
741
|
+ self.revision.properties = value
|
|
|
742
|
+
|
|
|
743
|
+ @_properties.expression
|
|
|
744
|
+ def _properties(cls):
|
|
|
745
|
+ return ContentRevisionRO.properties
|
|
|
746
|
+
|
|
|
747
|
+ @hybrid_property
|
|
|
748
|
+ def type(self):
|
|
|
749
|
+ return self.revision.type
|
|
|
750
|
+
|
|
|
751
|
+ @type.setter
|
|
|
752
|
+ def type(self, value):
|
|
|
753
|
+ self.revision.type = value
|
|
|
754
|
+
|
|
|
755
|
+ @type.expression
|
|
|
756
|
+ def type(cls):
|
|
|
757
|
+ return ContentRevisionRO.type
|
|
|
758
|
+
|
|
|
759
|
+ @hybrid_property
|
|
|
760
|
+ def status(self):
|
|
|
761
|
+ return self.revision.status
|
|
|
762
|
+
|
|
|
763
|
+ @status.setter
|
|
|
764
|
+ def status(self, value):
|
|
|
765
|
+ self.revision.status = value
|
|
|
766
|
+
|
|
|
767
|
+ @status.expression
|
|
|
768
|
+ def status(cls):
|
|
|
769
|
+ return ContentRevisionRO.status
|
|
|
770
|
+
|
|
|
771
|
+ @hybrid_property
|
|
|
772
|
+ def created(self):
|
|
|
773
|
+ return self.revision.created
|
|
|
774
|
+
|
|
|
775
|
+ @created.setter
|
|
|
776
|
+ def created(self, value):
|
|
|
777
|
+ self.revision.created = value
|
|
|
778
|
+
|
|
|
779
|
+ @created.expression
|
|
|
780
|
+ def created(cls):
|
|
|
781
|
+ return ContentRevisionRO.created
|
|
|
782
|
+
|
|
|
783
|
+ @hybrid_property
|
|
|
784
|
+ def updated(self):
|
|
|
785
|
+ return self.revision.updated
|
|
|
786
|
+
|
|
|
787
|
+ @updated.setter
|
|
|
788
|
+ def updated(self, value):
|
|
|
789
|
+ self.revision.updated = value
|
|
|
790
|
+
|
|
|
791
|
+ @updated.expression
|
|
|
792
|
+ def updated(cls):
|
|
|
793
|
+ return ContentRevisionRO.updated
|
|
|
794
|
+
|
|
|
795
|
+ @hybrid_property
|
|
|
796
|
+ def is_deleted(self):
|
|
|
797
|
+ return self.revision.is_deleted
|
|
|
798
|
+
|
|
|
799
|
+ @is_deleted.setter
|
|
|
800
|
+ def is_deleted(self, value):
|
|
|
801
|
+ self.revision.is_deleted = value
|
|
|
802
|
+
|
|
|
803
|
+ @is_deleted.expression
|
|
|
804
|
+ def is_deleted(cls):
|
|
|
805
|
+ return ContentRevisionRO.is_deleted
|
|
|
806
|
+
|
|
|
807
|
+ @hybrid_property
|
|
|
808
|
+ def is_archived(self):
|
|
|
809
|
+ return self.revision.is_archived
|
|
|
810
|
+
|
|
|
811
|
+ @is_archived.setter
|
|
|
812
|
+ def is_archived(self, value):
|
|
|
813
|
+ self.revision.is_archived = value
|
|
|
814
|
+
|
|
|
815
|
+ @is_archived.expression
|
|
|
816
|
+ def is_archived(cls):
|
|
|
817
|
+ return ContentRevisionRO.is_archived
|
|
|
818
|
+
|
|
|
819
|
+ @hybrid_property
|
|
|
820
|
+ def revision_type(self):
|
|
|
821
|
+ return self.revision.revision_type
|
|
|
822
|
+
|
|
|
823
|
+ @revision_type.setter
|
|
|
824
|
+ def revision_type(self, value):
|
|
|
825
|
+ self.revision.revision_type = value
|
|
|
826
|
+
|
|
|
827
|
+ @revision_type.expression
|
|
|
828
|
+ def revision_type(cls):
|
|
|
829
|
+ return ContentRevisionRO.revision_type
|
|
|
830
|
+
|
|
|
831
|
+ @hybrid_property
|
|
|
832
|
+ def workspace_id(self):
|
|
|
833
|
+ return self.revision.workspace_id
|
|
|
834
|
+
|
|
|
835
|
+ @workspace_id.setter
|
|
|
836
|
+ def workspace_id(self, value):
|
|
|
837
|
+ self.revision.workspace_id = value
|
|
|
838
|
+
|
|
|
839
|
+ @workspace_id.expression
|
|
|
840
|
+ def workspace_id(cls):
|
|
|
841
|
+ return ContentRevisionRO.workspace_id
|
|
|
842
|
+
|
|
|
843
|
+ @hybrid_property
|
|
|
844
|
+ def workspace(self):
|
|
|
845
|
+ return self.revision.workspace
|
|
|
846
|
+
|
|
|
847
|
+ @workspace.setter
|
|
|
848
|
+ def workspace(self, value):
|
|
|
849
|
+ self.revision.workspace = value
|
|
|
850
|
+
|
|
|
851
|
+ @workspace.expression
|
|
|
852
|
+ def workspace(cls):
|
|
|
853
|
+ return ContentRevisionRO.workspace
|
|
|
854
|
+
|
|
|
855
|
+ @hybrid_property
|
|
|
856
|
+ def parent_id(self):
|
|
|
857
|
+ return self.revision.parent_id
|
|
|
858
|
+
|
|
|
859
|
+ @parent_id.setter
|
|
|
860
|
+ def parent_id(self, value):
|
|
|
861
|
+ self.revision.parent_id = value
|
|
|
862
|
+
|
|
|
863
|
+ @parent_id.expression
|
|
|
864
|
+ def parent_id(cls):
|
|
|
865
|
+ return ContentRevisionRO.parent_id
|
|
|
866
|
+
|
|
|
867
|
+ @hybrid_property
|
|
|
868
|
+ def parent(self):
|
|
|
869
|
+ return self.revision.parent
|
|
|
870
|
+
|
|
|
871
|
+ @parent.setter
|
|
|
872
|
+ def parent(self, value):
|
|
|
873
|
+ self.revision.parent = value
|
|
|
874
|
+
|
|
|
875
|
+ @parent.expression
|
|
|
876
|
+ def parent(cls):
|
|
|
877
|
+ return ContentRevisionRO.parent
|
|
|
878
|
+
|
|
|
879
|
+ @hybrid_property
|
|
|
880
|
+ def node(self):
|
|
|
881
|
+ return self.revision.node
|
|
|
882
|
+
|
|
|
883
|
+ @node.setter
|
|
|
884
|
+ def node(self, value):
|
|
|
885
|
+ self.revision.node = value
|
|
|
886
|
+
|
|
|
887
|
+ @node.expression
|
|
|
888
|
+ def node(cls):
|
|
|
889
|
+ return ContentRevisionRO.node
|
|
|
890
|
+
|
|
|
891
|
+ @hybrid_property
|
|
|
892
|
+ def owner(self):
|
|
|
893
|
+ return self.revision.owner
|
|
|
894
|
+
|
|
|
895
|
+ @owner.setter
|
|
|
896
|
+ def owner(self, value):
|
|
|
897
|
+ self.revision.owner = value
|
|
|
898
|
+
|
|
|
899
|
+ @owner.expression
|
|
|
900
|
+ def owner(cls):
|
|
|
901
|
+ return ContentRevisionRO.owner
|
|
|
902
|
+
|
|
|
903
|
+ @hybrid_property
|
|
|
904
|
+ def children(self):
|
|
|
905
|
+ """
|
|
|
906
|
+ :return: list of children Content
|
|
|
907
|
+ :rtype Content
|
|
|
908
|
+ """
|
|
|
909
|
+ # Return a list of unique revisions parent content
|
|
|
910
|
+ return list(set([revision.node for revision in self.children_revisions]))
|
|
|
911
|
+
|
|
|
912
|
+ @property
|
|
|
913
|
+ def revision(self):
|
|
|
914
|
+ return self.get_current_revision()
|
|
|
915
|
+
|
|
|
916
|
+ def get_current_revision(self):
|
|
|
917
|
+ if not self.revisions:
|
|
|
918
|
+ return self.new_revision()
|
|
|
919
|
+
|
|
|
920
|
+ # If last revisions revision don't have revision_id, return it we just add it.
|
|
|
921
|
+ if self.revisions[-1].revision_id is None:
|
|
|
922
|
+ return self.revisions[-1]
|
|
|
923
|
+
|
|
|
924
|
+ # Revisions should be ordred by revision_id but we ensure that here
|
|
|
925
|
+ revisions = sorted(self.revisions, key=lambda revision: revision.revision_id)
|
|
|
926
|
+ return revisions[-1]
|
|
|
927
|
+
|
|
|
928
|
+ def new_revision(self):
|
|
|
929
|
+ """
|
|
|
930
|
+ Return and assign to this content a new revision.
|
|
|
931
|
+ If it's a new content, revision is totally new.
|
|
|
932
|
+ If this content already own revision, revision is build from last revision.
|
|
|
933
|
+ :return:
|
|
|
934
|
+ """
|
|
|
935
|
+ if not self.revisions:
|
|
|
936
|
+ self.revisions.append(ContentRevisionRO())
|
|
|
937
|
+ return self.revisions[0]
|
|
|
938
|
+
|
|
|
939
|
+ new_rev = ContentRevisionRO.new_from(self.get_current_revision())
|
|
|
940
|
+ self.revisions.append(new_rev)
|
|
|
941
|
+ return new_rev
|
|
|
942
|
+
|
|
475
|
943
|
def get_valid_children(self, content_types: list=None) -> ['Content']:
|
|
476
|
944
|
for child in self.children:
|
|
477
|
945
|
if not child.is_deleted and not child.is_archived:
|
|
478
|
946
|
if not content_types or child.type in content_types:
|
|
479
|
|
- yield child
|
|
|
947
|
+ yield child.node
|
|
480
|
948
|
|
|
481
|
949
|
@hybrid_property
|
|
482
|
950
|
def properties(self):
|
|
|
@@ -519,7 +987,6 @@ class Content(DeclarativeBase):
|
|
519
|
987
|
'html.parser' # Fixes hanging bug - http://stackoverflow.com/questions/12618567/problems-running-beautifulsoup4-within-apache-mod-python-django
|
|
520
|
988
|
)
|
|
521
|
989
|
|
|
522
|
|
-
|
|
523
|
990
|
for link in soup.findAll('a'):
|
|
524
|
991
|
href = link.get('href')
|
|
525
|
992
|
label = link.contents
|
|
|
@@ -530,7 +997,6 @@ class Content(DeclarativeBase):
|
|
530
|
997
|
## FIXME - Does this return a sorted list ???!
|
|
531
|
998
|
return sorted_links
|
|
532
|
999
|
|
|
533
|
|
-
|
|
534
|
1000
|
def get_child_nb(self, content_type: ContentType, content_status = ''):
|
|
535
|
1001
|
child_nb = 0
|
|
536
|
1002
|
for child in self.get_valid_children():
|
|
|
@@ -586,7 +1052,7 @@ class Content(DeclarativeBase):
|
|
586
|
1052
|
children = []
|
|
587
|
1053
|
for child in self.children:
|
|
588
|
1054
|
if ContentType.Comment==child.type and not child.is_deleted and not child.is_archived:
|
|
589
|
|
- children.append(child)
|
|
|
1055
|
+ children.append(child.node)
|
|
590
|
1056
|
return children
|
|
591
|
1057
|
|
|
592
|
1058
|
def get_last_comment_from(self, user: User) -> 'Content':
|
|
|
@@ -615,19 +1081,6 @@ class Content(DeclarativeBase):
|
|
615
|
1081
|
|
|
616
|
1082
|
return None
|
|
617
|
1083
|
|
|
618
|
|
- def get_current_revision(self) -> 'ContentRevisionRO':
|
|
619
|
|
- # TODO - D.A. - 2015-08-26
|
|
620
|
|
- # This code is not efficient at all!!!
|
|
621
|
|
- # We should get the revision id directly from the view
|
|
622
|
|
- rev_ids = [revision.revision_id for revision in self.revisions]
|
|
623
|
|
- rev_ids.sort()
|
|
624
|
|
-
|
|
625
|
|
- for revision in self.revisions:
|
|
626
|
|
- if revision.revision_id == rev_ids[-1]:
|
|
627
|
|
- return revision
|
|
628
|
|
-
|
|
629
|
|
- return None
|
|
630
|
|
-
|
|
631
|
1084
|
def description_as_raw_text(self):
|
|
632
|
1085
|
# 'html.parser' fixes a hanging bug
|
|
633
|
1086
|
# see http://stackoverflow.com/questions/12618567/problems-running-beautifulsoup4-within-apache-mod-python-django
|
|
|
@@ -667,102 +1120,22 @@ class Content(DeclarativeBase):
|
|
667
|
1120
|
return url_template.format(wid=wid, fid=fid, ctype=ctype, cid=cid)
|
|
668
|
1121
|
|
|
669
|
1122
|
|
|
670
|
|
-class ContentChecker(object):
|
|
671
|
|
-
|
|
672
|
|
- @classmethod
|
|
673
|
|
- def check_properties(cls, item: Content):
|
|
674
|
|
- if item.type==ContentType.Folder:
|
|
675
|
|
- properties = item.properties
|
|
676
|
|
- if 'allowed_content' not in properties.keys():
|
|
677
|
|
- return False
|
|
678
|
|
- if 'folders' not in properties['allowed_content']:
|
|
679
|
|
- return False
|
|
680
|
|
- if 'files' not in properties['allowed_content']:
|
|
681
|
|
- return False
|
|
682
|
|
- if 'pages' not in properties['allowed_content']:
|
|
683
|
|
- return False
|
|
684
|
|
- if 'threads' not in properties['allowed_content']:
|
|
685
|
|
- return False
|
|
686
|
|
-
|
|
687
|
|
- return True
|
|
688
|
|
-
|
|
689
|
|
- raise NotImplementedError
|
|
690
|
|
-
|
|
691
|
|
- @classmethod
|
|
692
|
|
- def reset_properties(cls, item: Content):
|
|
693
|
|
- if item.type==ContentType.Folder:
|
|
694
|
|
- item.properties = dict(
|
|
695
|
|
- allowed_content = dict (
|
|
696
|
|
- folder = True,
|
|
697
|
|
- file = True,
|
|
698
|
|
- page = True,
|
|
699
|
|
- thread = True
|
|
700
|
|
- )
|
|
701
|
|
- )
|
|
702
|
|
- return
|
|
703
|
|
-
|
|
704
|
|
- raise NotImplementedError
|
|
705
|
|
-
|
|
706
|
|
-
|
|
707
|
|
-class ContentRevisionRO(DeclarativeBase):
|
|
708
|
|
-
|
|
709
|
|
- __tablename__ = 'content_revisions'
|
|
710
|
|
-
|
|
711
|
|
- revision_id = Column(Integer, Sequence('seq__content_revisions__revision_id'), primary_key=True)
|
|
712
|
|
- content_id = Column(Integer, ForeignKey('contents.content_id'))
|
|
713
|
|
- owner_id = Column(Integer, ForeignKey('users.user_id'), nullable=True)
|
|
714
|
|
- label = Column(Unicode(1024), unique=False, nullable=False)
|
|
715
|
|
- description = Column(Text(), unique=False, nullable=False, default='')
|
|
716
|
|
- file_name = Column(Unicode(255), unique=False, nullable=False, default='')
|
|
717
|
|
- file_mimetype = Column(Unicode(255), unique=False, nullable=False, default='')
|
|
718
|
|
- file_content = deferred(Column(LargeBinary(), unique=False, nullable=False, default=None))
|
|
719
|
|
-
|
|
720
|
|
- type = Column(Unicode(32), unique=False, nullable=False)
|
|
721
|
|
- status = Column(Unicode(32), unique=False, nullable=False)
|
|
722
|
|
- created = Column(DateTime, unique=False, nullable=False)
|
|
723
|
|
- updated = Column(DateTime, unique=False, nullable=False)
|
|
724
|
|
- is_deleted = Column(Boolean, unique=False, nullable=False)
|
|
725
|
|
- is_archived = Column(Boolean, unique=False, nullable=False)
|
|
726
|
|
- revision_type = Column(Unicode(32), unique=False, nullable=False, default='')
|
|
727
|
|
-
|
|
728
|
|
- workspace_id = Column(Integer, ForeignKey('workspaces.workspace_id'), unique=False, nullable=True)
|
|
729
|
|
- workspace = relationship('Workspace', remote_side=[Workspace.workspace_id])
|
|
730
|
|
-
|
|
731
|
|
- node = relationship('Content', remote_side=[Content.content_id], backref='revisions')
|
|
732
|
|
- owner = relationship('User', remote_side=[User.user_id])
|
|
733
|
|
-
|
|
734
|
|
- def get_status(self):
|
|
735
|
|
- return ContentStatus(self.status)
|
|
736
|
|
-
|
|
737
|
|
- def get_label(self):
|
|
738
|
|
- return self.label if self.label else self.file_name if self.file_name else ''
|
|
739
|
|
-
|
|
740
|
|
- def get_last_action(self) -> ActionDescription:
|
|
741
|
|
- return ActionDescription(self.revision_type)
|
|
742
|
|
-
|
|
743
|
|
- # Read by must be used like this:
|
|
744
|
|
- # read_datetime = revision.ready_by[<User instance>]
|
|
745
|
|
- # if user did not read the content, then a key error is raised
|
|
746
|
|
- read_by = association_proxy(
|
|
747
|
|
- 'revision_read_statuses', # name of the attribute
|
|
748
|
|
- 'view_datetime', # attribute the value is taken from
|
|
749
|
|
- creator=lambda k, v: \
|
|
750
|
|
- RevisionReadStatus(user=k, view_datetime=v)
|
|
751
|
|
- )
|
|
752
|
|
-
|
|
753
|
|
- def has_new_information_for(self, user: User) -> bool:
|
|
754
|
|
- """
|
|
755
|
|
- :param user: the session current user
|
|
756
|
|
- :return: bool, True if there is new information for given user else False
|
|
757
|
|
- False if the user is None
|
|
758
|
|
- """
|
|
759
|
|
- if not user:
|
|
760
|
|
- return False
|
|
761
|
|
-
|
|
762
|
|
- if user not in self.read_by.keys():
|
|
763
|
|
- return True
|
|
|
1123
|
+@contextmanager
|
|
|
1124
|
+def new_revision(content):
|
|
|
1125
|
+ """
|
|
|
1126
|
+ Prepare context to update a Content. It will add a new updatable revision to the content.
|
|
|
1127
|
+ :param content: Content instance to update
|
|
|
1128
|
+ :return:
|
|
|
1129
|
+ """
|
|
|
1130
|
+ with DBSession.no_autoflush:
|
|
|
1131
|
+ try:
|
|
|
1132
|
+ if inspect(content.revision).has_identity:
|
|
|
1133
|
+ content.new_revision()
|
|
|
1134
|
+ RevisionsIntegrity.add_to_updatable(content.revision)
|
|
|
1135
|
+ yield content.revision
|
|
|
1136
|
+ finally:
|
|
|
1137
|
+ RevisionsIntegrity.remove_from_updatable(content.revision)
|
|
764
|
1138
|
|
|
765
|
|
- return False
|
|
766
|
1139
|
|
|
767
|
1140
|
class RevisionReadStatus(DeclarativeBase):
|
|
768
|
1141
|
|
|
|
@@ -772,11 +1145,6 @@ class RevisionReadStatus(DeclarativeBase):
|
|
772
|
1145
|
user_id = Column(Integer, ForeignKey('users.user_id', ondelete='CASCADE', onupdate='CASCADE'), primary_key=True)
|
|
773
|
1146
|
view_datetime = Column(DateTime, unique=False, nullable=False, server_default=func.now())
|
|
774
|
1147
|
|
|
775
|
|
- # content_revision = relationship(
|
|
776
|
|
- # 'ContentRevisionRO',
|
|
777
|
|
- # remote_side=[ContentRevisionRO.revision_id],
|
|
778
|
|
- # backref='revision_read_statuses')
|
|
779
|
|
-
|
|
780
|
1148
|
content_revision = relationship(
|
|
781
|
1149
|
'ContentRevisionRO',
|
|
782
|
1150
|
backref=backref(
|
Bastien Sevajol