re-organize code directory structure

weed-fs/src/pkg/directory/file_id.go → src/weed/directory/file_id.go

@@ -2,8 +2,8 @@ package directory
 
 import (
 	"encoding/hex"
-	"pkg/storage"
-	"pkg/util"
+	"weed/storage"
+	"weed/util"
 	"strings"
 )
 

weed-fs/src/cmd/weed/export.go → src/weed/export.go

@@ -7,8 +7,8 @@ import (
 	"log"
 	"os"
 	"path"
-	"pkg/directory"
-	"pkg/storage"
+	"weed/directory"
+	"weed/storage"
 	"strconv"
 	"strings"
 	"text/template"

weed-fs/src/cmd/weed/fix.go → src/weed/fix.go

@@ -4,7 +4,7 @@ import (
 	"log"
 	"os"
 	"path"
-	"pkg/storage"
+	"weed/storage"
 	"strconv"
 )
 

weed-fs/src/cmd/weed/master.go → src/weed/master.go

@@ -5,9 +5,9 @@ import (
 	"errors"
 	"log"
 	"net/http"
-	"pkg/replication"
-	"pkg/storage"
-	"pkg/topology"
+	"weed/replication"
+	"weed/storage"
+	"weed/topology"
 	"runtime"
 	"strconv"
 	"strings"

weed-fs/src/pkg/operation/allocate_volume.go → src/weed/operation/allocate_volume.go

@@ -4,9 +4,9 @@ import (
 	"encoding/json"
 	"errors"
 	"net/url"
-	"pkg/storage"
-	"pkg/topology"
-	"pkg/util"
+	"weed/storage"
+	"weed/topology"
+	"weed/util"
 )
 
 type AllocateVolumeResult struct {

weed-fs/src/pkg/operation/lookup_volume_id.go → src/weed/operation/lookup_volume_id.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 	_ "fmt"
 	"net/url"
-	"pkg/storage"
-	"pkg/util"
+	"weed/storage"
+	"weed/util"
 )
 
 type Location struct {

weed-fs/src/pkg/replication/volume_growth.go → src/weed/replication/volume_growth.go

@@ -4,9 +4,9 @@ import (
 	"errors"
 	"fmt"
 	"math/rand"
-	"pkg/operation"
-	"pkg/storage"
-	"pkg/topology"
+	"weed/operation"
+	"weed/storage"
+	"weed/topology"
 	"sync"
 )
 

weed-fs/src/pkg/replication/volume_growth_test.go → src/weed/replication/volume_growth_test.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"math/rand"
-	"pkg/storage"
-	"pkg/topology"
+	"weed/storage"
+	"weed/topology"
 	"testing"
 	"time"
 )

weed-fs/src/pkg/storage/compact_map_perf_test.go → src/weed/storage/compact_map_perf_test.go

@@ -3,7 +3,7 @@ package storage
 import (
 	"log"
 	"os"
-	"pkg/util"
+	"weed/util"
 	"testing"
 )
 

weed-fs/src/pkg/storage/needle.go → src/weed/storage/needle.go

@@ -7,7 +7,7 @@ import (
 	"mime"
 	"net/http"
 	"path"
-	"pkg/util"
+	"weed/util"
 	"strconv"
 	"strings"
 )

weed-fs/src/pkg/storage/needle_map.go → src/weed/storage/needle_map.go

@@ -3,7 +3,7 @@ package storage
 import (
 	//"log"
 	"os"
-	"pkg/util"
+	"weed/util"
 )
 
 type NeedleMap struct {

weed-fs/src/pkg/storage/needle_read_write.go → src/weed/storage/needle_read_write.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"pkg/util"
+	"weed/util"
 )
 
 const (

weed-fs/src/pkg/storage/store.go → src/weed/storage/store.go

@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"log"
 	"net/url"
-	"pkg/util"
+	"weed/util"
 	"strconv"
 	"strings"
 )

weed-fs/src/pkg/topology/data_node.go → src/weed/topology/data_node.go

@@ -2,7 +2,7 @@ package topology
 
 import (
 	_ "fmt"
-	"pkg/storage"
+	"weed/storage"
 	"strconv"
 )
 

weed-fs/src/pkg/topology/node.go → src/weed/topology/node.go

@@ -2,7 +2,7 @@ package topology
 
 import (
 	"fmt"
-	"pkg/storage"
+	"weed/storage"
 )
 
 type NodeId string

weed-fs/src/pkg/topology/node_list.go → src/weed/topology/node_list.go

@@ -3,7 +3,7 @@ package topology
 import (
 	"fmt"
 	"math/rand"
-	"pkg/storage"
+	"weed/storage"
 )
 
 type NodeList struct {

weed-fs/src/pkg/topology/topo_test.go → src/weed/topology/topo_test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"math/rand"
-	"pkg/storage"
+	"weed/storage"
 	"testing"
 	"time"
 )

weed-fs/src/pkg/topology/topology.go → src/weed/topology/topology.go

@@ -4,9 +4,9 @@ import (
 	"errors"
 	"io/ioutil"
 	"math/rand"
-	"pkg/directory"
-	"pkg/sequence"
-	"pkg/storage"
+	"weed/directory"
+	"weed/sequence"
+	"weed/storage"
 )
 
 type Topology struct {

weed-fs/src/pkg/topology/topology_compact.go → src/weed/topology/topology_compact.go

@@ -5,8 +5,8 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
-	"pkg/storage"
-	"pkg/util"
+	"weed/storage"
+	"weed/util"
 	"time"
 )
 

weed-fs/src/pkg/topology/topology_event_handling.go → src/weed/topology/topology_event_handling.go

@@ -3,7 +3,7 @@ package topology
 import (
 	"fmt"
 	"math/rand"
-	"pkg/storage"
+	"weed/storage"
 	"time"
 )
 

weed-fs/src/pkg/topology/volume_layout.go → src/weed/topology/volume_layout.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"math/rand"
-	"pkg/storage"
+	"weed/storage"
 )
 
 type VolumeLayout struct {

weed-fs/src/cmd/weed/upload.go → src/weed/upload.go

@@ -7,8 +7,8 @@ import (
 	"net/url"
 	"os"
 	"path"
-	"pkg/operation"
-	"pkg/util"
+	"weed/operation"
+	"weed/util"
 	"strconv"
 )
 

weed-fs/src/cmd/weed/volume.go → src/weed/volume.go

@@ -7,8 +7,8 @@ import (
 	"mime"
 	"net/http"
 	"os"
-	"pkg/operation"
-	"pkg/storage"
+	"weed/operation"
+	"weed/storage"
 	"runtime"
 	"strconv"
 	"strings"
@@ -242,7 +242,7 @@ func DeleteHandler(w http.ResponseWriter, r *http.Request) {
 	n.Size = 0
 	ret, err := store.Delete(volumeId, n)
 	if err != nil {
-		log.Println("delete error: %s", err)
+		log.Printf("delete error: %s\n", err)
 		return
 	}