tildetown
/
rodo
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

made function names more descriptive

main
m455 2019-05-25 09:49:06 -04:00
parent 59630f3b64
commit ed0152a71c
4 changed files with 157 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
args.rkt
View File

@ -19,13 +19,13 @@
[(and
(equal? args-length 1)
(equal? (vector:vector-member config:list-command args) 0))
(util:show-list)]
(util:show-list-from-program-file)]
;; add
[(and
(or (equal? args-length 2) (>= args-length 2))
(equal? (vector-ref args 0) config:add-command))
(util:add-item args)]
(util:add-item-to-list args)]
;; rm
[(and
@ -35,7 +35,7 @@
(positive? (string->number (vector-ref args 1)))
(not (> (string->number (vector-ref args 1)) (length (util:file->string-list config:path-to-file))))
(not (< (string->number (vector-ref args 1)) (car (list:range (length (util:file->string-list config:path-to-file)))))))
(util:remove-item args)]
(util:remove-item-from-list args)]
;; init
[(and

10
init.rkt
View File

@ -15,11 +15,11 @@
(cond
[(member user-input (hash-ref messages:y/n 'yes))
(util:display-hash-ref messages:messages 'creating)
(util:create-directory)
(util:create-file)
(util:create-program-directory)
(util:create-program-file)
(if (and
(util:check-for-directory)
(util:check-for-file))
(util:check-for-program-directory)
(util:check-for-program-file))
(util:display-hash-ref messages:messages 'successfully-created)
(util:display-hash-ref messages:messages 'creation-error))]
@ -30,7 +30,7 @@
(init-prompt messages:messages 'choose-y/n)])))
(define (initialize)
(if (util:check-for-file)
(if (util:check-for-program-file)
(util:display-hash-ref messages:messages 'file-already-exists)
(begin
(init-prompt messages:messages 'init-y/n))))

65
util.rkt
View File

@ -8,21 +8,20 @@
(provide (all-defined-out))
(define (check-for-file)
(define (check-for-program-file)
(file-exists? config:path-to-file))
(define (create-file)
(let ([opened-file
(open-output-file config:path-to-file
(define (create-program-file)
(let ([opened-file (open-output-file config:path-to-file
#:mode 'text
#:exists 'truncate)])
(close-output-port opened-file))
(file-or-directory-permissions config:path-to-file #o600))
(define (check-for-directory)
(define (check-for-program-directory)
(directory-exists? config:program-directory))
(define (create-directory)
(define (create-program-directory)
(make-directory config:program-directory)
(file-or-directory-permissions config:program-directory #o700))
@ -41,67 +40,67 @@
;; Find out which item is being removed by scooping up
;; the number the user entered in the command line
;; argument
;; arguments
(define (get-removed-item lst args)
;; Subtract one from what the user chose, because they are
;; are actually viewing the list numbers as human numbers
;; so (actual-number +1)
(list-ref (file->string-list lst) (sub1 (string->number args))))
(define (surround-in-quotes args)
(define (surround-item-in-quotation-marks args)
(display (string-append "\"" args "\"")))
(define (prefix-with-period lst)
(define (prefix-item-with-period lst)
(string-append lst ". "))
(define (prefix-with-number lst)
(define (prefix-item-with-number lst)
(map string-append
;; Note: compose starts from the last element in it's
;; list, as if it were nested, so that would be add1 here
(map (compose prefix-with-period number->string add1)
(map (compose prefix-item-with-period number->string add1)
(list:range (length lst)))
lst))
(define (display-prettified-list)
(define (display-prettified-program-file)
(display
(string:string-join
(prefix-with-number (file->string-list config:path-to-file))
(prefix-item-with-number (file->string-list config:path-to-file))
"\n"
#:after-last "\n")))
;; This is a bit of ugly scheme sorcery
(define (append-to-end args lst)
;; This one is pretty wild
(define (append-item-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)
(surround-in-quotes args)
(surround-item-in-quotation-marks args)
(display-hash-ref messages:messages 'item-added-suffix))
(define (display-item-removed args)
(display-hash-ref messages:messages 'item-removed-prefix)
(surround-in-quotes args)
(surround-item-in-quotation-marks args)
(display-hash-ref messages:messages 'item-removed-suffix))
(define (show-list)
(define (show-list-from-program-file)
(cond [(and
(check-for-directory)
(check-for-file))
(check-for-program-directory)
(check-for-program-file))
(if
;; If file exists, see if it's empty, if so
;; tell the user
(list-empty? config:path-to-file)
(display-hash-ref messages:messages 'empty-todo-list)
;; If file isn't empty, display a pretty list
(display-prettified-list))]
(display-prettified-program-file))]
;; If file doesn't exist, tell the user
[else
(display-hash-ref messages:messages 'file-not-found)
(display-hash-ref messages:messages 'try-init)]))
(define (add-item-to-file args)
(define (write-item-to-program-file args)
;; Add item to end of list and write to file
(let ([new-list (append-to-end args config:path-to-file)])
(let ([new-list (append-item-to-end args config:path-to-file)])
(file:display-to-file
(string:string-join new-list "\n")
config:path-to-file
@ -109,17 +108,17 @@
#:exists 'truncate)
(display-item-added args)))
(define (add-item args)
(define (add-item-to-list args)
(if (and
(check-for-directory)
(check-for-file))
(check-for-program-directory)
(check-for-program-file))
;; The cdr here prevents the command line argument "add" from being added to the file
(add-item-to-file (string:string-join (cdr (vector->list args))))
(write-item-to-program-file (string:string-join (cdr (vector->list args))))
(begin
(display-hash-ref messages:messages 'file-not-found)
(display-hash-ref messages:messages 'try-init))))
(define (remove-item-from-file args)
(define (remove-item-from-program-file args)
(let* ([removed-item (get-removed-item config:path-to-file args)]
[new-list (remove removed-item (file->string-list config:path-to-file))])
(file:display-to-file
@ -129,14 +128,14 @@
#:exists 'truncate)
(display-item-removed removed-item)))
(define (remove-item args)
(define (remove-item-from-list args)
(cond [(list-empty? config:path-to-file)
(display-hash-ref messages:messages 'empty-todo-list)]
[(and
(check-for-directory)
(check-for-file))
(remove-item-from-file (vector-ref args 1))]
[(and (not (check-for-directory)) (not (check-for-file)))
(check-for-program-directory)
(check-for-program-file))
(remove-item-from-program-file (vector-ref args 1))]
[(and (not (check-for-program-directory)) (not (check-for-program-file)))
(begin
(display-hash-ref messages:messages 'file-not-found)
(display-hash-ref messages:messages 'try-init))]))