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

Small fixes: removing height calculation from classifier modal, adding in better logging for feed address changes, iPhone story detail view bug.

Browse source
This commit is contained in:
Samuel Clay 2010-08-03 21:53:08 -04:00
parent a494954966
commit 0bcc3ae484
6 changed files with 72 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
media/iphone/Classes/StoryDetailViewController.h
View file

@ -18,5 +18,6 @@
}
@property (nonatomic, retain) IBOutlet UIWebView *webView;
@property (nonatomic, retain) NewsBlurAppDelegate *appDelegate;
@end

59
media/iphone/NewsBlur.xcodeproj/conesus.mode1v3
View file

@ -304,6 +304,8 @@
<key>Layout</key>
<array>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
@ -348,7 +350,7 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
<integer>3</integer>
<integer>2</integer>
<integer>1</integer>
<integer>0</integer>
</array>
@ -384,14 +386,12 @@
<key>Dock</key>
<array>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>1CE0B20306471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
<string>StoryDetailViewController.m</string>
<string>StoryDetailViewController.h</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@ -399,11 +399,11 @@
<key>PBXProjectModuleGUID</key>
<string>1CE0B20406471E060097A5F4</string>
<key>PBXProjectModuleLabel</key>
<string>StoryDetailViewController.m</string>
<string>StoryDetailViewController.h</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>786FD1D311F9FCCF0003F4B8</string>
<string>785086B612089C6000CF3B50</string>
<key>history</key>
<array>
<string>787A0E8411CEAF200056422D</string>
@ -423,8 +423,8 @@
<string>78850C3B11EFF5AE003C7C0D</string>
<string>78850C6311EFF7AA003C7C0D</string>
<string>78850CE411F0A2BC003C7C0D</string>
<string>786FD1D011F9FC3D0003F4B8</string>
<string>786FD1D111F9FC3D0003F4B8</string>
<string>785086B412089C6000CF3B50</string>
<string>785086B512089C6000CF3B50</string>
</array>
</dict>
<key>SplitCount</key>
@ -436,14 +436,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {735, 603}}</string>
<string>{{0, 0}, {735, 600}}</string>
<key>RubberWindowFrame</key>
<string>319 75 1034 767 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
<string>603pt</string>
<string>600pt</string>
</dict>
<dict>
<key>ContentConfiguration</key>
@ -456,14 +456,14 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 608}, {735, 118}}</string>
<string>{{0, 605}, {735, 121}}</string>
<key>RubberWindowFrame</key>
<string>319 75 1034 767 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
<key>Proportion</key>
<string>118pt</string>
<string>121pt</string>
</dict>
</array>
<key>Proportion</key>
@ -482,9 +482,9 @@
</array>
<key>TableOfContents</key>
<array>
<string>786FD1BE11F9FB780003F4B8</string>
<string>785086B712089C6000CF3B50</string>
<string>1CE0B1FE06471DED0097A5F4</string>
<string>786FD1BF11F9FB780003F4B8</string>
<string>785086B812089C6000CF3B50</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@ -619,7 +619,7 @@
<key>StatusbarIsVisible</key>
<true/>
<key>TimeStamp</key>
<real>301595855.47144401</real>
<real>302554208.55399001</real>
<key>ToolbarConfigUserDefaultsMinorVersion</key>
<string>2</string>
<key>ToolbarDisplayMode</key>
@ -638,6 +638,7 @@
<array>
<string>788997AE11C9C87C00041675</string>
<string>1CD10A99069EF8BA00B06720</string>
<string>1C78EAAD065D492600B07095</string>
<string>/Users/conesus/newsblur/media/iphone/NewsBlur.xcodeproj</string>
</array>
<key>WindowString</key>
@ -679,6 +680,8 @@
<string>251pt</string>
</dict>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@ -718,7 +721,7 @@
<key>TableOfContents</key>
<array>
<string>788997AE11C9C87C00041675</string>
<string>786FD1C011F9FB780003F4B8</string>
<string>785086A91208980D00CF3B50</string>
<string>1CD0528F0623707200166675</string>
<string>XCMainBuildResultsModuleGUID</string>
</array>
@ -762,8 +765,8 @@
<string>yes</string>
<key>sizes</key>
<array>
<string>{{0, 0}, {648, 355}}</string>
<string>{{648, 0}, {647, 355}}</string>
<string>{{0, 0}, {648, 357}}</string>
<string>{{648, 0}, {647, 357}}</string>
</array>
</dict>
<key>VerticalSplitView</key>
@ -778,8 +781,8 @@
<string>yes</string>
<key>sizes</key>
<array>
<string>{{0, 0}, {1295, 355}}</string>
<string>{{0, 355}, {1295, 324}}</string>
<string>{{0, 0}, {1295, 357}}</string>
<string>{{0, 357}, {1295, 322}}</string>
</array>
</dict>
</dict>
@ -814,7 +817,7 @@
<real>330</real>
</array>
<key>Frame</key>
<string>{{648, 0}, {647, 355}}</string>
<string>{{648, 0}, {647, 357}}</string>
<key>RubberWindowFrame</key>
<string>137 125 1295 720 0 0 1440 878 </string>
</dict>
@ -842,13 +845,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
<string>786FD1C111F9FB780003F4B8</string>
<string>785086AA1208980D00CF3B50</string>
<string>1C162984064C10D400B95A72</string>
<string>786FD1C211F9FB780003F4B8</string>
<string>786FD1C311F9FB780003F4B8</string>
<string>786FD1C411F9FB780003F4B8</string>
<string>786FD1C511F9FB780003F4B8</string>
<string>786FD1C611F9FB780003F4B8</string>
<string>785086AB1208980D00CF3B50</string>
<string>785086AC1208980D00CF3B50</string>
<string>785086AD1208980D00CF3B50</string>
<string>785086AE1208980D00CF3B50</string>
<string>785086AF1208980D00CF3B50</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
@ -1004,7 +1007,7 @@
<key>TableOfContents</key>
<array>
<string>1C78EAAD065D492600B07095</string>
<string>78850C2911EFF086003C7C0D</string>
<string>785086B912089C6000CF3B50</string>
<string>1C78EAAC065D492600B07095</string>
</array>
<key>ToolbarConfiguration</key>

