diff --git a/.air.toml b/.air.toml
index ad439e1..f0d77e9 100644
--- a/.air.toml
+++ b/.air.toml
@@ -7,7 +7,7 @@ tmp_dir = "tmp"
bin = "./tmp/main"
cmd = "go build -o ./tmp/main ."
delay = 0
- exclude_dir = ["assets", "tmp", "vendor", "testdata"]
+ exclude_dir = ["assets", "tmp", "vendor", "testdata", "views"]
exclude_file = []
exclude_regex = ["_test.go"]
exclude_unchanged = false
diff --git a/.gitignore b/.gitignore
index 9a2cb61..370751d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
db.sqlite
-obs-replay-server
\ No newline at end of file
+obs-replay-server
+*.exe
+replays/*
\ No newline at end of file
diff --git a/db/query.sql b/db/query.sql
index 8ba36d9..ec1e5ad 100644
--- a/db/query.sql
+++ b/db/query.sql
@@ -2,10 +2,10 @@
SELECT * FROM users WHERE name = ? LIMIT 1;
-- name: ReplaysForUser :many
-SELECT * FROM replays JOIN users ON replays.owner = users.id WHERE users.name = ?;
+SELECT * FROM replays JOIN users ON replays.owner = users.id WHERE users.name = ? ORDER BY replays.id DESC;
-- name: CreateUser :one
INSERT INTO users (name) VALUES (?) RETURNING *;
-- name: AddReplay :one
-INSERT INTO replays (file_path, owner) VALUES (?, ?) RETURNING *;
\ No newline at end of file
+INSERT INTO replays (file_path, creation_time, owner) VALUES (?, ?, ?) RETURNING *;
\ No newline at end of file
diff --git a/db/schema.sql b/db/schema.sql
index be454ba..b99a149 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -7,6 +7,7 @@ CREATE TABLE users (
CREATE TABLE replays (
id INTEGER PRIMARY KEY AUTOINCREMENT,
file_path text NOT NULL,
+ creation_time text NOT NULL,
owner INTEGER NOT NULL,
FOREIGN KEY (owner) REFERENCES users (id)
);
diff --git a/go.mod b/go.mod
index 1aba16d..c49d35d 100644
--- a/go.mod
+++ b/go.mod
@@ -5,11 +5,17 @@ go 1.20
require (
github.com/andreykaipov/goobs v0.12.0
github.com/charmbracelet/log v0.2.2
+ github.com/davecgh/go-spew v1.1.1
github.com/labstack/echo/v4 v4.10.2
+ github.com/tjarratt/babble v0.0.0-20210505082055-cbca2a4833c1
)
require (
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
+ github.com/goodsign/monday v1.0.1 // indirect
+ github.com/martinhoefling/goxkcdpwgen v0.1.1 // indirect
+ github.com/onsi/ginkgo v1.16.5 // indirect
+ github.com/onsi/gomega v1.27.8 // indirect
golang.org/x/time v0.3.0 // indirect
)
@@ -33,7 +39,7 @@ require (
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
golang.org/x/crypto v0.6.0 // indirect
- golang.org/x/net v0.7.0 // indirect
- golang.org/x/sys v0.6.0 // indirect
- golang.org/x/text v0.7.0 // indirect
+ golang.org/x/net v0.10.0 // indirect
+ golang.org/x/sys v0.8.0 // indirect
+ golang.org/x/text v0.9.0 // indirect
)
diff --git a/go.sum b/go.sum
index 5d0ec28..ac9fe31 100644
--- a/go.sum
+++ b/go.sum
@@ -11,20 +11,40 @@ github.com/charmbracelet/log v0.2.2/go.mod h1:Zs11hKpb8l+UyX4y1srwZIGW+MPCXJHIty
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/goodsign/monday v1.0.1 h1:yJogH0uQNn4blHjoC3ESbdV0P1OhDtGYdd6x0w7QZBo=
+github.com/goodsign/monday v1.0.1/go.mod h1:r4T4breXpoFwspQNM+u2sLxJb2zyTaxVGqUfTBjWOu8=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/labstack/echo/v4 v4.10.2 h1:n1jAhnq/elIFTHr1EYpiYtyKgx4RW9ccVgkqByZaN2M=
github.com/labstack/echo/v4 v4.10.2/go.mod h1:OEyqf2//K1DFdE57vw2DRgWY0M7s65IVQO2FzvI4J5k=
github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/martinhoefling/goxkcdpwgen v0.1.1 h1:cUPlcs35f0O863EHUnk2k9Rrj2gY1Jk6LzmUtxWlyUU=
+github.com/martinhoefling/goxkcdpwgen v0.1.1/go.mod h1:ZksVqSs26I/A6zASske3+yoieIc2J9Xr/Va4Ce0+3RA=
github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
@@ -43,34 +63,92 @@ github.com/muesli/termenv v0.15.1 h1:UzuTb/+hhlBugQz28rpzey4ZuKcZ03MeKsoG7IJZIxs
github.com/muesli/termenv v0.15.1/go.mod h1:HeAQPTzpfs016yGtA4g00CsdYnVLJvxsS4ANqrZs2sQ=
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d h1:VhgPp6v9qf9Agr/56bj7Y/xa04UccTW04VP0Qed4vnQ=
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
+github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
+github.com/tjarratt/babble v0.0.0-20210505082055-cbca2a4833c1 h1:j8whCiEmvLCXI3scVn+YnklCU8mwJ9ZJ4/DGAKqQbRE=
+github.com/tjarratt/babble v0.0.0-20210505082055-cbca2a4833c1/go.mod h1:O5hBrCGqzfb+8WyY8ico2AyQau7XQwAfEQeEQ5/5V9E=
github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
diff --git a/handlers/handlers.go b/handlers/handlers.go
index 2ecd63c..8153ca1 100644
--- a/handlers/handlers.go
+++ b/handlers/handlers.go
@@ -2,18 +2,32 @@ package handlers
import (
"database/sql"
+ "fmt"
"html/template"
+ "io"
"net/http"
+ "os"
+ "path/filepath"
+ "time"
+ "github.com/andreykaipov/goobs/api/events"
+ "github.com/charmbracelet/log"
+ "github.com/goodsign/monday"
+ "github.com/martinhoefling/goxkcdpwgen/xkcdpwgen"
+ "github.com/radiden/obs-replay-server/models"
"github.com/radiden/obs-replay-server/services"
"github.com/labstack/echo/v4"
)
var sv *services.Services
+var g = xkcdpwgen.NewGenerator()
func InitHandlers(svs *services.Services) {
sv = svs
+ g.SetNumWords(3)
+ g.SetDelimiter("-")
+ g.SetCapitalize(false)
}
func IndexHandler(c echo.Context) error {
@@ -36,14 +50,17 @@ func AuthHandler(c echo.Context) error {
if err == sql.ErrNoRows {
_, err := sv.DB.Queries.CreateUser(c.Request().Context(), userName)
if err != nil {
+ log.Error("couldn't create new user", "err", err)
return err
}
} else if err != nil {
+ log.Error("couldn't query user", "err", err)
return err
}
t, err := template.ParseFiles("views/base.html", "views/public/login_success.html")
if err != nil {
+ log.Error("couldn't parse template", "err", err)
return err
}
@@ -51,14 +68,121 @@ func AuthHandler(c echo.Context) error {
}
func PanelHandler(c echo.Context) error {
- _, err := c.Cookie("sdvxreplay_session")
+ ctx := c.Request().Context()
+
+ cookie, err := c.Cookie("sdvxreplay_session")
if err != nil {
- return c.Redirect(http.StatusBadRequest, "/")
+ return c.Redirect(http.StatusTemporaryRedirect, "/")
}
+
+ replays, err := sv.DB.Queries.ReplaysForUser(ctx, cookie.Value)
+ if err != nil {
+ log.Error("failed to get replays", "err", err)
+ }
+
t, err := template.ParseFiles("views/base.html", "views/public/panel.html")
+ if err != nil {
+ log.Error("failed to render panel template", "err", err)
+ return err
+ }
+
+ return t.Execute(c.Response().Writer, map[string]any{
+ "replays": replays,
+ "username": cookie.Value,
+ })
+}
+
+func SaveHandler(c echo.Context) error {
+ ctx := c.Request().Context()
+ cookie, err := c.Cookie("sdvxreplay_session")
+ if err != nil {
+ return c.Redirect(http.StatusTemporaryRedirect, "/")
+ }
+
+ path, err := saveOBSReplay()
if err != nil {
return err
}
- return t.Execute(c.Response().Writer, nil)
+ log.Info("saved file", "path", path)
+
+ user, err := sv.DB.Queries.UserByName(ctx, cookie.Value)
+ if err != nil {
+ log.Error("couldn't query user in db", "user", cookie.Value, "err", err)
+ }
+
+ sv.DB.Queries.AddReplay(ctx, models.AddReplayParams{
+ FilePath: path,
+ CreationTime: monday.Format(time.Now(), "Monday, 02 Jan 2006 15:04:05", monday.LocalePlPL),
+ Owner: user.ID,
+ })
+
+ return c.JSON(http.StatusOK, map[string]string{
+ "path": path,
+ })
+}
+
+func saveOBSReplay() (string, error) {
+ _, err := sv.OBS.Outputs.SaveReplayBuffer()
+ if err != nil {
+ log.Error("failed saving replay buffer", "err", err)
+ return "", err
+ }
+
+ // get saved replay path
+ savedFilePath := getSavedPath()
+
+ // open saved replay
+ inputFile, err := os.Open(savedFilePath)
+ if err != nil {
+ log.Error("couldn't open source replay file", "err", err)
+ return "", err
+ }
+
+ // get cwd
+ currentDir, err := os.Getwd()
+ if err != nil {
+ log.Error("couldn't get cwd", "err", err)
+ return "", err
+ }
+
+ // create output file
+ fileName := g.GeneratePasswordString()
+ destDir := filepath.Join(currentDir, "replays")
+ destFileName := fmt.Sprintf("%s%s", fileName, filepath.Ext(savedFilePath))
+ outputFile, err := os.Create(filepath.Join(destDir, destFileName))
+ if err != nil {
+ inputFile.Close()
+ log.Error("couldn't create output replay file", "err", err)
+ return "", err
+ }
+ // close output file after function runs
+ defer outputFile.Close()
+
+ // copy source to output
+ _, err = io.Copy(outputFile, inputFile)
+ if err != nil {
+ log.Error("failed to copy replay file", "err", err)
+ return "", err
+ }
+
+ // close input file
+ inputFile.Close()
+ // remove input file
+ err = os.Remove(savedFilePath)
+ if err != nil {
+ log.Error("failed removing source replay file", "err", err)
+ }
+
+ return destFileName, nil
+}
+
+func getSavedPath() string {
+ for {
+ msg := <-sv.OBS.IncomingEvents
+ switch m := msg.(type) {
+ case *events.ReplayBufferSaved:
+ return m.SavedReplayPath
+ }
+ }
}
diff --git a/main.go b/main.go
index d288022..8dd4283 100644
--- a/main.go
+++ b/main.go
@@ -44,19 +44,12 @@ func main() {
return nil
},
}))
- e.Static("/assets", "assets")
+ e.Debug = true
+ e.HideBanner = true
+ e.Static("/replays", "replays")
e.GET("/", handlers.IndexHandler)
e.POST("/auth", handlers.AuthHandler)
e.GET("/panel", handlers.PanelHandler)
- e.Logger.Fatal(e.Start(":1323"))
+ e.GET("/save", handlers.SaveHandler)
+ e.Logger.Fatal(e.Start(":80"))
}
-
-// func getSavedPath(client *goobs.Client) string {
-// for {
-// msg := <-client.IncomingEvents
-// switch m := msg.(type) {
-// case *events.ReplayBufferSaved:
-// return m.SavedReplayPath
-// }
-// }
-// }
diff --git a/models/models.go b/models/models.go
index d2b1d29..8f6ce41 100644
--- a/models/models.go
+++ b/models/models.go
@@ -7,9 +7,10 @@ package models
import ()
type Replay struct {
- ID int64
- FilePath string
- Owner int64
+ ID int64
+ FilePath string
+ CreationTime string
+ Owner int64
}
type User struct {
diff --git a/models/query.sql.go b/models/query.sql.go
index 494af13..0db8ba9 100644
--- a/models/query.sql.go
+++ b/models/query.sql.go
@@ -10,18 +10,24 @@ import (
)
const addReplay = `-- name: AddReplay :one
-INSERT INTO replays (file_path, owner) VALUES (?, ?) RETURNING id, file_path, owner
+INSERT INTO replays (file_path, creation_time, owner) VALUES (?, ?, ?) RETURNING id, file_path, creation_time, owner
`
type AddReplayParams struct {
- FilePath string
- Owner int64
+ FilePath string
+ CreationTime string
+ Owner int64
}
func (q *Queries) AddReplay(ctx context.Context, arg AddReplayParams) (Replay, error) {
- row := q.db.QueryRowContext(ctx, addReplay, arg.FilePath, arg.Owner)
+ row := q.db.QueryRowContext(ctx, addReplay, arg.FilePath, arg.CreationTime, arg.Owner)
var i Replay
- err := row.Scan(&i.ID, &i.FilePath, &i.Owner)
+ err := row.Scan(
+ &i.ID,
+ &i.FilePath,
+ &i.CreationTime,
+ &i.Owner,
+ )
return i, err
}
@@ -37,15 +43,16 @@ func (q *Queries) CreateUser(ctx context.Context, name string) (User, error) {
}
const replaysForUser = `-- name: ReplaysForUser :many
-SELECT replays.id, file_path, owner, users.id, name FROM replays JOIN users ON replays.owner = users.id WHERE users.name = ?
+SELECT replays.id, file_path, creation_time, owner, users.id, name FROM replays JOIN users ON replays.owner = users.id WHERE users.name = ? ORDER BY replays.id DESC
`
type ReplaysForUserRow struct {
- ID int64
- FilePath string
- Owner int64
- ID_2 int64
- Name string
+ ID int64
+ FilePath string
+ CreationTime string
+ Owner int64
+ ID_2 int64
+ Name string
}
func (q *Queries) ReplaysForUser(ctx context.Context, name string) ([]ReplaysForUserRow, error) {
@@ -60,6 +67,7 @@ func (q *Queries) ReplaysForUser(ctx context.Context, name string) ([]ReplaysFor
if err := rows.Scan(
&i.ID,
&i.FilePath,
+ &i.CreationTime,
&i.Owner,
&i.ID_2,
&i.Name,
diff --git a/tmp/main b/tmp/main
deleted file mode 100755
index a61cafe..0000000
Binary files a/tmp/main and /dev/null differ
diff --git a/views/public/index.html b/views/public/index.html
index 3435532..87928b7 100644
--- a/views/public/index.html
+++ b/views/public/index.html
@@ -1,5 +1,13 @@
{{define "title"}}SDVX Replay{{end}}
{{define "content"}}
+
SDVX Replay Server
Wpisz swój nick aby kontynuować
+
+
+Witaj, {{.username}}
+
+
+
+Moje powtórki
+
{{end}}
\ No newline at end of file