Skip to content

Commit

Permalink
Exporting the unique code to a helper function
Browse files Browse the repository at this point in the history
  • Loading branch information
@COMTOP1
COMTOP1 committed Feb 27, 2024
1 parent 172099c commit cac73a4
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 117 deletions.
54 changes: 54 additions & 0 deletions server/views/generateUnique.go
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package views

import (
"fmt"
)

func (v *Views) generateUnique() (string, error) {
var b []byte

loop := true

for loop {
b = make([]byte, 10)
for i := range b {
b[i] = charset[seededRand.Intn(len(charset))]
}

streams1, err := v.store.GetStreams()
if err != nil {
return "", fmt.Errorf("failed to get streams: %+v", err)
}

if len(streams1) == 0 {
break
}

for _, s := range streams1 {
if s.Stream == string(b) {
loop = true
break
}
loop = false
}

stored, err := v.store.GetStored()
if err != nil {
return "", fmt.Errorf("failed to get stored: %+v", err)
}

if len(stored) == 0 {
break
}

for _, s := range stored {
if s.Stream == string(b) {
loop = true
break
}
loop = false
}
}

return string(b), nil
}
66 changes: 10 additions & 56 deletions server/views/save.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,57 +48,11 @@ func (v *Views) SaveFunc(c echo.Context) error {
}
sort.Ints(numbers)

var b []byte

loop := true

