diff --git a/api/routes.go b/api/routes.go index 050d8c77..b96574f4 100644 --- a/api/routes.go +++ b/api/routes.go @@ -20,9 +20,9 @@ func InstallRoutes(proxyService *proxy.Service, r *mux.Router) { r.HandleFunc("/content/claims/{uri}/{claim}/{filename}", captureErrors(ContentByClaimsURI)) r.HandleFunc("/content/url", captureErrors(ContentByURL)) - actionsRouter := r.Path("/api/v1/actions").Subrouter() + actionsRouter := r.PathPrefix("/api/v1/actions").Subrouter() authenticator := users.NewAuthenticator(users.NewUserService()) lbrynetPublisher := &publish.LbrynetPublisher{Service: proxyService} UploadHandler := publish.NewUploadHandler(config.GetPublishSourceDir(), lbrynetPublisher) - actionsRouter.HandleFunc("/publish", authenticator.Wrap(UploadHandler.Handle)).Headers(users.TokenHeader, "") + actionsRouter.HandleFunc("/publish", authenticator.Wrap(UploadHandler.Handle)) //.Headers(users.TokenHeader, "") } diff --git a/app/publish/handler_test.go b/app/publish/handler_test.go index f1df4415..5d4c83b8 100644 --- a/app/publish/handler_test.go +++ b/app/publish/handler_test.go @@ -42,12 +42,12 @@ func TestUploadHandler(t *testing.T) { writer := multipart.NewWriter(body) - fileBody, err := writer.CreateFormFile(fileField, "lbry_auto_test_file") + fileBody, err := writer.CreateFormFile(FileFieldName, "lbry_auto_test_file") require.Nil(t, err) _, err = io.Copy(fileBody, readSeeker) require.Nil(t, err) - jsonPayload, err := writer.CreateFormField(jsonrpcPayloadField) + jsonPayload, err := writer.CreateFormField(JSONRPCFieldName) require.Nil(t, err) jsonPayload.Write([]byte(lbrynet.ExampleStreamCreateRequest)) @@ -87,11 +87,11 @@ func TestUploadHandlerAuthRequired(t *testing.T) { writer := multipart.NewWriter(body) - fileBody, err := writer.CreateFormFile(fileField, "lbry_auto_test_file") + fileBody, err := writer.CreateFormFile(FileFieldName, "lbry_auto_test_file") require.Nil(t, err) io.Copy(fileBody, readSeeker) - jsonPayload, err := writer.CreateFormField(jsonrpcPayloadField) + jsonPayload, err := writer.CreateFormField(JSONRPCFieldName) require.Nil(t, err) jsonPayload.Write([]byte(lbrynet.ExampleStreamCreateRequest)) @@ -126,11 +126,11 @@ func TestUploadHandlerSystemError(t *testing.T) { writer := multipart.NewWriter(body) - fileBody, err := writer.CreateFormFile(fileField, "lbry_auto_test_file") + fileBody, err := writer.CreateFormFile(FileFieldName, "lbry_auto_test_file") require.Nil(t, err) io.Copy(fileBody, readSeeker) - jsonPayload, err := writer.CreateFormField(jsonrpcPayloadField) + jsonPayload, err := writer.CreateFormField(JSONRPCFieldName) require.Nil(t, err) jsonPayload.Write([]byte(lbrynet.ExampleStreamCreateRequest)) diff --git a/app/publish/publish.go b/app/publish/publish.go index e4f0c5f7..4d3d9158 100644 --- a/app/publish/publish.go +++ b/app/publish/publish.go @@ -15,8 +15,8 @@ import ( const uploadPath = "/tmp" -const fileField = "file" -const jsonrpcPayloadField = "json_payload" +const FileFieldName = "file" +const JSONRPCFieldName = "json_payload" const fileNameParam = "file_path" @@ -80,7 +80,7 @@ func (h UploadHandler) handleUpload(r *users.AuthenticatedRequest) (*os.File, er if err != nil { return nil, err } - log.Debugf("saved uploaded file %v (%v bytes written)", f.Name(), numWritten) + log.Infof("saved uploaded file %v (%v bytes written)", f.Name(), numWritten) if err := f.Close(); err != nil { return nil, err @@ -111,7 +111,7 @@ func (h UploadHandler) Handle(w http.ResponseWriter, r *users.AuthenticatedReque return } - response := h.Publisher.Publish(f.Name(), r.AccountID, []byte(r.FormValue(jsonrpcPayloadField))) + response := h.Publisher.Publish(f.Name(), r.AccountID, []byte(r.FormValue(JSONRPCFieldName))) w.Write(response) } diff --git a/lbrytv.yml b/lbrytv.yml index 7132d7bd..bab15fce 100644 --- a/lbrytv.yml +++ b/lbrytv.yml @@ -15,4 +15,5 @@ AccountsEnabled: 1 MetricsAddress: :2112 MetricsPath: /metrics -PublishSourceDir: ./.lbrynet/publish +PublishSourceDir: /storage/published +BlobFilesDir: /storage/lbrynet/blobfiles