commit 22c8ff45ecfdcd7f083bf363c017b89bdcaca1f6
parent 510cd2851cf23032e2596b77541db2f5d5bf510c
Author: Jack Mordaunt <jackmordaunt@gmail.com>
Date: Tue, 13 Nov 2018 16:25:56 +1300
[+] Partial video downloads! :)
Also, updated deps.
Diffstat:
5 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/cmd/cli/main.go b/cmd/cli/main.go
@@ -50,7 +50,7 @@ func main() {
dl := giffer.Downloader{
Dir: "./tmp/dl",
}
- downloaded, err := dl.Download(url, giffer.Medium)
+ downloaded, err := dl.Download(url, 0, 0, giffer.Medium)
if err != nil {
log.Fatalf("downloading: %v", err)
}
diff --git a/cmd/desktop/giffer.go b/cmd/desktop/giffer.go
@@ -67,7 +67,7 @@ func (g Giffer) make(
width, height int,
q giffer.Quality,
) (*RenderedGif, error) {
- video, err := g.Download(url, q)
+ video, err := g.Download(url, start, end, q)
if err != nil {
return nil, errors.Wrap(err, "downloading")
}
diff --git a/download.go b/download.go
@@ -219,7 +219,10 @@ func Download(videoURL string, start, end float64, quality Quality) (string, err
break
}
}
- path, err = item.Download(videoURL)
+ dl := downloader.Downloader{
+ Config: config.NewFromGlobal(),
+ }
+ path, err = dl.Download(&item, videoURL, start, end)
if err != nil {
return "", errors.Wrap(err, "downloading")
}
diff --git a/go.mod b/go.mod
@@ -9,9 +9,9 @@ require (
github.com/gorilla/mux v1.6.2
github.com/gorilla/websocket v1.4.0
github.com/hashicorp/go-multierror v1.0.0
- github.com/jackmordaunt/video-downloader v0.0.0-20181105210957-4fcc0a0db5fa
+ github.com/jackmordaunt/video-downloader v0.0.0-20181113032415-88f45b3022a3
github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
github.com/pkg/errors v0.8.0
github.com/zserge/webview v0.0.0-20181018084947-f390a2df9ec5
- golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd
+ golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869
)
diff --git a/go.sum b/go.sum
@@ -24,8 +24,8 @@ github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/U
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o=
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/jackmordaunt/video-downloader v0.0.0-20181105210957-4fcc0a0db5fa h1:+rrTx3ivriLXJO6Wew4qwedhW2ZbZ9YGDTuDq50hPx0=
-github.com/jackmordaunt/video-downloader v0.0.0-20181105210957-4fcc0a0db5fa/go.mod h1:lpJaIhnCxJiQ14jMk0Jt0pprldUnVCliN9dUAL6Mu4M=
+github.com/jackmordaunt/video-downloader v0.0.0-20181113032415-88f45b3022a3 h1:GUA1WFrAuZaFcq7S5yVNRkYgKMLBqK/t90pNZiEGLIg=
+github.com/jackmordaunt/video-downloader v0.0.0-20181113032415-88f45b3022a3/go.mod h1:0wZq7bsiv4eGa0JACeruRKck7gkYwIqJA/urPORdDh4=
github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 h1:PJPDf8OUfOK1bb/NeTKd4f1QXZItOX389VN3B6qC8ro=
github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -45,12 +45,12 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/zserge/webview v0.0.0-20181018084947-f390a2df9ec5 h1:1zYVGLwZR4gPRQdEiOBf9s63ZHGfCkQ/p99d1zHuZBQ=
github.com/zserge/webview v0.0.0-20181018084947-f390a2df9ec5/go.mod h1:a1CV8KR4Dd1eP2g+mEijGOp+HKczwdKHWyx0aPHKvo4=
-golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd h1:VtIkGDhk0ph3t+THbvXHfMZ8QHgsBO39Nh52+74pq7w=
-golang.org/x/crypto v0.0.0-20181106171534-e4dc69e5b2fd/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869 h1:kkXA53yGe04D0adEYJwEVQjeBppL01Exg+fnMjfUraU=
+golang.org/x/crypto v0.0.0-20181112202954-3d3f9f413869/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc h1:ZMCWScCvS2fUVFw8LOpxyUUW5qiviqr4Dg5NdjLeiLU=
-golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/sys v0.0.0-20181031143558-9b800f95dbbc h1:SdCq5U4J+PpbSDIl9bM0V1e1Ug1jsnBkAFvTs1htn7U=
-golang.org/x/sys v0.0.0-20181031143558-9b800f95dbbc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/net v0.0.0-20181108082009-03003ca0c849 h1:FSqE2GGG7wzsYUsWiQ8MZrvEd1EOyU3NCF0AW3Wtltg=
+golang.org/x/net v0.0.0-20181108082009-03003ca0c849/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8 h1:YoY1wS6JYVRpIfFngRf2HHo9R9dAne3xbkGOQ5rJXjU=
+golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
gopkg.in/cheggaaa/pb.v1 v1.0.26 h1:KbH37VyQGNNrLEz+fflXwuLLxnPNoWwUwBF783VJWUg=
gopkg.in/cheggaaa/pb.v1 v1.0.26/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