60
media/iphone/NewsBlur.xcodeproj/conesus.pbxuser
View file

@ -112,8 +112,8 @@
PBXFileDataSource_Target_ColumnID,
);
};
PBXPerProjectTemplateStateSaveDate = 301595508;
PBXWorkspaceStateSaveDate = 301595508;
PBXPerProjectTemplateStateSaveDate = 302553073;
PBXWorkspaceStateSaveDate = 302553073;
};
perUserProjectItems = {
7842EB9911CFFC1B0066CF9D /* PBXTextBookmark */ = 7842EB9911CFFC1B0066CF9D /* PBXTextBookmark */;
@ -129,9 +129,9 @@
7843F5AD11EEC0AA00675F64 /* PBXTextBookmark */ = 7843F5AD11EEC0AA00675F64 /* PBXTextBookmark */;
7843F5AE11EEC0AA00675F64 /* PBXTextBookmark */ = 7843F5AE11EEC0AA00675F64 /* PBXTextBookmark */;
7843F5DA11EEC43F00675F64 /* PBXTextBookmark */ = 7843F5DA11EEC43F00675F64 /* PBXTextBookmark */;
786FD1D011F9FC3D0003F4B8 /* PBXTextBookmark */ = 786FD1D011F9FC3D0003F4B8 /* PBXTextBookmark */;
786FD1D111F9FC3D0003F4B8 /* PBXTextBookmark */ = 786FD1D111F9FC3D0003F4B8 /* PBXTextBookmark */;
786FD1D311F9FCCF0003F4B8 /* PBXTextBookmark */ = 786FD1D311F9FCCF0003F4B8 /* PBXTextBookmark */;
785086B412089C6000CF3B50 /* PBXTextBookmark */ = 785086B412089C6000CF3B50 /* PBXTextBookmark */;
785086B512089C6000CF3B50 /* PBXTextBookmark */ = 785086B512089C6000CF3B50 /* PBXTextBookmark */;
785086B612089C6000CF3B50 /* PBXTextBookmark */ = 785086B612089C6000CF3B50 /* PBXTextBookmark */;
787A0E8411CEAF200056422D /* PBXTextBookmark */ = 787A0E8411CEAF200056422D /* PBXTextBookmark */;
78850C3B11EFF5AE003C7C0D /* PBXTextBookmark */ = 78850C3B11EFF5AE003C7C0D /* PBXTextBookmark */;
78850C6311EFF7AA003C7C0D /* PBXTextBookmark */ = 78850C6311EFF7AA003C7C0D /* PBXTextBookmark */;
@ -178,16 +178,16 @@
};
7842ECF511D44A530066CF9D /* StoryDetailViewController.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {686, 586}}";
sepNavSelRange = "{417, 0}";
sepNavVisRange = "{0, 417}";
sepNavIntBoundsRect = "{{0, 0}, {686, 583}}";
sepNavSelRange = "{474, 0}";
sepNavVisRange = "{0, 481}";
};
};
7842ECF611D44A530066CF9D /* StoryDetailViewController.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {686, 988}}";
sepNavSelRange = "{2492, 0}";
sepNavVisRange = "{0, 1659}";
sepNavIntBoundsRect = "{{0, 0}, {686, 962}}";
sepNavSelRange = "{292, 0}";
sepNavVisRange = "{3, 1656}";
};
};
7842EE6011D46E550066CF9D /* PBXTextBookmark */ = {
@ -321,34 +321,34 @@
vrLen = 592;
vrLoc = 0;
};
786FD1D011F9FC3D0003F4B8 /* PBXTextBookmark */ = {
785086B412089C6000CF3B50 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 7842ECF611D44A530066CF9D /* StoryDetailViewController.m */;
name = "StoryDetailViewController.m: 15";
rLen = 0;
rLoc = 292;
rType = 0;
vrLen = 1656;
vrLoc = 3;
};
785086B512089C6000CF3B50 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 7842ECF511D44A530066CF9D /* StoryDetailViewController.h */;
name = "StoryDetailViewController.h: 23";
name = "StoryDetailViewController.h: 21";
rLen = 0;
rLoc = 417;
rLoc = 474;
rType = 0;
vrLen = 417;
vrLen = 481;
vrLoc = 0;
};
786FD1D111F9FC3D0003F4B8 /* PBXTextBookmark */ = {
785086B612089C6000CF3B50 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 7842ECF611D44A530066CF9D /* StoryDetailViewController.m */;
name = "StoryDetailViewController.m: 84";
fRef = 7842ECF511D44A530066CF9D /* StoryDetailViewController.h */;
name = "StoryDetailViewController.h: 21";
rLen = 0;
rLoc = 2492;
rLoc = 474;
rType = 0;
vrLen = 1569;
vrLoc = 0;
};
786FD1D311F9FCCF0003F4B8 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 7842ECF611D44A530066CF9D /* StoryDetailViewController.m */;
name = "StoryDetailViewController.m: 81";
rLen = 0;
rLoc = 2492;
rType = 0;
vrLen = 1659;
vrLen = 481;
vrLoc = 0;
};
787A0CD811CE65330056422D /* FeedDetailViewController.h */ = {

2
media/js/newsblur/reader_classifier.js
View file

@ -569,7 +569,7 @@ var classifier = {
});
},
'onShow': function(dialog) {
$('#simplemodal-container').corner('6px').css({'width': 600, 'height': height});
$('#simplemodal-container').corner('6px').css({'width': 600});
$('.NB-classifier', self.$modal).corner('14px');
$.modal.impl.setPosition();
},

