Merge tip

.hgtags

@@ -1,53 +1,54 b''
 bc8fce57a613175450b8b6d933cdd85f22c04658 1.1
 784258eb652c563c288ca7652c33f52cd4733d83 1.1-stable
 1b53a22467a8fccc798935d7a26efe78e4bc7b25 1.2-stable
 1713fb7543386089e364c39703b79e57d3d851f0 1.3
 80f183ebbe132ea8433eacae9431360f31fe7083 1.4
 4330ff5a2bf6c543d8aaae8a43de1dc062f3bd13 1.4.1
 8531d7b001392289a6b761f38c73a257606552ad 1.5
 78e843c8b04b5a81cee5aa24601e305fae75da24 1.5.1
 4f92838730ed9aa1d17651bbcdca19a097fd0c37 1.6
 4bac2f37ea463337ddd27f98e7985407a74de504 1.7
 1c4febea92c6503ae557fba73b2768659ae90d24 1.7.1
 56a4a4578fc454ee455e33dd74a2cc82234bcb59 1.7.2
 34d6f3d5deb22be56b6c1512ec654bd7f6e03bcc 1.7.3
 f5cca33d29c673b67d43f310bebc4e3a21c6d04c 1.7.4
 7f7c33ba6e3f3797ca866c5ed5d358a2393f1371 1.8
 a6b9dd9547bdc17b681502efcceb17aa5c09adf4 1.8.1
 8318fa1615d1946e4519f5735ae880909521990d 2.0
 e23590ee7e2067a3f0fc3cbcfd66404b47127feb 2.1
 4d998aba79e4abf0a2e78e93baaa2c2800b1c49c 2.2
 07fdef4ac33a859250d03f17c594089792bca615 2.2.1
 bcc74d45f060ecd3ff06ff448165aea0d026cb3e 2.2.2
 b0e629ff24eb47a449ecfb455dc6cc600d18c9e2 2.2.3
 1b52ba60f17fd7c90912c14d9d17e880b7952d01 2.2.4
 957e2fec91468f739b0fc2b9936d564505048c68 2.3.0
 bb91141c6ea5c822ccbe2d46c3c48bdab683b77d 2.4.0
 97eb184637e5691b288eaf6b03e8971f3364c239 2.5.0
 119fafc5381b933bf30d97be0b278349f6135075 2.5.1
 d528d76d3242cced614fa11bb63f3d342e4e1d09 2.5.2
 1b631781ced34fbdeec032e7674bc4e131724699 2.6.0
 0f2ef17dc0de678ada279bf7eedf6c5585f1fd7a 2.6.1
 d53fc814a424d7fd90f23025c87b87baa164450e 2.7.0
 836d8bb9fcd930b952b9a02029442c71c2441983 2.8.0
 dfb6c481b1a2c33705de9a9b5304bc924c46b202 2.8.1
 4a5bec08ccfb47a27f9e98698f12dd5b7246623b 2.8.2
 604935b98f5b5e4a5e903594f048046e1fbb3519 2.8.3
 c48ffdc671566069ed0f33644da1229277f3cd18 2.9.0
 d66dc192d4e089ba85325afeef5229b73cb0fde4 2.10.0
 1c22a38cca9ae3bee13d6f263792c0629d0061f6 2.10.1
 3076e0d03339f3b41dcc71fb6af2b4169920846c 2.11.0
 9cffa58fae74952b8ffe70328af88a5df17059c1 2.12.0
 f5caa9e46201ed5b3f1e31655fb4d57bc1b89ab1 3.0.0
 df2ee5df6e73363c8d8fd8f22b87e1a2b21544d4 3.1.0
 3504151c4799f4e33fb7ff846b119d5693c74145 3.2.0
 a03f50d9723e618d011fde7dcc7288bc6861346e 3.2.1
 507a67acbf2e8dc287ba796fa7e5700f8f725bac 3.2.2
 1376f5fc44354b4dff69631ad187d57690c0d460 3.3.0
 21e5d408a1a59aec0e3a97cb206d70c8ce34e9b8 3.3.1
 f2d19a1cde13d82a3803a7d73a4f9c114ed00e7e 3.3.2
 bb195ee1fe07d68b6fccfdde1dbe7c4dd430e15d 3.3.3
 19785af352684884f94566785ba1b13b3ddc5216 3.4.0
 757b4ada4ca121db4296b13ec0df491645db8fd0 3.5.0
 3da1a2d02072eec5419956265dcd8c7f47155c12 4.0.0
 da8f0f9d5099ee8b22aa317b91beb06543011f1d 4.1.0
+9619ecc0f79b705c94b3ac873896809eaf7779a6 4.1.1

boards/abstracts/sync_filters.py

@@ -1,31 +1,66 b''
 import xml.etree.ElementTree as et
 
-from boards.models import Post
+from boards.models import Post, Tag
 
 TAG_THREAD = 'thread'
+TAG_TAGS = 'tags'
+TAG_TAG = 'tag'
+TAG_TIME_FROM = 'timestamp_from'
 
 
 class PostFilter:
     def __init__(self, content=None):
         self.content = content
 
     def filter(self, posts):
         return posts
 
     def add_filter(self, model_tag, value):
         return model_tag
 
 
 class ThreadFilter(PostFilter):
     def filter(self, posts):
         op_id = self.content.text
 
         op = Post.objects.filter(opening=True, id=op_id).first()
         if op:
             return posts.filter(thread=op.get_thread())
         else:
             return posts.none()
 
     def add_filter(self, model_tag, value):
         thread_tag = et.SubElement(model_tag, TAG_THREAD)
         thread_tag.text = str(value)
