steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

move site-watcher db code to new vocab, clean up the site-watcher api

db4
Doug Coleman 2009-03-18 17:43:49 -05:00
parent d5581b453e
commit e8f9d48b08
4 changed files with 93 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extra/site-watcher/db/authors.txt Normal file
View File

@ -0,0 +1 @@
Doug Coleman

51
extra/site-watcher/db/db.factor Normal file
View File

@ -0,0 +1,51 @@
! Copyright (C) 2009 Doug Coleman.
! See http://factorcode.org/license.txt for BSD license.
USING: accessors continuations db db.sqlite db.tuples db.types
io.directories io.files.temp kernel ;
IN: site-watcher.db
: site-watcher-path ( -- path ) "site-watcher.db" temp-file ; inline
[ site-watcher-path delete-file ] ignore-errors
: with-sqlite-db ( quot -- )
site-watcher-path <sqlite-db> swap with-db ; inline
TUPLE: account account-id email ;
: <account> ( email -- account )
account new
swap >>email ;
account "ACCOUNT" {
{ "account-id" "ACCOUNT_ID" +db-assigned-id+ }
{ "email" "EMAIL" VARCHAR }
} define-persistent
TUPLE: site site-id url up? changed? last-up error last-error ;
: <site> ( url -- site )
site new
swap >>url ;
site "SITE" {
{ "site-id" "SITE_ID" INTEGER +db-assigned-id+ }
{ "url" "URL" VARCHAR }
{ "up?" "UP" BOOLEAN }
{ "changed?" "CHANGED" BOOLEAN }
{ "last-up" "LAST_UP" TIMESTAMP }
{ "error" "ERROR" VARCHAR }
{ "last-error" "LAST_ERROR" TIMESTAMP }
} define-persistent
TUPLE: watching-site account-id site-id ;
: <watching-site> ( account-id site-id -- watching-site )
watching-site new
swap >>site-id
swap >>account-id ;
watching-site "WATCHING_SITE" {
{ "account-id" "ACCOUNT_ID" INTEGER +user-assigned-id+ }
{ "site-id" "SITE_ID" INTEGER +user-assigned-id+ }
} define-persistent

19
extra/site-watcher/site-watcher-tests.factor Normal file
View File

@ -0,0 +1,19 @@
! Copyright (C) 2009 Doug Coleman.
! See http://factorcode.org/license.txt for BSD license.
USING: db.tuples locals site-watcher site-watcher.db ;
IN: site-watcher.tests
:: fake-sites ( -- seq )
[
account ensure-table
site ensure-table
watching-site ensure-table
"erg@factorcode.org" insert-account
"http://asdfasdfasdfasdfqwerqqq.com" insert-site
"http://fark.com" insert-site
"erg@factorcode.org" "http://asdfasdfasdfasdfqwerqqq.com" watch-site
f <site> select-tuples
] with-sqlite-db ;

106
extra/site-watcher/site-watcher.factor
View File