9
utils/feed_fetcher.py
View file

@ -24,9 +24,9 @@ import xml.sax
# Refresh feed code adapted from Feedjack.
# http://feedjack.googlecode.com
VERSION = '0.9'
VERSION = '0.4'
URL = 'http://www.newsblur.com/'
USER_AGENT = 'NewsBlur %s - %s' % (VERSION, URL)
USER_AGENT = 'NewsBlur Fetcher %s - %s' % (VERSION, URL)
SLOWFEED_WARNING = 10
ENTRY_NEW, ENTRY_UPDATED, ENTRY_SAME, ENTRY_ERR = range(4)
FEED_OK, FEED_SAME, FEED_ERRPARSE, FEED_ERRHTTP, FEED_ERREXC = range(5)
@ -71,7 +71,7 @@ class FetchFeed:
self.feed.id)
logging.info(log_msg)
print(log_msg)
feed.save_feed_history(501, "Already fetched")
feed.save_feed_history(303, "Already fetched")
return FEED_SAME, None
modified = self.feed.last_modified.utctimetuple()[:7] if self.feed.last_modified else None
@ -113,6 +113,9 @@ class ProcessFeed:
self.feed.last_modified = None
self.feed.etag = None
self.feed.save()
else:
self.feed.save_feed_history(502, 'Duplicate feed, can\'t de-dupe')
return FEED_ERRPARSE, ret_values
elif self.fpf.bozo and isinstance(self.fpf.bozo_exception, xml.sax._exceptions.SAXException):
feed = fetch_address_from_page(self.feed.feed_link, self.feed)

4
utils/feed_functions.py
View file

@ -1,7 +1,7 @@
import datetime
import time
import sys
from django.utils.translation import ungettext, ugettext
from django.utils.translation import ungettext
from utils import feedfinder
def encode(tstr):
@ -58,6 +58,8 @@ def fetch_address_from_page(url, existing_feed=None):
feed_finder_url = feedfinder.feed(url)
if feed_finder_url:
if existing_feed:
if Feed.objects.filter(feed_address=feed_finder_url):
return None
existing_feed.feed_address = feed_finder_url
existing_feed.save()
feed = existing_feed