+
+
+class TagsFilter(PostFilter):
+    def filter(self, posts):
+        tags = []
+        for tag_tag in self.content:
+            try:
+                tags.append(Tag.objects.get(name=tag_tag.text))
+            except Tag.DoesNotExist:
+                pass
+
+        if tags:
+            return posts.filter(thread__tags__in=tags)
+        else:
+            return posts.none()
+
+    def add_filter(self, model_tag, value):
+        tags_tag = et.SubElement(model_tag, TAG_TAGS)
+        for tag_name in value:
+            tag_tag = et.SubElement(tags_tag, TAG_TAG)
+            tag_tag.text = tag_name
+
+
+class TimestampFromFilter(PostFilter):
+    def filter(self, posts):
+        from_time = self.content.text
+        return posts.filter(pub_time__gt=from_time)
+
+    def add_filter(self, model_tag, value):
+        tags_from_time = et.SubElement(model_tag, TAG_TIME_FROM)
+        tags_from_time.text = value
+

boards/config/default_settings.ini

@@ -1,49 +1,49 b''
 [Version]
-Version = 4.1.0 2017
+Version = 4.1.1 2017
 SiteName = Neboard DEV
 
 [Cache]
 # Timeout for caching, if cache is used
 CacheTimeout = 600
 
 [Forms]
 # Max post length in characters
 MaxTextLength = 30000
 MaxFileSize = 8000000
 LimitFirstPosting = true
 LimitPostingSpeed = false
 PowDifficulty = 0
 # Delay in seconds
 PostingDelay = 30
 Autoban = false
 DefaultTag = test
 MaxFileCount = 1
 AdditionalSpoilerSpaces = false
 
 [Messages]
 # Thread bumplimit
 MaxPostsPerThread = 10
 ThreadArchiveDays = 300
 AnonymousMode = false
 
 [View]
 DefaultTheme = md
 DefaultImageViewer = simple
 LastRepliesCount = 3
 ThreadsPerPage = 3
 PostsPerPage = 10
 ImagesPerPageGallery = 20
 MaxFavoriteThreads = 20
 MaxLandingThreads = 20
 Themes=md:Mystic Dark,md_centered:Mystic Dark (centered),sw:Snow White,pg:Photon Grey,ad:Amanita Dark,iw:Inocibe White
 ImageViewers=simple:Simple,popup:Popup
 
 [Storage]
 # Enable archiving threads instead of deletion when the thread limit is reached
 ArchiveThreads = true
 
 [RSS]
 MaxItems = 20
 
 [External]
 ImageSearchHost=

boards/management/commands/sync_with_server.py

@@ -1,99 +1,115 b''
 import re
 import logging
 import xml.etree.ElementTree as ET
 
 import httplib2
 from django.core.management import BaseCommand
 
 from boards.models import GlobalId
 from boards.models.post.sync import SyncManager, TAG_ID, TAG_VERSION
 
 __author__ = 'neko259'
 
 
 REGEX_GLOBAL_ID = re.compile(r'(\w+)::([\w\+/]+)::(\d+)')
 
 
 class Command(BaseCommand):
     help = 'Send a sync or get request to the server.'
 
     def add_arguments(self, parser):
         parser.add_argument('url', type=str, help='Server root url')
         parser.add_argument('--global-id', type=str, default='',
                             help='Post global ID')
         parser.add_argument('--split-query', type=int, default=1,
                             help='Split GET query into separate by the given'
                                  ' number of posts in one')
         parser.add_argument('--thread', type=int,
                             help='Get posts of one specific thread')
+        parser.add_argument('--tags', type=str,
+                help='Get posts of the tags, comma-separated')
+        parser.add_argument('--time-from', type=str,
+                help='Get posts from the given timestamp')
 
     def handle(self, *args, **options):
         logger = logging.getLogger('boards.sync')
 
         url = options.get('url')
 
         list_url = url + 'api/sync/list/'
         get_url = url + 'api/sync/get/'
         file_url = url[:-1]
 
         global_id_str = options.get('global_id')
         if global_id_str:
             match = REGEX_GLOBAL_ID.match(global_id_str)
             if match:
                 key_type = match.group(1)
                 key = match.group(2)
                 local_id = match.group(3)
 
                 global_id = GlobalId(key_type=key_type, key=key,
                                      local_id=local_id)
 
                 xml = SyncManager.generate_request_get([global_id])
                 h = httplib2.Http()
                 response, content = h.request(get_url, method="POST", body=xml)
 
                 SyncManager.parse_response_get(content, file_url)
             else:
                 raise Exception('Invalid global ID')
         else:
             logger.info('Running LIST request...')
             h = httplib2.Http()
+
+            tags = []
+            tags_str = options.get('tags')
+            if tags_str:
+                tags = tags_str.split(',')
+
             xml = SyncManager.generate_request_list(
-                opening_post=options.get('thread'))
+                opening_post=options.get('thread'), tags=tags,
+                timestamp_from=options.get('time_from')).encode()
             response, content = h.request(list_url, method="POST", body=xml)
+            if response.status != 200:
+                raise Exception('Server returned error {}'.format(response.status))
+
             logger.info('Processing response...')
 
             root = ET.fromstring(content)
             status = root.findall('status')[0].text
             if status == 'success':
                 ids_to_sync = list()
 
                 models = root.findall('models')[0]
                 for model in models:
                     tag_id = model.find(TAG_ID)
                     global_id, exists = GlobalId.from_xml_element(tag_id)
                     tag_version = model.find(TAG_VERSION)
                     if tag_version is not None:
                         version = int(tag_version.text) or 1
                     else:
                         version = 1
                     if not exists or global_id.post.version < version:
                         logger.debug('Processed (+) post {}'.format(global_id))
                         ids_to_sync.append(global_id)
                     else:
                         logger.debug('* Processed (-) post {}'.format(global_id))
                 logger.info('Starting sync...')
 
                 if len(ids_to_sync) > 0:
                     limit = options.get('split_query', len(ids_to_sync))
                     for offset in range(0, len(ids_to_sync), limit):
                         xml = SyncManager.generate_request_get(ids_to_sync[offset:offset + limit])
                         h = httplib2.Http()
                         logger.info('Running GET request...')
                         response, content = h.request(get_url, method="POST", body=xml)
                         logger.info('Processing response...')
 
                         SyncManager.parse_response_get(content, file_url)
