mirrors_public/schollz_croc
1
1
Fork 0
mirror of https://github.com/schollz/croc.git synced 2025-10-11 13:21:00 +02:00
Code Activity

start implementing UI

Browse source
This commit is contained in:
Zack Scholl 2019-04-11 10:19:16 -07:00
parent 55b6eb3802
commit 58910a3f34
5 changed files with 41 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
go.mod
View file

@ -3,6 +3,7 @@ module github.com/schollz/croc/v5
go 1.12
require (
github.com/denisbrodbeck/machineid v1.0.1
github.com/go-redis/redis v6.15.2+incompatible
github.com/mattn/go-colorable v0.1.1
github.com/pion/webrtc/v2 v2.0.2

2
go.sum
View file

@ -3,6 +3,8 @@ github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wX
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/denisbrodbeck/machineid v1.0.1 h1:geKr9qtkB876mXguW2X6TU4ZynleN6ezuMSRhl4D7AQ=
github.com/denisbrodbeck/machineid v1.0.1/go.mod h1:dJUwb7PTidGDeYyUBmXZ2GphQBbjJCrnectwCyxcUSI=
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/go-redis/redis v6.15.2+incompatible h1:9SpNVG76gr6InJGxoZ6IuuxaCOQwDAhzyXg+Bs+0Sb4=

28
src/croc/croc.go
View file

@ -15,6 +15,7 @@ import (
"sync"
"time"
"github.com/denisbrodbeck/machineid"
"github.com/go-redis/redis"
"github.com/mattn/go-colorable"
"github.com/pions/webrtc"
@ -36,8 +37,16 @@ func init() {
log.SetFormatter(&logrus.TextFormatter{ForceColors: true})
log.SetOutput(colorable.NewColorableStdout())
log.SetLevel(logrus.DebugLevel)
receiver.Debug()
sender.Debug()
}
func Debug(debug bool) {
receiver.Debug(debug)
sender.Debug(debug)
if debug {
log.SetLevel(logrus.DebugLevel)
} else {
log.SetLevel(logrus.WarnLevel)
}
}
type Client struct {
@ -193,6 +202,7 @@ func (c *Client) Receive() (err error) {
func (c *Client) transfer(options TransferOptions) (err error) {
if c.IsSender {
c.FilesToTransfer = make([]FileInfo, len(options.PathToFiles))
totalFilesSize := int64(0)
for i, pathToFile := range options.PathToFiles {
var fstats os.FileInfo
var fullPath string
@ -216,6 +226,7 @@ func (c *Client) transfer(options TransferOptions) (err error) {
ModTime: fstats.ModTime(),
}
c.FilesToTransfer[i].Hash, err = utils.HashFile(fullPath)
totalFilesSize += fstats.Size()
if err != nil {
return
}
@ -242,6 +253,19 @@ func (c *Client) transfer(options TransferOptions) (err error) {
}
log.Debugf("file %d info: %+v", i, c.FilesToTransfer[i])
}
fname := fmt.Sprintf("%d files", len(c.FilesToTransfer))
if len(c.FilesToTransfer) == 1 {
fname = fmt.Sprintf("'%s'", c.FilesToTransfer[0].Name)
}
machID, macIDerr := machineid.ID()
if macIDerr != nil {
log.Error(macIDerr)
return
}
if len(machID) > 6 {
machID = machID[:6]
}
fmt.Fprintf(os.Stderr, "Sending %s (%s) as '%s'\n", fname, utils.ByteCountDecimal(totalFilesSize), machID)
}
// create channel for quitting
// quit with c.quit <- true

8
src/webrtc/pkg/session/receiver/receiver.go
View file

@ -25,8 +25,12 @@ func init() {
log.SetLevel(logrus.WarnLevel)
}
func Debug() {
log.SetLevel(logrus.DebugLevel)
func Debug(debug bool) {
if debug {
log.SetLevel(logrus.DebugLevel)
} else {
log.SetLevel(logrus.WarnLevel)
}
}
// Session is a receiver session

8
src/webrtc/pkg/session/sender/sender.go
View file

@ -34,8 +34,12 @@ func init() {
log.SetLevel(logrus.WarnLevel)
}
func Debug() {
log.SetLevel(logrus.DebugLevel)
func Debug(debug bool) {
if debug {
log.SetLevel(logrus.DebugLevel)
} else {
log.SetLevel(logrus.WarnLevel)
}
}
type outputMsg struct {