temp bs
This commit is contained in:
parent
66079e5e03
commit
1567035954
5
db/db.go
5
db/db.go
@ -31,6 +31,7 @@ type Item struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type Jdb struct {
|
type Jdb struct {
|
||||||
|
Foo string `json:"-"`
|
||||||
Items []Item `json:"items"`
|
Items []Item `json:"items"`
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -72,7 +73,7 @@ func (d *Db) Transact(id int, persist bool, f func(*Item)) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (d *Db) save() error {
|
func (d *Db) save() error {
|
||||||
data, err := json.Marshal(Jdb{d.items})
|
data, err := json.Marshal(Jdb{"", d.items})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@ -82,7 +83,7 @@ func (d *Db) save() error {
|
|||||||
func (d *Db) Run(f func(*Jdb)) {
|
func (d *Db) Run(f func(*Jdb)) {
|
||||||
d.mutex.Lock()
|
d.mutex.Lock()
|
||||||
defer d.mutex.Unlock()
|
defer d.mutex.Unlock()
|
||||||
f(&Jdb{d.items})
|
f(&Jdb{"", d.items})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Db) Save() error {
|
func (d *Db) Save() error {
|
||||||
|
|||||||
3
main.go
3
main.go
@ -70,9 +70,11 @@ func main() {
|
|||||||
log.Panic(err)
|
log.Panic(err)
|
||||||
}
|
}
|
||||||
defer d.Save()
|
defer d.Save()
|
||||||
|
http.Handle("/assets/", http.FileServer(http.Dir("./")))
|
||||||
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
||||||
if r.Method == http.MethodGet {
|
if r.Method == http.MethodGet {
|
||||||
d.Run(func(d *db.Jdb) {
|
d.Run(func(d *db.Jdb) {
|
||||||
|
d.Foo = "Hello"
|
||||||
if err := tmpl.Execute(w, d); err != nil {
|
if err := tmpl.Execute(w, d); err != nil {
|
||||||
log.Panic(err)
|
log.Panic(err)
|
||||||
}
|
}
|
||||||
@ -106,7 +108,6 @@ func main() {
|
|||||||
w.WriteHeader(http.StatusInternalServerError)
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
fmt.Println("path is", p, "id is", id)
|
|
||||||
var sc <-chan string
|
var sc <-chan string
|
||||||
d.Transact(id, false, func(i *db.Item) {
|
d.Transact(id, false, func(i *db.Item) {
|
||||||
pt := i.Pt
|
pt := i.Pt
|
||||||
|
|||||||
@ -1,82 +1,119 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html>
|
<html>
|
||||||
<head>
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
<title>Youtube Downloader UI</title>
|
<title>Youtube Downloader UI</title>
|
||||||
<!-- Diable favicon requests: https://stackoverflow.com/a/13416784 -->
|
<!-- Diable favicon requests: https://stackoverflow.com/a/13416784 -->
|
||||||
<link rel="icon" href="data:;base64,iVBORw0KGgo=">
|
<link rel="icon" href="data:;base64,iVBORw0KGgo=">
|
||||||
|
<link href="assets/bootstrap/css/bootstrap.css" rel="stylesheet" >
|
||||||
<script>
|
<script>
|
||||||
// https://developer.mozilla.org/en-US/docs/Web/API/Window/DOMContentLoaded_event
|
// https://developer.mozilla.org/en-US/docs/Web/API/Window/DOMContentLoaded_event
|
||||||
window.addEventListener('DOMContentLoaded', () => {
|
window.addEventListener('DOMContentLoaded', () => {
|
||||||
progressElems = document.querySelectorAll(".ytprogress")
|
progressElems = document.querySelectorAll("[data-ytstatus=progress")
|
||||||
progressElems.forEach(function(item) {
|
progressElems.forEach(function(item) {
|
||||||
// https://developer.mozilla.org/en-US/docs/Learn/HTML/Howto/Use_data_attributes
|
// https://developer.mozilla.org/en-US/docs/Learn/HTML/Howto/Use_data_attributes
|
||||||
item.innerText = item.dataset.ytid
|
item.innerText = item.dataset.ytid
|
||||||
ytid = item.dataset.ytid
|
ytid = item.dataset.ytid
|
||||||
|
|
||||||
// https://stackoverflow.com/a/47472874
|
// https://stackoverflow.com/a/47472874
|
||||||
var url = new URL("/ws/" + ytid, window.location.href);
|
var url = new URL("/ws/" + ytid, window.location.href);
|
||||||
url.protocol = url.protocol.replace('http', 'ws');
|
url.protocol = url.protocol.replace('http', 'ws');
|
||||||
|
|
||||||
let socket = new WebSocket(url.href)
|
let socket = new WebSocket(url.href)
|
||||||
socket.onmessage = function(event) {
|
socket.onmessage = function(event) {
|
||||||
item.innerHTML = event.data
|
item.innerHTML = event.data
|
||||||
}
|
}
|
||||||
});
|
socket.onclose = function(event) {
|
||||||
|
window.location.reload();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
pendingTitles = document.querySelectorAll(".yttitle")
|
pendingTitles = document.querySelectorAll("[data-yttitle]")
|
||||||
pendingTitles.forEach(function(item) {
|
pendingTitles.forEach(function(item) {
|
||||||
ytid = item.dataset.ytid
|
ytid = item.dataset.ytid
|
||||||
fetch("/title/" + ytid).then(function(response) {
|
fetch("/title/" + ytid).then(function(response) {
|
||||||
if(response.ok) {
|
if(response.ok) {
|
||||||
return response.text().then(function(text) {
|
return response.text().then(function(text) {
|
||||||
item.innerText = text
|
item.innerText = text
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
console.log("Response not ok")
|
console.log("Response not ok")
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<form method="POST" action="/">
|
<h1 class="text-center"> {{ .Foo }} </h1>
|
||||||
<input type="text" name="youtube_url">
|
<div class="container">
|
||||||
<input type="submit" value="Ask">
|
<div class="row my-4 text-center">
|
||||||
</form>
|
<form method="POST" action="/">
|
||||||
<table>
|
<input class="col-md-8 h-100" placeholder="Enter video link" type="text" name="youtube_url">
|
||||||
<caption>Vidoes</caption>
|
<input class="btn btn-outline-primary mx-2" type="submit" value="Download">
|
||||||
<thead>
|
</form>
|
||||||
<tr>
|
</div>
|
||||||
<th>Date</th>
|
<div class="row row-cols-1 row-cols-md-3 row-cols-lg-4 m-4 g-3">
|
||||||
<th>URL</th>
|
{{ range .Items }}
|
||||||
<th>Title</th>
|
<div class="col my-2">
|
||||||
<th>Link</th>
|
<div class="card h-100">
|
||||||
</tr>
|
<div class="card-body">
|
||||||
</thead>
|
<h5 class="card-title">
|
||||||
<tbody>
|
{{ if eq .Title "Loading" }}
|
||||||
{{ range .Items }}
|
<span data-yttitle="" data-ytid="{{.Id}}">Loading...</span>
|
||||||
<tr>
|
{{ else }}
|
||||||
<td>{{ .Date }}</td>
|
{{ .Title }}
|
||||||
<td>{{ .URL }}</td>
|
{{ end }}
|
||||||
<td>
|
</h5>
|
||||||
{{ if eq .Title "Loading" }}
|
<h6 class="card-subtitle mb-2 text-muted">On {{ .Date }}</h6>
|
||||||
<span class="yttitle" data-ytid="{{.Id}}">Loading...</span>
|
<a href="{{ .URL }}" class="card-link d-block mb-2">Youtube Link</a>
|
||||||
{{ else }}
|
{{ if eq .Status "Done" }}
|
||||||
{{ .Title }}
|
<a class="btn btn-primary w-100" target="_blank" href="{{ vids_prefix }}/{{ .FileName }}">Watch</a>
|
||||||
{{ end }}
|
{{ else if eq .Status "InProgress" }}
|
||||||
</td>
|
<span class="border border-info w-100 text-center d-block" data-ytstatus="progress" data-ytid="{{.Id}}">In Progress</span>
|
||||||
<td>
|
{{ else }}
|
||||||
{{ if eq .Status "Done" }}
|
<span class="border border-danger w-100 text-center d-block"> {{ .Status }} </span>
|
||||||
<a target="_blank" href="{{ vids_prefix }}/{{ .FileName }}">Watch</a>
|
{{ end }}
|
||||||
{{ else if eq .Status "InProgress" }}
|
</div>
|
||||||
<span class="ytprogress" data-ytid="{{.Id}}">In Progress</span>
|
</div>
|
||||||
{{ else }}
|
</div>
|
||||||
{{ .Status }}
|
{{ end }}
|
||||||
{{ end }}
|
</div>
|
||||||
</td>
|
<table>
|
||||||
</tr>
|
<caption>All Vidoes</caption>
|
||||||
{{ end }}
|
<thead>
|
||||||
</tbody>
|
<tr>
|
||||||
</table>
|
<th>Date</th>
|
||||||
|
<th>URL</th>
|
||||||
|
<th>Title</th>
|
||||||
|
<th>Link</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{{ range .Items }}
|
||||||
|
<tr>
|
||||||
|
<td>{{ .Date }}</td>
|
||||||
|
<td>{{ .URL }}</td>
|
||||||
|
<td>
|
||||||
|
{{ if eq .Title "Loading" }}
|
||||||
|
<span data-yttitle="" data-ytid="{{.Id}}">Loading...</span>
|
||||||
|
{{ else }}
|
||||||
|
{{ .Title }}
|
||||||
|
{{ end }}
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
{{ if eq .Status "Done" }}
|
||||||
|
<a target="_blank" href="{{ vids_prefix }}/{{ .FileName }}">Watch</a>
|
||||||
|
{{ else if eq .Status "InProgress" }}
|
||||||
|
<span data-ytstatus="progress" data-ytid="{{.Id}}">In Progress</span>
|
||||||
|
{{ else }}
|
||||||
|
{{ .Status }}
|
||||||
|
{{ end }}
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
{{ end }}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user