Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a4c6b2da30 | ||
|
|
7f48220a80 | ||
|
|
9e49110295 | ||
|
|
4506bdb638 | ||
|
|
a8551bc9ee | ||
|
|
b5c9806dd0 | ||
|
|
8c349cf7ac | ||
|
|
f3f40c41ef | ||
|
|
05b65c4cb5 | ||
|
|
69ad13848b | ||
|
|
e496ad670a | ||
|
|
9d8eb32f9f | ||
|
|
6668840b11 | ||
|
|
e893f68bc1 | ||
|
|
8da631eac3 | ||
|
|
1729af0ae5 | ||
|
|
dce71d2451 | ||
|
|
f4e75cf221 | ||
|
|
ae3dad944d | ||
|
|
f7f0231c80 | ||
|
|
0c42b96332 | ||
|
|
52cd483f47 | ||
|
|
79dd6d1458 | ||
|
|
10ad46f464 | ||
|
|
ccebab35da | ||
|
|
8dce052fe6 | ||
|
|
76e653fb9b | ||
|
|
cfe8ff0879 |
No files matched your search
@@ -55,7 +55,7 @@ Usage:
|
||||
|
||||
Flags:
|
||||
--after int Specify from when to pull jobs [Unix time](Default: 0)
|
||||
--before int Specify until when to pull jobs [Unix time](Default: current Unix time) (default 1582834707)
|
||||
--before int Specify until when to pull jobs [Unix time](Default: current Unix time) (default current timestamp)
|
||||
--channelID string If specified, only this channel will be synced.
|
||||
--concurrent-jobs int how many jobs to process concurrently (default 1)
|
||||
-h, --help help for ytsync
|
||||
@@ -63,12 +63,14 @@ Flags:
|
||||
--max-length float Maximum video length to process (in hours) (default 2)
|
||||
--max-size int Maximum video size to process (in MB) (default 2048)
|
||||
--max-tries int Number of times to try a publish that fails (default 3)
|
||||
--remove-db-unpublished Remove videos from the database that are marked as published but aren't really published
|
||||
--run-once Whether the process should be stopped after one cycle or not
|
||||
--skip-space-check Do not perform free space check on startup
|
||||
--status string Specify which queue to pull from. Overrides --update
|
||||
--stop-on-error If a publish fails, stop all publishing and exit
|
||||
--takeover-existing-channel If channel exists and we don't own it, take over the channel
|
||||
--update Update previously synced channels instead of syncing new ones
|
||||
--upgrade-metadata Upgrade videos if they're on the old metadata version
|
||||
--videos-limit int how many videos to process per channel (default 1000)
|
||||
```
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ require (
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
|
||||
github.com/kr/pretty v0.1.0 // indirect
|
||||
github.com/lbryio/errors.go v0.0.0-20180223142025-ad03d3cc6a5c
|
||||
github.com/lbryio/lbry.go v1.0.7
|
||||
github.com/lbryio/lbry.go v1.0.15
|
||||
github.com/lusis/slack-test v0.0.0-20190408224659-6cf59653add2 // indirect
|
||||
github.com/mitchellh/go-ps v0.0.0-20170309133038-4fdf99ab2936
|
||||
github.com/mitchellh/mapstructure v1.1.2 // indirect
|
||||
|
||||
@@ -9,7 +9,6 @@ github.com/PuerkitoBio/goquery v1.5.0 h1:uGvmFXOA73IKluu/F84Xd1tt/z07GYm8X49XKHP
|
||||
github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg=
|
||||
github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
|
||||
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
|
||||
github.com/aead/siphash v1.0.1 h1:FwHfE/T45KPKYuuSAKyyvE+oPWcaQ+CUmFW0bPlM+kg=
|
||||
github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
|
||||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
|
||||
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
|
||||
@@ -30,9 +29,7 @@ github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803 h1:j3AgPKKZtZStM2
|
||||
github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
|
||||
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw=
|
||||
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
|
||||
github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd h1:qdGvebPBDuYDPGi1WCPjy1tGyMpmDK8IEapSsszn7HE=
|
||||
github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
|
||||
github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723 h1:ZA/jbKoGcVAnER6pCHPEkGdZOV7U1oLUedErBHCUMs0=
|
||||
github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
|
||||
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 h1:R8vQdOQdZ9Y3SkEwmHoWBmX1DNXhXZqlTpq6s4tyJGc=
|
||||
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
|
||||
@@ -68,9 +65,7 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekf
|
||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
||||
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
||||
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
||||
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
|
||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
github.com/golang/protobuf v1.3.0 h1:kbxbvI4Un1LUWKxufD+BiE6AEExYYgkQLQmLFqA1LFk=
|
||||
github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0=
|
||||
github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
|
||||
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
@@ -82,14 +77,12 @@ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXi
|
||||
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
|
||||
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e h1:XWcjeEtTFTOVA9Fs1w7n2XBftk5ib4oZrhzWk0B+3eA=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
||||
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
|
||||
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
|
||||
github.com/gorilla/rpc v1.1.0/go.mod h1:V4h9r+4sF5HnzqbwIez0fKSpANP0zlYd3qR7p36jkTQ=
|
||||
github.com/gorilla/websocket v1.2.0 h1:VJtLvh6VQym50czpZzx07z/kw9EgAxI3x1ZB8taTMQQ=
|
||||
github.com/gorilla/websocket v1.2.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
|
||||
github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
|
||||
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
|
||||
@@ -100,22 +93,17 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
|
||||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
||||
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
|
||||
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
|
||||
github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89 h1:12K8AlpT0/6QUXSfV0yi4Q0jkbq8NDtIKFtF61AoqV0=
|
||||
github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
|
||||
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
|
||||
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
|
||||
github.com/jrick/logrotate v1.0.0 h1:lQ1bL/n9mBNeIXoTUoYRlK4dHuNJVofX9oWqBtPnSzI=
|
||||
github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
|
||||
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
|
||||
github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
|
||||
github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
|
||||
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
|
||||
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
|
||||
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
|
||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||
github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23 h1:FOOIBWrEkLgmlgGfMuZT83xIwfPDxEI2OHu6xUmJMFE=
|
||||
github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||
@@ -127,8 +115,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
|
||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||
github.com/lbryio/errors.go v0.0.0-20180223142025-ad03d3cc6a5c h1:BhdcWGsuKif/XoSZnqVGNqJ1iEmH0czWR5upj+AuR8M=
|
||||
github.com/lbryio/errors.go v0.0.0-20180223142025-ad03d3cc6a5c/go.mod h1:muH7wpUqE8hRA3OrYYosw9+Sl681BF9cwcjzE+OCNK8=
|
||||
github.com/lbryio/lbry.go v1.0.7 h1:CO9wnH/grsrX1O3YpeSBpLVPtc3lOOVTvZCcPFZ2Os0=
|
||||
github.com/lbryio/lbry.go v1.0.7/go.mod h1:JtyI30bU51rm0LZ/po3mQuzf++14OWb6kR/6mMRAmKU=
|
||||
github.com/lbryio/lbry.go v1.0.15 h1:g4g9cDDUsobmWgTA+1jEIb5k2fRCP0/NvPOMXduP8xY=
|
||||
github.com/lbryio/lbry.go v1.0.15/go.mod h1:JtyI30bU51rm0LZ/po3mQuzf++14OWb6kR/6mMRAmKU=
|
||||
github.com/lbryio/lbryschema.go v0.0.0-20190428231007-c54836bca002 h1:urfYK5ElpUrAv90auPLldoVC60LwiGAcY0OE6HJB9KI=
|
||||
github.com/lbryio/lbryschema.go v0.0.0-20190428231007-c54836bca002/go.mod h1:dAzPCBj3CKKWBGYBZxK6tKBP5SCgY2tqd9SnQd/OyKo=
|
||||
github.com/lbryio/ozzo-validation v0.0.0-20170323141101-d1008ad1fd04/go.mod h1:fbG/dzobG8r95KzMwckXiLMHfFjZaBRQqC9hPs2XAQ4=
|
||||
@@ -136,7 +124,6 @@ github.com/lbryio/types v0.0.0-20190422033210-321fb2abda9c h1:m3O7561xBQ00lfUVay
|
||||
github.com/lbryio/types v0.0.0-20190422033210-321fb2abda9c/go.mod h1:CG3wsDv5BiVYQd5i1Jp7wGsaVyjZTJshqXeWMVKsISE=
|
||||
github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5 h1:AsEBgzv3DhuYHI/GiQh2HxvTP71HCCE9E/tzGUzGdtU=
|
||||
github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5/go.mod h1:c2mYKRyMb1BPkO5St0c/ps62L4S0W2NAkaTXj9qEI+0=
|
||||
github.com/lusis/slack-test v0.0.0-20180109053238-3c758769bfa6 h1:iOAVXzZyXtW408TMYejlUPo6BIn92HmOacWtIfNyYns=
|
||||
github.com/lusis/slack-test v0.0.0-20180109053238-3c758769bfa6/go.mod h1:sFlOUpQL1YcjhFVXhg1CG8ZASEs/Mf1oVb6H75JL/zg=
|
||||
github.com/lusis/slack-test v0.0.0-20190408224659-6cf59653add2 h1:CTzpAplpuXay3gDDqbErv/OSV6SoKZ9UTsGxLKfxB8M=
|
||||
github.com/lusis/slack-test v0.0.0-20190408224659-6cf59653add2/go.mod h1:sFlOUpQL1YcjhFVXhg1CG8ZASEs/Mf1oVb6H75JL/zg=
|
||||
@@ -154,11 +141,9 @@ github.com/nikooo777/ytdl v0.0.0-20190215151411-9c7832eaf457/go.mod h1:Z/EmaCtMz
|
||||
github.com/nlopes/slack v0.5.0 h1:NbIae8Kd0NpqaEI3iUrsuS0KbcEDhzhc939jLW5fNm0=
|
||||
github.com/nlopes/slack v0.5.0/go.mod h1:jVI4BBK3lSktibKahxBF74txcK2vyvkza1z/+rRnVAM=
|
||||
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||
github.com/onsi/ginkgo v1.7.0 h1:WSHQ+IS43OoUrWtD1/bbclrwK8TTH5hzp+umCiuxHgs=
|
||||
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||
github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
|
||||
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||
github.com/onsi/gomega v1.4.3 h1:RE1xgDvH7imwFD45h+u2SgIfERHlS2yNG4DObb5BSKU=
|
||||
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
|
||||
github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
|
||||
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
|
||||
@@ -229,7 +214,6 @@ golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73r
|
||||
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd h1:HuTn7WObtcDo9uEEU7rEqL0jYthdXAmZ6PP+meazmaU=
|
||||
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
|
||||
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190415214537-1da14a5a36f2 h1:iC0Y6EDq+rhnAePxGvJs2kzUAYcwESqdcGRPzEUfzTU=
|
||||
@@ -240,7 +224,6 @@ golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a h1:tImsplftrFpALCYumobsd0
|
||||
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
|
||||
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
|
||||
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
|
||||
@@ -36,6 +36,8 @@ var (
|
||||
videosLimit int
|
||||
maxVideoSize int
|
||||
maxVideoLength float64
|
||||
removeDBUnpublished bool
|
||||
upgradeMetadata bool
|
||||
)
|
||||
|
||||
func main() {
|
||||
@@ -56,6 +58,8 @@ func main() {
|
||||
cmd.Flags().BoolVar(&skipSpaceCheck, "skip-space-check", false, "Do not perform free space check on startup")
|
||||
cmd.Flags().BoolVar(&syncUpdate, "update", false, "Update previously synced channels instead of syncing new ones")
|
||||
cmd.Flags().BoolVar(&singleRun, "run-once", false, "Whether the process should be stopped after one cycle or not")
|
||||
cmd.Flags().BoolVar(&removeDBUnpublished, "remove-db-unpublished", false, "Remove videos from the database that are marked as published but aren't really published")
|
||||
cmd.Flags().BoolVar(&upgradeMetadata, "upgrade-metadata", false, "Upgrade videos if they're on the old metadata version")
|
||||
cmd.Flags().StringVar(&syncStatus, "status", "", "Specify which queue to pull from. Overrides --update")
|
||||
cmd.Flags().StringVar(&channelID, "channelID", "", "If specified, only this channel will be synced.")
|
||||
cmd.Flags().Int64Var(&syncFrom, "after", time.Unix(0, 0).Unix(), "Specify from when to pull jobs [Unix time](Default: 0)")
|
||||
@@ -188,6 +192,8 @@ func ytSync(cmd *cobra.Command, args []string) {
|
||||
syncProperties,
|
||||
apiConfig,
|
||||
maxVideoLength,
|
||||
removeDBUnpublished,
|
||||
upgradeMetadata,
|
||||
)
|
||||
err := sm.Start()
|
||||
if err != nil {
|
||||
|
||||
+22
-10
@@ -2,8 +2,6 @@ package manager
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/aws/aws-sdk-go/aws"
|
||||
"github.com/aws/aws-sdk-go/aws/credentials"
|
||||
"strings"
|
||||
"syscall"
|
||||
"time"
|
||||
@@ -13,6 +11,9 @@ import (
|
||||
|
||||
"github.com/lbryio/lbry.go/extras/errors"
|
||||
"github.com/lbryio/lbry.go/extras/util"
|
||||
|
||||
"github.com/aws/aws-sdk-go/aws"
|
||||
"github.com/aws/aws-sdk-go/aws/credentials"
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
@@ -39,12 +40,14 @@ type SyncManager struct {
|
||||
singleRun bool
|
||||
syncProperties *sdk.SyncProperties
|
||||
apiConfig *sdk.APIConfig
|
||||
removeDBUnpublished bool
|
||||
upgradeMetadata bool
|
||||
}
|
||||
|
||||
func NewSyncManager(stopOnError bool, maxTries int, takeOverExistingChannel bool, refill int, limit int,
|
||||
skipSpaceCheck bool, syncUpdate bool, concurrentJobs int, concurrentVideos int, blobsDir string, videosLimit int,
|
||||
maxVideoSize int, lbrycrdString string, awsS3ID string, awsS3Secret string, awsS3Region string, awsS3Bucket string,
|
||||
syncStatus string, singleRun bool, syncProperties *sdk.SyncProperties, apiConfig *sdk.APIConfig, maxVideoLength float64) *SyncManager {
|
||||
syncStatus string, singleRun bool, syncProperties *sdk.SyncProperties, apiConfig *sdk.APIConfig, maxVideoLength float64, removeDBUnpublished bool, upgradeMetadata bool) *SyncManager {
|
||||
return &SyncManager{
|
||||
stopOnError: stopOnError,
|
||||
maxTries: maxTries,
|
||||
@@ -68,6 +71,8 @@ func NewSyncManager(stopOnError bool, maxTries int, takeOverExistingChannel bool
|
||||
singleRun: singleRun,
|
||||
syncProperties: syncProperties,
|
||||
apiConfig: apiConfig,
|
||||
removeDBUnpublished: removeDBUnpublished,
|
||||
upgradeMetadata: upgradeMetadata,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,9 +91,10 @@ const (
|
||||
var SyncStatuses = []string{StatusPending, StatusPendingEmail, StatusPendingUpgrade, StatusQueued, StatusSyncing, StatusSynced, StatusFailed, StatusFinalized, StatusAbandoned}
|
||||
|
||||
const (
|
||||
VideoStatusPublished = "published"
|
||||
VideoStatusFailed = "failed"
|
||||
VideoStatusUnpublished = "unpublished"
|
||||
VideoStatusPublished = "published"
|
||||
VideoStatusFailed = "failed"
|
||||
VideoStatusUpgradeFailed = "upgradefailed"
|
||||
VideoStatusUnpublished = "unpublished"
|
||||
)
|
||||
|
||||
func (s *SyncManager) Start() error {
|
||||
@@ -131,10 +137,12 @@ func (s *SyncManager) Start() error {
|
||||
AwsS3Region: s.awsS3Region,
|
||||
AwsS3Bucket: s.awsS3Bucket,
|
||||
namer: namer.NewNamer(),
|
||||
Fee: channels[0].Fee,
|
||||
}
|
||||
shouldInterruptLoop = true
|
||||
} else {
|
||||
var queuesToSync []string
|
||||
//TODO: implement scrambling to avoid starvation of queues
|
||||
if s.syncStatus != "" {
|
||||
queuesToSync = append(queuesToSync, s.syncStatus)
|
||||
} else if s.syncUpdate {
|
||||
@@ -147,7 +155,9 @@ func (s *SyncManager) Start() error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for _, c := range channels {
|
||||
log.Infof("There are %d channels in the \"%s\" queue", len(channels), q)
|
||||
if len(channels) > 0 {
|
||||
c := channels[0]
|
||||
syncs = append(syncs, Sync{
|
||||
APIConfig: s.apiConfig,
|
||||
YoutubeChannelID: c.ChannelId,
|
||||
@@ -165,7 +175,9 @@ func (s *SyncManager) Start() error {
|
||||
AwsS3Region: s.awsS3Region,
|
||||
AwsS3Bucket: s.awsS3Bucket,
|
||||
namer: namer.NewNamer(),
|
||||
Fee: c.Fee,
|
||||
})
|
||||
continue
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -173,9 +185,9 @@ func (s *SyncManager) Start() error {
|
||||
log.Infoln("No channels to sync. Pausing 5 minutes!")
|
||||
time.Sleep(5 * time.Minute)
|
||||
}
|
||||
for i, sync := range syncs {
|
||||
for _, sync := range syncs {
|
||||
shouldNotCount := false
|
||||
SendInfoToSlack("Syncing %s (%s) to LBRY! (iteration %d/%d - total processed channels: %d)", sync.LbryChannelName, sync.YoutubeChannelID, i+1, len(syncs), syncCount+1)
|
||||
SendInfoToSlack("Syncing %s (%s) to LBRY! total processed channels since startup: %d", sync.LbryChannelName, sync.YoutubeChannelID, syncCount+1)
|
||||
err := sync.FullCycle()
|
||||
if err != nil {
|
||||
fatalErrors := []string{
|
||||
@@ -195,7 +207,7 @@ func (s *SyncManager) Start() error {
|
||||
SendInfoToSlack("A non fatal error was reported by the sync process. %s\nContinuing...", err.Error())
|
||||
}
|
||||
}
|
||||
SendInfoToSlack("Syncing %s (%s) reached an end. (iteration %d/%d - total processed channels: %d)", sync.LbryChannelName, sync.YoutubeChannelID, i+1, len(syncs), syncCount+1)
|
||||
SendInfoToSlack("Syncing %s (%s) reached an end. total processed channels since startup: %d", sync.LbryChannelName, sync.YoutubeChannelID, syncCount+1)
|
||||
if !shouldNotCount {
|
||||
syncCount++
|
||||
}
|
||||
|
||||
+70
-67
@@ -2,6 +2,7 @@ package manager
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"math"
|
||||
"net/http"
|
||||
"os"
|
||||
"strconv"
|
||||
@@ -21,8 +22,6 @@ import (
|
||||
"google.golang.org/api/youtube/v3"
|
||||
)
|
||||
|
||||
const minimumRefillAmount = 3
|
||||
|
||||
func (s *Sync) enableAddressReuse() error {
|
||||
accountsResponse, err := s.daemon.AccountList()
|
||||
if err != nil {
|
||||
@@ -34,7 +33,8 @@ func (s *Sync) enableAddressReuse() error {
|
||||
}
|
||||
for _, a := range accounts {
|
||||
_, err = s.daemon.AccountSet(a.ID, jsonrpc.AccountSettings{
|
||||
ChangeMaxUses: 1000,
|
||||
ChangeMaxUses: util.PtrToInt(1000),
|
||||
ReceivingMaxUses: util.PtrToInt(100),
|
||||
})
|
||||
if err != nil {
|
||||
return errors.Err(err)
|
||||
@@ -43,7 +43,7 @@ func (s *Sync) enableAddressReuse() error {
|
||||
return nil
|
||||
}
|
||||
func (s *Sync) walletSetup() error {
|
||||
//prevent unnecessary concurrent execution
|
||||
//prevent unnecessary concurrent execution and publishing while refilling/reallocating UTXOs
|
||||
s.walletMux.Lock()
|
||||
defer s.walletMux.Unlock()
|
||||
err := s.ensureChannelOwnership()
|
||||
@@ -67,51 +67,51 @@ func (s *Sync) walletSetup() error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
numOnSource := int(n)
|
||||
videosOnYoutube := int(n)
|
||||
|
||||
log.Debugf("Source channel has %d videos", numOnSource)
|
||||
if numOnSource == 0 {
|
||||
log.Debugf("Source channel has %d videos", videosOnYoutube)
|
||||
if videosOnYoutube == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
s.syncedVideosMux.RLock()
|
||||
numPublished := len(s.syncedVideos) //should we only count published videos? Credits are allocated even for failed ones...
|
||||
s.syncedVideosMux.RUnlock()
|
||||
log.Debugf("We already allocated credits for %d videos", numPublished)
|
||||
|
||||
if numOnSource-numPublished > s.Manager.videosLimit {
|
||||
numOnSource = s.Manager.videosLimit
|
||||
}
|
||||
|
||||
minBalance := (float64(numOnSource)-float64(numPublished))*(publishAmount+0.1) + channelClaimAmount
|
||||
if s.Manager.syncStatus == StatusPendingUpgrade {
|
||||
videosToUpgrade := 0
|
||||
for _, v := range s.syncedVideos {
|
||||
if v.Published && v.MetadataVersion < 2 {
|
||||
videosToUpgrade++
|
||||
publishedCount := 0
|
||||
notUpgradedCount := 0
|
||||
failedCount := 0
|
||||
for _, sv := range s.syncedVideos {
|
||||
if sv.Published {
|
||||
publishedCount++
|
||||
if sv.MetadataVersion < 2 {
|
||||
notUpgradedCount++
|
||||
}
|
||||
} else {
|
||||
failedCount++
|
||||
}
|
||||
minBalance += float64(videosToUpgrade) * 0.001
|
||||
}
|
||||
if numPublished > numOnSource && balance < minimumRefillAmount {
|
||||
SendErrorToSlack("something is going on as we published more videos than those available on source: %d/%d", numPublished, numOnSource)
|
||||
minBalance = minimumRefillAmount
|
||||
s.syncedVideosMux.RUnlock()
|
||||
|
||||
log.Debugf("We already allocated credits for %d published videos and %d failed videos", publishedCount, failedCount)
|
||||
|
||||
if videosOnYoutube > s.Manager.videosLimit {
|
||||
videosOnYoutube = s.Manager.videosLimit
|
||||
}
|
||||
unallocatedVideos := videosOnYoutube - (publishedCount + failedCount)
|
||||
requiredBalance := float64(unallocatedVideos)*(publishAmount+estimatedMaxTxFee) + channelClaimAmount
|
||||
if s.Manager.upgradeMetadata {
|
||||
requiredBalance += float64(notUpgradedCount) * 0.001
|
||||
}
|
||||
|
||||
refillAmount := 0.0
|
||||
if balance < requiredBalance || balance < minimumAccountBalance {
|
||||
refillAmount = math.Max(requiredBalance-balance, minimumRefillAmount)
|
||||
}
|
||||
amountToAdd := minBalance - balance
|
||||
|
||||
if s.Refill > 0 {
|
||||
if amountToAdd < 0 {
|
||||
amountToAdd = float64(s.Refill)
|
||||
} else {
|
||||
amountToAdd += float64(s.Refill)
|
||||
}
|
||||
refillAmount += float64(s.Refill)
|
||||
}
|
||||
|
||||
if amountToAdd > 0 {
|
||||
if amountToAdd < minimumRefillAmount {
|
||||
amountToAdd = minimumRefillAmount
|
||||
}
|
||||
err := s.addCredits(amountToAdd)
|
||||
if refillAmount > 0 {
|
||||
err := s.addCredits(refillAmount)
|
||||
if err != nil {
|
||||
return errors.Err(err)
|
||||
}
|
||||
@@ -166,14 +166,19 @@ func (s *Sync) ensureEnoughUTXOs() error {
|
||||
target := 40
|
||||
slack := int(float32(0.1) * float32(target))
|
||||
count := 0
|
||||
confirmedCount := 0
|
||||
|
||||
for _, utxo := range *utxolist {
|
||||
amount, _ := strconv.ParseFloat(utxo.Amount, 64)
|
||||
if !utxo.IsClaim && !utxo.IsSupport && !utxo.IsUpdate && amount != 0.0 {
|
||||
if utxo.IsMine && utxo.Type == "payment" && amount > 0.001 {
|
||||
if utxo.Confirmations > 0 {
|
||||
confirmedCount++
|
||||
}
|
||||
count++
|
||||
}
|
||||
}
|
||||
log.Infof("utxo count: %d", count)
|
||||
log.Infof("utxo count: %d (%d confirmed)", count, confirmedCount)
|
||||
UTXOWaitThreshold := 16
|
||||
if count < target-slack {
|
||||
balance, err := s.daemon.AccountBalance(&defaultAccount)
|
||||
if err != nil {
|
||||
@@ -186,23 +191,27 @@ func (s *Sync) ensureEnoughUTXOs() error {
|
||||
if err != nil {
|
||||
return errors.Err(err)
|
||||
}
|
||||
broadcastFee := 0.01
|
||||
amountToSplit := fmt.Sprintf("%.6f", balanceAmount-broadcastFee)
|
||||
maxUTXOs := uint64(500)
|
||||
desiredUTXOCount := uint64(math.Floor((balanceAmount) / 0.1))
|
||||
if desiredUTXOCount > maxUTXOs {
|
||||
desiredUTXOCount = maxUTXOs
|
||||
}
|
||||
log.Infof("Splitting balance of %s evenly between %d UTXOs", *balance, desiredUTXOCount)
|
||||
|
||||
log.Infof("Splitting balance of %s evenly between 40 UTXOs", *balance)
|
||||
|
||||
prefillTx, err := s.daemon.AccountFund(defaultAccount, defaultAccount, amountToSplit, uint64(target))
|
||||
broadcastFee := 0.1
|
||||
prefillTx, err := s.daemon.AccountFund(defaultAccount, defaultAccount, fmt.Sprintf("%.4f", balanceAmount-broadcastFee), desiredUTXOCount, false)
|
||||
if err != nil {
|
||||
return err
|
||||
} else if prefillTx == nil {
|
||||
return errors.Err("no response")
|
||||
}
|
||||
|
||||
err = s.waitForNewBlock()
|
||||
if err != nil {
|
||||
return err
|
||||
if confirmedCount < UTXOWaitThreshold {
|
||||
err = s.waitForNewBlock()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
} else if !allUTXOsConfirmed(utxolist) {
|
||||
} else if confirmedCount < UTXOWaitThreshold {
|
||||
log.Println("Waiting for previous txns to confirm")
|
||||
err := s.waitForNewBlock()
|
||||
if err != nil {
|
||||
@@ -355,34 +364,28 @@ func (s *Sync) ensureChannelOwnership() error {
|
||||
locations = []jsonrpc.Location{{Country: util.PtrToString(channelInfo.Country)}}
|
||||
}
|
||||
var c *jsonrpc.TransactionSummary
|
||||
claimCreateOptions := jsonrpc.ClaimCreateOptions{
|
||||
Title: &channelInfo.Title,
|
||||
Description: &channelInfo.Description,
|
||||
Tags: tagsManager.GetTagsForChannel(s.YoutubeChannelID),
|
||||
Languages: languages,
|
||||
Locations: locations,
|
||||
ThumbnailURL: &thumbnailURL,
|
||||
}
|
||||
if channelUsesOldMetadata {
|
||||
c, err = s.daemon.ChannelUpdate(s.lbryChannelID, jsonrpc.ChannelUpdateOptions{
|
||||
ClearTags: util.PtrToBool(true),
|
||||
ClearLocations: util.PtrToBool(true),
|
||||
ClearLanguages: util.PtrToBool(true),
|
||||
ChannelCreateOptions: jsonrpc.ChannelCreateOptions{
|
||||
ClaimCreateOptions: jsonrpc.ClaimCreateOptions{
|
||||
Title: channelInfo.Title,
|
||||
Description: channelInfo.Description,
|
||||
Tags: tagsManager.GetTagsForChannel(s.YoutubeChannelID),
|
||||
Languages: languages,
|
||||
Locations: locations,
|
||||
ThumbnailURL: &thumbnailURL,
|
||||
},
|
||||
CoverURL: bannerURL,
|
||||
ClaimCreateOptions: claimCreateOptions,
|
||||
CoverURL: bannerURL,
|
||||
},
|
||||
})
|
||||
} else {
|
||||
c, err = s.daemon.ChannelCreate(s.LbryChannelName, channelBidAmount, jsonrpc.ChannelCreateOptions{
|
||||
ClaimCreateOptions: jsonrpc.ClaimCreateOptions{
|
||||
Title: channelInfo.Title,
|
||||
Description: channelInfo.Description,
|
||||
Tags: tagsManager.GetTagsForChannel(s.YoutubeChannelID),
|
||||
Languages: languages,
|
||||
Locations: locations,
|
||||
ThumbnailURL: &thumbnailURL,
|
||||
},
|
||||
CoverURL: bannerURL,
|
||||
ClaimCreateOptions: claimCreateOptions,
|
||||
CoverURL: bannerURL,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -403,7 +406,7 @@ func allUTXOsConfirmed(utxolist *jsonrpc.UTXOListResponse) bool {
|
||||
}
|
||||
|
||||
for _, utxo := range *utxolist {
|
||||
if utxo.Height == 0 {
|
||||
if utxo.Confirmations <= 0 {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
+139
-64
@@ -37,9 +37,12 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
channelClaimAmount = 0.01
|
||||
publishAmount = 0.01
|
||||
maxReasonLength = 500
|
||||
channelClaimAmount = 0.01
|
||||
estimatedMaxTxFee = 0.1
|
||||
minimumAccountBalance = 4.0
|
||||
minimumRefillAmount = 1
|
||||
publishAmount = 0.01
|
||||
maxReasonLength = 500
|
||||
)
|
||||
|
||||
type video interface {
|
||||
@@ -48,7 +51,7 @@ type video interface {
|
||||
IDAndNum() string
|
||||
PlaylistPosition() int
|
||||
PublishedAt() time.Time
|
||||
Sync(*jsonrpc.Client, sources.SyncParams, *sdk.SyncedVideo, bool) (*sources.SyncSummary, error)
|
||||
Sync(*jsonrpc.Client, sources.SyncParams, *sdk.SyncedVideo, bool, *sync.RWMutex) (*sources.SyncSummary, error)
|
||||
}
|
||||
|
||||
// sorting videos
|
||||
@@ -74,27 +77,30 @@ type Sync struct {
|
||||
AwsS3Secret string
|
||||
AwsS3Region string
|
||||
AwsS3Bucket string
|
||||
|
||||
daemon *jsonrpc.Client
|
||||
claimAddress string
|
||||
videoDirectory string
|
||||
syncedVideosMux *sync.RWMutex
|
||||
syncedVideos map[string]sdk.SyncedVideo
|
||||
grp *stop.Group
|
||||
lbryChannelID string
|
||||
namer *namer.Namer
|
||||
|
||||
walletMux *sync.Mutex
|
||||
queue chan video
|
||||
Fee *sdk.Fee
|
||||
daemon *jsonrpc.Client
|
||||
claimAddress string
|
||||
videoDirectory string
|
||||
syncedVideosMux *sync.RWMutex
|
||||
syncedVideos map[string]sdk.SyncedVideo
|
||||
grp *stop.Group
|
||||
lbryChannelID string
|
||||
namer *namer.Namer
|
||||
walletMux *sync.RWMutex
|
||||
queue chan video
|
||||
}
|
||||
|
||||
func (s *Sync) AppendSyncedVideo(videoID string, published bool, failureReason string, claimName string) {
|
||||
func (s *Sync) AppendSyncedVideo(videoID string, published bool, failureReason string, claimName string, claimID string, metadataVersion int8, size int64) {
|
||||
s.syncedVideosMux.Lock()
|
||||
defer s.syncedVideosMux.Unlock()
|
||||
s.syncedVideos[videoID] = sdk.SyncedVideo{
|
||||
VideoID: videoID,
|
||||
Published: published,
|
||||
FailureReason: failureReason,
|
||||
VideoID: videoID,
|
||||
Published: published,
|
||||
FailureReason: failureReason,
|
||||
ClaimID: claimID,
|
||||
ClaimName: claimName,
|
||||
MetadataVersion: metadataVersion,
|
||||
Size: size,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -255,7 +261,7 @@ func (s *Sync) FullCycle() (e error) {
|
||||
s.setExceptions()
|
||||
|
||||
s.syncedVideosMux = &sync.RWMutex{}
|
||||
s.walletMux = &sync.Mutex{}
|
||||
s.walletMux = &sync.RWMutex{}
|
||||
s.grp = stop.New()
|
||||
s.queue = make(chan video)
|
||||
interruptChan := make(chan os.Signal, 1)
|
||||
@@ -289,6 +295,7 @@ func (s *Sync) FullCycle() (e error) {
|
||||
return errors.Wrap(err, 0)
|
||||
}
|
||||
|
||||
defer deleteSyncFolder(s.videoDirectory)
|
||||
log.Printf("Starting daemon")
|
||||
err = startDaemonViaSystemd()
|
||||
if err != nil {
|
||||
@@ -317,6 +324,16 @@ func (s *Sync) FullCycle() (e error) {
|
||||
return nil
|
||||
}
|
||||
|
||||
func deleteSyncFolder(videoDirectory string) {
|
||||
if !strings.Contains(videoDirectory, "/tmp/ytsync") {
|
||||
_ = util.SendToSlack(errors.Err("Trying to delete an unexpected directory: %s", videoDirectory).Error())
|
||||
}
|
||||
err := os.RemoveAll(videoDirectory)
|
||||
if err != nil {
|
||||
_ = util.SendToSlack(err.Error())
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Sync) setChannelTerminationStatus(e *error) {
|
||||
if *e != nil {
|
||||
//conditions for which a channel shouldn't be marked as failed
|
||||
@@ -445,8 +462,10 @@ func (s *Sync) fixDupes(claims []jsonrpc.Claim) (bool, error) {
|
||||
}
|
||||
|
||||
//updateRemoteDB counts the amount of videos published so far and updates the remote db if some videos weren't marked as published
|
||||
func (s *Sync) updateRemoteDB(claims []jsonrpc.Claim) (total int, fixed int, err error) {
|
||||
//additionally it removes all entries in the database indicating that a video is published when it's actually not
|
||||
func (s *Sync) updateRemoteDB(claims []jsonrpc.Claim) (total, fixed, removed int, err error) {
|
||||
count := 0
|
||||
videoIDMap := make(map[string]string, len(claims))
|
||||
for _, c := range claims {
|
||||
if !isYtsyncClaim(c) {
|
||||
continue
|
||||
@@ -455,22 +474,60 @@ func (s *Sync) updateRemoteDB(claims []jsonrpc.Claim) (total int, fixed int, err
|
||||
//check if claimID is in remote db
|
||||
tn := c.Value.GetThumbnail().GetUrl()
|
||||
videoID := tn[strings.LastIndex(tn, "/")+1:]
|
||||
pv, ok := s.syncedVideos[videoID]
|
||||
if !ok || pv.ClaimName != c.Name {
|
||||
fixed++
|
||||
log.Debugf("adding %s to the database", c.Name)
|
||||
size, err := c.GetStreamSizeByMagic()
|
||||
videoIDMap[videoID] = c.ClaimID
|
||||
pv, claimInDatabase := s.syncedVideos[videoID]
|
||||
claimMetadataVersion := uint(1)
|
||||
if strings.Contains(tn, thumbs.ThumbnailEndpoint) {
|
||||
claimMetadataVersion = 2
|
||||
}
|
||||
|
||||
metadataDiffers := claimInDatabase && pv.MetadataVersion != int8(claimMetadataVersion)
|
||||
claimIDDiffers := claimInDatabase && pv.ClaimID != c.ClaimID
|
||||
claimNameDiffers := claimInDatabase && pv.ClaimName != c.Name
|
||||
claimMarkedUnpublished := claimInDatabase && !pv.Published
|
||||
if metadataDiffers {
|
||||
log.Debugf("%s: Mismatch in database for metadata. DB: %d - Blockchain: %d", videoID, pv.MetadataVersion, claimMetadataVersion)
|
||||
}
|
||||
if claimIDDiffers {
|
||||
log.Debugf("%s: Mismatch in database for claimID. DB: %s - Blockchain: %s", videoID, pv.ClaimID, c.ClaimID)
|
||||
}
|
||||
if claimNameDiffers {
|
||||
log.Debugf("%s: Mismatch in database for claimName. DB: %s - Blockchain: %s", videoID, pv.ClaimName, c.Name)
|
||||
}
|
||||
if claimMarkedUnpublished {
|
||||
log.Debugf("%s: Mismatch in database: published but marked as unpublished", videoID)
|
||||
}
|
||||
if !claimInDatabase {
|
||||
log.Debugf("%s: Published but is not in database (%s - %s)", videoID, c.Name, c.ClaimID)
|
||||
}
|
||||
if !claimInDatabase || metadataDiffers || claimIDDiffers || claimNameDiffers || claimMarkedUnpublished {
|
||||
claimSize, err := c.GetStreamSizeByMagic()
|
||||
if err != nil {
|
||||
size = 0
|
||||
claimSize = 0
|
||||
}
|
||||
metadataVersion := uint(1)
|
||||
err = s.Manager.apiConfig.MarkVideoStatus(s.YoutubeChannelID, videoID, VideoStatusPublished, c.ClaimID, c.Name, "", util.PtrToInt64(int64(size)), metadataVersion)
|
||||
fixed++
|
||||
log.Debugf("updating %s in the database", videoID)
|
||||
err = s.Manager.apiConfig.MarkVideoStatus(s.YoutubeChannelID, videoID, VideoStatusPublished, c.ClaimID, c.Name, "", util.PtrToInt64(int64(claimSize)), claimMetadataVersion)
|
||||
if err != nil {
|
||||
return count, fixed, err
|
||||
return count, fixed, 0, err
|
||||
}
|
||||
}
|
||||
}
|
||||
return count, fixed, nil
|
||||
idsToRemove := make([]string, 0, len(videoIDMap))
|
||||
for vID, sv := range s.syncedVideos {
|
||||
_, ok := videoIDMap[vID]
|
||||
if !ok && sv.Published {
|
||||
log.Debugf("%s: claims to be published but wasn't found in the list of claims and will be removed if --remove-db-unpublished was specified", vID)
|
||||
idsToRemove = append(idsToRemove, vID)
|
||||
}
|
||||
}
|
||||
if s.Manager.removeDBUnpublished && len(idsToRemove) > 0 {
|
||||
err := s.Manager.apiConfig.DeleteVideos(idsToRemove)
|
||||
if err != nil {
|
||||
return count, fixed, 0, err
|
||||
}
|
||||
}
|
||||
return count, fixed, len(idsToRemove), nil
|
||||
}
|
||||
|
||||
func (s *Sync) getClaims() ([]jsonrpc.Claim, error) {
|
||||
@@ -516,16 +573,21 @@ func (s *Sync) doSync() error {
|
||||
}
|
||||
}
|
||||
|
||||
pubsOnWallet, nFixed, err := s.updateRemoteDB(allClaims)
|
||||
pubsOnWallet, nFixed, nRemoved, err := s.updateRemoteDB(allClaims)
|
||||
if err != nil {
|
||||
return errors.Prefix("error counting claims", err)
|
||||
return errors.Prefix("error updating remote database", err)
|
||||
}
|
||||
if nFixed > 0 {
|
||||
if nFixed > 0 || nRemoved > 0 {
|
||||
err := s.setStatusSyncing()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
SendInfoToSlack("%d claims were not on the remote database and were fixed", nFixed)
|
||||
if nFixed > 0 {
|
||||
SendInfoToSlack("%d claims had mismatched database info or were completely missing and were fixed", nFixed)
|
||||
}
|
||||
if nRemoved > 0 {
|
||||
SendInfoToSlack("%d were marked as published but weren't actually published and thus removed from the database", nRemoved)
|
||||
}
|
||||
}
|
||||
pubsOnDB := 0
|
||||
for _, sv := range s.syncedVideos {
|
||||
@@ -555,7 +617,7 @@ func (s *Sync) doSync() error {
|
||||
}
|
||||
|
||||
if s.LbryChannelName == "@UCBerkeley" {
|
||||
err = errors.Err("UCB is not supported on this version of YTSYNC")
|
||||
err = errors.Err("UCB is not supported in this version of YTSYNC")
|
||||
} else {
|
||||
err = s.enqueueYoutubeVideos()
|
||||
}
|
||||
@@ -594,7 +656,7 @@ func (s *Sync) startWorker(workerNum int) {
|
||||
err := s.processVideo(v)
|
||||
|
||||
if err != nil {
|
||||
logMsg := "error processing video: " + err.Error()
|
||||
logMsg := fmt.Sprintf("error processing video %s: %s", v.ID(), err.Error())
|
||||
log.Errorln(logMsg)
|
||||
fatalErrors := []string{
|
||||
":5279: read: connection reset by peer",
|
||||
@@ -624,30 +686,36 @@ func (s *Sync) startWorker(workerNum int) {
|
||||
"Watch this video on YouTube.",
|
||||
"have blocked it on copyright grounds",
|
||||
"the video must be republished as we can't get the right size",
|
||||
"Invalid status code: 403",
|
||||
}
|
||||
if util.SubstringInSlice(err.Error(), errorsNoRetry) {
|
||||
if strings.Contains(err.Error(), "txn-mempool-conflict") ||
|
||||
strings.Contains(err.Error(), "too-long-mempool-chain") {
|
||||
log.Println("waiting for a block before retrying")
|
||||
err := s.waitForNewBlock()
|
||||
if err != nil {
|
||||
s.grp.Stop()
|
||||
SendErrorToSlack("something went wrong while waiting for a block: %v", err)
|
||||
break
|
||||
}
|
||||
} else if util.SubstringInSlice(err.Error(), errorsNoRetry) {
|
||||
log.Println("This error should not be retried at all")
|
||||
} else if tryCount < s.MaxTries {
|
||||
if strings.Contains(err.Error(), "txn-mempool-conflict") ||
|
||||
strings.Contains(err.Error(), "too-long-mempool-chain") {
|
||||
log.Println("waiting for a block before retrying")
|
||||
err = s.waitForNewBlock()
|
||||
if err != nil {
|
||||
s.grp.Stop()
|
||||
SendErrorToSlack("something went wrong while waiting for a block: %v", err)
|
||||
break
|
||||
}
|
||||
} else if util.SubstringInSlice(err.Error(), []string{
|
||||
if util.SubstringInSlice(err.Error(), []string{
|
||||
"Not enough funds to cover this transaction",
|
||||
"failed: Not enough funds",
|
||||
"Error in daemon: Insufficient funds, please deposit additional LBC"}) {
|
||||
log.Println("refilling addresses before retrying")
|
||||
err = s.walletSetup()
|
||||
"Error in daemon: Insufficient funds, please deposit additional LBC",
|
||||
// "txn-mempool-conflict", //TODO: uncomment the two lines when the SDK will start spending confirmed UTXOs before failing
|
||||
//"too-long-mempool-chain",
|
||||
}) {
|
||||
log.Println("checking funds and UTXOs before retrying...")
|
||||
err := s.walletSetup()
|
||||
if err != nil {
|
||||
s.grp.Stop()
|
||||
SendErrorToSlack("failed to setup the wallet for a refill: %v", err)
|
||||
break
|
||||
}
|
||||
} else if strings.Contains(err.Error(), "Error in daemon: 'str' object has no attribute 'get'") {
|
||||
time.Sleep(5 * time.Second)
|
||||
}
|
||||
log.Println("Retrying")
|
||||
continue
|
||||
@@ -657,17 +725,24 @@ func (s *Sync) startWorker(workerNum int) {
|
||||
existingClaim, ok := s.syncedVideos[v.ID()]
|
||||
existingClaimID := ""
|
||||
existingClaimName := ""
|
||||
existingClaimSize := v.Size()
|
||||
existingClaimSize := int64(0)
|
||||
if v.Size() != nil {
|
||||
existingClaimSize = *v.Size()
|
||||
}
|
||||
if ok {
|
||||
existingClaimID = existingClaim.ClaimID
|
||||
existingClaimName = existingClaim.ClaimName
|
||||
if existingClaim.Size > 0 {
|
||||
existingClaimSize = &existingClaim.Size
|
||||
existingClaimSize = existingClaim.Size
|
||||
}
|
||||
}
|
||||
|
||||
s.AppendSyncedVideo(v.ID(), false, err.Error(), "")
|
||||
err = s.Manager.apiConfig.MarkVideoStatus(s.YoutubeChannelID, v.ID(), VideoStatusFailed, existingClaimID, existingClaimName, err.Error(), existingClaimSize, 1)
|
||||
videoStatus := VideoStatusFailed
|
||||
if strings.Contains(err.Error(), "upgrade failed") {
|
||||
videoStatus = VideoStatusUpgradeFailed
|
||||
} else {
|
||||
s.AppendSyncedVideo(v.ID(), false, err.Error(), existingClaimName, existingClaimID, 0, existingClaimSize)
|
||||
}
|
||||
err = s.Manager.apiConfig.MarkVideoStatus(s.YoutubeChannelID, v.ID(), videoStatus, existingClaimID, existingClaimName, err.Error(), &existingClaimSize, 0)
|
||||
if err != nil {
|
||||
SendErrorToSlack("Failed to mark video on the database: %s", err.Error())
|
||||
}
|
||||
@@ -805,8 +880,9 @@ func (s *Sync) processVideo(v video) (err error) {
|
||||
s.syncedVideosMux.RLock()
|
||||
sv, ok := s.syncedVideos[v.ID()]
|
||||
s.syncedVideosMux.RUnlock()
|
||||
newMetadataVersion := int8(2)
|
||||
alreadyPublished := ok && sv.Published
|
||||
isUpgradeSync := s.Manager.syncStatus == StatusPendingUpgrade
|
||||
videoRequiresUpgrade := ok && s.Manager.upgradeMetadata && sv.MetadataVersion < newMetadataVersion
|
||||
|
||||
neverRetryFailures := []string{
|
||||
"Error extracting sts from embedded url response",
|
||||
@@ -822,17 +898,16 @@ func (s *Sync) processVideo(v video) (err error) {
|
||||
return nil
|
||||
}
|
||||
|
||||
if alreadyPublished && !isUpgradeSync {
|
||||
if alreadyPublished && !videoRequiresUpgrade {
|
||||
log.Println(v.ID() + " already published")
|
||||
return nil
|
||||
}
|
||||
newMetadataVersion := int8(2)
|
||||
if ok && sv.MetadataVersion >= newMetadataVersion {
|
||||
log.Println(v.ID() + " upgraded to the new metadata")
|
||||
return nil
|
||||
}
|
||||
|
||||
if v.PlaylistPosition() > s.Manager.videosLimit {
|
||||
if !videoRequiresUpgrade && v.PlaylistPosition() > s.Manager.videosLimit {
|
||||
log.Println(v.ID() + " is old: skipping")
|
||||
return nil
|
||||
}
|
||||
@@ -847,20 +922,20 @@ func (s *Sync) processVideo(v video) (err error) {
|
||||
MaxVideoSize: s.Manager.maxVideoSize,
|
||||
Namer: s.namer,
|
||||
MaxVideoLength: s.Manager.maxVideoLength,
|
||||
Fee: s.Fee,
|
||||
}
|
||||
|
||||
summary, err := v.Sync(s.daemon, sp, &sv, isUpgradeSync)
|
||||
summary, err := v.Sync(s.daemon, sp, &sv, videoRequiresUpgrade, s.walletMux)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
s.AppendSyncedVideo(v.ID(), true, "", summary.ClaimName, summary.ClaimID, newMetadataVersion, *v.Size())
|
||||
err = s.Manager.apiConfig.MarkVideoStatus(s.YoutubeChannelID, v.ID(), VideoStatusPublished, summary.ClaimID, summary.ClaimName, "", v.Size(), 2)
|
||||
if err != nil {
|
||||
SendErrorToSlack("Failed to mark video on the database: %s", err.Error())
|
||||
}
|
||||
|
||||
s.AppendSyncedVideo(v.ID(), true, "", summary.ClaimName)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
+44
-11
@@ -34,16 +34,17 @@ type SyncProperties struct {
|
||||
YoutubeChannelID string
|
||||
}
|
||||
|
||||
type Fee struct {
|
||||
Amount string `json:"amount"`
|
||||
Address string `json:"address"`
|
||||
Currency string `json:"currency"`
|
||||
}
|
||||
type YoutubeChannel struct {
|
||||
ChannelId string `json:"channel_id"`
|
||||
TotalVideos uint `json:"total_videos"`
|
||||
DesiredChannelName string `json:"desired_channel_name"`
|
||||
Fee *struct {
|
||||
Amount string `json:"amount"`
|
||||
Address string `json:"address"`
|
||||
Currency string `json:"currency"`
|
||||
} `json:"fee"`
|
||||
ChannelClaimID string `json:"channel_claim_id"`
|
||||
Fee *Fee `json:"fee"`
|
||||
ChannelClaimID string `json:"channel_claim_id"`
|
||||
}
|
||||
|
||||
func (a *APIConfig) FetchChannels(status string, cp *SyncProperties) ([]YoutubeChannel, error) {
|
||||
@@ -163,10 +164,40 @@ func (a *APIConfig) SetChannelClaimID(channelID string, channelClaimID string) e
|
||||
}
|
||||
|
||||
const (
|
||||
VideoStatusPublished = "published"
|
||||
VideoStatusFailed = "failed"
|
||||
VideoStatusPublished = "published"
|
||||
VideoStatusUpgradeFailed = "upgradefailed"
|
||||
VideoStatusFailed = "failed"
|
||||
)
|
||||
|
||||
func (a *APIConfig) DeleteVideos(videos []string) error {
|
||||
endpoint := a.ApiURL + "/yt/video_delete"
|
||||
videoIDs := strings.Join(videos, ",")
|
||||
vals := url.Values{
|
||||
"video_ids": {videoIDs},
|
||||
"auth_token": {a.ApiToken},
|
||||
}
|
||||
res, _ := http.PostForm(endpoint, vals)
|
||||
defer res.Body.Close()
|
||||
body, _ := ioutil.ReadAll(res.Body)
|
||||
var response struct {
|
||||
Success bool `json:"success"`
|
||||
Error null.String `json:"error"`
|
||||
Data null.String `json:"data"`
|
||||
}
|
||||
err := json.Unmarshal(body, &response)
|
||||
if err != nil {
|
||||
return errors.Err(err)
|
||||
}
|
||||
if !response.Error.IsNull() {
|
||||
return errors.Err(response.Error.String)
|
||||
}
|
||||
|
||||
if !response.Data.IsNull() && response.Data.String == "ok" {
|
||||
return nil
|
||||
}
|
||||
return errors.Err("invalid API response. Status code: %d", res.StatusCode)
|
||||
}
|
||||
|
||||
func (a *APIConfig) MarkVideoStatus(channelID string, videoID string, status string, claimID string, claimName string, failureReason string, size *int64, metadataVersion uint) error {
|
||||
endpoint := a.ApiURL + "/yt/video_status"
|
||||
|
||||
@@ -177,14 +208,16 @@ func (a *APIConfig) MarkVideoStatus(channelID string, videoID string, status str
|
||||
"status": {status},
|
||||
"auth_token": {a.ApiToken},
|
||||
}
|
||||
if status == VideoStatusPublished {
|
||||
if status == VideoStatusPublished || status == VideoStatusUpgradeFailed {
|
||||
if claimID == "" || claimName == "" {
|
||||
return errors.Err("claimID or claimName missing")
|
||||
return errors.Err("claimID (%s) or claimName (%s) missing", claimID, claimName)
|
||||
}
|
||||
vals.Add("published_at", strconv.FormatInt(time.Now().Unix(), 10))
|
||||
vals.Add("claim_id", claimID)
|
||||
vals.Add("claim_name", claimName)
|
||||
vals.Add("metadata_version", fmt.Sprintf("%d", metadataVersion))
|
||||
if metadataVersion > 0 {
|
||||
vals.Add("metadata_version", fmt.Sprintf("%d", metadataVersion))
|
||||
}
|
||||
if size != nil {
|
||||
vals.Add("size", strconv.FormatInt(*size, 10))
|
||||
}
|
||||
|
||||
+4
-1
@@ -2,6 +2,7 @@ package sources
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/lbryio/lbry.go/extras/jsonrpc"
|
||||
"github.com/lbryio/ytsync/namer"
|
||||
@@ -12,7 +13,9 @@ type SyncSummary struct {
|
||||
ClaimName string
|
||||
}
|
||||
|
||||
func publishAndRetryExistingNames(daemon *jsonrpc.Client, title, filename string, amount float64, options jsonrpc.StreamCreateOptions, namer *namer.Namer) (*SyncSummary, error) {
|
||||
func publishAndRetryExistingNames(daemon *jsonrpc.Client, title, filename string, amount float64, options jsonrpc.StreamCreateOptions, namer *namer.Namer, walletLock *sync.RWMutex) (*SyncSummary, error) {
|
||||
walletLock.RLock()
|
||||
defer walletLock.RUnlock()
|
||||
for {
|
||||
name := namer.GetNextName(title)
|
||||
response, err := daemon.StreamCreate(name, filename, amount, options)
|
||||
|
||||
+115
-77
@@ -10,6 +10,7 @@ import (
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/lbryio/lbry.go/extras/errors"
|
||||
@@ -24,6 +25,7 @@ import (
|
||||
"github.com/ChannelMeter/iso8601duration"
|
||||
"github.com/aws/aws-sdk-go/aws"
|
||||
"github.com/nikooo777/ytdl"
|
||||
"github.com/shopspring/decimal"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"google.golang.org/api/youtube/v3"
|
||||
)
|
||||
@@ -45,43 +47,44 @@ type YoutubeVideo struct {
|
||||
thumbnailURL string
|
||||
lbryChannelID string
|
||||
mocked bool
|
||||
walletLock *sync.RWMutex
|
||||
}
|
||||
|
||||
const reflectorURL = "http://blobs.lbry.io/"
|
||||
|
||||
var youtubeCategories = map[string]string{
|
||||
"1": "Film & Animation",
|
||||
"2": "Autos & Vehicles",
|
||||
"10": "Music",
|
||||
"15": "Pets & Animals",
|
||||
"17": "Sports",
|
||||
"18": "Short Movies",
|
||||
"19": "Travel & Events",
|
||||
"20": "Gaming",
|
||||
"21": "Videoblogging",
|
||||
"22": "People & Blogs",
|
||||
"23": "Comedy",
|
||||
"24": "Entertainment",
|
||||
"25": "News & Politics",
|
||||
"26": "Howto & Style",
|
||||
"27": "Education",
|
||||
"28": "Science & Technology",
|
||||
"29": "Nonprofits & Activism",
|
||||
"30": "Movies",
|
||||
"31": "Anime/Animation",
|
||||
"32": "Action/Adventure",
|
||||
"33": "Classics",
|
||||
"34": "Comedy",
|
||||
"35": "Documentary",
|
||||
"36": "Drama",
|
||||
"37": "Family",
|
||||
"38": "Foreign",
|
||||
"39": "Horror",
|
||||
"40": "Sci-Fi/Fantasy",
|
||||
"41": "Thriller",
|
||||
"42": "Shorts",
|
||||
"43": "Shows",
|
||||
"44": "Trailers",
|
||||
"1": "film & animation",
|
||||
"2": "autos & vehicles",
|
||||
"10": "music",
|
||||
"15": "pets & animals",
|
||||
"17": "sports",
|
||||
"18": "short movies",
|
||||
"19": "travel & events",
|
||||
"20": "gaming",
|
||||
"21": "videoblogging",
|
||||
"22": "people & blogs",
|
||||
"23": "comedy",
|
||||
"24": "entertainment",
|
||||
"25": "news & politics",
|
||||
"26": "howto & style",
|
||||
"27": "education",
|
||||
"28": "science & technology",
|
||||
"29": "nonprofits & activism",
|
||||
"30": "movies",
|
||||
"31": "anime/animation",
|
||||
"32": "action/adventure",
|
||||
"33": "classics",
|
||||
"34": "comedy",
|
||||
"35": "documentary",
|
||||
"36": "drama",
|
||||
"37": "family",
|
||||
"38": "foreign",
|
||||
"39": "horror",
|
||||
"40": "sci-fi/fantasy",
|
||||
"41": "thriller",
|
||||
"42": "shorts",
|
||||
"43": "shows",
|
||||
"44": "trailers",
|
||||
}
|
||||
|
||||
func NewYoutubeVideo(directory string, videoData *youtube.Video, playlistPosition int64, awsConfig aws.Config) *YoutubeVideo {
|
||||
@@ -159,30 +162,40 @@ func (v *YoutubeVideo) getFullPath() string {
|
||||
func (v *YoutubeVideo) getAbbrevDescription() string {
|
||||
maxLines := 10
|
||||
description := strings.TrimSpace(v.description)
|
||||
if strings.Count(description, "\n") < maxLines {
|
||||
return description
|
||||
}
|
||||
additionalDescription := "\nhttps://www.youtube.com/watch?v=" + v.id
|
||||
khanAcademyClaimID := "5fc52291980268b82413ca4c0ace1b8d749f3ffb"
|
||||
if v.lbryChannelID == khanAcademyClaimID {
|
||||
additionalDescription = additionalDescription + "\nNote: All Khan Academy content is available for free at (www.khanacademy.org)"
|
||||
}
|
||||
if strings.Count(description, "\n") < maxLines {
|
||||
return description + "\n..." + additionalDescription
|
||||
}
|
||||
return strings.Join(strings.Split(description, "\n")[:maxLines], "\n") + "\n..." + additionalDescription
|
||||
}
|
||||
|
||||
func (v *YoutubeVideo) fallbackDownload() error {
|
||||
cmd := exec.Command("youtube-dl",
|
||||
v.ID(),
|
||||
"--no-progress",
|
||||
"-fbestvideo[ext=mp4,height<=1080,filesize<2000M]+bestaudio/best[ext=mp4,height<=1080,filesize<2000M]",
|
||||
"-o"+strings.TrimRight(v.getFullPath(), ".mp4"))
|
||||
"-fbestvideo[ext=mp4,height<=1080,filesize<2000M]+best[ext=mp4,height<=1080,filesize<2000M]",
|
||||
"-o"+strings.TrimRight(v.getFullPath(), ".mp4"),
|
||||
"--merge-output-format",
|
||||
"mp4",
|
||||
"https://www.youtube.com/watch?v="+v.ID())
|
||||
|
||||
log.Printf("Running command and waiting for it to finish...")
|
||||
output, err := cmd.CombinedOutput()
|
||||
log.Debugln(string(output))
|
||||
if err != nil {
|
||||
log.Printf("Command finished with error: %v", errors.Err(string(output)))
|
||||
_ = v.delete()
|
||||
return errors.Err(err)
|
||||
}
|
||||
fi, err := os.Stat(v.getFullPath())
|
||||
if err != nil {
|
||||
return errors.Err(err)
|
||||
}
|
||||
videoSize := fi.Size()
|
||||
v.size = &videoSize
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -316,19 +329,33 @@ func (v *YoutubeVideo) triggerThumbnailSave() (err error) {
|
||||
return err
|
||||
}
|
||||
|
||||
func (v *YoutubeVideo) publish(daemon *jsonrpc.Client, claimAddress string, amount float64, namer *namer.Namer) (*SyncSummary, error) {
|
||||
func (v *YoutubeVideo) publish(daemon *jsonrpc.Client, params SyncParams) (*SyncSummary, error) {
|
||||
languages, locations, tags := v.getMetadata()
|
||||
|
||||
var fee *jsonrpc.Fee
|
||||
if params.Fee != nil {
|
||||
feeAmount, err := decimal.NewFromString(params.Fee.Amount)
|
||||
if err != nil {
|
||||
return nil, errors.Err(err)
|
||||
}
|
||||
fee = &jsonrpc.Fee{
|
||||
FeeAddress: ¶ms.Fee.Address,
|
||||
FeeAmount: feeAmount,
|
||||
FeeCurrency: jsonrpc.Currency(params.Fee.Currency),
|
||||
}
|
||||
}
|
||||
|
||||
options := jsonrpc.StreamCreateOptions{
|
||||
ClaimCreateOptions: jsonrpc.ClaimCreateOptions{
|
||||
Title: v.title,
|
||||
Description: v.getAbbrevDescription(),
|
||||
ClaimAddress: &claimAddress,
|
||||
Title: &v.title,
|
||||
Description: util.PtrToString(v.getAbbrevDescription()),
|
||||
ClaimAddress: ¶ms.ClaimAddress,
|
||||
Languages: languages,
|
||||
ThumbnailURL: &v.thumbnailURL,
|
||||
Tags: tags,
|
||||
Locations: locations,
|
||||
},
|
||||
Fee: fee,
|
||||
License: util.PtrToString("Copyrighted (contact publisher)"),
|
||||
ReleaseTime: util.PtrToInt64(v.publishedAt.Unix()),
|
||||
ChannelID: &v.lbryChannelID,
|
||||
@@ -337,7 +364,7 @@ func (v *YoutubeVideo) publish(daemon *jsonrpc.Client, claimAddress string, amou
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return publishAndRetryExistingNames(daemon, v.title, downloadPath, amount, options, namer)
|
||||
return publishAndRetryExistingNames(daemon, v.title, downloadPath, params.Amount, options, params.Namer, v.walletLock)
|
||||
}
|
||||
|
||||
func (v *YoutubeVideo) Size() *int64 {
|
||||
@@ -351,15 +378,17 @@ type SyncParams struct {
|
||||
MaxVideoSize int
|
||||
Namer *namer.Namer
|
||||
MaxVideoLength float64
|
||||
Fee *sdk.Fee
|
||||
}
|
||||
|
||||
func (v *YoutubeVideo) Sync(daemon *jsonrpc.Client, params SyncParams, existingVideoData *sdk.SyncedVideo, reprocess bool) (*SyncSummary, error) {
|
||||
func (v *YoutubeVideo) Sync(daemon *jsonrpc.Client, params SyncParams, existingVideoData *sdk.SyncedVideo, reprocess bool, walletLock *sync.RWMutex) (*SyncSummary, error) {
|
||||
v.maxVideoSize = int64(params.MaxVideoSize) * 1024 * 1024
|
||||
v.maxVideoLength = params.MaxVideoLength
|
||||
v.lbryChannelID = params.ChannelID
|
||||
v.walletLock = walletLock
|
||||
if reprocess && existingVideoData != nil && existingVideoData.Published {
|
||||
summary, err := v.reprocess(daemon, params, existingVideoData)
|
||||
return summary, err
|
||||
return summary, errors.Prefix("upgrade failed", err)
|
||||
}
|
||||
return v.downloadAndPublish(daemon, params)
|
||||
}
|
||||
@@ -382,7 +411,7 @@ func (v *YoutubeVideo) downloadAndPublish(daemon *jsonrpc.Client, params SyncPar
|
||||
}
|
||||
log.Debugln("Created thumbnail for " + v.id)
|
||||
|
||||
summary, err := v.publish(daemon, params.ClaimAddress, params.Amount, params.Namer)
|
||||
summary, err := v.publish(daemon, params)
|
||||
//delete the video in all cases (and ignore the error)
|
||||
_ = v.delete()
|
||||
|
||||
@@ -452,19 +481,40 @@ func (v *YoutubeVideo) reprocess(daemon *jsonrpc.Client, params SyncParams, exis
|
||||
return nil, errors.Err("the video must be republished as we can't get the right size")
|
||||
}
|
||||
}
|
||||
v.size = util.PtrToInt64(int64(videoSize))
|
||||
var fee *jsonrpc.Fee
|
||||
if params.Fee != nil {
|
||||
feeAmount, err := decimal.NewFromString(params.Fee.Amount)
|
||||
if err != nil {
|
||||
return nil, errors.Err(err)
|
||||
}
|
||||
fee = &jsonrpc.Fee{
|
||||
FeeAddress: ¶ms.Fee.Address,
|
||||
FeeAmount: feeAmount,
|
||||
FeeCurrency: jsonrpc.Currency(params.Fee.Currency),
|
||||
}
|
||||
}
|
||||
streamCreateOptions := &jsonrpc.StreamCreateOptions{
|
||||
ClaimCreateOptions: jsonrpc.ClaimCreateOptions{
|
||||
Tags: tags,
|
||||
ThumbnailURL: &thumbnailURL,
|
||||
Languages: languages,
|
||||
Locations: locations,
|
||||
},
|
||||
Author: util.PtrToString(""),
|
||||
License: util.PtrToString("Copyrighted (contact publisher)"),
|
||||
ChannelID: &v.lbryChannelID,
|
||||
Height: util.PtrToUint(720),
|
||||
Width: util.PtrToUint(1280),
|
||||
Fee: fee,
|
||||
}
|
||||
|
||||
v.walletLock.RLock()
|
||||
defer v.walletLock.RUnlock()
|
||||
if v.mocked {
|
||||
pr, err := daemon.StreamUpdate(existingVideoData.ClaimID, jsonrpc.StreamUpdateOptions{
|
||||
StreamCreateOptions: &jsonrpc.StreamCreateOptions{
|
||||
ClaimCreateOptions: jsonrpc.ClaimCreateOptions{
|
||||
Tags: tags,
|
||||
ThumbnailURL: &thumbnailURL,
|
||||
},
|
||||
Author: util.PtrToString(""),
|
||||
License: util.PtrToString("Copyrighted (contact publisher)"),
|
||||
ChannelID: &v.lbryChannelID,
|
||||
},
|
||||
FileSize: &videoSize,
|
||||
StreamCreateOptions: streamCreateOptions,
|
||||
FileSize: &videoSize,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -481,28 +531,16 @@ func (v *YoutubeVideo) reprocess(daemon *jsonrpc.Client, params SyncParams, exis
|
||||
return nil, errors.Err(err)
|
||||
}
|
||||
|
||||
streamCreateOptions.ClaimCreateOptions.Title = &v.title
|
||||
streamCreateOptions.ClaimCreateOptions.Description = util.PtrToString(v.getAbbrevDescription())
|
||||
streamCreateOptions.Duration = util.PtrToUint64(uint64(math.Ceil(videoDuration.ToDuration().Seconds())))
|
||||
streamCreateOptions.ReleaseTime = util.PtrToInt64(v.publishedAt.Unix())
|
||||
pr, err := daemon.StreamUpdate(existingVideoData.ClaimID, jsonrpc.StreamUpdateOptions{
|
||||
ClearLanguages: util.PtrToBool(true),
|
||||
ClearLocations: util.PtrToBool(true),
|
||||
ClearTags: util.PtrToBool(true),
|
||||
StreamCreateOptions: &jsonrpc.StreamCreateOptions{
|
||||
ClaimCreateOptions: jsonrpc.ClaimCreateOptions{
|
||||
Title: v.title,
|
||||
Description: v.getAbbrevDescription(),
|
||||
Tags: tags,
|
||||
Languages: languages,
|
||||
Locations: locations,
|
||||
ThumbnailURL: &thumbnailURL,
|
||||
},
|
||||
Author: util.PtrToString(""),
|
||||
License: util.PtrToString("Copyrighted (contact publisher)"),
|
||||
VideoHeight: util.PtrToUint(720),
|
||||
VideoWidth: util.PtrToUint(1280),
|
||||
ReleaseTime: util.PtrToInt64(v.publishedAt.Unix()),
|
||||
Duration: util.PtrToUint64(uint64(math.Ceil(videoDuration.ToDuration().Seconds()))),
|
||||
ChannelID: &v.lbryChannelID,
|
||||
},
|
||||
FileSize: &videoSize,
|
||||
ClearLanguages: util.PtrToBool(true),
|
||||
ClearLocations: util.PtrToBool(true),
|
||||
ClearTags: util.PtrToBool(true),
|
||||
StreamCreateOptions: streamCreateOptions,
|
||||
FileSize: &videoSize,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
-152
@@ -1,152 +0,0 @@
|
||||
import os
|
||||
import sys
|
||||
from decimal import Decimal
|
||||
from bitcoinrpc.authproxy import AuthServiceProxy
|
||||
|
||||
from lbryum.wallet import Wallet, WalletStorage
|
||||
from lbryum.commands import known_commands, Commands
|
||||
from lbryum.simple_config import SimpleConfig
|
||||
from lbryum.blockchain import get_blockchain
|
||||
from lbryum.network import Network
|
||||
|
||||
|
||||
def get_lbrycrdd_connection_string(wallet_conf):
|
||||
settings = {"username": "rpcuser",
|
||||
"password": "rpcpassword",
|
||||
"rpc_port": 9245}
|
||||
if wallet_conf and os.path.exists(wallet_conf):
|
||||
with open(wallet_conf, "r") as conf:
|
||||
conf_lines = conf.readlines()
|
||||
for l in conf_lines:
|
||||
if l.startswith("rpcuser="):
|
||||
settings["username"] = l[8:].rstrip('\n')
|
||||
if l.startswith("rpcpassword="):
|
||||
settings["password"] = l[12:].rstrip('\n')
|
||||
if l.startswith("rpcport="):
|
||||
settings["rpc_port"] = int(l[8:].rstrip('\n'))
|
||||
|
||||
rpc_user = settings["username"]
|
||||
rpc_pass = settings["password"]
|
||||
rpc_port = settings["rpc_port"]
|
||||
rpc_url = "127.0.0.1"
|
||||
return "http://%s:%s@%s:%i" % (rpc_user, rpc_pass, rpc_url, rpc_port)
|
||||
|
||||
|
||||
class LBRYumWallet(object):
|
||||
def __init__(self, lbryum_path):
|
||||
self.config = SimpleConfig()
|
||||
self.config.set_key('chain', 'lbrycrd_main')
|
||||
self.storage = WalletStorage(lbryum_path)
|
||||
self.wallet = Wallet(self.storage)
|
||||
self.cmd_runner = Commands(self.config, self.wallet, None)
|
||||
if not self.wallet.has_seed():
|
||||
seed = self.wallet.make_seed()
|
||||
self.wallet.add_seed(seed, "derp")
|
||||
self.wallet.create_master_keys("derp")
|
||||
self.wallet.create_main_account()
|
||||
self.wallet.update_password("derp", "")
|
||||
self.network = Network(self.config)
|
||||
self.blockchain = get_blockchain(self.config, self.network)
|
||||
print self.config.get('chain'), self.blockchain
|
||||
self.wallet.storage.write()
|
||||
|
||||
def command(self, command_name, *args, **kwargs):
|
||||
cmd_runner = Commands(self.config, self.wallet, None)
|
||||
cmd = known_commands[command_name]
|
||||
func = getattr(cmd_runner, cmd.name)
|
||||
return func(*args, **kwargs)
|
||||
|
||||
def generate_address(self):
|
||||
address = self.wallet.create_new_address()
|
||||
self.wallet.storage.write()
|
||||
return address
|
||||
|
||||
|
||||
class LBRYcrd(object):
|
||||
def __init__(self, lbrycrdd_path):
|
||||
self.lbrycrdd_conn_str = get_lbrycrdd_connection_string(lbrycrdd_path)
|
||||
|
||||
def __call__(self, method, *args, **kwargs):
|
||||
return self.rpc(method)(*args, **kwargs)
|
||||
|
||||
def rpc(self, method):
|
||||
return AuthServiceProxy(self.lbrycrdd_conn_str, service_name=method)
|
||||
|
||||
|
||||
def get_wallet_path():
|
||||
cwd = os.getcwd()
|
||||
wallet_path = os.path.join(cwd, "wallet.json")
|
||||
if not os.path.exists(wallet_path):
|
||||
return wallet_path
|
||||
i = 1
|
||||
while True:
|
||||
wallet_path = os.path.join(cwd, "wallet_%i.json" % i)
|
||||
if not os.path.exists(wallet_path):
|
||||
return wallet_path
|
||||
i += 1
|
||||
|
||||
|
||||
def coin_chooser(lbrycrdd, amount, fee=0.001):
|
||||
def iter_txis():
|
||||
unspent = lbrycrdd("listunspent")
|
||||
unspent = sorted(unspent, key=lambda x: x['amount'], reverse=True)
|
||||
spendable = Decimal(0.0)
|
||||
for txi in unspent:
|
||||
if spendable >= amount:
|
||||
break
|
||||
else:
|
||||
spendable += txi['amount']
|
||||
yield txi
|
||||
if spendable < amount:
|
||||
print spendable, amount
|
||||
raise Exception("Not enough funds")
|
||||
|
||||
coins = list(iter(iter_txis()))
|
||||
total = sum(c['amount'] for c in coins)
|
||||
change = Decimal(total) - Decimal(amount) - Decimal(fee)
|
||||
|
||||
if change < 0:
|
||||
raise Exception("Not enough funds")
|
||||
if change:
|
||||
change_address = lbrycrdd("getnewaddress")
|
||||
else:
|
||||
change_address = None
|
||||
|
||||
print "Total: %f, amount: %f, change: %f" % (total, amount, change)
|
||||
|
||||
return coins, change, change_address
|
||||
|
||||
|
||||
def get_raw_tx(lbrycrdd, addresses, coins, amount, change, change_address):
|
||||
txi = [{'txid': c['txid'], 'vout': c['vout']} for c in coins]
|
||||
txo = {address: float(amount) for address in addresses}
|
||||
if change_address:
|
||||
txo[change_address] = float(change)
|
||||
return lbrycrdd("createrawtransaction", txi, txo)
|
||||
|
||||
|
||||
def main(count, value=None, lbryum_path=None, lbrycrdd_path=None):
|
||||
count = int(count)
|
||||
lbryum_path = lbryum_path or get_wallet_path()
|
||||
if sys.platform == "darwin":
|
||||
default_lbrycrdd = os.path.join(os.path.expanduser("~"),
|
||||
"Library/Application Support/lbrycrd/lbrycrd.conf")
|
||||
else:
|
||||
default_lbrycrdd = os.path.join(os.path.expanduser("~"), ".lbrycrd/lbrycrd.conf")
|
||||
lbrycrdd_path = lbrycrdd_path or default_lbrycrdd
|
||||
l = LBRYcrd(lbrycrdd_path=lbrycrdd_path)
|
||||
s = LBRYumWallet(lbryum_path)
|
||||
value = value or 1.0
|
||||
value = Decimal(value)
|
||||
|
||||
coins, change, change_address = coin_chooser(l, count * value)
|
||||
addresses = [s.generate_address() for i in range(count)]
|
||||
raw_tx = get_raw_tx(l, addresses, coins, value, change, change_address)
|
||||
signed = l("signrawtransaction", raw_tx)['hex']
|
||||
txid = l("sendrawtransaction", signed)
|
||||
print txid
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
args = sys.argv[1:]
|
||||
main(*args)
|
||||
+435
-14
@@ -1,7 +1,11 @@
|
||||
package tagsManager
|
||||
|
||||
import (
|
||||
"regexp"
|
||||
"sort"
|
||||
"strings"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
const (
|
||||
@@ -60,24 +64,37 @@ func SanitizeTags(tags []string, youtubeChannelID string) ([]string, error) {
|
||||
}
|
||||
}
|
||||
sanitizedTags := make([]string, 0, len(originalTags)+len(curatedTags))
|
||||
sort.Strings(curatedTags)
|
||||
sort.Strings(originalTags)
|
||||
sanitizedTags = append(sanitizedTags, curatedTags...)
|
||||
sanitizedTags = append(sanitizedTags, originalTags...)
|
||||
return sanitizedTags, nil
|
||||
}
|
||||
|
||||
const TagMaxLength = 255
|
||||
|
||||
func normalizeTag(t string) (string, error) {
|
||||
t = strings.ToLower(t)
|
||||
multipleSpaces := regexp.MustCompile(`\s{2,}`)
|
||||
leadingAndTrailingSpaces := regexp.MustCompile(`^\s+|\s$`)
|
||||
hashTags := regexp.MustCompile(`(#\d+\s)|#+`)
|
||||
inParenthesis := regexp.MustCompile(`\([^\)]+\)`)
|
||||
weirdChars := regexp.MustCompile(`[^-\w'& +\/A-Za-zÀ-ÖØ-öø-ÿ]`)
|
||||
startsOrEndsInWeirdChars := regexp.MustCompile(`^[^A-Za-zÀ-ÖØ-öø-ÿ0-9]+|[^A-Za-zÀ-ÖØ-öø-ÿ0-9]+$`)
|
||||
t = hashTags.ReplaceAllString(t, "")
|
||||
t = inParenthesis.ReplaceAllString(t, " ")
|
||||
t = startsOrEndsInWeirdChars.ReplaceAllString(t, "")
|
||||
t = multipleSpaces.ReplaceAllString(t, " ")
|
||||
t = leadingAndTrailingSpaces.ReplaceAllString(t, "")
|
||||
if weirdChars.MatchString(t) {
|
||||
log.Debugf("tag '%s' has weird stuff in it, skipping\n", t)
|
||||
return "", nil
|
||||
}
|
||||
if len(t) > TagMaxLength {
|
||||
log.Debugf("tag '%s' is too long, skipping\n", t)
|
||||
return "", nil
|
||||
}
|
||||
return t, nil
|
||||
//r, err := regexp.Compile("/\\([^\\)]+\\)/g")
|
||||
//if err != nil {
|
||||
// return "", errors.Err(err)
|
||||
//}
|
||||
//r2, err := regexp.Compile("/[^\\w-'& \+]/g")
|
||||
//if err != nil {
|
||||
// return "", errors.Err(err)
|
||||
//}
|
||||
//t = r.ReplaceAllString(t, "")
|
||||
//return r2.ReplaceAllString(t, ""), nil
|
||||
}
|
||||
|
||||
type tagsSanitizer struct {
|
||||
@@ -128,13 +145,417 @@ func (ts *tagsSanitizer) add() {
|
||||
}
|
||||
|
||||
const (
|
||||
Lunduke = "UCkK9UDm_ZNrq_rIXCz3xCGA"
|
||||
SwissExperiments = "UCNQfQvFMPnInwsU_iGYArJQ"
|
||||
SwissExperiments = "UCNQfQvFMPnInwsU_iGYArJQ"
|
||||
JustJuggling = "UCftqelpjmbFrUwr3VVzzVwA"
|
||||
anupjanakpur = "UC_5tRfC4L2AbTz6mj6vZrKw"
|
||||
PraveenMedia = "UC_fjE70lKNwM9AKIofQv-bA"
|
||||
MisteriosDesvelados = "UC-FzxivscjYzonBDXgX2GLg"
|
||||
kaipenchery = "UC-MU4K3Ghl-IdEX4J68tnTA"
|
||||
Dhinchakpooja = "UC-stzLwoQF_R8Vnfb28d7Lg"
|
||||
Karolajn = "UC-vYDJQiabg9BK8XTDPFspg"
|
||||
thefantasio974 = "UC0GHeUcPxfNEZqbFyxy2frQ"
|
||||
EduPrimitivo = "UC0odmP6ffEw3iVwTEyt-UKA"
|
||||
isupportanupriyapatel = "UC0sxOzdHnmauMdOra0cxXVg"
|
||||
theconfusedindian = "UC12ZPYxQbMA1loZE1OA609w"
|
||||
guriaarts = "UC1fHp166o1Hd024fg3-d-jg"
|
||||
minutodafisica = "UC1lUEcHrQwbusC5ext1himg"
|
||||
khabir = "UC1yzNCXXk1h_tHgsqChE8mw"
|
||||
OMapadaMinaMara = "UC2WMUPTbxQQ9hXq2_uutspg"
|
||||
oliverjanich = "UC3cmEfpy4XED7YYEe69nIMA"
|
||||
shyamsadhu = "UC3XAT8oBjL2RaqfblESHW_A"
|
||||
EbaduRahmantech = "UC4950gpY6Qw1lCAcN6gNWwQ"
|
||||
_1975oles = "UC4bGQWN4C8idymxlZxw77oA"
|
||||
_8dsongsbollywood = "UC4nH7zmw41lRDbaiIddumjw"
|
||||
EYESTV = "UC50CIbyHMydEEzEhV1ZNEBw"
|
||||
Nono = "UC5yufoRPJy-1e1pR73UTxFQ"
|
||||
lichtle = "UC6n_2v7YjwZ65F9h77nZPOA"
|
||||
elabuelokraken = "UC7iWk2xziMR4hs_NzfsYytw"
|
||||
cidvela = "UCaVOx5GCcSi2ELjWUdf05PA"
|
||||
jayaskumar = "UCax9CJCQ6aY0bntP3mcIWKQ"
|
||||
canaldarippi = "UCB_fba7yYMwa91F7rijBsVA"
|
||||
FunMusicClassical = "UCB_X256IN7QiBtDkueo_6QQ"
|
||||
minutodaterra = "UCB0zinWfy-dS_NqcOINYo3A"
|
||||
franciscoalves = "UCbAm6YcZGk04obnFb-LuOSA"
|
||||
criptomonedastv = "UCbK6Awel1-o-9JDVMFq808Q"
|
||||
lux77 = "UCBYm4l3NX352goFtjSgZ7jA"
|
||||
MrLuckyOficial = "UCEbMhGhZ1JoOYKgbgVyeQaA"
|
||||
KotneKit = "UCf_1BQz3T151Eph0Sarj3Yw"
|
||||
jaysgaming = "UCFAkedtc3jjDZQqqIULxqWg"
|
||||
iamdineshthakur = "UCg0VInmUZoSdHD-DNmjifBA"
|
||||
Musicreationz = "UCGJEtZB0Nj3rT3zZfyfjIZQ"
|
||||
lafenixtv = "UCHAx8o0jj-8L_sqR5QM1Cwg"
|
||||
guardeiafe = "UCHWjmG-Ce93VNcNZMMUyGQQ"
|
||||
KHANEKIKHUSHBOO = "UCI8DRKcrfrHklRqSJHPhOwQ"
|
||||
AjayGamingYT = "UCi9r5igvQblbI0PhJFj-IDg"
|
||||
SzekelyVegan = "UCiqvKH1Ib_VPwh9bQf_hlXQ"
|
||||
barzoy888 = "UCIYF1orTg4nDvv29ORoKXyA"
|
||||
_7playstudiopersian = "UCJ3QUKcd9yOhiJzZBR2zT3Q"
|
||||
eazypurple = "UCJ6Hd8S39g7pe65A6k42NZw"
|
||||
GennadyM = "UCjZlOrmC7hi_1kMA6BKZXeQ"
|
||||
GTGujarati = "UCKnYZmYFdFX4hP09Hh8k8jw"
|
||||
annapavlidou = "UCKPSHyCFIDtMqzbJ_Qx-7aw"
|
||||
Tamilmemesclub = "UCL_DPW38jcSGWy0Fu0A_hCg"
|
||||
QuickReactionTeam = "UCl--LVcANGKHJYN7O8uY6OA"
|
||||
rodrigojoseoficial = "UClMsSb57Jvexl1a0a2c2_CQ"
|
||||
AzadChaiwala = "UCM5QNdoIefx6eumjPk8ZTMw"
|
||||
lafenixextras = "UCM7zougvyPtfd9zw5HmAGlg"
|
||||
JustSawAGhost = "UCmQYXE03n6qlF9FhtAPztcw"
|
||||
mirchibangla = "UCmzj6hXrPZ_AwIZ8lgo-HuQ"
|
||||
marsaguirre = "UCN3OMvdU7ySvE6meGjo9omg"
|
||||
JustGoool = "UCn7kTV_syU_rI0jANxrpaFg"
|
||||
nossocanal = "UCNDb9jdx5Jz-C7hWJv3y6Fw"
|
||||
CSNN = "UCnfn-8PJbjYFAJ1fqzMdcew"
|
||||
pedronedved = "UCNhb2Fz3sVLZcMb_arm1cMQ"
|
||||
famoosh = "UCnQU2QZLVG1wxHoy_9LZucA"
|
||||
Cenoritas = "UCo-VSGoYy_4IjXF9u4QqTiw"
|
||||
fantabobgames = "UCo0U1tbk3YbqiLDhkeWOviQ"
|
||||
thesoundofsoul = "UCOey6R7Ktnil8RZrY_xJYiA"
|
||||
SaurabhMishraJournalist = "UCoHVCBoSfUOlQVa80dlN60g"
|
||||
YoYoHoneySinghlive = "UCOZTp3nGj39-snzo4QSdduA"
|
||||
CINEGLITZ = "UCP_p8JkLOwPcGAnxN1iVhZA"
|
||||
lovetreta = "UCPi3uuGrh2mxnZJMfRhcjiw"
|
||||
canalvendimeusofa = "UCpk58NDdaKdX0QiiA2e79tg"
|
||||
CARIBEANVIDEOS = "UCPynGkfzH35RKyXRccCgzNg"
|
||||
Dimon = "UCpZsZZ6KEqCHeAJ_Y0gEbyQ"
|
||||
Anantvijaysoni = "UCQ3NeFKF2yo70xxBBUDeXXQ"
|
||||
canalilhadebarbados = "UCR5L_Q8Tiljy7WKEQOrGKbg"
|
||||
SotomayorTV2 = "UCR70CjRHxQilfEUgBBYpDhg"
|
||||
Recipesarab = "UCRbMDfkH_bPUjQsv5dHcFQA"
|
||||
_4ak10 = "UCsbrIjDPPXuVlWApYTnQECA"
|
||||
Top50 = "UCSjXR8uvU4PijMM_kgyVQfw"
|
||||
SoumyajitPyne = "UCSJXwgF3SePNfyojYG3yt6Q"
|
||||
SneksShow = "UCsqZSkVccnyIxSE6pZuj13g"
|
||||
casadosaber = "UCtvvTFp0XANyllOdmzZr9VQ"
|
||||
Entarexyt = "UCuDkq6yAb5zdM2zIRG6VRDw"
|
||||
UCurU6GLM4ggcLtWWAOTzlYw = "UCurU6GLM4ggcLtWWAOTzlYw"
|
||||
promining = "UCviqKxlMnZqBipTzwixkGyg"
|
||||
zapkids = "UCx2uGhYa9EuCNmbL72hVKGg"
|
||||
Canalokok = "UCXyCAcjoWz9SMLGJT8dR0pA"
|
||||
SmoothGames = "UCY8gvG25rOZ4hWWvcQH88PQ"
|
||||
LIGATFA = "UCYhiIMOlDn_HEn3zvqZCDiw"
|
||||
DeHamad = "UCZ5G07Vw7IaV81InBgYLCcg"
|
||||
misszizi = "UCE55WTFs4ekJ_aWCoNEapbQ"
|
||||
creationshub = "UCNfELkowZPIQ-Vegmb3pIBQ"
|
||||
AlicePandora = "UCScRxEtwlt082_6ThI0YJbg"
|
||||
Akito0405 = "UCXHWx1teSYIKwTGiscYaC-Q"
|
||||
dashcambristol = "UCD0IC8bZI-MfIutkgPHlyWA"
|
||||
adrianbonillap = "UCdmY7p_kC-QN8jS7rocmCSA"
|
||||
SubhamVlogs = "UCXtdoCLRlnLIW3Skix0rHaQ"
|
||||
DisciplesofJesusChristJeremiahPayne = "UC_y2rVsotcQcVF7LImVGs5Q"
|
||||
ModernGalaxy = "UCGISiGs_RL7Z1qfs1-GD6PA"
|
||||
socofilms = "UCyDS9p6NWHpU9XbbbYLFLBw"
|
||||
buriedone = "UC_lm7xXB3adOTc0T1FwyGRQ"
|
||||
bitcoin = "UC-f5nPBEDyUBZz_jOPBwAfQ"
|
||||
globalrashid = "UC2ldcEtbR7cFYadgrnW3B6Q"
|
||||
gameofbitcoins = "UC2WKsYBxMwx7E7ENkND-fkg"
|
||||
CryptoInsightsBrasil = "UC4BrnREinCBUenQZi4ZU95w"
|
||||
Crypt0 = "UCdUSSt-IEUg2eq46rD7lu_g"
|
||||
cryptomined = "UCGQ3XHtsH8Q9iQr9bFbgfDA"
|
||||
altcoinbuzz = "UCGyqEtcGQQtXyUwvcy7Gmyg"
|
||||
crypto = "UCiMgF08KQ4z-Gnu8o2BLOxA"
|
||||
Crypto99 = "UCjsrdOJCAKcuBqyyqjg1cCQ"
|
||||
TheCryptoLark = "UCl2oCaw8hdR_kbqyqd2klIA"
|
||||
NuggetsNews = "UCLo66QVfEod0nNM_GzKNxmQ"
|
||||
btckyle = "UCNCGCxxTT10aeTgUMHW5FfQ"
|
||||
LouisThomas = "UCpceefaJ9vs4RYUTsO9Y3FA"
|
||||
BitsBeTrippin = "UCVVWXoQfMfQVuzxcLylq9aA"
|
||||
cryptocrow = "UCwsRWmIL5XKqFtdytBfeX0g"
|
||||
KouSuccessLeeFX = "UC0YkP4Fg_d8y6JFwLj3MLdg"
|
||||
TheSchiffReport = "UCIjuLiLHdFxYtFmWlbTGQRQ"
|
||||
MRU = "UCnkEhPBMZcEO0QGu51fDFDg"
|
||||
Vidello = "UCwMaWqZ6SdDpTaYOW0huELw"
|
||||
kaccreative = "UC02O9ICMuwrfULSa0N6SiSw"
|
||||
shecooks = "UChZYqTJkeYV2r7WETcytdPQ"
|
||||
vegsource = "UClEsPxvotpTJ1Z8eu2Y97rg"
|
||||
VeganGains = "UCr2eKhGzPhN5RPVk5dd5o3g"
|
||||
AwesomeKnowledge = "UC_pC4T8vr-caiNDYU6PYTTA"
|
||||
luckyloush = "UCbO0Oomf_jr20Wb4V2ap5Uw"
|
||||
MichaelLuzzi = "UCDwLrj4DSGrw3gFvANbl_Cw"
|
||||
NakedApe = "UCMOaRU-YsXVgU-WahBkZqWQ"
|
||||
ParaReact = "UCuJKELjsmWTlJG0X7T4ZD_A"
|
||||
dullytv = "UCv1J91Nhn7KsxMFaxKChT3w"
|
||||
REDONKULAS = "UCwd_sSDZ8EQt6SEeOO2tBRA"
|
||||
RedactedTonight = "UCyvaZ2RHEDrgKXz43gz7CbQ"
|
||||
TonyTornado = "UCZu9AV3mrCCDpK_dy1qJRAQ"
|
||||
hoodlumscrafty = "UC0cTVjYKgAnBrXQKcICyNmA"
|
||||
Karmakut = "UC2B8TOklu2rSDULqAzwn5GQ"
|
||||
Draxr = "UC72o3j23E1wKskBDEKlmTOw"
|
||||
BigfryTV = "UC7FVdUA3SxDMfl4fLBGlADg"
|
||||
CSGONews = "UC7L6NRLyldvxWukhOHABazQ"
|
||||
ZedGaming = "UC7Q15H71DmB7F1iSFE1Z8LQ"
|
||||
KamiVS = "UC9fh15yUcGAr8iUfQaoRRpQ"
|
||||
grabthegames = "UCaJFEgY6ij05Fxgn6qtcX_g"
|
||||
blueplays = "UCbjMsFlYb2NLpjS3uDzm9ow"
|
||||
ImNotBonkers = "UCCyN0G77B7wnf-1AOTI3gWQ"
|
||||
GunslingerMedia = "UCDjs4JoXmMzvaZyPVsvjKXw"
|
||||
LeagueVoices = "UCdkonRjBLzr1Adf7Jhu1bWQ"
|
||||
SirPugger = "UCelqWKTcCvBZP_1_1iYZAWA"
|
||||
gamesoup = "UCGPMrF9AN_D9BrmSmMeV3hA"
|
||||
ProHenis = "UCIjFoXSQ9HYbcWmRVIsH-Ow"
|
||||
Dota2Divine = "UCiR9IHCurqVHpC821NVcW6g"
|
||||
CrazyFoxMovies = "UCjewtQLpJEENPLbrCtb6YpA"
|
||||
Larry = "UCJVdNvvuvOnthuWVQjYff2w"
|
||||
hottake = "UCK24784Oqb4oYQfHL9XePNg"
|
||||
Breezy = "UCKWRpZpcLKriWd1am9SHf8A"
|
||||
retrorgb = "UCLPIbBCKVH2uKGm5C4sOkew"
|
||||
Zer0Gamer = "UCmII34jN4rqCIsGqWkK5JEg"
|
||||
nickatnyte = "UCMxYQX1zaepCgmiSmwbT39w"
|
||||
DyllonStejGaming = "UCngaLL0QDbsAGYj7zsB8o_Q"
|
||||
bluedrake42 = "UCNSwcDEUfIEzYdAPscXo6ZA"
|
||||
Rerez = "UCoFpRCAsKfWAshvLE1bYzdw"
|
||||
Op = "UCowi5kFfvGXR8NqhyE6jneQ"
|
||||
kidsgamesfun = "UCqjGzmb2pMWSFYm0GzKeTEA"
|
||||
GamesGlitches = "UCRj3Q06KOxAZWHaHScrkAOw"
|
||||
Musikage = "UCsej4tgCoXDgVH3J7M3NMgw"
|
||||
JeffyGaming = "UCTZzSNnZ43XQslejT5wFdRw"
|
||||
oniblackmage = "UCUEF9XL3o8dZ6hvVf8jAi8Q"
|
||||
nickatnyte2 = "UCuoTqrobMyZj0ge8LOCkiSw"
|
||||
KazeEmanuar = "UCuvSqzfO_LV_QzHdmEj84SQ"
|
||||
TheLinuxGamer = "UCv1Kcz-CuGM6mxzL3B1_Eiw"
|
||||
GaminGHD = "UCW-thz5HxE-goYq8yPds1Gw"
|
||||
BHGaming = "UCX4N3DioqqrugFeilxTkSIw"
|
||||
Potato = "UCxPPTDNH85HZWxrgZ3FQBYA"
|
||||
MikeyTaylorGaming = "UCycXj6lRWtsSqo-bZOIZePw"
|
||||
Acituanbus = "UCzfx1QvKjn-BxLMLBdBGgMw"
|
||||
juggling = "UC2fhTIbnQlFYaFzyTcmPkXg"
|
||||
KhanAcademy = "UC4a-Gbdw7vOaccHmFo40b9g"
|
||||
DON = "UCAYrPk70AePJZSaVLKrWdfQ"
|
||||
shogogarcia = "UCE3yZjxDg3iI91bcNJDFnsg"
|
||||
alphalifestyleacademy = "UCeggEaXtJu2domMahYMD_ig"
|
||||
NileRed = "UCFhXFikryT4aFcLkLw2LBLA"
|
||||
veritasium = "UCHnyfMqiRRG1u-2MsSQLbXA"
|
||||
stevecronin = "UCJYawZQYwjZ76mrF_US9eNg"
|
||||
jeranism = "UCS_FY5mR4g22L_E9t1D_ExQ"
|
||||
MinutePhysics = "UCUHW94eEFW7hkUMVaZz4eDg"
|
||||
_3Blue1Brown = "UCYO_jab_esuFRV4b17AJtAw"
|
||||
Itsrucka = "UC-B2LyEZcl3avG0coKeohGQ"
|
||||
unitedtaps = "UC5Q8e9-uutVZmiwAcEHKuzA"
|
||||
srodalmenara = "UC9kc1DaOy2kSzXHZgpn9kfQ"
|
||||
ShutupAndPlay = "UCAwuvzhah0KUw5QNihSkEwQ"
|
||||
sanx2 = "UCJ_waKl9kjbhfXI3LJOfHvA"
|
||||
DerickWattsAndTheSundayBlues = "UCmZhiZq7M7d73Kbey4yna_Q"
|
||||
akirathedon = "UCsoiSpBvkr4Y-78Pj3recUw"
|
||||
Musicoterapia = "UCsoSK8K4OpdMV1tqJFwO5QA"
|
||||
daydreaming = "UCtbuGylbRXc42pIxWey19Dg"
|
||||
RemixHolicRecords = "UCUW5GjwcXgbPcfk00t-GQZA"
|
||||
EDMBot = "UCvmUdL2NHWlj1NRiNJPI-TQ"
|
||||
TrioTravels = "UCdAPAmdnkdFsH5R2Hxevucg"
|
||||
caosonnguyen = "UCwPeW9kFId5-VbQ2LQEjVhg"
|
||||
TheAlmonteFilms = "UC4C_SF5koS4Q5om50b9NMTw"
|
||||
timcast = "UCG749Dj4V2fKa143f8sE60Q"
|
||||
SeekingTheTruth = "UCHrDpTVL9S0h91u9UCPgVbA"
|
||||
davidpakman = "UCvixJtaXuNdMPUGdOPcY8Ag"
|
||||
mikenayna = "UCzk08fzh5c_BhjQa1w35wtA"
|
||||
DoorMonster = "UC-to_wlckb-bFDtQfUZL3Kw"
|
||||
barnacules = "UC1MwJy1R0nGQkXxRD9p-zTQ"
|
||||
brightsunfilms = "UC5k3Kc0avyDJ2nG9Kxm9JmQ"
|
||||
Onision = "UC5OxQNCgW88FDBxeZCnrBbg"
|
||||
top10archive = "UCa03bf8gAS2EtffptV-_jfA"
|
||||
thought = "UCb0yiUQhhLV_jpY3BayJaLA"
|
||||
MothersBasement = "UCBs2Y3i14e1NWQxOGliatmg"
|
||||
VlogsOfKnowledge = "UCDUPGR6uL5uz0_hiRAQjZMQ"
|
||||
GorTheMovieGod = "UCHdTVw89QU6coU1MgN-9RHA"
|
||||
iamalexoconnor = "UCKAQLEk1GGqnPtov9EW0huQ"
|
||||
ADedits = "UCsX-zRuq3ovMsgFqEQLw2Bw"
|
||||
SynthCool = "UCxGTHsD0pLSFlFI7M7jYmBQ"
|
||||
JordanBPeterson = "UCL_f53ZEJxp8TtlOkHwMV9Q"
|
||||
Sciencedocumentinhindi = "UC9SpfUF3rm-MGep5WE6FSCA"
|
||||
NurdRage = "UCIgKGGJkt1MrNmhq3vRibYA"
|
||||
MINDBLASTER = "UC_ZMqbRu44jK-EogjYyHz8g"
|
||||
DaminousPurity = "UCdKRWvz50QoioZFgu6Nf9og"
|
||||
ScammerRevolts = "UC0uJKUXiU5T41Fzawy5H6mw"
|
||||
eevblog = "UC2DjFE7Xf11URZqWBigcVOQ"
|
||||
Luke = "UC2eYFnH61tmytImy1mTYvhA"
|
||||
AppGirl = "UC389S4_2Yt9cei1qNDwmBrA"
|
||||
thecryptodad = "UC68x_TIzqCtF69fYl2_kl3w"
|
||||
ChrisWereDigital = "UCAPR27YUyxmgwm3Wc2WSHLw"
|
||||
alecaddd = "UCbmBY_XYZqCa2G0XmFA7ZWg"
|
||||
EliTheComputerGuy = "UCD4EOyXKjfDUhCI6jlOZZYQ"
|
||||
archetapp = "UCDIBBmkZIB2hjBsk1hUImdA"
|
||||
PCPlaceNZ = "UCf5ZTSZAKbinY03jOwylfOg"
|
||||
NaomiSexyCyborgWu = "UCh_ugKacslKhsGGdXP0cRRA"
|
||||
NibiruWatcher = "UCi62JvN-lUn7hVL3ffofADA"
|
||||
imineblocks = "UCjYHcWGAjUVqU49D2JOKD3w"
|
||||
Lunduke = "UCkK9UDm_ZNrq_rIXCz3xCGA"
|
||||
CooLoserTech = "UCl97rZ2Tc7KV9lktmmHNFDQ"
|
||||
TechHD = "UCN3bPy04Jkp3ADRtyYvXomQ"
|
||||
MiketheScrapper = "UCqtlJpkH_llXS_vuDExGVvw"
|
||||
eevblog2 = "UCr-cm90DwFJC0W3f9jBs5jA"
|
||||
thecreativeone = "UCTikFhzCiIXfOMS7D29dvYg"
|
||||
weekendtricks = "UCYtAJXx0ymGPpCndn2Gt6-w"
|
||||
GBGuns = "UC2VOURrALs1CwVmbGlXJOPQ"
|
||||
Matsimus = "UCFWjEwhX6cSAKBQ28pufG3w"
|
||||
TheLateBoyScout = "UCZjvj5MN3BMxPFfdEKIrvxQ"
|
||||
BravoCinematografica = "UC2ruSXQoKMgr7JXzwO0H0KA"
|
||||
PyroNation = "UC4ffy3n1hE7Z8q-2KVq_91Q"
|
||||
dramatuber = "UC4Y8mImty3gFEG9grsR6T-w"
|
||||
BarnabasNagy = "UC8TRZRK1sJfxKJ0tXMmGTow"
|
||||
avery = "UCcfjIZLDCuSqkIlkH8i4DDg"
|
||||
Tingledove = "UCfI7wtV6K64gVbzjH7DOA_Q"
|
||||
crmjewelers = "UChpFWeF84jA5JeV3YyIo3pQ"
|
||||
NerfNerd18 = "UCIgmaEJNqvH9bU9zGMapZGg"
|
||||
SEIJIHITO = "UCNqUrLE6dI8fWw_u3HQkpXA"
|
||||
anvithavlogs = "UCsP9pYat2DEBvnvF_iFGG_w"
|
||||
YoelRekts = "UCZ_BcFyhIo6GdtTSrqXXepg"
|
||||
TechFox = "UCIp-oTSdFO7BhAJpW2d5HMQ"
|
||||
)
|
||||
|
||||
var channelWideTags = map[string][]string{
|
||||
Lunduke: {"linux", "technology"},
|
||||
SwissExperiments: {"science & technology", "experiments", "switzerland"},
|
||||
JustJuggling: {"juggling", "circus arts", "malabares"},
|
||||
SwissExperiments: {"science & technology", "experiments", "switzerland"},
|
||||
TechFox: {"technology", "reviews"},
|
||||
misszizi: {"art", "pop culture"},
|
||||
creationshub: {"art"},
|
||||
AlicePandora: {"art"},
|
||||
Akito0405: {"art"},
|
||||
dashcambristol: {"automotive"},
|
||||
adrianbonillap: {"automotive"},
|
||||
SubhamVlogs: {"automotive"},
|
||||
DisciplesofJesusChristJeremiahPayne: {"beliefs"},
|
||||
ModernGalaxy: {"beliefs"},
|
||||
socofilms: {"beliefs"},
|
||||
buriedone: {"blockchain"},
|
||||
bitcoin: {"blockchain"},
|
||||
globalrashid: {"blockchain"},
|
||||
gameofbitcoins: {"blockchain"},
|
||||
CryptoInsightsBrasil: {"blockchain"},
|
||||
Crypt0: {"blockchain"},
|
||||
cryptomined: {"blockchain"},
|
||||
altcoinbuzz: {"blockchain", "technology"},
|
||||
crypto: {"blockchain"},
|
||||
Crypto99: {"blockchain"},
|
||||
TheCryptoLark: {"blockchain", "technology"},
|
||||
NuggetsNews: {"blockchain", "learning"},
|
||||
btckyle: {"blockchain"},
|
||||
LouisThomas: {"blockchain"},
|
||||
BitsBeTrippin: {"blockchain"},
|
||||
cryptocrow: {"blockchain"},
|
||||
KouSuccessLeeFX: {"economics", "learning"},
|
||||
TheSchiffReport: {"economics"},
|
||||
MRU: {"economics"},
|
||||
Vidello: {"economics", "pop culture"},
|
||||
kaccreative: {"food", "art"},
|
||||
shecooks: {"food"},
|
||||
vegsource: {"food"},
|
||||
VeganGains: {"food"},
|
||||
AwesomeKnowledge: {"funny"},
|
||||
luckyloush: {"funny"},
|
||||
MichaelLuzzi: {"funny", "pop culture"},
|
||||
NakedApe: {"funny"},
|
||||
ParaReact: {"funny"},
|
||||
dullytv: {"funny"},
|
||||
REDONKULAS: {"funny"},
|
||||
RedactedTonight: {"funny", "news"},
|
||||
TonyTornado: {"funny"},
|
||||
hoodlumscrafty: {"gaming", "pop culture"},
|
||||
Karmakut: {"gaming"},
|
||||
Draxr: {"gaming", "pop culture"},
|
||||
BigfryTV: {"gaming"},
|
||||
CSGONews: {"gaming", "funny"},
|
||||
ZedGaming: {"gaming"},
|
||||
KamiVS: {"gaming"},
|
||||
grabthegames: {"gaming"},
|
||||
blueplays: {"gaming"},
|
||||
ImNotBonkers: {"gaming", "funny"},
|
||||
GunslingerMedia: {"gaming"},
|
||||
LeagueVoices: {"gaming"},
|
||||
SirPugger: {"gaming"},
|
||||
gamesoup: {"gaming"},
|
||||
ProHenis: {"gaming"},
|
||||
Dota2Divine: {"gaming"},
|
||||
CrazyFoxMovies: {"gaming", "pop culture", "technology"},
|
||||
Larry: {"gaming"},
|
||||
hottake: {"gaming", "funny"},
|
||||
Breezy: {"gaming", "funny"},
|
||||
retrorgb: {"gaming"},
|
||||
Zer0Gamer: {"gaming"},
|
||||
nickatnyte: {"gaming"},
|
||||
DyllonStejGaming: {"gaming"},
|
||||
bluedrake42: {"gaming"},
|
||||
Rerez: {"gaming"},
|
||||
Op: {"gaming"},
|
||||
kidsgamesfun: {"gaming", "pop culture"},
|
||||
GamesGlitches: {"gaming"},
|
||||
Musikage: {"gaming", "pop culture"},
|
||||
JeffyGaming: {"gaming", "funny"},
|
||||
oniblackmage: {"gaming"},
|
||||
nickatnyte2: {"gaming"},
|
||||
KazeEmanuar: {"gaming"},
|
||||
TheLinuxGamer: {"gaming", "technology", "linux"},
|
||||
GaminGHD: {"gaming", "pop culture"},
|
||||
BHGaming: {"gaming"},
|
||||
Potato: {"gaming"},
|
||||
MikeyTaylorGaming: {"gaming"},
|
||||
Acituanbus: {"gaming"},
|
||||
juggling: {"juggling", "circus art", "malabares"},
|
||||
KhanAcademy: {"learning", "science"},
|
||||
DON: {"learning", "pop culture"},
|
||||
shogogarcia: {"learning"},
|
||||
alphalifestyleacademy: {"learning"},
|
||||
NileRed: {"learning", "science"},
|
||||
veritasium: {"learning", "science"},
|
||||
stevecronin: {"learning"},
|
||||
jeranism: {"learning"},
|
||||
MinutePhysics: {"learning", "science"},
|
||||
_3Blue1Brown: {"learning"},
|
||||
Itsrucka: {"music"},
|
||||
unitedtaps: {"music"},
|
||||
srodalmenara: {"music"},
|
||||
ShutupAndPlay: {"music", "learning"},
|
||||
sanx2: {"music"},
|
||||
DerickWattsAndTheSundayBlues: {"music", "funny"},
|
||||
akirathedon: {"music"},
|
||||
Musicoterapia: {"music"},
|
||||
daydreaming: {"music"},
|
||||
RemixHolicRecords: {"music"},
|
||||
EDMBot: {"music"},
|
||||
TrioTravels: {"nature"},
|
||||
caosonnguyen: {"nature"},
|
||||
TheAlmonteFilms: {"news"},
|
||||
timcast: {"news", "technology"},
|
||||
SeekingTheTruth: {"news"},
|
||||
davidpakman: {"news"},
|
||||
mikenayna: {"news"},
|
||||
DoorMonster: {"pop culture", "funny"},
|
||||
barnacules: {"pop culture", "gaming"},
|
||||
brightsunfilms: {"pop culture"},
|
||||
Onision: {"pop culture", "funny"},
|
||||
top10archive: {"pop culture"},
|
||||
thought: {"pop culture", "learning"},
|
||||
MothersBasement: {"pop culture", "gaming"},
|
||||
VlogsOfKnowledge: {"pop culture", "gaming"},
|
||||
GorTheMovieGod: {"pop culture"},
|
||||
iamalexoconnor: {"pop culture"},
|
||||
ADedits: {"pop culture"},
|
||||
SynthCool: {"pop culture", "funny"},
|
||||
JordanBPeterson: {"psychology", "postmodernism", "news"},
|
||||
Sciencedocumentinhindi: {"science"},
|
||||
NurdRage: {"science", "learning"},
|
||||
MINDBLASTER: {"sports", "funny"},
|
||||
DaminousPurity: {"sports", "gaming"},
|
||||
ScammerRevolts: {"technology"},
|
||||
eevblog: {"technology", "learning"},
|
||||
Luke: {"technology", "funny"},
|
||||
AppGirl: {"technology"},
|
||||
thecryptodad: {"technology", "blockchain"},
|
||||
ChrisWereDigital: {"technology"},
|
||||
alecaddd: {"technology", "learning"},
|
||||
EliTheComputerGuy: {"technology"},
|
||||
archetapp: {"technology", "learning"},
|
||||
PCPlaceNZ: {"technology"},
|
||||
NaomiSexyCyborgWu: {"technology"},
|
||||
NibiruWatcher: {"technology", "learning"},
|
||||
imineblocks: {"technology", "blockchain"},
|
||||
Lunduke: {"technology"},
|
||||
CooLoserTech: {"technology"},
|
||||
TechHD: {"technology", "learning"},
|
||||
MiketheScrapper: {"technology"},
|
||||
eevblog2: {"technology"},
|
||||
thecreativeone: {"technology", "gaming"},
|
||||
weekendtricks: {"technology"},
|
||||
GBGuns: {"weapons"},
|
||||
Matsimus: {"weapons", "gaming"},
|
||||
TheLateBoyScout: {"weapons"},
|
||||
}
|
||||
var tagsToSkip = map[string]*struct{}{
|
||||
"#hangoutsonair": nil,
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package tagsManager
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"testing"
|
||||
)
|
||||
|
||||
@@ -44,3 +45,100 @@ outer:
|
||||
}
|
||||
|
||||
}
|
||||
func TestNormalizeTag(t *testing.T) {
|
||||
tags := []string{
|
||||
"blockchain",
|
||||
"Switzerland",
|
||||
"news ",
|
||||
" science & Technology ",
|
||||
"economics",
|
||||
"experiments",
|
||||
"this",
|
||||
"in it",
|
||||
"will build the (WOOPS)",
|
||||
"~has",
|
||||
"crypto",
|
||||
"trump",
|
||||
"wall",
|
||||
"expensive",
|
||||
"!currency",
|
||||
" a lot of ",
|
||||
"#",
|
||||
"#whatever",
|
||||
"#123",
|
||||
"#123 Something else",
|
||||
"#123aaa",
|
||||
"!asdasd",
|
||||
"CASA BLANCA",
|
||||
"wwe 2k18 Elimination chamber!",
|
||||
"pero'",
|
||||
"però",
|
||||
"è proprio",
|
||||
"Ep 29",
|
||||
"sctest29 Keddr",
|
||||
"mortal kombat 11 shang tsung",
|
||||
"!asdasd!",
|
||||
}
|
||||
normalizedTags := make([]string, 0, len(tags))
|
||||
for _, tag := range tags {
|
||||
got, err := normalizeTag(tag)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
return
|
||||
}
|
||||
if got != "" {
|
||||
normalizedTags = append(normalizedTags, got)
|
||||
}
|
||||
fmt.Printf("Got tag: '%s'\n", got)
|
||||
}
|
||||
expected := []string{
|
||||
"blockchain",
|
||||
"switzerland",
|
||||
"news",
|
||||
"science & technology",
|
||||
"economics",
|
||||
"experiments",
|
||||
"this",
|
||||
"in it",
|
||||
"will build the",
|
||||
"has",
|
||||
"crypto",
|
||||
"trump",
|
||||
"wall",
|
||||
"expensive",
|
||||
"currency",
|
||||
"a lot of",
|
||||
"whatever",
|
||||
"123",
|
||||
"something else",
|
||||
"123aaa",
|
||||
"asdasd",
|
||||
"casa blanca",
|
||||
"wwe 2k18 elimination chamber",
|
||||
"pero",
|
||||
"però",
|
||||
"è proprio",
|
||||
"ep 29",
|
||||
"sctest29 keddr",
|
||||
"mortal kombat 11 shang tsung",
|
||||
"asdasd",
|
||||
}
|
||||
if !Equal(normalizedTags, expected) {
|
||||
t.Error("result not as expected")
|
||||
return
|
||||
}
|
||||
|
||||
}
|
||||
func Equal(a, b []string) bool {
|
||||
if len(a) != len(b) {
|
||||
fmt.Printf("expected length %d but got %d", len(b), len(a))
|
||||
return false
|
||||
}
|
||||
for i, v := range a {
|
||||
if v != b[i] {
|
||||
fmt.Printf("expected %s but bot %s\n", b[i], v)
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
+5
-4
@@ -61,10 +61,11 @@ func (u *thumbnailUploader) uploadThumbnail() error {
|
||||
uploader := s3manager.NewUploader(s3Session)
|
||||
|
||||
_, err = uploader.Upload(&s3manager.UploadInput{
|
||||
Bucket: aws.String("thumbnails.lbry.com"),
|
||||
Key: key,
|
||||
Body: thumb,
|
||||
ACL: aws.String("public-read"),
|
||||
Bucket: aws.String("thumbnails.lbry.com"),
|
||||
Key: key,
|
||||
Body: thumb,
|
||||
ACL: aws.String("public-read"),
|
||||
ContentType: aws.String("image/jpeg"),
|
||||
})
|
||||
u.mirroredUrl = ThumbnailEndpoint + u.name
|
||||
return errors.Err(err)
|
||||
|
||||
Reference in new issue
Block a user