+
+                        logger.info('Sync completed successfully')
                 else:
                     logger.info('Nothing to get, everything synced')
             else:
                 raise Exception('Invalid response status')

boards/models/post/sync.py

@@ -1,345 +1,391 b''
 import xml.etree.ElementTree as et
 import logging
 from xml.etree import ElementTree
 
 from boards.abstracts.exceptions import SyncException
-from boards.abstracts.sync_filters import ThreadFilter
+from boards.abstracts.sync_filters import ThreadFilter, TagsFilter,\
+        TimestampFromFilter
 from boards.models import KeyPair, GlobalId, Signature, Post, Tag
 from boards.models.attachment.downloaders import download
 from boards.models.signature import TAG_REQUEST, ATTR_TYPE, TYPE_GET, \
     ATTR_VERSION, TAG_MODEL, ATTR_NAME, TAG_ID, TYPE_LIST
 from boards.utils import get_file_mimetype, get_file_hash
 from django.db import transaction
 from django import forms
 
 EXCEPTION_NODE = 'Sync node returned an error: {}.'
 EXCEPTION_DOWNLOAD = 'File was not downloaded.'
 EXCEPTION_HASH = 'File hash does not match attachment hash.'
 EXCEPTION_SIGNATURE = 'Invalid model signature for {}.'
 EXCEPTION_AUTHOR_SIGNATURE = 'Model {} has no author signature.'
+EXCEPTION_THREAD = 'No thread exists for post {}'
 ENCODING_UNICODE = 'unicode'
 
 TAG_MODEL = 'model'
 TAG_REQUEST = 'request'
 TAG_RESPONSE = 'response'
 TAG_ID = 'id'
 TAG_STATUS = 'status'
 TAG_MODELS = 'models'
 TAG_TITLE = 'title'
 TAG_TEXT = 'text'
 TAG_THREAD = 'thread'
 TAG_PUB_TIME = 'pub-time'
 TAG_SIGNATURES = 'signatures'
 TAG_SIGNATURE = 'signature'
 TAG_CONTENT = 'content'
 TAG_ATTACHMENTS = 'attachments'
 TAG_ATTACHMENT = 'attachment'
 TAG_TAGS = 'tags'
 TAG_TAG = 'tag'
 TAG_ATTACHMENT_REFS = 'attachment-refs'
 TAG_ATTACHMENT_REF = 'attachment-ref'
 TAG_TRIPCODE = 'tripcode'
 TAG_VERSION = 'version'
 
 TYPE_GET = 'get'
 
 ATTR_VERSION = 'version'
 ATTR_TYPE = 'type'
 ATTR_NAME = 'name'
 ATTR_VALUE = 'value'
 ATTR_MIMETYPE = 'mimetype'
 ATTR_KEY = 'key'
 ATTR_REF = 'ref'
 ATTR_URL = 'url'
 ATTR_ID_TYPE = 'id-type'
 
 ID_TYPE_MD5 = 'md5'
 ID_TYPE_URL = 'url'
 
 STATUS_SUCCESS = 'success'
 
 
 logger = logging.getLogger('boards.sync')
 
 
 class SyncManager:
     @staticmethod
     def generate_response_get(model_list: list):
         response = et.Element(TAG_RESPONSE)
 
         status = et.SubElement(response, TAG_STATUS)
         status.text = STATUS_SUCCESS
 
         models = et.SubElement(response, TAG_MODELS)
 
         for post in model_list:
             model = et.SubElement(models, TAG_MODEL)
             model.set(ATTR_NAME, 'post')
 
             global_id = post.global_id
 
             attachments = post.attachments.all()
             if global_id.content:
                 model.append(et.fromstring(global_id.content))
                 if len(attachments) > 0:
                     internal_attachments = False
                     for attachment in attachments:
                         if attachment.is_internal():
                             internal_attachments = True
                             break
 
                     if internal_attachments:
                         attachment_refs = et.SubElement(model, TAG_ATTACHMENT_REFS)
                         for file in attachments:
                             SyncManager._attachment_to_xml(
                                 None, attachment_refs, file)
             else:
                 content_tag = et.SubElement(model, TAG_CONTENT)
 
                 tag_id = et.SubElement(content_tag, TAG_ID)
                 global_id.to_xml_element(tag_id)
 
                 title = et.SubElement(content_tag, TAG_TITLE)
                 title.text = post.title
 
                 text = et.SubElement(content_tag, TAG_TEXT)
                 text.text = post.get_sync_text()
 
                 thread = post.get_thread()
                 if post.is_opening():
                     tag_tags = et.SubElement(content_tag, TAG_TAGS)
                     for tag in thread.get_tags():
                         tag_tag = et.SubElement(tag_tags, TAG_TAG)
                         tag_tag.text = tag.name
                 else:
                     tag_thread = et.SubElement(content_tag, TAG_THREAD)
                     thread_id = et.SubElement(tag_thread, TAG_ID)
                     thread.get_opening_post().global_id.to_xml_element(thread_id)
 
                 pub_time = et.SubElement(content_tag, TAG_PUB_TIME)
                 pub_time.text = str(post.get_pub_time_str())
 
                 if post.tripcode:
                     tripcode = et.SubElement(content_tag, TAG_TRIPCODE)
                     tripcode.text = post.tripcode
 
                 if len(attachments) > 0:
                     attachments_tag = et.SubElement(content_tag, TAG_ATTACHMENTS)
                     
                     internal_attachments = False
                     for attachment in attachments:
                         if attachment.is_internal():
                             internal_attachments = True
                             break
 
                     if internal_attachments:
                         attachment_refs = et.SubElement(model, TAG_ATTACHMENT_REFS)
                     else:
                         attachment_refs = None
 
                     for file in attachments:
                         SyncManager._attachment_to_xml(
                             attachments_tag, attachment_refs, file)
                 version_tag = et.SubElement(content_tag, TAG_VERSION)
                 version_tag.text = str(post.version)
 
                 global_id.content = et.tostring(content_tag, ENCODING_UNICODE)
                 global_id.save()
 
             signatures_tag = et.SubElement(model, TAG_SIGNATURES)
             post_signatures = global_id.signature_set.all()
             if post_signatures:
                 signatures = post_signatures
             else:
                 key = KeyPair.objects.get(public_key=global_id.key)
                 signature = Signature(
                     key_type=key.key_type,
                     key=key.public_key,
                     signature=key.sign(global_id.content),
                     global_id=global_id,
                 )
                 signature.save()
                 signatures = [signature]
             for signature in signatures:
                 signature_tag = et.SubElement(signatures_tag, TAG_SIGNATURE)
                 signature_tag.set(ATTR_TYPE, signature.key_type)
                 signature_tag.set(ATTR_VALUE, signature.signature)
                 signature_tag.set(ATTR_KEY, signature.key)
 
         return et.tostring(response, ENCODING_UNICODE)
 
     @staticmethod
     def parse_response_get(response_xml, hostname):
         tag_root = et.fromstring(response_xml)
         tag_status = tag_root.find(TAG_STATUS)
         if STATUS_SUCCESS == tag_status.text:
             tag_models = tag_root.find(TAG_MODELS)
             for tag_model in tag_models:
                 SyncManager.parse_post(tag_model, hostname)
         else:
             raise SyncException(EXCEPTION_NODE.format(tag_status.text))
 
     @staticmethod
     @transaction.atomic
     def parse_post(tag_model, hostname):
         tag_content = tag_model.find(TAG_CONTENT)
 
         content_str = et.tostring(tag_content, ENCODING_UNICODE)
 
         tag_id = tag_content.find(TAG_ID)
         global_id, exists = GlobalId.from_xml_element(tag_id)
         signatures = SyncManager._verify_model(global_id, content_str, tag_model)
 
         version = int(tag_content.find(TAG_VERSION).text)
         is_old = exists and global_id.post.version < version
         if exists and not is_old:
