Skip to content
This repository has been archived by the owner on Jun 18, 2020. It is now read-only.

Commit

Permalink
Migrate old files, proper handling of profiles
Browse files Browse the repository at this point in the history
  • Loading branch information
@lehitoskin
lehitoskin committed Dec 4, 2014
1 parent 8a9fd88 commit b3e6113
Show file tree
Hide file tree
Showing 3 changed files with 128 additions and 116 deletions.
86 changes: 7 additions & 79 deletions blight.rkt
View file
Expand Up @@ -44,72 +44,6 @@ Unported\", all credit attributed to Adam Reid.")
and bug the dev! Alternatively, you could join #tox-dev on freenode and see
if people have a similar problem.")

#|
command-line stuff
--profile: determine the profile to use
--list: list available profiles (by looking for .tox files)
arg: list of files to copy to tox-dir as .tox files
1. default profile is "blight"
2. all other files are determined by adding to profile-name
ex: (string-append (profile-name) "-config.json")
(string-append (profile-name) "-data.tox")
(string-append (profile-name) "-history.sqlite")
|#
(let* ([ext ".tox"]
[dlst (directory-list tox-path)]
[checker (λ (f)
(let ([name (path->string f)])
(cond [(false? (string-contains-ci name ext)) #f]
[else f])))]
[filtered (filter checker dlst)])
(command-line
#:usage-help
"Calling Blight without any arguments will start Blight with the defualt profile."
"Otherwise, please provide a valid profile for Blight to use."
"Giving Blight an optional number of files will have them be imported"
"as Tox profiles."
#:once-any
[("-p" "--profile")
pn ; takes one argument pn
"Specify the profile (by name) to use at startup. (Do not include a .tox extension.)"
"Use --list to see a list of available profiles."
; given profile has no extension
(cond [(integer? (string-contains-ci pn ext))
(displayln "Invalid profile entered! Reverting to default profile...")]
; given profile is valid (if it doesn't exist, we'll just make it)
[else (profile-name pn)
(printf "db-file is now ~a~n" ((db-file)))
((data-file))
((config-file))])]
[("-l" "--list") "List available Tox profiles to load."
(for-each (λ (f)
(let ([name (path->string f)])
(displayln
(substring name 0 (- (string-length name) 4)))))
filtered)
(exit)]
#:args import-files
(unless (empty? import-files)
(for-each
(λ (x)
(let* ([fn (path->string (file-name-from-path x))]
[contains (string-contains-ci fn ext)]
[timestamp
(inexact->exact
(floor (current-inexact-milliseconds)))])
(if (false? contains)
(copy-file x (build-path tox-path
(string-append fn timestamp ext)))
(copy-file x (build-path tox-path
(substring fn 0 contains))))))
import-files))))

(printf "profile-name: ~a~ndb-file: ~a~ndata-file: ~a~nconfig-file: ~a~n"
(profile-name) ((db-file)) ((data-file)) ((config-file)))
(exit)

; instantiate Tox session
(define my-tox (tox-new #f))

Expand All @@ -129,15 +63,11 @@ val is a value that corresponds to the value of the key
|#
(define blight-save-config
(λ (key val)
(let* ([profile (if (string=? (profile-name) "blight")
config-file
(build-path tox-path
(string-append (profile-name) ".json")))]
[new-input-port (open-input-file profile
(let* ([new-input-port (open-input-file ((config-file))
#:mode 'text)]
[json (read-json new-input-port)]
[modified-json (hash-set* json key val)]
[config-port-out (open-output-file profile
[config-port-out (open-output-file ((config-file))
#:mode 'text
#:exists 'truncate/replace)])
(json-null 'null)
Expand All @@ -155,17 +85,17 @@ val is a value that corresponds to the value of the key
(define percent 0) ; percent of bytes sent

; data-file is empty, use default settings
(cond [(zero? (file-size (data-file)))
(cond [(zero? (file-size ((data-file))))
; set username
(set-name my-tox my-name)
; set status message
(set-status-message my-tox my-status-message)]
; data-file is not empty, load from data-file
[(not (zero? (file-size (data-file))))
[(not (zero? (file-size ((data-file)))))
; load the messenger from data of size length
(define size (file-size (data-file)))
(define size (file-size ((data-file))))
; no conversions necessary because bytes-ref reports a decimal value
(define my-bytes (file->bytes (data-file) #:mode 'binary))
(define my-bytes (file->bytes ((data-file)) #:mode 'binary))
(display "Loading from data file... ")
(if (zero? (tox-load my-tox my-bytes size))
(displayln "Done!")
Expand Down Expand Up @@ -217,7 +147,7 @@ val is a value that corresponds to the value of the key
; place all tox info into data-bytes
(tox-save! my-tox data-bytes)
; SAVE INFORMATION TO DATA
(let ([data-port-out (open-output-file (data-file)
(let ([data-port-out (open-output-file ((data-file))
#:mode 'binary
#:exists 'truncate/replace)])
(write-bytes data-bytes data-port-out)
Expand All @@ -231,8 +161,6 @@ val is a value that corresponds to the value of the key
(blight-save-data)
; disconnect from the database
(disconnect sqlc)
; close config file input port
(close-input-port config-port-in)
; kill tox thread
(kill-thread tox-loop-thread)
; this kills the tox
Expand Down
148 changes: 121 additions & 27 deletions config.rkt
View file
@@ -1,7 +1,12 @@
#lang racket/base
; config.rkt
; contains default values for variables
(require json)
(require json
racket/bool
srfi/13
racket/cmdline
racket/list
racket/path)
(provide (all-defined-out))

; base tox directory
Expand Down Expand Up @@ -34,13 +39,13 @@
(λ ([profile (profile-name)])
(make-parameter
(build-path tox-path
(string-append (profile-name) ".tox")))))
(string-append profile ".tox")))))
; blight-specific configurations
(define config-file
(λ ([profile (profile-name)])
(make-parameter
(build-path tox-path
(string-append (profile-name) ".json")))))
(string-append profile ".json")))))

; location of sound directory (currently depends on running from same dir
; change to /usr/share/blight/sounds (or something) once a proper
Expand Down Expand Up @@ -84,44 +89,130 @@
(unless (directory-exists? avatar-dir)
(make-directory avatar-dir))

; if blight-config.json does not exist, create it
#|
command-line stuff
--profile: determine the profile to use
--list: list available profiles (by looking for .tox files)
arg: list of files to copy to tox-path as .tox files
1. default profile is "blight"
2. all other files are determined by adding to profile-name
ex: (string-append (profile-name) ".json")
(string-append (profile-name) ".tox")
(string-append (profile-name) ".sqlite")
3. file parameters are curried, which means (db-file) returns a procedure
and to change it, you must run ((db-file <profile>)), but that is
only temporary as calling ((db-file)) again will change it back to
whatever (profile-name) is currently
|#
(let* ([ext ".tox"]
[dlst (directory-list tox-path)]
[checker (λ (f)
(let ([name (path->string f)])
(cond [(false? (string-contains-ci name ext)) #f]
[else f])))]
[filtered (filter checker dlst)])
(command-line
#:usage-help
"Calling Blight without any arguments will start Blight with the defualt profile."
"Otherwise, please provide a valid profile for Blight to use."
"Giving Blight an optional number of files will have them be imported"
"as Tox profiles."
#:once-any
[("-p" "--profile")
pn ; takes one argument pn
"Specify the profile (by name) to use at startup. (Do not include a .tox extension.)"
"Use --list to see a list of available profiles."
; given profile has no extension
(cond [(integer? (string-contains-ci pn ext))
(displayln "Invalid profile entered! Reverting to default profile...")]
; given profile is valid (if it doesn't exist, we'll just make it)
[else (profile-name pn)
((data-file))
((config-file))
((db-file))])]
[("-l" "--list") "List available Tox profiles to load."
(for-each (λ (f)
(let ([name (path->string f)])
(displayln
(substring name 0 (- (string-length name) 4)))))
filtered)
(exit)]
#:args import-files
(unless (empty? import-files)
(for-each
(λ (x)
(let* ([fn (path->string (file-name-from-path x))]
[contains (string-contains-ci fn ext)]
[timestamp
(inexact->exact
(floor (current-inexact-milliseconds)))])
(if (false? contains)
(copy-file x (build-path tox-path
(string-append fn timestamp ext)))
(copy-file x (build-path tox-path
(substring fn 0 contains))))))
import-files))))
#| ###################### END COMMAND-LINE STUFF ######################### |#

#| ###################### OLD FILE IMPORTATION ########################## |#
; migrate old config file
(let ([old-config-file (build-path tox-path "blight-config.json")]
[new-config-file (build-path tox-path "blight.json")])
(cond [(and (not (file-exists? new-config-file))
(file-exists? old-config-file))
(printf "Detected old config file ~a, copying to ~a... "
old-config-file new-config-file)
(copy-file old-config-file new-config-file)
(displayln "Done!")]))

; migrate old data file
(let ([old-data-file (build-path tox-path "blight-data")]
[new-data-file (build-path tox-path "blight.tox")])
; if old data-file exists, but new one does not,
; copy it over, otherwise do nothing
(cond [(and (not (file-exists? new-data-file))
(file-exists? old-data-file))
(printf "Detected old data file ~a, copying to ~a... " old-data-file new-data-file)
(copy-file old-data-file new-data-file)
(displayln "Done!")]))

; migrate old history database
(let ([old-db-file (build-path tox-path "blight-tox.db")]
[new-db-file (build-path tox-path "blight.sqlite")])
(cond [(and (not (file-exists? new-db-file))
(file-exists? old-db-file))
(printf "Detected old history database ~a, copying to ~a... " old-db-file new-db-file)
(copy-file old-db-file new-db-file)
(displayln "Done!")]))
#| ##################### END OLD FILE IMPORTATION ############################ |#

; if <profile>.json does not exist, create it
(unless (file-exists? ((config-file)))
(define config-port-out
(open-output-file config-file
(open-output-file ((config-file))
#:mode 'text
#:exists 'can-update))
(printf "~a created...\n" ((config-file)))
(close-output-port config-port-out))

; open blight-config.json
(define config-port-in (open-input-file ((config-file))
#:mode 'text))

(let ([old-data-file (build-path tox-path "blight-data")])
; if old data-file exists, but new one does not,
; copy it over, otherwise do nothing
(cond [(and (not (file-exists? ((data-file))))
(file-exists? old-data-file))
(printf "Detected old data file ~a, copying to ~a... " old-data-file ((data-file)))
(copy-file old-data-file ((data-file)))
(displayln "Done!")]
; if neither exist, this must all be new, so create a fresh data-file
[(and (not (file-exists? ((data-file))))
(not (file-exists? old-data-file)))
(define data-port-out
; if <profile>.tox does not exist, create it
(unless (file-exists? ((data-file)))
(define data-port-out
(open-output-file ((data-file))
#:mode 'binary
#:exists 'can-update))
(printf "~a created...~n" ((data-file)))
(close-output-port data-port-out)]))
(close-output-port data-port-out))

; default name and status message
; if data exists, do no use these
(define my-name-default "Blight Tester")
(define my-status-message-default "Toxing on Blight")

; default DHT settings
; if blight-config.json exists, do not use these
; if <profile>.json exists, do not use these
(define dht-address-default "23.226.230.47")
(define dht-port-default 33445)
(define dht-public-key-default
Expand All @@ -136,7 +227,7 @@
'my-status-last my-status-message-default
'make-noise-last make-noise-default))

; blight-config.json is empty, initialize with default values for variables
; <profile>.json is empty, initialize with default values for variables
(unless (not (zero? (file-size ((config-file)))))
(let ([config-port-out (open-output-file ((config-file))
#:mode 'text
Expand All @@ -146,9 +237,12 @@
(write-json (json-null) config-port-out)
(close-output-port config-port-out)))

; read from blight-config.json
(define json-info (read-json config-port-in))
; set variables to values those contained in blight-config.json
; read from <profile>.json
(define json-info (let ([config-port-in
(open-input-file ((config-file))
#:mode 'text)])
(read-json config-port-in)))
; set variables to values those contained in <profile>.json
(define dht-address (hash-ref json-info 'dht-address))
(define dht-port (hash-ref json-info 'dht-port))
(define dht-public-key (hash-ref json-info 'dht-public-key))
Expand Down
10 changes: 0 additions & 10 deletions history.rkt
View file
Expand Up @@ -9,16 +9,6 @@
disconnect
get-history)

(printf "db-file is currently ~a~n" ((db-file)))
; copy old file scheme to follow new file scheme
(let ([old-db-file (build-path tox-path "blight-tox.db")])
(cond [(and (not (file-exists? ((db-file))))
(file-exists? old-db-file))
(printf "Detected old history database ~a, copying to ~a... " old-db-file ((db-file)))
(copy-file old-db-file ((db-file)))
(displayln "Done!")]))

(printf "db-file is currently ~a~n" ((db-file)))
#| ############ BEGIN DATABASE STUFF ################ |#
; DATABASE DATABASE! JUST LIVING IN THE DATABASE!
; WOWOW
Expand Down

0 comments on commit b3e6113

Please sign in to comment.