Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #79 #80

Merged
merged 3 commits into from
May 30, 2018
Merged

Fix #79 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c43ef27
Fix #79
lehitoskin May 28, 2018
6b6b588
Refactor some rdf:li copypasta
lehitoskin May 29, 2018
55fe431
Simplify rdf:li-fixer
lehitoskin May 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion embed.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
is-rdf:li?
is-tag?
make-xmp-xexpr
rdf:li-fixer
set-embed-tags!
set-embed-xmp!
set-xmp-tag
Expand Down Expand Up @@ -713,12 +714,21 @@ GIF XMP keyword: #"XMP Data" with auth #"XMP"
([tag (in-list lst)])
(append bag `((rdf:li () ,tag)))))))

; fixes issues when we have multiple elements inside a single rdf:li
; enter a single rdf:li, return a single string
(define/contract (rdf:li-fixer rdf:li)
(is-rdf:li? . -> . string?)
(define elem (get-elements rdf:li))
(if (> (length elem) 1)
(apply string-append elem)
(first elem)))

; take a dc:subject entry and return a list of tags
(define/contract (dc:subject->list dc:sub)
(is-dc:subject? . -> . list?)
(define found (findf*-txexpr dc:sub is-rdf:li?))
(if found
(flatten (map (λ (item) (get-elements item)) found))
(map rdf:li-fixer found)
empty))

; set the tag inside xexpr with the contents of tx.
Expand Down
37 changes: 15 additions & 22 deletions meta-editor.rkt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,28 +168,28 @@
(send attr-tfield set-value "")
(send attr-choice set-string-selection ""))

(define (tab-panel-defaults)
(define num (send tab-panel get-number))
(when (> num 1)
(for ([tab (in-range (- num 1))])
(send tab-panel delete 1)))
(send tab-panel set-item-label 0 "default"))

(define (meta-editor-defaults)
; set tabs to default
(let ([num (send tab-panel get-number)])
(cond [(= num 1)
(send tab-panel set-item-label 0 "default")]
[else
; delete all but one tab
(for ([tab (in-range (- num 1))])
(send tab-panel delete 1))
(send tab-panel set-item-label 0 "default")]))
(tab-panel-defaults)
(fields-defaults)
(send xmp-lbox set-string-selection "dc:subject"))

(define (langs-hash found)
(define elem+attrs (map (λ (tx) (findf-txexpr tx is-rdf:li?)) found))
(for/hash ([tx (in-list elem+attrs)])
(define elem (first (get-elements tx)))
(define elem+attrs (map (λ (tx) (findf*-txexpr tx is-rdf:li?)) found))
(for/hash ([tx (in-list (first elem+attrs))])
(define elem (rdf:li-fixer tx))
(define lang
(first
(filter
(λ (pair)
(equal? (first pair) 'xml:lang))
(eq? (first pair) 'xml:lang))
(get-attrs tx))))
(values (second lang) elem)))

Expand Down Expand Up @@ -246,14 +246,7 @@
; set some fields to defaults
(fields-defaults)
; set tabs to default
(let ([num (send tab-panel get-number)])
(cond [(= num 1)
(send tab-panel set-item-label 0 "default")]
[else
; delete all but one tab
(for ([tab (in-range (- num 1))])
(send tab-panel delete 1))
(send tab-panel set-item-label 0 "default")]))
(tab-panel-defaults)
(case sel
; just in case get-string-selection returns #f
[(||) (void)]
Expand Down Expand Up @@ -286,7 +279,7 @@
dc:type)
(when found
(define rdf:li (findf*-txexpr (first found) is-rdf:li?))
(define lst (flatten (map get-elements rdf:li)))
(define lst (map rdf:li-fixer rdf:li))
(send dc-tfield set-value (string-join lst ", ")))]
; grab the attrs from rdf:Description
[(xmp:BaseURL xmp:Label xmp:Rating)
Expand All @@ -306,7 +299,7 @@
; everything else is just a single value
[else
(when found
(define lst (flatten (map get-elements found)))
(define lst (map rdf:li-fixer found))
(send dc-tfield set-value (string-join lst ", ")))])))]))

(define dc-vpanel
Expand Down