-            print('Post with same ID exists and is up to date.')
+            logger.debug('Post {} exists and is up to date.'.format(global_id))
         else:
             global_id.content = content_str
             global_id.save()
             for signature in signatures:
                 signature.global_id = global_id
                 signature.save()
 
             title = tag_content.find(TAG_TITLE).text or ''
             text = tag_content.find(TAG_TEXT).text or ''
             pub_time = tag_content.find(TAG_PUB_TIME).text
             tripcode_tag = tag_content.find(TAG_TRIPCODE)
             if tripcode_tag is not None:
                 tripcode = tripcode_tag.text or ''
             else:
                 tripcode = ''
 
             thread = tag_content.find(TAG_THREAD)
             tags = []
             if thread:
                 thread_id = thread.find(TAG_ID)
                 op_global_id, exists = GlobalId.from_xml_element(thread_id)
                 if exists:
                     opening_post = Post.objects.get(global_id=op_global_id)
                 else:
-                    logger.debug('No thread exists for post {}'.format(global_id))
+                    raise Exception(EXCEPTION_THREAD.format(global_id))
             else:
                 opening_post = None
                 tag_tags = tag_content.find(TAG_TAGS)
                 for tag_tag in tag_tags:
                     tag, created = Tag.objects.get_or_create(
                         name=tag_tag.text)
                     tags.append(tag)
 
             # TODO Check that the replied posts are already present
             # before adding new ones
 
             files = []
             urls = []
             tag_attachments = tag_content.find(TAG_ATTACHMENTS) or list()
             tag_refs = tag_model.find(TAG_ATTACHMENT_REFS)
             for attachment in tag_attachments:
                 if attachment.get(ATTR_ID_TYPE) == ID_TYPE_URL:
                     urls.append(attachment.text)
                 else:
                     tag_ref = tag_refs.find("{}[@ref='{}']".format(
                         TAG_ATTACHMENT_REF, attachment.text))
                     url = tag_ref.get(ATTR_URL)
                     try:
                         attached_file = download(hostname + url, validate=False)
 
                         if attached_file is None:
                             raise SyncException(EXCEPTION_DOWNLOAD)
 
                         hash = get_file_hash(attached_file)
                         if hash != attachment.text:
                             raise SyncException(EXCEPTION_HASH)
 
                         files.append(attached_file)
                     except forms.ValidationError:
                         urls.append(hostname+url)
                         
 
             if is_old:
                 post = global_id.post
                 Post.objects.update_post(
                     post, title=title, text=text, pub_time=pub_time,
                     tags=tags, files=files, file_urls=urls,
                     tripcode=tripcode, version=version)
                 logger.debug('Parsed updated post {}'.format(global_id))
             else:
                 Post.objects.import_post(
                     title=title, text=text, pub_time=pub_time,
                     opening_post=opening_post, tags=tags,
                     global_id=global_id, files=files,
                     file_urls=urls, tripcode=tripcode,
                     version=version)
                 logger.debug('Parsed new post {}'.format(global_id))
 
     @staticmethod
     def generate_response_list(filters):
         response = et.Element(TAG_RESPONSE)
 
         status = et.SubElement(response, TAG_STATUS)
         status.text = STATUS_SUCCESS
 
         models = et.SubElement(response, TAG_MODELS)
 
         posts = Post.objects.prefetch_related('global_id')
         for post_filter in filters:
             posts = post_filter.filter(posts)
 
         for post in posts:
             tag_model = et.SubElement(models, TAG_MODEL)
             tag_id = et.SubElement(tag_model, TAG_ID)
             post.global_id.to_xml_element(tag_id)
             tag_version = et.SubElement(tag_model, TAG_VERSION)
             tag_version.text = str(post.version)
 
         return et.tostring(response, ENCODING_UNICODE)
 
     @staticmethod
     def _verify_model(global_id, content_str, tag_model):
         """
         Verifies all signatures for a single model.
         """
 
         signatures = []
 
         tag_signatures = tag_model.find(TAG_SIGNATURES)
         has_author_signature = False
         for tag_signature in tag_signatures:
             signature_type = tag_signature.get(ATTR_TYPE)
             signature_value = tag_signature.get(ATTR_VALUE)
             signature_key = tag_signature.get(ATTR_KEY)
 
             if global_id.key_type == signature_type and\
                     global_id.key == signature_key:
                 has_author_signature = True
 
             signature = Signature(key_type=signature_type,
                                   key=signature_key,
                                   signature=signature_value)
 
             if not KeyPair.objects.verify(signature, content_str):
                 raise SyncException(EXCEPTION_SIGNATURE.format(content_str))
 
             signatures.append(signature)
         if not has_author_signature:
             raise SyncException(EXCEPTION_AUTHOR_SIGNATURE.format(content_str))
 
         return signatures
 
     @staticmethod
     def _attachment_to_xml(tag_attachments, tag_refs, attachment):
         if tag_attachments is not None:
             attachment_tag = et.SubElement(tag_attachments, TAG_ATTACHMENT)
             if attachment.is_internal():
                 mimetype = get_file_mimetype(attachment.file.file)
                 attachment_tag.set(ATTR_MIMETYPE, mimetype)
                 attachment_tag.set(ATTR_ID_TYPE, ID_TYPE_MD5)
                 attachment_tag.text = attachment.hash
             else:
                 attachment_tag.set(ATTR_ID_TYPE, ID_TYPE_URL)
                 attachment_tag.text = attachment.url
 
