Merge branch 'master' of github.com:samuelclay/NewsBlur

* 'master' of github.com:samuelclay/NewsBlur:
  Shortening names on analytics for improved space saving.
  Adding new analytics collections to keep track of page loads and feed fetches. Need to start aggregating before I can tell how useful this data will be.
  Adding new analytics collections to keep track of page loads and feed fetches. Need to start aggregating before I can tell how useful this data will be.
  Adding VentureBeat article to press page.
  Adding order/read_filter to api. Also adding river blurblog.
  Fixing right click on folders.
  Adding a bit of error checking on read stories for social subs.
  Fixing @afita's issue around weirdness in Feed story selection when story titles are pinned to top.
  Scrolling to selected story when re-opening hidden story titles pane. Thanks @afita.

apps/reader/models.py

@@ -557,7 +557,7 @@ class MUserStory(mongo.Document):
     read_date = mongo.DateTimeField()
     story_id = mongo.StringField(unique_with=('user_id', 'feed_id'))
     story_date = mongo.DateTimeField()
-    story = mongo.ReferenceField(MStory)
+    story = mongo.ReferenceField(MStory, dbref=True)
     found_story = mongo.GenericReferenceField()
     
     meta = {

apps/social/models.py

@@ -8,7 +8,7 @@ import math
 import mongoengine as mongo
 import random
 from collections import defaultdict
-from mongoengine.queryset import OperationError
+# from mongoengine.queryset import OperationError
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
@@ -796,15 +796,21 @@ class MSocialSubscription(mongo.Document):
             date = now if now > story.story_date else story.story_date # For handling future stories
             if not feed_id:
                 feed_id = story.story_feed_id
-            m = MUserStory(user_id=self.user_id, 
-                           feed_id=feed_id, read_date=date, 
-                           story_id=story.story_guid, story_date=story.shared_date)
             try:
-                m.save()
+                m, _ = MUserStory.objects.get_or_create(user_id=self.user_id, 
-            except OperationError:
+                                                        feed_id=feed_id, 
+                                                        story_id=story.story_guid,
+                                                        defaults={
+                                                            "read_date": date,
+                                                            "story_date": story.shared_date,
+                                                        })
+            # except OperationError:
+            #     if not mark_all_read:
+            #         logging.user(request, "~FRAlready saved read story: %s" % story.story_guid)
+            #     continue
+            except MUserStory.MultipleObjectsReturned:
                 if not mark_all_read:
-                    logging.user(request, "~FRAlready saved read story: %s" % story.story_guid)
+                    logging.user(request, "~FRMultiple read stories: %s" % story.story_guid)
-                continue
             
             # Find other social feeds with this story to update their counts
             friend_key = "F:%s:F" % (self.user_id)

apps/statistics/models.py

@@ -228,4 +228,126 @@ class MFeedback(mongo.Document):
     def all(cls):
         feedbacks = cls.objects.all()[:4]
 
-        return feedbacks
+        return feedbacks
+
+class MAnalyticsPageLoad(mongo.Document):
+    date = mongo.DateTimeField(default=datetime.datetime.now)
+    username = mongo.StringField()
+    user_id = mongo.IntField()
+    is_premium = mongo.BooleanField()
+    platform = mongo.StringField()
+    path = mongo.StringField()
+    duration = mongo.FloatField()
+    
+    meta = {
+        'db_alias': 'nbanalytics',
+        'collection': 'page_loads',
+        'allow_inheritance': False,
+        'indexes': ['path', 'date', 'platform', 'user_id'],
+        'ordering': ['date'],
+    }
+    
+    def __unicode__(self):
+        return "%s / %s: (%.4s) %s" % (self.username, self.platform, self.duration, self.path)
+        
+    @classmethod
+    def add(cls, user, is_premium, platform, path, duration):
+        if user.is_anonymous():
+            username = None
+            user_id = 0
+        else:
+            username = user.username
+            user_id = user.pk
+            
+        path = cls.clean_path(path)
+        
+        cls.objects.create(username=username, user_id=user_id, is_premium=is_premium,
+                           platform=platform, path=path, duration=duration)
+    
+    @classmethod
+    def clean_path(cls, path):
+        if path and path.startswith('/reader/feed/'):
+            path = '/reader/feed/'
+            
+        return path
+        
+    @classmethod
+    def fetch_stats(cls, stat_key, stat_value):
+        stats = cls.objects.filter(**{stat_key: stat_value})
+        return cls.calculate_stats(stats)
+        
+    @classmethod
+    def calculate_stats(cls, stats):
+        return cls.aggregate(**stats)
+
+    @classmethod
+    def clean(cls, days=1):
+        last_day = datetime.datetime.now() - datetime.timedelta(days=days)
+        
+        from utils.feed_functions import timelimit, TimeoutError
+        @timelimit(60)
+        def delete_old_history():
+            cls.objects(date__lte=last_day).delete()
+            cls.objects(date__lte=last_day).delete()
+        try:
+            delete_old_history()
+        except TimeoutError:
+            print "Timed out on deleting old history. Shit."
+        
+
+class MAnalyticsFetcher(mongo.Document):
+    date = mongo.DateTimeField(default=datetime.datetime.now)
+    feed_id = mongo.IntField()
+    feed_fetch = mongo.FloatField()
+    feed_process = mongo.FloatField()
+    page = mongo.FloatField()
+    icon = mongo.FloatField()
+    total = mongo.FloatField()
+    
+    meta = {
+        'db_alias': 'nbanalytics',
+        'collection': 'feed_fetches',
+        'allow_inheritance': False,
+        'indexes': ['date', 'feed_id'],
+        'ordering': ['date'],
+    }
+    
+    def __unicode__(self):
+        return "%s: %.4s+%.4s+%.4s+%.4s = %.4ss" % (self.feed_id, self.feed_fetch,
+                                                    self.feed_process,
+                                                    self.page, 
+                                                    self.icon,
+                                                    self.total)
+        
+    @classmethod
+    def add(cls, feed_id, feed_fetch, feed_process, 
+            page, icon, total):
+        if icon and page:
+            icon -= page
+        if page and feed_process:
+            page -= feed_process
+        if feed_process and feed_fetch:
+            feed_process -= feed_fetch
+        
+        cls.objects.create(feed_id=feed_id, feed_fetch=feed_fetch,
+                           feed_process=feed_process, 
+                           page=page, icon=icon, total=total)
+    
+    @classmethod
+    def calculate_stats(cls, stats):
+        return cls.aggregate(**stats)
+
+    @classmethod
+    def clean(cls, days=1):
+        last_day = datetime.datetime.now() - datetime.timedelta(days=days)
+        
+        from utils.feed_functions import timelimit, TimeoutError
+        @timelimit(60)
+        def delete_old_history():
+            cls.objects(date__lte=last_day).delete()
+            cls.objects(date__lte=last_day).delete()
+        try:
+            delete_old_history()
+        except TimeoutError:
+            print "Timed out on deleting old history. Shit."
+        

media/css/reader.css

@@ -7666,9 +7666,13 @@ form.opml_import_form input {
 /* = iPhone Page = */
 /* =============== */
 
-.NB-static-iphone {
+.NB-static-iphone .NB-ios-mockup,
+.NB-static-iphone .NB-ios-main {
     -webkit-transform : translate3d(0, 0, 0);
 }
+.NB-static-iphone .NB-splash-info {
+    z-index: 2;
+}
 .NB-static-iphone .NB-ios-main {
     margin: 24px 36px 24px 0;
     text-align: center;
@@ -7834,6 +7838,7 @@ form.opml_import_form input {
     width: 554px;
     height: 630px;
     position: relative;
+    z-index: 1;
 }
 .NB-static-iphone .NB-ios-mockup .NB-ios-iphone-skeleton {
     position: absolute;

media/ios/NewsBlur_Prefix.pch

@@ -15,8 +15,8 @@
 //    #define BACKGROUND_REFRESH_SECONDS -5
     #define BACKGROUND_REFRESH_SECONDS -10*60
 
-    #define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.com"]
+//    #define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.com"]
-//    #define NEWSBLUR_URL [NSString stringWithFormat:@"www.newsblur.com"]
+    #define NEWSBLUR_URL [NSString stringWithFormat:@"www.newsblur.com"]
 
     #define NEWSBLUR_LINK_COLOR 0x405BA8
     #define NEWSBLUR_HIGHLIGHT_COLOR 0xd2e6fd

media/js/newsblur/reader/reader.js

@@ -2448,6 +2448,7 @@
             NEWSBLUR.reader.layout.rightLayout.open(story_anchor);
             this.resize_window();
             this.flags['story_titles_closed'] = false;
+            NEWSBLUR.app.story_titles.scroll_to_selected_story();
         },
         
         // =======================

media/js/newsblur/reader/reader_keyboard.js

@@ -221,7 +221,7 @@ NEWSBLUR.ReaderKeyboard.prototype = {
             ]),
             $.make('div', { className: 'NB-keyboard-group' }, [
               $.make('div', { className: 'NB-keyboard-shortcut' }, [
-                $.make('div', { className: 'NB-keyboard-shortcut-explanation' }, 'Hide Sidebar'),
+                $.make('div', { className: 'NB-keyboard-shortcut-explanation' }, 'Hide Sites'),
                 $.make('div', { className: 'NB-keyboard-shortcut-key' }, [
                     'shift',
                     $.make('span', '+'),
@@ -229,9 +229,11 @@ NEWSBLUR.ReaderKeyboard.prototype = {
                 ])
               ]),
               $.make('div', { className: 'NB-keyboard-shortcut NB-last' }, [
-                $.make('div', { className: 'NB-keyboard-shortcut-explanation' }, 'View keyboard shortcuts'),
+                $.make('div', { className: 'NB-keyboard-shortcut-explanation' }, 'Hide Story titles'),
                 $.make('div', { className: 'NB-keyboard-shortcut-key' }, [
-                    '?'
+                    'shift',
+                    $.make('span', '+'),
+                    't'
                 ])
               ])
             ]),
@@ -244,6 +246,12 @@ NEWSBLUR.ReaderKeyboard.prototype = {
                 $.make('div', { className: 'NB-keyboard-shortcut-key' }, [
                     '-'
                 ])
+              ]),
+              $.make('div', { className: 'NB-keyboard-shortcut NB-last' }, [
+                $.make('div', { className: 'NB-keyboard-shortcut-explanation' }, 'View keyboard shortcuts'),
+                $.make('div', { className: 'NB-keyboard-shortcut-key' }, [
+                    '?'
+                ])
               ])
             ])
         ]);

