public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Samuel Clay 2010-08-03 09:27:22 -04:00
commit a494954966
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/analyzer/views.py
View file

@ -76,6 +76,8 @@ def save_classifier(request):
_save_classifier(ClassifierTitle, 'title') _save_classifier(ClassifierTitle, 'title')
_save_classifier(ClassifierFeed, 'publisher') _save_classifier(ClassifierFeed, 'publisher')
print " ---> [%s]: Feed training: %s" % (request.user, feed)
response = dict(code=code, message=message, payload=payload) response = dict(code=code, message=message, payload=payload)
return response return response

4
apps/reader/views.py
View file

@ -523,11 +523,11 @@ def load_features(request):
@json.json_view @json.json_view
def save_feed_order(request): def save_feed_order(request):
folders = request.POST.get('folders') folders = request.POST.get('folders')
print " ---> [%s]: Feed re-ordering: %s" % (request.user, folders)
if folders: if folders:
# Test that folders can be JSON decoded # Test that folders can be JSON decoded
folders_list = json.decode(folders) folders_list = json.decode(folders)
assert folders_list is not None assert folders_list is not None
print " ---> [%s]: Feed re-ordering: %s folders/feeds" % (request.user, len(folders_list))
user_sub_folders = UserSubscriptionFolders.objects.get(user=request.user) user_sub_folders = UserSubscriptionFolders.objects.get(user=request.user)
user_sub_folders.folders = folders user_sub_folders.folders = folders
user_sub_folders.save() user_sub_folders.save()
@ -551,6 +551,8 @@ def get_feeds_trainer(request):
classifier['feed_authors'] = json.decode(us.feed.popular_authors) if us.feed.popular_authors else [] classifier['feed_authors'] = json.decode(us.feed.popular_authors) if us.feed.popular_authors else []
classifiers.append(classifier) classifiers.append(classifier)
print " ---> [%s] Loading Trainer: %s" % (request.user, len(classifiers))
return classifiers return classifiers
@login_required @login_required

2
apps/rss_feeds/views.py
View file

@ -25,4 +25,6 @@ def load_feed_statistics(request):
# Subscribers # Subscribers
stats['subscriber_count'] = feed.num_subscribers stats['subscriber_count'] = feed.num_subscribers
print " ---> [%s] Statistics: %s" % (request.user, feed)
return stats return stats

4
utils/json.py
View file

@ -108,7 +108,7 @@ def json_view(func):
'\n'.join(traceback.format_exception(*exc_info)), '\n'.join(traceback.format_exception(*exc_info)),
request_repr, request_repr,
) )
print message # print message
mail_admins(subject, message, fail_silently=True) mail_admins(subject, message, fail_silently=True)
# Come what may, we're returning JSON. # Come what may, we're returning JSON.
@ -126,7 +126,7 @@ def json_view(func):
def main(): def main():
test = {1: True, 2: u"string", 3: 30} test = {1: True, 2: u"string", 3: 30}
json_test = json_encode(test) json_test = json_encode(test)
print test, json_test # print test, json_test
if __name__ == '__main__': if __name__ == '__main__':
main() main()