-        if tag_refs is not None:
+        if tag_refs is not None and attachment.is_internal():
             attachment_ref = et.SubElement(tag_refs, TAG_ATTACHMENT_REF)
             attachment_ref.set(ATTR_REF, attachment.hash)
-            attachment_ref.set(ATTR_URL, attachment.file.url)	
+            attachment_ref.set(ATTR_URL, attachment.file.url)
+
+    @staticmethod
+    def generate_request_get(global_id_list: list):
+        """
+        Form a get request from a list of ModelId objects.
+        """
+
+        request = et.Element(TAG_REQUEST)
+        request.set(ATTR_TYPE, TYPE_GET)
+        request.set(ATTR_VERSION, '1.0')
+
+        model = et.SubElement(request, TAG_MODEL)
+        model.set(ATTR_VERSION, '1.0')
+        model.set(ATTR_NAME, 'post')
+
+        for global_id in global_id_list:
+            tag_id = et.SubElement(model, TAG_ID)
+            global_id.to_xml_element(tag_id)
+
+        return et.tostring(request, 'unicode')
+
+    @staticmethod
+    def generate_request_list(opening_post=None, tags=list(),
+            timestamp_from=None):
+        """
+        Form a pull request from a list of ModelId objects.
+        """
+
+        request = et.Element(TAG_REQUEST)
+        request.set(ATTR_TYPE, TYPE_LIST)
+        request.set(ATTR_VERSION, '1.0')
+
+        model = et.SubElement(request, TAG_MODEL)
+        model.set(ATTR_VERSION, '1.0')
+        model.set(ATTR_NAME, 'post')
+
+        if opening_post:
+            ThreadFilter().add_filter(model, opening_post)
+        if tags:
+            TagsFilter().add_filter(model, tags)
+        if timestamp_from:
+            TimestampFromFilter().add_filter(model, timestamp_from)
+
+        return et.tostring(request, 'unicode')

boards/tests/test_sync.py