@ -1,68 +1,11 @@
! Copyright (C) 2009 Doug Coleman. ! Copyright (C) 2009 Doug Coleman.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: db.sqlite db.types db.tuples kernel accessors USING: accessors alarms arrays calendar combinators
db io.files io.files.temp locals io.directories continuations combinators.smart continuations db db.tuples debugger
assocs sequences alarms namespaces http.client init calendar http.client init io.streams.string kernel locals math
math math.parser smtp strings io combinators arrays debugger math.parser namespaces sequences site-watcher.db smtp ;
generalizations combinators.smart io.streams.string ;
IN: site-watcher IN: site-watcher
: site-watcher-path ( -- path ) "site-watcher.db" temp-file ; inline
[ site-watcher-path delete-file ] ignore-errors
: with-sqlite-db ( quot -- )
site-watcher-path <sqlite-db> swap with-db ; inline
TUPLE: account account-id email ;
: <account> ( email -- account )
account new
swap >>email ;
account "ACCOUNT" {
{ "account-id" "ACCOUNT_ID" +db-assigned-id+ }
{ "email" "EMAIL" VARCHAR }
} define-persistent
TUPLE: site site-id url up? changed? last-up error last-error ;
: <site> ( url -- site )
site new
swap >>url ;
site "SITE" {
{ "site-id" "SITE_ID" INTEGER +db-assigned-id+ }
{ "url" "URL" VARCHAR }
{ "up?" "UP" BOOLEAN }
{ "changed?" "CHANGED" BOOLEAN }
{ "last-up" "LAST_UP" TIMESTAMP }
{ "error" "ERROR" VARCHAR }
{ "last-error" "LAST_ERROR" TIMESTAMP }
} define-persistent
TUPLE: watching-site account-id site-id ;
: <watching-site> ( account-id site-id -- watching-site )
watching-site new
swap >>site-id
swap >>account-id ;
watching-site "WATCHING_SITE" {
{ "account-id" "ACCOUNT_ID" INTEGER +user-assigned-id+ }
{ "site-id" "SITE_ID" INTEGER +user-assigned-id+ }
} define-persistent
: select-account/site ( email url -- account site )
[ <account> select-tuple account-id>> ]
[ <site> select-tuple site-id>> ] bi* ;
: watch-site ( email url -- )
select-account/site <watching-site> insert-tuple ;
: unwatch-site ( email url -- )
select-account/site <watching-site> delete-tuples ;
SYMBOL: site-watcher-from SYMBOL: site-watcher-from
"factor-site-watcher@gmail.com" site-watcher-from set-global "factor-site-watcher@gmail.com" site-watcher-from set-global
@ -70,6 +13,7 @@ SYMBOL: site-watcher-frequency
10 seconds site-watcher-frequency set-global 10 seconds site-watcher-frequency set-global
SYMBOL: running-site-watcher SYMBOL: running-site-watcher
[ f running-site-watcher set-global ] "site-watcher" add-init-hook
<PRIVATE <PRIVATE
@ -122,8 +66,25 @@ TUPLE: reporting-site email url up? changed? last-up? error last-error ;
[ [ reporting-site boa ] input<sequence ] map email-accounts [ [ reporting-site boa ] input<sequence ] map email-accounts
"update site set changed = 'f';" sql-command ; "update site set changed = 'f';" sql-command ;
: insert-site ( url -- site )
<site> dup select-tuple [
dup t >>up? insert-tuple
] unless ;
PRIVATE> PRIVATE>
: select-account/site ( email url -- account site )
[ <account> select-tuple account-id>> ]
[ insert-site site-id>> ] bi* ;
: watch-site ( email url -- )
select-account/site <watching-site> insert-tuple ;
: unwatch-site ( email url -- )
select-account/site <watching-site> delete-tuples ;
: insert-account ( email -- ) <account> insert-tuple ;
: watch-sites ( -- alarm ) : watch-sites ( -- alarm )
[ [
[ [
@ -131,12 +92,6 @@ PRIVATE>
] with-sqlite-db ] with-sqlite-db
] site-watcher-frequency get every ; ] site-watcher-frequency get every ;
: watch-new-site ( url -- )
<site> t >>up? insert-tuple ;
: insert-account ( email -- )
<account> insert-tuple ;
: run-site-watcher ( -- ) : run-site-watcher ( -- )
running-site-watcher get [ running-site-watcher get [
watch-sites running-site-watcher set-global watch-sites running-site-watcher set-global
@ -144,20 +99,3 @@ PRIVATE>
: stop-site-watcher ( -- ) : stop-site-watcher ( -- )
running-site-watcher get [ cancel-alarm ] when* ; running-site-watcher get [ cancel-alarm ] when* ;
[ f running-site-watcher set-global ] "site-watcher" add-init-hook
:: fake-sites ( -- seq )
[
account ensure-table
site ensure-table
watching-site ensure-table
"erg@factorcode.org" insert-account
"http://asdfasdfasdfasdfqwerqqq.com" watch-new-site
"http://fark.com" watch-new-site
"erg@factorcode.org" "http://asdfasdfasdfasdfqwerqqq.com" watch-site
f <site> select-tuples
] with-sqlite-db ;