From f080a5dc8859dd89b1238f61b120a0e658eef208 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 27 May 2015 21:22:43 +0100 Subject: [PATCH] Squashed commit of the following: commit d8d30f35465f474923b31d6536dec5e1808fc940 Author: Mark Date: Sun Aug 10 10:55:57 2014 +0100 Removed reliance on created_at field --- .gitignore | 2 ++ bambu_buffer/__init__.py | 5 ----- bambu_buffer/models.py | 18 +++++++----------- bambu_buffer/receivers.py | 2 +- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 0d20b64..6ee2538 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ *.pyc +bambu_buffer.egg-info +dist diff --git a/bambu_buffer/__init__.py b/bambu_buffer/__init__.py index e106f78..4992ce9 100644 --- a/bambu_buffer/__init__.py +++ b/bambu_buffer/__init__.py @@ -47,11 +47,6 @@ def post(item, author, **kwargs): object_id = item.pk, content_type = content_type ).exists(): - print '%s %d has already been sent to Buffer' % ( - unicode(item._meta.verbose_name).capitalize(), - item.pk - ) - return BufferedItem.objects.create( diff --git a/bambu_buffer/models.py b/bambu_buffer/models.py index 0b60be7..535d3da 100644 --- a/bambu_buffer/models.py +++ b/bambu_buffer/models.py @@ -1,9 +1,8 @@ from django.db import models -from django.utils.timezone import pytz +from django.utils.timezone import now from bambu_buffer.settings import PROFILES_URL, TIMEOUT from bambu_buffer import log from bambu_buffer.receivers import * -from datetime import datetime, timedelta import requests, json class BufferToken(models.Model): @@ -45,19 +44,10 @@ class BufferToken(models.Model): services[service.remote_id] = service - epoch = datetime(1970, 1, 1, 0, 0, 0, - tzinfo = pytz.timezone( - profile['timezone'] - ) - ) - service.profiles.create( avatar = profile.get('avatar_https', profile.get('avatar') ), - created_at = epoch + timedelta( - seconds = profile['created_at'] - ), default = profile['default'], selected = profile['default'], formatted_username = profile['formatted_username'], @@ -105,6 +95,12 @@ class BufferProfile(models.Model): def icon(self): return self.service.icon + def save(self, *args, **kwargs): + if not self.created_at: + self.created_at = now() + + super(BufferProfile, self).save(*args, **kwargs) + class Meta: db_table = 'buffer_profile' diff --git a/bambu_buffer/receivers.py b/bambu_buffer/receivers.py index 1abbc81..8fd8879 100644 --- a/bambu_buffer/receivers.py +++ b/bambu_buffer/receivers.py @@ -12,7 +12,7 @@ def post_save_receiver(sender, instance, **kwargs): name = m.pop(0) app, model = name.lower().split('.') - if app != instance._meta.app_label or model != instance._meta.module_name: + if app != type(instance)._meta.app_label or model != instance._meta.module_name: continue if any(m):