@@ -1,214 +1,253 b''
 from django.test import TestCase
 
 from boards.models import KeyPair, Post, Tag
 from boards.models.post.sync import SyncManager
 from boards.tests.mocks import MockRequest
 from boards.views.sync import response_get, response_list
 
 __author__ = 'neko259'
 
 
 class SyncTest(TestCase):
     def test_get(self):
         """
         Forms a GET request of a post and checks the response.
         """
 
         key = KeyPair.objects.generate_key(primary=True)
         tag = Tag.objects.create(name='tag1')
         post = Post.objects.create_post(title='test_title',
                                         text='test_text\rline two',
                                         tags=[tag])
 
         request = MockRequest()
         request.body = (
             '<request type="get" version="1.0">'
             '<model name="post" version="1.0">'
             '<id key="%s" local-id="%d" type="%s" />'
             '</model>'
             '</request>' % (post.global_id.key,
                             post.id,
                             post.global_id.key_type)
         )
 
         response = response_get(request).content.decode()
         self.assertTrue(
             '<status>success</status>'
             '<models>'
             '<model name="post">'
             '<content>'
             '<id key="%s" local-id="%d" type="%s" />'
             '<title>%s</title>'
             '<text>%s</text>'
             '<tags><tag>%s</tag></tags>'
             '<pub-time>%s</pub-time>'
             '<version>%s</version>'
             '</content>' % (
                 post.global_id.key,
                 post.global_id.local_id,
                 post.global_id.key_type,
                 post.title,
                 post.get_sync_text(),
                 post.get_thread().get_tags().first().name,
                 post.get_pub_time_str(),
                 post.version,
             ) in response,
             'Wrong response generated for the GET request.')
 
         post.delete()
         key.delete()
 
         KeyPair.objects.generate_key(primary=True)
 
         SyncManager.parse_response_get(response, None)
         self.assertEqual(1, Post.objects.count(),
                          'Post was not created from XML response.')
 
         parsed_post = Post.objects.first()
         self.assertEqual('tag1',
                          parsed_post.get_thread().get_tags().first().name,
                          'Invalid tag was parsed.')
 
         SyncManager.parse_response_get(response, None)
         self.assertEqual(1, Post.objects.count(),
                          'The same post was imported twice.')
 
         self.assertEqual(1, parsed_post.global_id.signature_set.count(),
                          'Signature was not saved.')
 
         post = parsed_post
 
         # Trying to sync the same once more
         response = response_get(request).content.decode()
 
         self.assertTrue(
             '<status>success</status>'
             '<models>'
             '<model name="post">'
             '<content>'
             '<id key="%s" local-id="%d" type="%s" />'
             '<title>%s</title>'
             '<text>%s</text>'
             '<tags><tag>%s</tag></tags>'
             '<pub-time>%s</pub-time>'
             '<version>%s</version>'
             '</content>' % (
                 post.global_id.key,
                 post.global_id.local_id,
                 post.global_id.key_type,
                 post.title,
                 post.get_sync_text(),
                 post.get_thread().get_tags().first().name,
                 post.get_pub_time_str(),
                 post.version,
             ) in response,
             'Wrong response generated for the GET request.')
 
     def test_list_all(self):
         key = KeyPair.objects.generate_key(primary=True)
         tag = Tag.objects.create(name='tag1')
         post = Post.objects.create_post(title='test_title',
                                         text='test_text\rline two',
                                         tags=[tag])
         post2 = Post.objects.create_post(title='test title 2',
                                          text='test text 2',
                                          tags=[tag])
 
         request_all = MockRequest()
         request_all.body = (
             '<request type="list" version="1.0">'
             '<model name="post" version="1.0">'
             '</model>'
             '</request>'
         )
 
         response_all = response_list(request_all).content.decode()
         self.assertTrue(
             '<status>success</status>'
             '<models>'
             '<model>'
             '<id key="{}" local-id="{}" type="{}" />'
             '<version>{}</version>'
             '</model>'
             '<model>'
             '<id key="{}" local-id="{}" type="{}" />'
             '<version>{}</version>'
             '</model>'
             '</models>'.format(
                 post.global_id.key,
                 post.global_id.local_id,
                 post.global_id.key_type,
                 post.version,
                 post2.global_id.key,
                 post2.global_id.local_id,
                 post2.global_id.key_type,
                 post2.version,
             ) in response_all,
             'Wrong response generated for the LIST request for all posts.')
 
     def test_list_existing_thread(self):
         key = KeyPair.objects.generate_key(primary=True)
         tag = Tag.objects.create(name='tag1')
         post = Post.objects.create_post(title='test_title',
                                         text='test_text\rline two',
                                         tags=[tag])
         post2 = Post.objects.create_post(title='test title 2',
                                          text='test text 2',
                                          tags=[tag])
 
         request_thread = MockRequest()
         request_thread.body = (
             '<request type="list" version="1.0">'
             '<model name="post" version="1.0">'
             '<thread>{}</thread>'
             '</model>'
             '</request>'.format(
                 post.id,
             )
         )
 
         response_thread = response_list(request_thread).content.decode()
         self.assertTrue(
             '<status>success</status>'
             '<models>'
             '<model>'
             '<id key="{}" local-id="{}" type="{}" />'
             '<version>{}</version>'
             '</model>'
             '</models>'.format(
                 post.global_id.key,
                 post.global_id.local_id,
                 post.global_id.key_type,
                 post.version,
             ) in response_thread,
             'Wrong response generated for the LIST request for posts of '
             'existing thread.')
 
     def test_list_non_existing_thread(self):
         key = KeyPair.objects.generate_key(primary=True)
         tag = Tag.objects.create(name='tag1')
         post = Post.objects.create_post(title='test_title',
                                         text='test_text\rline two',
                                         tags=[tag])
         post2 = Post.objects.create_post(title='test title 2',
                                          text='test text 2',
                                          tags=[tag])
 
         request_thread = MockRequest()
         request_thread.body = (
             '<request type="list" version="1.0">'
             '<model name="post" version="1.0">'
             '<thread>{}</thread>'
             '</model>'
             '</request>'.format(
                 0,
             )
         )
 
         response_thread = response_list(request_thread).content.decode()
         self.assertTrue(
             '<status>success</status>'
             '<models />'
             in response_thread,
             'Wrong response generated for the LIST request for posts of '
             'non-existing thread.')