for loop {
b = make([]byte, 10)
for i := range b {
b[i] = charset[seededRand.Intn(len(charset))]
}

streams1, err := v.store.GetStreams()
if err != nil {
log.Printf("failed to get streams: %+v", err)
response.Error = fmt.Sprintf("failed to get streams: %+v", err)
return c.JSON(http.StatusOK, response)
}

if len(streams1) == 0 {
break
}

for _, s := range streams1 {
if s.Stream == string(b) {
loop = true
break
}
loop = false
}

if loop {
continue
}

stored, err := v.store.GetStored()
if err != nil {
log.Printf("failed to get stored: %+v", err)
response.Error = fmt.Sprintf("failed to get stored: %+v", err)
return c.JSON(http.StatusOK, response)
}

if len(stored) == 0 {
break
}

for _, s := range stored {
if s.Stream == string(b) {
loop = true
break
}
loop = false
}
unique, err := v.generateUnique()
if err != nil {
log.Printf("failed to get unique: %+v", err)
response.Error = fmt.Sprintf("failed to get unique: %+v", err)
return c.JSON(http.StatusOK, response)
}

recording := ""
Expand All @@ -120,7 +74,7 @@ func (v *Views) SaveFunc(c echo.Context) error {
}

stored := &storage.Stored{
Stream: string(b),
Stream: unique,
Input: endpoint + "/" + c.FormValue("stream_input"),
Recording: recording,
Website: website,
Expand All @@ -129,8 +83,8 @@ func (v *Views) SaveFunc(c echo.Context) error {

s, err := v.store.AddStored(stored)
if err != nil {
log.Printf("failed to add stored: %+v, unique: %s", err, string(b))
response.Error = fmt.Sprintf("failed to add stored: %+v, unique: %s", err, string(b))
log.Printf("failed to add stored: %+v, unique: %s", err, unique)
response.Error = fmt.Sprintf("failed to add stored: %+v, unique: %s", err, unique)
return c.JSON(http.StatusOK, response)
}

Expand All @@ -145,8 +99,8 @@ func (v *Views) SaveFunc(c echo.Context) error {
log.Printf("failed to turn transmission light on: %+v, ignoring and continuing", err)
}

log.Printf("saved stream: %s", string(b))
response.Unique = string(b)
log.Printf("saved stream: %s", unique)
response.Unique = unique
return c.JSON(http.StatusOK, response)
}
return echo.NewHTTPError(http.StatusMethodNotAllowed, "invalid method")
Expand Down
85 changes: 24 additions & 61 deletions server/views/start.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@ func (v *Views) StartFunc(c echo.Context) error {
Action: action.Start,
}

streamSelector := c.FormValue("stream_selector")

fStart := commonTransporter.ForwarderStart{
StreamIn: c.FormValue("stream_selector"),
StreamIn: streamSelector,
}

rStart := commonTransporter.RecorderStart{
StreamIn: c.FormValue("stream_selector"),
StreamIn: streamSelector,
PathOut: c.FormValue("save_path"),
}

Expand All @@ -46,9 +48,9 @@ func (v *Views) StartFunc(c echo.Context) error {
}

if c.FormValue("website_stream") == "on" {
//websiteStream = true
if v.websiteCheck(c.FormValue("website_stream_endpoint")) {
fStart.WebsiteOut = c.FormValue("website_stream_endpoint")
websiteStreamEndpoint := c.FormValue("website_stream_endpoint")
if v.websiteCheck(websiteStreamEndpoint) {
fStart.WebsiteOut = websiteStreamEndpoint
} else {
response.Error = "website key check has failed"
return c.JSON(http.StatusOK, response)
Expand All @@ -69,56 +71,14 @@ func (v *Views) StartFunc(c echo.Context) error {
}
sort.Ints(numbers)

var b []byte

loop := true

for loop {
b = make([]byte, 10)
for i := range b {
b[i] = charset[seededRand.Intn(len(charset))]
}

streams1, err := v.store.GetStreams()
if err != nil {
log.Printf("failed to get streams: %+v", err)
response.Error = fmt.Sprintf("failed to get streams: %+v", err)
return c.JSON(http.StatusOK, response)
}

if len(streams1) == 0 {
break
}

for _, s := range streams1 {
if s.Stream == string(b) {
loop = true
break
}
loop = false
}

stored, err := v.store.GetStored()
if err != nil {
log.Printf("failed to get stored: %+v", err)
response.Error = fmt.Sprintf("failed to get stored: %+v", err)
return c.JSON(http.StatusOK, response)
}

if len(stored) == 0 {
break
}

for _, s := range stored {
if s.Stream == string(b) {
loop = true
break
}
loop = false
}
unique, err := v.generateUnique()
if err != nil {
log.Printf("failed to get unique: %+v", err)
response.Error = fmt.Sprintf("failed to get unique: %+v", err)
return c.JSON(http.StatusOK, response)
}

transporter.Unique = string(b)
transporter.Unique = unique

var streams []string
for _, index := range numbers {
Expand All @@ -140,7 +100,8 @@ func (v *Views) StartFunc(c echo.Context) error {
if c.FormValue("record_checkbox") == "on" {
recorderTransporter := transporter
recorderTransporter.Payload = rStart
wsResponse, err := v.wsHelper(server.Recorder, recorderTransporter)
var wsResponse commonTransporter.ResponseTransporter
wsResponse, err = v.wsHelper(server.Recorder, recorderTransporter)
if err != nil {
log.Printf("failed sending to Recorder for start: %+v", err)
errorMessages = append(errorMessages, fmt.Sprintf("failed sending to Recorder for start: %+v", err))
Expand All @@ -162,7 +123,8 @@ func (v *Views) StartFunc(c echo.Context) error {
defer wg.Done()
forwarderTransporter := transporter
forwarderTransporter.Payload = fStart
wsResponse, err := v.wsHelper(server.Forwarder, forwarderTransporter)
var wsResponse commonTransporter.ResponseTransporter
wsResponse, err = v.wsHelper(server.Forwarder, forwarderTransporter)
if err != nil {
log.Printf("failed sending to Forwarder for start: %+v", err)
errorMessages = append(errorMessages, fmt.Sprintf("failed sending to Forwarder for start: %+v", err))
Expand All @@ -182,14 +144,15 @@ func (v *Views) StartFunc(c echo.Context) error {
wg.Wait()

if len(errorMessages) == 0 {
err := v.HandleTXLight(v.conf.TransmissionLight, tx.TransmissionOn)
err = v.HandleTXLight(v.conf.TransmissionLight, tx.TransmissionOn)
if err != nil {
log.Printf("failed to turn transmission light on: %+v, ignoring and continuing", err)
}

s, err := v.store.AddStream(&storage.Stream{
Stream: string(b),
Input: c.FormValue("stream_selector"),
var s *storage.Stream
s, err = v.store.AddStream(&storage.Stream{
Stream: unique,
Input: streamSelector,
Recording: rStart.PathOut,
Website: fStart.WebsiteOut,
Streams: streams,
Expand All @@ -208,9 +171,9 @@ func (v *Views) StartFunc(c echo.Context) error {
return c.JSON(http.StatusOK, response)
}

log.Printf("started stream: %s", string(b))
log.Printf("started stream: %s", unique)

response.Unique = string(b)
response.Unique = unique
return c.JSON(http.StatusOK, response)
}

Expand Down

0 comments on commit cac73a4

Please sign in to comment.