Vergelijk commits

...

5 Commits

Auteur SHA1 Bericht Datum
  kiska f5c3674906 Update 'main.go' 3 jaren geleden
  kiska 1ada262b6b Update 'main.go' 3 jaren geleden
  kiska 4071d130d7 Update 'cmd/cmd.go' 3 jaren geleden
  kiska 46a543b286 Update 'main.go' 3 jaren geleden
  root dfc497ff99 kiska test 3 jaren geleden
5 gewijzigde bestanden met toevoegingen van 11 en 9 verwijderingen
  1. +1
    -1
      cmd/cmd.go
  2. +1
    -1
      main.go
  3. +1
    -1
      manifest.json
  4. +6
    -5
      server/handlers.go
  5. +2
    -1
      server/server.go

+ 1
- 1
cmd/cmd.go Bestand weergeven

@@ -6,7 +6,7 @@ import (
"os"
"strings"

"github.com/dutchcoders/transfer.sh/server"
"git.kiska.pw/kiska/transfer.sh/server"
"github.com/fatih/color"
"github.com/minio/cli"
"google.golang.org/api/googleapi"


+ 1
- 1
main.go Bestand weergeven

@@ -1,6 +1,6 @@
package main

import "github.com/dutchcoders/transfer.sh/cmd"
import "git.kiska.pw/kiska/transfer.sh/cmd"

func main() {
app := cmd.New()


+ 1
- 1
manifest.json Bestand weergeven

@@ -1,6 +1,6 @@
{
"dependencies": {
"github.com/dutchcoders/transfer.sh-web": {
"github.com/kiska3/transfer.sh-web": {
"branch": "master"
}
}


+ 6
- 5
server/handlers.go Bestand weergeven

@@ -321,7 +321,7 @@ func (s *Server) postHandler(w http.ResponseWriter, r *http.Request) {

}

filename = url.QueryEscape(filename)
filename = url.PathEscape(filename)
relativeURL, _ := url.Parse(path.Join(token, filename))
fmt.Fprintln(w, getURL(r).ResolveReference(relativeURL).String())

@@ -480,7 +480,7 @@ func (s *Server) putHandler(w http.ResponseWriter, r *http.Request) {

w.Header().Set("Content-Type", "text/plain")

filename = url.QueryEscape(filename)
filename = url.PathEscape(filename)
relativeURL, _ := url.Parse(path.Join(token, filename))
deleteUrl, _ := url.Parse(path.Join(token, filename, metadata.DeletionToken))

@@ -556,9 +556,10 @@ func (s *Server) CheckMetadata(token, filename string) error {
var metadata Metadata

r, _, _, err := s.storage.Get(token, fmt.Sprintf("%s.metadata", filename))
if s.storage.IsNotExist(err) {
return nil
} else if err != nil {
//if s.storage.IsNotExist(err) {
// return nil
//} else if err != nil {
if err != nil {
return err
}



+ 2
- 1
server/server.go Bestand weergeven

@@ -341,7 +341,8 @@ func (s *Server) Run() {
r.HandleFunc("/{action:(?:download|get|inline)}/{token}/{filename}", s.headHandler).Methods("HEAD")

r.HandleFunc("/{token}/{filename}", s.previewHandler).MatcherFunc(func(r *http.Request, rm *mux.RouteMatch) (match bool) {
match = false
return false
match = false

// The file will show a preview page when opening the link in browser directly or
// from external link. If the referer url path and current path are the same it will be


Laden…
Annuleren
Opslaan