+
+    def test_list_pub_time(self):
+        key = KeyPair.objects.generate_key(primary=True)
+        tag = Tag.objects.create(name='tag1')
+        post = Post.objects.create_post(title='test_title',
+                                        text='test_text\rline two',
+                                        tags=[tag])
+        post2 = Post.objects.create_post(title='test title 2',
+                                         text='test text 2',
+                                         tags=[tag])
+
+        request_thread = MockRequest()
+        request_thread.body = (
+            '<request type="list" version="1.0">'
+            '<model name="post" version="1.0">'
+            '<timestamp_from>{}</timestamp_from>'
+            '</model>'
+            '</request>'.format(
+                post.pub_time,
+            )
+        )
+
+        response_thread = response_list(request_thread).content.decode()
+        self.assertTrue(
+            '<status>success</status>'
+            '<models>'
+            '<model>'
+            '<id key="{}" local-id="{}" type="{}" />'
+            '<version>{}</version>'
+            '</model>'
+            '</models>'.format(
+                post2.global_id.key,
+                post2.global_id.local_id,
+                post2.global_id.key_type,
+                post2.version,
+            ) in response_thread,
+            'Wrong response generated for the LIST request for posts of '
+            'existing thread.')
+

boards/utils.py

@@ -1,157 +1,157 b''
 """
 This module contains helper functions and helper classes.
 """
 import hashlib
 import uuid
 
 from boards.abstracts.constants import FILE_DIRECTORY
 from random import random
 import time
 import hmac
 
 from django.core.cache import cache
 from django.db.models import Model
 from django import forms
 from django.template.defaultfilters import filesizeformat
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 import magic
 import os
 
 import boards
 from boards.settings import get_bool
 from neboard import settings
 
 CACHE_KEY_DELIMITER = '_'
 
 HTTP_FORWARDED = 'HTTP_X_FORWARDED_FOR'
 META_REMOTE_ADDR = 'REMOTE_ADDR'
 
 SETTING_MESSAGES = 'Messages'
 SETTING_ANON_MODE = 'AnonymousMode'
 
 ANON_IP = '127.0.0.1'
 
 FILE_EXTENSION_DELIMITER = '.'
 
 
 def is_anonymous_mode():
     return get_bool(SETTING_MESSAGES, SETTING_ANON_MODE)
 
 
 def get_client_ip(request):
     if is_anonymous_mode():
         ip = ANON_IP
     else:
         x_forwarded_for = request.META.get(HTTP_FORWARDED)
         if x_forwarded_for:
             ip = x_forwarded_for.split(',')[-1].strip()
         else:
             ip = request.META.get(META_REMOTE_ADDR)
     return ip
 
 
 # TODO The output format is not epoch because it includes microseconds
 def datetime_to_epoch(datetime):
     return int(time.mktime(timezone.localtime(
         datetime,timezone.get_current_timezone()).timetuple())
                * 1000000 + datetime.microsecond)
 
 
 def get_websocket_token(user_id='', timestamp=''):
     """
     Create token to validate information provided by new connection.
     """
 
     sign = hmac.new(settings.CENTRIFUGE_PROJECT_SECRET.encode())
     sign.update(settings.CENTRIFUGE_PROJECT_ID.encode())
     sign.update(user_id.encode())
     sign.update(timestamp.encode())
     token = sign.hexdigest()
 
     return token
 
 
 # TODO Test this carefully
 def cached_result(key_method=None):
     """
     Caches method result in the Django's cache system, persisted by object name,
     object name, model id if object is a Django model, args and kwargs if any.
     """
     def _cached_result(function):
         def inner_func(obj, *args, **kwargs):
             cache_key_params = [obj.__class__.__name__, function.__name__]
 
             cache_key_params += args
             for key, value in kwargs:
                 cache_key_params.append(key + ':' + value)
 
             if isinstance(obj, Model):
                 cache_key_params.append(str(obj.id))
 
             if key_method is not None:
                 cache_key_params += [str(arg) for arg in key_method(obj)]
 
             cache_key = CACHE_KEY_DELIMITER.join(cache_key_params)
 
             persisted_result = cache.get(cache_key)
             if persisted_result is not None:
                 result = persisted_result
             else:
                 result = function(obj, *args, **kwargs)
                 if result is not None:
                     cache.set(cache_key, result)
 
             return result
 
         return inner_func
     return _cached_result
 
 
 def get_file_hash(file) -> str:
     md5 = hashlib.md5()
     for chunk in file.chunks():
         md5.update(chunk)
     return md5.hexdigest()
 
 
 def validate_file_size(size: int):
     max_size = boards.settings.get_int('Forms', 'MaxFileSize')
-    if size > max_size:
+    if max_size > 0 and size > max_size:
         raise forms.ValidationError(
             _('File must be less than %s but is %s.')
             % (filesizeformat(max_size), filesizeformat(size)))
 
 
 def get_extension(filename):
     return filename.split(FILE_EXTENSION_DELIMITER)[-1:][0]
 
 
 def get_upload_filename(model_instance, old_filename):
     extension = get_extension(old_filename)
     new_name = '{}.{}'.format(uuid.uuid4(), extension)
 
     return os.path.join(FILE_DIRECTORY, new_name)
 
 
 def get_file_mimetype(file) -> str:
     file_type = magic.from_buffer(file.chunks().__next__(), mime=True)
     if file_type is None:
         file_type = 'application/octet-stream'
     elif type(file_type) == bytes:
         file_type = file_type.decode()
     return file_type
 
 
 def get_domain(url: str) -> str:
     """
     Gets domain from an URL with random number of domain levels.
     """
     domain_parts = url.split('/')
     if len(domain_parts) >= 2:
         full_domain = domain_parts[2]
     else:
         full_domain = ''
 
     return full_domain
 

boards/views/landing.py