media/js/newsblur/views/folder_view.js

@@ -183,6 +183,8 @@ NEWSBLUR.Views.Folder = Backbone.View.extend({
     // ==========
    
     open: function(e) {
+        e.preventDefault();
+        e.stopPropagation();
         if (this.options.feed_chooser) return;
         var $folder = $(e.currentTarget).closest('li.folder');
         if ($folder[0] != this.el) return;

media/js/newsblur/views/story_list_view.js

@@ -351,7 +351,7 @@ NEWSBLUR.Views.StoryListView = Backbone.View.extend({
             !NEWSBLUR.assets.preference('feed_view_single_story')) {
             var from_top = NEWSBLUR.reader.cache.mouse_position_y + this.$el.scrollTop();
             var offset = this.cache.story_pane_position;
-            var position = from_top; // - offset;
+            var position = from_top - offset;
             var positions = this.cache.feed_view_story_positions_keys;
             var closest = $.closest(position, positions);
             var story = this.cache.feed_view_story_positions[positions[closest]];

media/js/newsblur/views/story_titles_view.js

@@ -176,7 +176,7 @@ NEWSBLUR.Views.StoryTitlesView = Backbone.View.extend({
     // ============
     
     scroll_to_selected_story: function(story) {
-        var story_title_view = story.story_title_view || this.collection.active_story.story_title_view;
+        var story_title_view = story && story.story_title_view || this.collection.active_story.story_title_view;
         var story_title_visisble = NEWSBLUR.reader.$s.$story_titles.isScrollVisible(story_title_view.$el);
         if (!story_title_visisble) {
             var container_offset = NEWSBLUR.reader.$s.$story_titles.position().top;

settings.py

@@ -352,6 +352,19 @@ CELERYBEAT_SCHEDULE = {
     },
 }
 
+# =========
+# = Mongo =
+# =========
+
+MONGO_DB = {
+    'host': '127.0.0.1:27017',
+    'name': 'newsblur',
+}
+MONGO_ANALYTICS_DB = {
+    'host': '127.0.0.1:27017',
+    'name': 'nbanalytics',
+}
+
 # ====================
 # = Database Routers =
 # ====================
@@ -427,10 +440,19 @@ DEBUG_TOOLBAR_CONFIG = {
 MONGO_DB_DEFAULTS = {
     'name': 'newsblur',
     'host': 'db02:27017',
+    'alias': 'default',
 }
 MONGO_DB = dict(MONGO_DB_DEFAULTS, **MONGO_DB)
 MONGODB = connect(MONGO_DB.pop('name'), **MONGO_DB)
 
+MONGO_ANALYTICS_DB_DEFAULTS = {
+    'name': 'nbanalytics',
+    'host': 'db02:27017',
+    'alias': 'nbanalytics',
+}
+MONGO_ANALYTICS_DB = dict(MONGO_ANALYTICS_DB_DEFAULTS, **MONGO_ANALYTICS_DB)
+MONGOANALYTICSDB = connect(MONGO_ANALYTICS_DB.pop('name'), **MONGO_ANALYTICS_DB)
+
 # =========
 # = Redis =
 # =========

templates/static/api.yml

@@ -178,6 +178,16 @@
           optional: true
           default: 1
           example: 2
+        - key: order
+          desc: "Story order by oldest or newest first"
+          optional: true
+          default: newest
+          example: oldest
+        - key: read_filter
+          desc: "Show all stories or only unread stories"
+          optional: true
+          default: all
+          example: unread
   
     - url: /reader/starred_stories
       method: GET
@@ -207,16 +217,12 @@
           optional: true
           default: 1
           example: 2
-        - key: read_stories_count
+        - key: order
-          desc: >
+          desc: "Story order by oldest or newest first"
-            An optimization used to skip a set number of stories that are 
-            guaranteed to be read. Pass in the number of stories that have 
-            been read from this series. If your page >= 2, you should probably 
-            have some read stories from the first page.
           optional: true
-          default: "0"
+          default: newest
-          example: 12
+          example: oldest
-  
+            
     - url: /reader/mark_story_as_read
       method: POST
       short_desc: "Mark a story as read."
@@ -329,6 +335,28 @@
           example: "7"
 
 - social:
+    - url: /social/river_stories
+      method: GET
+      short_desc: "Stories from multiple users (River of News)."
+      long_desc: 
+        - "Retrieve stories from a collection of social subscriptions. This is known as the River of News."
+        - "Stories are ordered in reverse chronological order by default."
+        - "Only unread stories are available."
+      params:
+        - key: social_user_ids
+          desc: "User ids to use in the river."
+          required: true
+          example: "[12, 24, 36]"
+        - key: page
+          desc: "Page of stories, starting from 1."
+          optional: true
+          default: 1
+          example: 2
+        - key: order
+          desc: "Story order by oldest or newest first"
+          optional: true
+          default: newest
+          example: oldest
     - url: /social/share_story
       method: POST
       short_desc: "Share a story with optional comments."
@@ -657,6 +685,17 @@
       long_desc: 
         - "Shared stories from a user's blurblog."
         - "Comments, replies, and profiles from followed users are automatically included."
+      params:
+        - key: order
+          desc: "Story order by oldest or newest first"
+          optional: true
+          default: newest
+          example: oldest
+        - key: read_filter
+          desc: "Show all stories or only unread stories"
+          optional: true
+          default: all
+          example: unread
       tips:
         - >
           The <code>username</code> url parameter is optional. It's just recommended 

templates/static/press.xhtml

@@ -68,6 +68,39 @@
     <h5 class="NB-module-title">Reviews of NewsBlur</h5>
     <div class="NB-module-content">
       <ul class="NB-static-press-reviews">
+        <li>
+          <a href="http://venturebeat.com/2012/09/05/newsblur-ipad/">
+            NewsBlur launches iPad app, aims to compete with Google Reader (exclusive)
+          </a>
+          <span class="NB-press-publisher">
+            <img src="http://0.gravatar.com/blavatar/6a5449d7551fc1e8f149b0920ca4b6f6?s=16">
+            VentureBeat
+          </span>, 
+          <span class="NB-press-author">Christina Farr</span>, 
+          <span class="NB-press-date">Sept 5, 2012</span>
+        </li>
+        <li>
+          <a href="http://isopixel.net/archivo/2012/09/un-lector-de-feeds-mas-en-la-app-store-newsblur/?utm_source=twitterfeed&utm_medium=twitter&utm_campaign=Feed%3A+isopixelone%2Fisopixel+%28Isopixel%29">
+            ¿Un lector de feeds más en la App Store?: NewsBlur
+          </a>
+          <span class="NB-press-publisher">
+            <img src="">
+            Isopixel
+          </span>, 
+          <span class="NB-press-author">Nancy Lupis</span>, 
+          <span class="NB-press-date">Sept 6, 2012</span>
+        </li>
+        <li>
+          <a href="http://wwwhatsnew.com/2012/09/06/mas-competencia-para-google-reader-en-ipad/">
+              NewsBlur: Más competencia para Google Reader, Flipboard y Pulse en iPad
+          </a>
+          <span class="NB-press-publisher">
+            <img src="http://wwwhatsnew.com/wp-content/themes/wwwhatsnew/favicon.ico">
+            wwwhat's new
+          </span>, 
+          <span class="NB-press-author">Juan Diego Polo</span>, 
+          <span class="NB-press-date">Sept 6, 2012</span>
+        </li>
         <li>
           <a href="https://www.linux.com/learn/tutorials/514787:newsblur-the-open-source-feed-reader-with-brains">NewsBlur: The Open Source Feed Reader with Brains</a>
           <span class="NB-press-publisher">

utils/feed_fetcher.py

@@ -14,6 +14,7 @@ from apps.rss_feeds.models import Feed, MStory
 from apps.rss_feeds.page_importer import PageImporter
 from apps.rss_feeds.icon_importer import IconImporter
 from apps.push.models import PushSubscription
+from apps.statistics.models import MAnalyticsFetcher
 from utils import feedparser
 from utils.story_functions import pre_process_story
 from utils import log as logging
@@ -303,10 +304,17 @@ class Dispatcher:
         current_process = multiprocessing.current_process()
         identity = "X"
         feed = None
+        
         if current_process._identity:
             identity = current_process._identity[0]
             
         for feed_id in feed_queue:
+            start_duration = time.time()
+            feed_fetch_duration = None
+            feed_process_duration = None
+            page_duration = None
+            icon_duration = None
+        
             ret_entries = {
                 ENTRY_NEW: 0,
                 ENTRY_UPDATED: 0,
@@ -339,14 +347,16 @@ class Dispatcher:
                         feed.num_subscribers,
                         rand, quick))
                     continue
-
+                    
                 ffeed = FetchFeed(feed_id, self.options)
                 ret_feed, fetched_feed = ffeed.fetch()
+                feed_fetch_duration = time.time() - start_duration
                 
                 if ((fetched_feed and ret_feed == FEED_OK) or self.options['force']):
                     pfeed = ProcessFeed(feed_id, fetched_feed, self.options)
                     ret_feed, ret_entries = pfeed.process()
                     feed = pfeed.feed
+                    feed_process_duration = time.time() - start_duration
                     
                     if ret_entries.get(ENTRY_NEW) or self.options['force']:
                         start = time.time()
@@ -402,6 +412,7 @@ class Dispatcher:
                 page_importer = PageImporter(feed)
                 try:
                     page_data = page_importer.fetch_page()
+                    page_duration = time.time() - start_duration
                 except TimeoutError, e:
                     logging.debug('   ---> [%-30s] ~FRPage fetch timed out...' % (feed.title[:30]))
                     page_data = None
@@ -421,6 +432,7 @@ class Dispatcher:
                 icon_importer = IconImporter(feed, page_data=page_data, force=self.options['force'])
                 try:
                     icon_importer.save()
+                    icon_duration = time.time() - start_duration
                 except TimeoutError, e:
                     logging.debug('   ---> [%-30s] ~FRIcon fetch timed out...' % (feed.title[:30]))
                     feed.save_page_history(556, 'Timeout', '')
@@ -451,6 +463,11 @@ class Dispatcher:
                 identity, feed.feed_title[:30], delta,
                 feed.pk, self.feed_trans[ret_feed],))
             logging.debug(done_msg)
+            total_duration = time.time() - start_duration
+            MAnalyticsFetcher.add(feed_id=feed.pk, feed_fetch=feed_fetch_duration,
+                                  feed_process=feed_process_duration, 
+                                  page=page_duration, icon=icon_duration,
+                                  total=total_duration)
             
             self.feed_stats[ret_feed] += 1
             for key, val in ret_entries.items():

utils/log.py

@@ -4,6 +4,7 @@ import string
 import time
 from django.core.handlers.wsgi import WSGIRequest
 from django.conf import settings
+from utils.user_functions import extract_user_agent
 
 class NullHandler(logging.Handler): #exists in python 3.1
     def emit(self, record):
@@ -14,41 +15,14 @@ def getlogger():
     return logger
 
 def user(u, msg, request=None):
+    from apps.statistics.models import MAnalyticsPageLoad
     platform = '------'
     time_elapsed = ""
     if isinstance(u, WSGIRequest) or request:
         if not request:
             request = u
             u = request.user
-        user_agent = request.environ.get('HTTP_USER_AGENT', '')
+        platform = extract_user_agent(request)
-        if 'iPad App' in user_agent:
-            platform = 'iPad'
-        elif 'iPhone App' in user_agent:
-            platform = 'iPhone'
-        elif 'Blar' in user_agent:
-            platform = 'Blar'
-        elif 'Android' in user_agent:
-            platform = 'Androd'
-        elif 'MSIE' in user_agent:
-            platform = 'IE'
-            if 'MSIE 9' in user_agent:
-                platform += '9'
-            elif 'MSIE 10' in user_agent:
-                platform += '10'
-            elif 'MSIE 8' in user_agent:
-                platform += '8'
-        elif 'Chrome' in user_agent:
-            platform = 'Chrome'
-        elif 'Safari' in user_agent:
-            platform = 'Safari'
-        elif 'MeeGo' in user_agent:
-            platform = 'MeeGo'
-        elif 'Firefox' in user_agent:
-            platform = 'FF'
-        elif 'Opera' in user_agent:
-            platform = 'Opera'
-        elif 'WP7' in user_agent:
-            platform = 'WP7'
 
         if hasattr(request, 'start_time'):
             seconds = time.time() - request.start_time
@@ -56,9 +30,13 @@ def user(u, msg, request=None):
                 '~FB' if seconds < .5 else '~FR',
                 seconds,
             )
-    premium = '*' if u.is_authenticated() and u.profile.is_premium else ''
+    is_premium = u.is_authenticated() and u.profile.is_premium
-    username = cipher(unicode(u)) if settings.CIPHER_USERNAMES else u
+    premium = '*' if is_premium else ''
+    username = cipher(unicode(u)) if settings.CIPHER_USERNAMES else unicode(u)
     info(' ---> [~FB~SN%-6s~SB] %s[%s%s] %s' % (platform, time_elapsed, username, premium, msg))
+    if request:
+        MAnalyticsPageLoad.add(user=u, is_premium=is_premium, platform=platform, path=request.path, 
+                               duration=seconds)
 
 def cipher(msg):
     shift = len(msg)

utils/user_functions.py

@@ -70,4 +70,40 @@ def invalidate_template_cache(fragment_name, *variables):
 def generate_secret_token(phrase, size=12):
     """Generate a (SHA1) security hash from the provided info."""
     info = (phrase, settings.SECRET_KEY)
-    return sha_constructor("".join(info)).hexdigest()[:size]
+    return sha_constructor("".join(info)).hexdigest()[:size]
+
+def extract_user_agent(request):
+    user_agent = request.environ.get('HTTP_USER_AGENT', '')
+    platform = '------'
+    if 'iPad App' in user_agent:
+        platform = 'iPad'
+    elif 'iPhone App' in user_agent:
+        platform = 'iPhone'
+    elif 'Blar' in user_agent:
+        platform = 'Blar'
+    elif 'Android' in user_agent:
+        platform = 'Androd'
+    elif 'MSIE' in user_agent:
+        platform = 'IE'
+        if 'MSIE 9' in user_agent:
+            platform += '9'
+        elif 'MSIE 10' in user_agent:
+            platform += '10'
+        elif 'MSIE 8' in user_agent:
+            platform += '8'
+    elif 'Chrome' in user_agent:
+        platform = 'Chrome'
+    elif 'Safari' in user_agent:
+        platform = 'Safari'
+    elif 'MeeGo' in user_agent:
+        platform = 'MeeGo'
+    elif 'Firefox' in user_agent:
+        platform = 'FF'
+    elif 'Opera' in user_agent:
+        platform = 'Opera'
+    elif 'WP7' in user_agent:
+        platform = 'WP7'
+    elif 'WP8' in user_agent:
+        platform = 'WP8'
+    
+    return platform