jeena/woodwind
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

fix up the subscribe/update stuff

Browse source
This commit is contained in:
Kyle Mahan 2015-01-27 22:14:30 -08:00
parent 8a45968175
commit 73cabc2050
10 changed files with 118 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

2
celeryconfig.py
View file

@ -8,7 +8,7 @@ CELERY_ACCEPT_CONTENT = ['json']
CELERYBEAT_SCHEDULE = {
'tick-every-5-minutes': {
'task': 'woodwind.tasks.tick',
'schedule': datetime.timedelta(seconds=30),
'schedule': datetime.timedelta(minutes=5),
}
}
# recommended to disable if not using -- introduces a lot of complexity

7
woodwind/static/style.scss
View file

@ -44,6 +44,13 @@ article {
float: left;
border-radius: 4px;
}
color: $armadillo;
border-bottom: 1px solid $armadillo;
}
h1 {
font-size: 1.2em;
font-weight: bold;
}
}

30
woodwind/tasks.py
View file

@ -60,7 +60,7 @@ def process_feed_for_new_entries(feed):
def process_xml_feed_for_new_entries(feed):
logger.debug('updating feed: %s', feed)
logger.debug('fetching xml feed: %s', feed)
now = datetime.datetime.utcnow()
parsed = feedparser.parse(feed.feed)
@ -71,11 +71,16 @@ def process_xml_feed_for_new_entries(feed):
default_author_photo = feed_props.get('logo')
all_uids = [e.id or e.link for e in parsed.entries]
preexisting = set(row[0] for row in session.query(Entry.uid)
.filter(Entry.uid.in_(all_uids))
.filter(Entry.feed == feed))
if all_uids:
preexisting = set(row[0] for row in session.query(Entry.uid)
.filter(Entry.uid.in_(all_uids))
.filter(Entry.feed == feed))
else:
preexisting = set()
logger.debug('found {} entries'.format(len(parsed.entries)))
for p_entry in parsed.entries:
logger.debug('processing entry {}'.format(p_entry))
permalink = p_entry.link
uid = p_entry.id or permalink
@ -84,10 +89,10 @@ def process_xml_feed_for_new_entries(feed):
updated = datetime.datetime.fromtimestamp(
time.mktime(p_entry.updated_parsed)
) if p_entry.updated_parsed else None
) if 'updated_parsed' in p_entry else None
published = datetime.datetime.fromtimestamp(
time.mktime(p_entry.published_parsed)
) if p_entry.published_parsed else None
) if 'published_parsed' in p_entry else now
title = p_entry.get('title')
@ -125,7 +130,7 @@ def process_xml_feed_for_new_entries(feed):
def process_html_feed_for_new_entries(feed):
logger.debug('updating feed: %s', feed)
logger.debug('fetching html feed: %s', feed)
now = datetime.datetime.utcnow()
parsed = mf2util.interpret_feed(
@ -133,9 +138,12 @@ def process_html_feed_for_new_entries(feed):
hfeed = parsed.get('entries', [])
all_uids = [e.get('uid') or e.get('url') for e in hfeed]
preexisting = set(row[0] for row in session.query(Entry.uid)
.filter(Entry.uid.in_(all_uids))
.filter(Entry.feed == feed))
if all_uids:
preexisting = set(row[0] for row in session.query(Entry.uid)
.filter(Entry.uid.in_(all_uids))
.filter(Entry.feed == feed))
else:
preexisting = set()
# logger.debug('preexisting urls: %r', preexisting)
@ -151,7 +159,7 @@ def process_html_feed_for_new_entries(feed):
# uid = hentry.get('uid') or uid
entry = Entry(
feed=feed,
published=hentry.get('published'),
published=hentry.get('published') or now,
updated=hentry.get('updated'),
uid=uid,
permalink=permalink,

21
woodwind/templates/base.jinja2
View file

@ -7,12 +7,19 @@
{% block head %}{% endblock %}
</head>
<body>
{% if current_user.is_authenticated() %}
<div class="logged-in">{{ current_user.domain }}</div>
{% endif %}
{% for message in get_flashed_messages() %}
<div class="flash">{{ message | safe }}</div>
{% endfor %}
{% block body %}{% endblock %}
<main>
{% if current_user.is_authenticated() %}
<div class="logged-in">{{ current_user.domain }}</div>
{% else %}
<form action="{{ url_for('.login') }}" method="GET">
<input type="text" name="me" placeholder="mydomain.com" />
<button type="submit">Login</button>
</form>
{% endif %}
{% for message in get_flashed_messages() %}
<div class="flash">{{ message | safe }}</div>
{% endfor %}
{% block body %}{% endblock %}
</main>
</body>
</html>

64
woodwind/templates/feed.jinja2
View file

@ -1,31 +1,51 @@
{% extends "base.jinja2" %}
{% block body %}
<main>
{% for entry in entries %}
<article>
<header>
{% if entry.author_photo %}
<img src="{{entry.author_photo}}"/>
{% endif %}
{% if entry.author_name %}
{{ entry.author_name }} -
{% endif %}
{{ entry.feed.name }}
</header>
{% if entry.title %}
<h1>{{ entry.title }}</h1>
<form action="{{ url_for('.subscribe') }}" method="POST">
<input type="text" id="origin" name="origin" placeholder="Feed URL" />
<button type="submit" id="subscribe">Subscribe</button>
</form>
{% for entry in entries %}
<article>
<header>
{% if entry.author_photo %}
<img src="{{entry.author_photo}}"/>
{% endif %}
{% if entry.content %}
{% if entry.author_name %}
{{ entry.author_name }} -
{% endif %}
{{ entry.feed.name }}
</header>
{% if entry.title %}
<h1>{{ entry.title }}</h1>
{% endif %}
{% if entry.content %}
<div>
{{ entry.content_cleaned() }}
</div>
{% endif %}
<div>
<a href="{{ entry.permalink }}">{{ entry.published }}</a>
</div>
</article>
{% endfor %}
</main>
{% endif %}
<div>
<a href="{{ entry.permalink }}">{{ entry.published }}</a>
</div>
<form action="{{ current_user.micropub_endpoint }}" method="POST">
<input type="hidden" name="access_token" value="{{current_user.access_token}}"/>
<input type="hidden" name="h" value="entry"/>
<input type="hidden" name="like-of" value="{{ entry.permalink }}"/>
<button type="submit">Like</button>
</form>
<!--
<form action="{{ current_user.micropub_endpoint }}" method="POST">
<input type="hidden" name="access_token" value="{{current_user.access_token}}"/>
<input type="hidden" name="h" value="entry"/>
<input type="hidden" name="in-reply-to" value="{{ entry.permalink }}"/>
<textarea name="content"></textarea>
<button type="submit">Reply</button>
</form>
-->
</article>
{% endfor %}
{% endblock body %}

26
woodwind/templates/feeds.jinja2
View file

@ -1,18 +1,28 @@
{% extends "base.jinja2" %}
{% block body %}
<main>
{% for feed in feeds %}
{% for feed in feeds %}
<form action="{{ url_for('.edit_feed', id=feed.id) }}" method="POST">
<div>
<form style="display:inline"
action="{{ url_for('.edit_feed') }}" method="POST">
<input type="hidden" name="id" value="{{ feed.id }}"/>
<input type="text" name="name" value="{{ feed.name }}"/>
<input type="text" name="feed" value="{{ feed.feed }}"/>
<input type="text" name="name" style="width:25%" value="{{ feed.name }}"/>
<input type="text" name="feed" style="width:25%" value="{{ feed.feed }}"/>
<button type="submit">Save</button>
</form>
<form style="display:inline;"
action="{{ url_for('.update_feed') }}" method="GET">
<input type="hidden" name="id" value="{{ feed.id }}"/>
<button type="submit">Update</button>
</form>
<form style="display:inline;"
action="{{ url_for('.delete_feed') }}" method="POST">
<input type="hidden" name="id" value="{{ feed.id }}"/>
<button type="submit">Delete</button>
</form>
</div>
{% endfor %}
</main>
{% endfor %}
{% endblock body %}

10
woodwind/templates/login.jinja2
View file

@ -1,9 +1,7 @@
{% extends "base.jinja2" %}
{% block body %}
<main>
<form action="{{ url_for('login') }}" method="GET">
<input type="text" name="me" placeholder="mydomain.com" />
<button type="submit">Login</button>
</form>
</main>
<form action="{{ url_for('.login') }}" method="GET">
<input type="text" name="me" placeholder="mydomain.com" />
<button type="submit">Login</button>
</form>
{% endblock %}

2
woodwind/templates/select-feed.jinja2
View file

@ -1,7 +1,7 @@
{% extends "base.jinja2" %}
{% block body %}
<main>
<form action="{{ url_for('subscribe') }}" method="POST">
<form action="{{ url_for('.subscribe') }}" method="POST">
<input type="hidden" id="origin" name="origin" value="{{ origin }}" />
{% for feed in feeds %}

3
woodwind/templates/subscribe.jinja2
View file

@ -1,10 +1,7 @@
{% extends "base.jinja2" %}
{% block body %}
<main>
<form method="POST">
<input type="text" id="origin" name="origin" placeholder="Feed URL" />
<button type="submit" id="subscribe">Subscribe</button>
</form>
</main>
{% endblock body %}

27
woodwind/views.py
View file

@ -15,9 +15,6 @@ ui = flask.Blueprint('ui', __name__)
@ui.route('/')
def index():
import os
print('cwd', os.getcwd(), 'db', db)
if flask_login.current_user.is_authenticated():
feed_ids = [f.id for f in flask_login.current_user.feeds]
entries = Entry.query.filter(
@ -52,11 +49,12 @@ def feeds():
def update_feed():
feed_id = flask.request.args.get('id')
tasks.update_feed.delay(feed_id)
return flask.redirect(flask.url_for('.feeds'))
@ui.route('/delete_feed')
@ui.route('/delete_feed', methods=['POST'])
def delete_feed():
feed_id = flask.request.args.get('id')
feed_id = flask.request.form.get('id')
feed = Feed.query.get(feed_id)
db.session.delete(feed)
db.session.commit()
@ -83,9 +81,6 @@ def edit_feed():
@ui.route('/login')
def login():
if True:
flask_login.login_user(User.query.all()[0], remember=True)
me = flask.request.args.get('me')
if me:
return micropub.authorize(
@ -151,27 +146,29 @@ def subscribe():
return flask.render_template('subscribe.jinja2')
def add_subscription(origin, feed, type):
def add_subscription(origin, feed_url, type):
feed = None
if type == 'html':
parsed = mf2util.interpret_feed(mf2py.parse(url=feed), feed)
flask.current_app.logger.debug('mf2py parsing %s', feed_url)
parsed = mf2util.interpret_feed(mf2py.parse(url=feed_url), feed_url)
name = parsed.get('name')
if not name or len(name) > 140:
p = urllib.parse.urlparse(origin)
name = p.netloc + p.path
feed = Feed(user=flask_login.current_user, name=name,
origin=origin, feed=feed, type=type)
origin=origin, feed=feed_url, type=type)
elif type == 'xml':
parsed = feedparser.parse(feed)
flask.current_app.logger.debug('feedparser parsing %s', feed_url)
parsed = feedparser.parse(feed_url)
feed = Feed(user=flask_login.current_user,
name=parsed.feed.title, origin=origin, feed=feed,
type=type)
name=parsed.feed and parsed.feed.title,
origin=origin, feed=feed_url, type=type)
if feed:
db.session.add(feed)
db.session.commit()
# go ahead and update the fed
tasks.update_feed.delay(feed.id)
return feed
return feed
def find_possible_feeds(origin):