@@ -1,42 +1,46 b''
 from datetime import datetime
 from datetime import timedelta
 
 from django.db.models import Count
 from django.shortcuts import render
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_protect
 
 from boards import settings
 from boards.models import Post
 from boards.models import Tag, Attachment, STATUS_ACTIVE
 from boards.views.base import BaseBoardView
 
 PARAM_SECTION_STR = 'section_str'
 PARAM_LATEST_THREADS = 'latest_threads'
 PARAM_IMAGES = 'images'
 
 TEMPLATE = 'boards/landing.html'
 
 RANDOM_IMAGE_COUNT = 3
 
 
 class LandingView(BaseBoardView):
     @method_decorator(csrf_protect)
     def get(self, request):
         params = dict()
 
         params[PARAM_SECTION_STR] = Tag.objects.get_tag_url_list(
                 Tag.objects.filter(required=True))
 
         today = datetime.now() - timedelta(1)
-        max_landing_threads = settings.get_int('View', 'MaxFavoriteThreads')
         ops = Post.objects.filter(thread__replies__pub_time__gt=today, opening=True, thread__status=STATUS_ACTIVE)\
                   .annotate(today_post_count=Count('thread__replies'))\
-                  .order_by('-pub_time')[:max_landing_threads]
+                  .order_by('-pub_time')
+
+        max_landing_threads = settings.get_int('View', 'MaxFavoriteThreads')
+        if max_landing_threads > 0:
+            ops = ops[:max_landing_threads]
+
         params[PARAM_LATEST_THREADS] = ops
 
         params[PARAM_IMAGES] = Attachment.objects.get_random_images(
             RANDOM_IMAGE_COUNT)
 
         return render(request, TEMPLATE, params)
 

boards/views/search.py

@@ -1,44 +1,45 b''
 from django.shortcuts import render
 from django.views.generic import View
+from django.db.models import Q
 
 from boards.abstracts.paginator import get_paginator
 from boards.forms import SearchForm, PlainErrorList
 from boards.models import Post
 
 
 MIN_QUERY_LENGTH = 3
 RESULTS_PER_PAGE = 10
 
 FORM_QUERY = 'query'
 
 CONTEXT_QUERY = 'query'
 CONTEXT_FORM = 'form'
 CONTEXT_PAGE = 'page'
 
 REQUEST_PAGE = 'page'
 
 __author__ = 'neko259'
 
 TEMPLATE = 'search/search.html'
 
 
 class BoardSearchView(View):
     def get(self, request):
         params = dict()
 
         form = SearchForm(request.GET, error_class=PlainErrorList)
         params[CONTEXT_FORM] = form
 
         if form.is_valid():
             query = form.cleaned_data[FORM_QUERY]
             if len(query) >= MIN_QUERY_LENGTH:
-                results = Post.objects.filter(text__icontains=query)\
-                        .order_by('-id')
+                results = Post.objects.filter(Q(text__icontains=query) |
+                        Q(title__icontains=query)).order_by('-id')
                 paginator = get_paginator(results, RESULTS_PER_PAGE)
 
                 page = int(request.GET.get(REQUEST_PAGE, '1'))
 
                 params[CONTEXT_PAGE] = paginator.page(page)
                 params[CONTEXT_QUERY] = query
 
         return render(request, TEMPLATE, params)

boards/views/sync.py

@@ -1,79 +1,83 b''
 import logging
 
 import xml.etree.ElementTree as et
 
 from django.http import HttpResponse, Http404
 
-from boards.abstracts.sync_filters import ThreadFilter, TAG_THREAD
+from boards.abstracts.sync_filters import ThreadFilter, TagsFilter,\
+        TimestampFromFilter,\
+        TAG_THREAD, TAG_TAGS, TAG_TIME_FROM
 from boards.models import GlobalId, Post
 from boards.models.post.sync import SyncManager
 
 
 logger = logging.getLogger('boards.sync')
 
 
 FILTERS = {
         TAG_THREAD: ThreadFilter,
+        TAG_TAGS: TagsFilter,
+        TAG_TIME_FROM: TimestampFromFilter,
 }
 
 
 def response_list(request):
     request_xml = request.body
 
     filters = []
 
     if request_xml is None or len(request_xml) == 0:
         return HttpResponse(content='Use the API')
     else:
         root_tag = et.fromstring(request_xml)
         model_tag = root_tag[0]
 
         for tag_filter in model_tag:
             filter_name = tag_filter.tag
-            model_filter = FILTERS.get(filter_name)(tag_filter)
+            model_filter = FILTERS.get(filter_name)
             if not model_filter:
                 logger.warning('Unavailable filter: {}'.format(filter_name))
-            filters.append(model_filter)
+            filters.append(model_filter(tag_filter))
 
     response_xml = SyncManager.generate_response_list(filters)
 
     return HttpResponse(content=response_xml)
 
 
 def response_get(request):
     """
     Processes a GET request with post ID list and returns the posts XML list.
     Request should contain an 'xml' post attribute with the actual request XML.
     """
 
     request_xml = request.body
 
     if request_xml is None or len(request_xml) == 0:
         return HttpResponse(content='Use the API')
 
     posts = []
 
     root_tag = et.fromstring(request_xml)
     model_tag = root_tag[0]
     for id_tag in model_tag:
         global_id, exists = GlobalId.from_xml_element(id_tag)
         if exists:
             posts.append(Post.objects.get(global_id=global_id))
 
     response_xml = SyncManager.generate_response_get(posts)
 
     return HttpResponse(content=response_xml)
 
 
 def get_post_sync_data(request, post_id):
     try:
         post = Post.objects.get(id=post_id)
     except Post.DoesNotExist:
         raise Http404()
 
     xml_str = SyncManager.generate_response_get([post])
 
     return HttpResponse(
         content_type='text/xml; charset=utf-8',
         content=xml_str,
     )