diff --git a/contrib/rss/readme.txt b/contrib/rss/readme.txt index c6a7c0f9c2..2f0885b569 100644 --- a/contrib/rss/readme.txt +++ b/contrib/rss/readme.txt @@ -14,14 +14,9 @@ somewhere: Replacing "libsqlite3.so" with the path to the sqlite shared library or DLL. I put this in my ~/.factor-rc. -Before running the RSS reader web application you need to create the -history database in the same directory as the 'f' executable. Create -it with: - - sqlite3 history.db - > create table rss (url text, title text, link text, primary key (url)); - > create table entries (url text, link text, title text, description text, pubdate text, primary key(url, link)); - > [eof] +The RSS reader web application creates a database file called +'rss-reader.db' in the same directory as the Factor executable when +first started. This database contains all the feed information. To load the web application use: diff --git a/contrib/rss/rss-reader.factor b/contrib/rss/rss-reader.factor index ae3d8f3b73..b6ed9ad626 100644 --- a/contrib/rss/rss-reader.factor +++ b/contrib/rss/rss-reader.factor @@ -9,20 +9,36 @@ ! > [eof] ! IN: rss -USING: kernel html cont-responder namespaces sequences io hashtables sqlite errors ; +USING: kernel html cont-responder namespaces sequences io hashtables sqlite errors tuple-db ; -SYMBOL: feeds +TUPLE: reader-feed url title link ; +TUPLE: reader-entry url link title description pubdate ; -: init-feeds ( -- ) - V{ } clone feeds set-global ; +reader-feed default-mapping set-mapping +reader-entry default-mapping set-mapping + +SYMBOL: db + +: init-db ( -- ) + db get-global [ sqlite-close ] when* + "rss-reader.db" exists? [ + "rss-reader.db" sqlite-open db set-global + ] [ + "rss-reader.db" sqlite-open dup db set-global + dup reader-feed create-tuple-table + reader-entry create-tuple-table + ] if ; : add-feed ( url -- ) - feeds get push ; + "" "" db get swap insert-tuple ; : remove-feed ( url -- ) - feeds get remove feeds set-global ; + f f db get swap find-tuples [ db get swap delete-tuple ] each ; -: get-feed ( -- url ) +: all-urls ( -- urls ) + f f f db get swap find-tuples [ reader-feed-url ] map ; + +: ask-for-url ( -- url ) [ "Enter a Feed URL" write @@ -36,27 +52,18 @@ SYMBOL: feeds ] show "url" swap hash ; -: get-entries ( url -- ) - "history.db" sqlite-open ( db ) - "select * from entries where url='" rot append "'" append dupd sqlite-prepare ( db stmt ) - [ [ [ 2 column-text ] keep - [ 1 column-text ] keep - [ 3 column-text ] keep - 4 column-text - ] sqlite-map - ] keep - sqlite-finalize - swap sqlite-close ; +: get-entries ( url -- entries ) + f f f f db get swap find-tuples ; -: view-entries ( url -- ) +: display-entries ( url -- ) [ "View entries for " write over write swap get-entries [ -

dup rss-entry-title write

+

dup reader-entry-title write

- rss-entry-description write + reader-entry-description write

] each

"Back" write

@@ -64,54 +71,28 @@ SYMBOL: feeds ] show 2drop ; -: rss-delete-statement ( url -- string ) - [ - "delete from rss where url='" % % "';" % ] "" make ; +: rss>reader-feed ( url rss -- reader-feed ) + [ rss-title ] keep rss-link ; -: rss-insert-statement ( url rss -- string ) - [ - "insert into rss values('" % swap % "','" % - [ rss-title "'" "''" rot replace % "','" % ] keep - rss-link % "');" % - ] "" make ; +: rss-entry>reader-entry ( url entry -- reader-entry ) + [ rss-entry-link ] keep + [ rss-entry-title ] keep + [ rss-entry-description ] keep + rss-entry-pub-date + ; -: entry-delete-statement ( url entry -- string ) - [ - "delete from entries where url='" % swap % "' and link='" % - rss-entry-link "'" "''" rot replace % "';" % - ] "" make ; - -: entry-insert-statement ( url entry -- string ) - [ - "insert into entries values('" % swap % "','" % - [ rss-entry-link "'" "''" rot replace % "','" % ] keep - [ rss-entry-title "'" "''" rot replace % "','" % ] keep - [ rss-entry-description "'" "''" rot replace % "','" % ] keep - rss-entry-pub-date "'" "''" rot replace % "');" % - ] "" make ; - -: do-update ( string -- ) - "history.db" sqlite-open ( db ) - dup rot sqlite-prepare [ [ drop ] sqlite-each ] keep - sqlite-finalize - sqlite-close ; - -: update-feed-database ( url rss -- ) - over rss-delete-statement do-update - 2dup rss-insert-statement do-update ( url rss - ) - rss-entries [ ( url entry ) - 2dup entry-delete-statement do-update - entry-insert-statement do-update +: update-feed-database ( url -- ) + dup remove-feed + dup rss-get + 2dup rss>reader-feed db get swap save-tuple + rss-entries [ + dupd rss-entry>reader-entry + dup >r reader-entry-link f f f db get swap find-tuples [ db get swap delete-tuple ] each r> + db get swap save-tuple ] each-with ; : update-feeds ( seq -- ) - [ - [ - dup rss-get - ] catch [ - update-feed-database - ] unless - ] each + [ update-feed-database ] each [ "Feeds Updated" write @@ -129,22 +110,19 @@ SYMBOL: feeds

- feeds get [ + all-urls [ - + ] each
dup write dup [ remove-feed ] curry "Remove" swap quot-href [ view-entries ] curry "Database" swap quot-href [ display-entries ] curry "Database" swap quot-href

-

"Add Feed" [ get-feed add-feed ] quot-href

-

"Update Feeds" [ feeds get update-feeds ] quot-href

+

"Add Feed" [ ask-for-url add-feed ] quot-href

+

"Update Feeds" [ all-urls update-feeds ] quot-href

] show-final ; -init-feeds - - -"maintain-feeds" [ maintain-feeds ] install-cont-responder +"maintain-feeds" [ init-db maintain-feeds ] install-cont-responder