public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-04-13 09:42:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

OPML import: Using custom feed titles if they don't match what's in the feed DB.

Browse source
This commit is contained in:
Samuel Clay 2012-04-01 20:04:03 -07:00
parent 0f0bb2e92c
commit 57ebbb0790
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/feed_import/models.py
View file

@ -116,8 +116,15 @@ class OPMLImporter(Importer):
feed = item feed = item
if not hasattr(feed, 'htmlUrl'): if not hasattr(feed, 'htmlUrl'):
setattr(feed, 'htmlUrl', None) setattr(feed, 'htmlUrl', None)
if not hasattr(feed, 'title') or not feed.title: # If feed title matches what's in the DB, don't override it on subscription.
feed_title = getattr(feed, 'title', None) or getattr(feed, 'text', None)
if not feed_title:
setattr(feed, 'title', feed.htmlUrl or feed.xmlUrl) setattr(feed, 'title', feed.htmlUrl or feed.xmlUrl)
user_feed_title = None
else:
setattr(feed, 'title', feed_title)
user_feed_title = feed.title
feed_address = urlnorm.normalize(feed.xmlUrl) feed_address = urlnorm.normalize(feed.xmlUrl)
feed_link = urlnorm.normalize(feed.htmlUrl) feed_link = urlnorm.normalize(feed.htmlUrl)
if len(feed_address) > Feed._meta.get_field('feed_address').max_length: if len(feed_address) > Feed._meta.get_field('feed_address').max_length:
@ -138,7 +145,10 @@ class OPMLImporter(Importer):
feed_db, _ = Feed.objects.get_or_create(feed_address=feed_address, feed_db, _ = Feed.objects.get_or_create(feed_address=feed_address,
feed_link=feed_link, feed_link=feed_link,
defaults=dict(**feed_data)) defaults=dict(**feed_data))
if user_feed_title == feed_db.feed_title:
user_feed_title = None
us, _ = UserSubscription.objects.get_or_create( us, _ = UserSubscription.objects.get_or_create(
feed=feed_db, feed=feed_db,
user=self.user, user=self.user,
@ -146,6 +156,7 @@ class OPMLImporter(Importer):
'needs_unread_recalc': True, 'needs_unread_recalc': True,
'mark_read_date': datetime.datetime.utcnow() - datetime.timedelta(days=1), 'mark_read_date': datetime.datetime.utcnow() - datetime.timedelta(days=1),
'active': self.user.profile.is_premium, 'active': self.user.profile.is_premium,
'user_title': user_feed_title
} }
) )
if self.user.profile.is_premium and not us.active: if self.user.profile.is_premium and not us.active:

1
local_settings.py.template
View file

@ -18,6 +18,7 @@ NEWSBLUR_URL = 'http://www.newsblur.com'
# ================== # ==================
DEBUG = True DEBUG = True
DEBUG_ASSETS = DEBUG
MEDIA_URL = '/media/' MEDIA_URL = '/media/'
SECRET_KEY = 'YOUR SECRET KEY' SECRET_KEY = 'YOUR SECRET KEY'