Merge branch 'prefixed'

main
m455 2018-10-10 15:05:54 -04:00
commit b7519faa03
10 changed files with 421 additions and 436 deletions

1
README.md 100755 → 100644
View File

@ -87,3 +87,4 @@ rm - `rodo rm 1`
## Configuring rodo
Right now, the configurations can be found in the config.rkt file. Settings such at program name, path and directory can be set here.

View File

@ -1,47 +1,48 @@
#lang racket/base
(require racket/vector
racket/list
"config.rkt"
"init.rkt"
"util.rkt"
"messages.rkt")
(require (prefix-in vector: racket/vector)
(prefix-in list: racket/list)
(prefix-in config: "config.rkt")
(prefix-in init: "init.rkt")
(prefix-in util: "util.rkt")
(prefix-in messages: "messages.rkt"))
(provide (all-defined-out))
(define (check-args args)
(let
([args-length (vector-length args)])
(cond
[(equal? args-length 0)
(d-hash-ref messages 'show-usage)]
(let([args-length (vector-length args)])
(cond [(equal? args-length 0)
(util:display-hash-ref messages:messages 'show-usage)]
[(and
(equal? args-length 1)
(equal? (vector-member list-command args) 0))
(show-list)]
(equal? (vector:vector-member config:list-command args) 0))
(util:show-list)]
[(and
(equal? args-length 2)
(equal? (vector-ref args 0) add-command))
(add-item args)]
(equal? (vector-ref args 0) config:add-command))
(util:add-item args)]
[(and
(equal? args-length 2)
(equal? (vector-member remove-command args) 0)
(not (equal? (vector-member "0" args) 1))
(vector-member (vector-ref args 1) (list->vector (map number->string (rest (range (length (file->string-list path))))))))
(remove-item args)]
(equal? (vector:vector-member config:remove-command args) 0)
(not (equal? (vector:vector-member "0" args) 1))
(vector:vector-member
(vector-ref args 1)
(list->vector
(map number->string (list:rest (list:range (length (util:file->string-list config:path))))))))
(util:remove-item args)]
[(and
(equal? args-length 1)
(equal? (vector-member initialize-command args) 0))
(initialize)]
(equal? (vector:vector-member config:initialize-command args) 0))
(init:initialize)]
[(and
(equal? args-length 1)
(member (vector-ref args 0) help-command))
(d-hash-ref messages 'show-help)]
(member (vector-ref args 0) config:help-command))
(util:display-hash-ref messages:messages 'show-help)]
[else
(d-hash-ref messages 'show-usage)])))
(util:display-hash-ref messages:messages 'show-usage)])))

View File

@ -1,5 +1,4 @@
#lang racket/base
(require racket/file)
(provide (all-defined-out))
(define program-name "rodo")

View File

@ -1,47 +1,45 @@
#lang racket/base
(require racket/file
"config.rkt"
"util.rkt"
"messages.rkt"
"io.rkt")
(require (prefix-in file: racket/file)
(prefix-in config: "config.rkt")
(prefix-in util: "util.rkt")
(prefix-in messages: "messages.rkt"))
(provide (all-defined-out))
(define (initialize-file)
(display-to-file
(file:display-to-file
"--Do not edit this file--\n"
path
config:path
#:mode 'text
#:exists 'replace))
(define (init-prompt hash-list key)
(d-hash-ref hash-list key)
(util:display-hash-ref hash-list key)
(display "> ")
(let
([user-input (read-line)])
(cond
[(member user-input (hash-ref y/n 'yes))
(d-hash-ref messages 'creating-folder)
(d-hash-ref messages 'creating-file)
(create-folder)
(create-file)
[(member user-input (hash-ref messages:y/n 'yes))
(util:display-hash-ref messages:messages 'creating-folder)
(util:display-hash-ref messages:messages 'creating-file)
(util:create-folder)
(util:create-file)
(initialize-file)
(if
(and
(check-for-folder)
(check-for-file))
(d-hash-ref messages 'successfully-created)
(d-hash-ref messages 'creation-error))]
(if (and
(util:check-for-folder)
(util:check-for-file))
(util:display-hash-ref messages:messages 'successfully-created)
(util:display-hash-ref messages:messages 'creation-error))]
[(member user-input (hash-ref y/n 'no))
(d-hash-ref messages 'terminating)]
[(member user-input (hash-ref messages:y/n 'no))
(util:display-hash-ref messages:messages 'terminating)]
[else
(init-prompt messages 'choose-y/n)])))
(init-prompt messages:messages 'choose-y/n)])))
(define (initialize)
(if (check-for-file)
(d-hash-ref messages 'file-already-exists)
(if (util:check-for-file)
(util:display-hash-ref messages:messages 'file-already-exists)
(begin
(init-prompt messages 'init-y/n))))
(init-prompt messages:messages 'init-y/n))))

32
io.rkt
View File

@ -1,32 +0,0 @@
#lang racket/base
(require racket/file
"config.rkt")
(provide (all-defined-out))
(define (check-for-file)
(file-exists? path))
(define (create-file)
(let
([opened-file
(open-output-file
path
#:mode 'text
#:exists 'can-update)])
(close-output-port opened-file)))
(define (check-for-folder)
(directory-exists?
(expand-user-path
(string-append
program-path
program-directory))))
(define (create-folder)
(make-directory
(expand-user-path
(string-append
program-path
program-directory))))

View File

@ -1,6 +1,6 @@
#lang racket/base
(require "config.rkt")
(require (prefix-in config: "config.rkt"))
(provide (all-defined-out))
@ -8,36 +8,36 @@
(hash
'show-help
(string-append
"* " initialize-command ": "
config:initialize-command ":\n"
"initialize a file in "
program-path
program-directory
program-file
config:program-path
config:program-directory
config:program-file
"\n"
"\x09Example: "
"Example: "
"rodo init\n\n"
"* " list-command ": "
config:list-command ":\n"
"lists items on the list"
"\n"
"\x09Example: "
"Example: "
"rodo ls\n\n"
"* " add-command ": "
config:add-command ":\n"
"adds an item to the list"
"\n"
"\x09Example: "
"Example: "
"rodo add bread\n\n"
"\x09Note: For multi-word items you will need to\n"
"\x09surround your item in double quotes as so:\n"
"\x09rodo add \"go to the bank\"\n"
"Note: For multi-word items you will need to\n"
"surround your item in double quotes as so:\n"
"rodo add \"go to the bank\"\n\n"
"* " remove-command ": "
config:remove-command ":\n"
"removes an item from the list\n"
"\x09Example: "
"rodo rm 1\n"
"\x09Note: You may have to run `rodo ls` to see which\n"
"\x09number corresponds to which item to remove it.\n")
"Example: "
"rodo rm 1\n\n"
"Note: You may have to run `rodo ls` to see which\n"
"number corresponds to which item to remove it.\n")
'empty-todo-list
"> There is nothing in your list \n"
@ -45,77 +45,77 @@
'show-usage
(string-append
"> For usage type "
"`" program-name " -h`"
"`" config:program-name " -h`"
" or "
"`" program-name " --help`\n")
"`" config:program-name " --help`\n")
'creating-folder
(string-append
"> creating a "
program-directory
config:program-directory
" folder in "
program-path " ...\n")
config:program-path " ...\n")
'creating-file
(string-append
"> creating a "
program-file
config:program-file
" file in "
program-path
program-directory " ...\n")
config:program-path
config:program-directory " ...\n")
'creation-error
(string-append
"> Error: Could not create "
program-file
config:program-file
" in "
program-directory
program-path ".\n"
config:program-directory
config:program-path ".\n"
"> This may be due to directory permissions\n")
'file-already-exists
(string-append
"> Error: "
program-name
config:program-name
" already exists in "
program-path
program-directory
program-file "\n")
config:program-path
config:program-directory
config:program-file "\n")
'successfully-created
(string-append
"> "
program-path
program-directory
program-file
config:program-path
config:program-directory
config:program-file
" has been successfully created\n")
'file-not-found
(string-append
"> Error: Could not find "
program-path
program-directory
program-file "\n")
config:program-path
config:program-directory
config:program-file "\n")
'init-y/n
(string-append
"> A "
program-file
config:program-file
" file will be created in "
program-path
program-directory "\n"
config:program-path
config:program-directory "\n"
"> Are you sure you want to continue? [y/n]\n")
'try-init
(string-append
"> Try typing "
"`" program-name " init` "
"`" config:program-name " init` "
"to set it up\n")
'terminating
(string-append
"> Exiting "
program-name
config:program-name
" ...\n")
'choose-y/n

BIN
rodo

Binary file not shown.

View File

@ -1,9 +1,9 @@
#! /usr/bin/env racket
#lang racket/base
(require "args.rkt")
(require (prefix-in args: "args.rkt"))
(define (main)
(check-args (current-command-line-arguments)))
(args:check-args (current-command-line-arguments)))
(main)

130
util.rkt
View File

@ -1,31 +1,49 @@
#lang racket/base
(require racket/list
racket/file
racket/string
"config.rkt"
"io.rkt"
"messages.rkt")
(require (prefix-in list: racket/list)
(prefix-in file: racket/file)
(prefix-in string: racket/string)
(prefix-in config: "config.rkt")
(prefix-in messages: "messages.rkt"))
(provide (all-defined-out))
(define (d-hash-ref hash-list key)
(define (check-for-file)
(file-exists? config:path))
(define (create-file)
(let ([opened-file
(open-output-file config:path
#:mode 'text
#:exists 'can-update)])
(close-output-port opened-file)))
(define (check-for-folder)
(directory-exists? (expand-user-path
(string-append
config:program-path
config:program-directory))))
(define (create-folder)
(make-directory (expand-user-path
(string-append
config:program-path
config:program-directory))))
(define (display-hash-ref hash-list key)
(display (hash-ref hash-list key)))
(define (d-vector-ref args key)
(display (vector-ref args key)))
(define (file->string-list path-to-file)
(let
([todo-list
(file->lines
path-to-file
(define (file->string-list config:path-to-file)
(let ([todo-list (file:file->lines config:path-to-file
#:mode 'text
#:line-mode 'any)])
todo-list))
(define (list-empty? lst)
(empty? (rest (file->string-list lst))))
(list:empty? (list:rest (file->string-list lst))))
(define (get-removed-item lst args)
(list-ref lst (string->number args)))
@ -34,83 +52,83 @@
(display
(string-append "\"" args "\"")))
(define (number-list lst)
(define (prefix-with-number lst)
(map string-append
(map number->string (rest (range (length lst))))
(rest lst)))
(map number->string (list:rest (list:range (length lst))))
(list:rest lst)))
(define (indent-list lst)
(define (prefix-with-period lst)
(string-append ". " lst))
(define (prettify-list)
(display
(string-join
(number-list (map indent-list (file->string-list path)))
(string:string-join (prefix-with-number (map prefix-with-period (file->string-list config:path)))
"\n"
#:after-last "\n")))
(define (append-to-end args lst)
(reverse (cons args (reverse (file->string-list lst)))))
(define (display-item-added args)
(display-hash-ref messages:messages 'item-added-prefix)
(quote-item args)
(display-hash-ref messages:messages 'item-added-suffix))
(define (display-item-removed args)
(display-hash-ref messages:messages 'item-removed-prefix)
(quote-item args)
(display-hash-ref messages:messages 'item-removed-suffix))
(define (show-list)
(cond
[(and
(cond [(and
(check-for-folder)
(check-for-file))
(if
(list-empty? path)
(d-hash-ref messages 'empty-todo-list)
(list-empty? config:path)
(display-hash-ref messages:messages 'empty-todo-list)
(prettify-list))]
[else
(d-hash-ref messages 'file-not-found)
(d-hash-ref messages 'try-init)]))
(display-hash-ref messages:messages 'file-not-found)
(display-hash-ref messages:messages 'try-init)]))
(define (add-item-to-file args)
(let ([new-list
(reverse
(cons args
(reverse (file->string-list path))))])
(display-to-file
(string-join new-list "\n" #:after-last "\n")
path
(let ([new-list (append-to-end args config:path)])
(file:display-to-file
(string:string-join new-list "\n" #:after-last "\n")
config:path
#:mode 'text
#:exists 'replace)
(d-hash-ref messages 'item-added-prefix)
(quote-item args)
(d-hash-ref messages 'item-added-suffix)))
(display-item-added args)))
(define (add-item args)
(if
(and
(if (and
(check-for-folder)
(check-for-file))
(add-item-to-file (vector-ref args 1))
(begin
(d-hash-ref messages 'file-not-found)
(d-hash-ref messages 'try-init))))
(display-hash-ref messages:messages 'file-not-found)
(display-hash-ref messages:messages 'try-init))))
(define (remove-item-from-file args)
(let ([removed-item
(get-removed-item (file->string-list path) args)]
[new-list
(remove
(list-ref (file->string-list path) (string->number args))
(file->string-list path))])
(display-to-file
(string-join new-list "\n" #:after-last "\n")
path
(let ([removed-item (get-removed-item (file->string-list config:path) args)]
[new-list (remove
(list-ref (file->string-list config:path) (string->number args))
(file->string-list config:path))])
(file:display-to-file
(string:string-join new-list "\n" #:after-last "\n")
config:path
#:mode 'text
#:exists 'replace)
(d-hash-ref messages 'item-removed-prefix)
(quote-item removed-item)
(d-hash-ref messages 'item-removed-suffix)))
(display-item-removed removed-item)))
(define (remove-item args)
(cond
[(list-empty? path)
(d-hash-ref messages 'empty-todo-list)]
(cond [(list-empty? config:path)
(display-hash-ref messages:messages 'empty-todo-list)]
[(and
(check-for-folder)
(check-for-file))
(remove-item-from-file (vector-ref args 1))]
[(and (not (check-for-folder)) (not (check-for-file)))
(begin
(d-hash-ref messages 'file-not-found)
(d-hash-ref messages 'try-init))]))
(display-hash-ref messages:messages 'file-not-found)
(display-hash-ref messages:messages 'try-init))]))