unistack-org/blob-ftp
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix cache

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
This commit is contained in:
Василий Толстов
2015-05-07 15:51:20 +03:00
parent 797f9d11e7
commit fed9122523
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main.go
View File

@@ -248,26 +248,26 @@ func (s *Conn) cmdServerList(args string) {
opts.Prefix += "/" opts.Prefix += "/"
} }
} }
objs, err := s.loadObjects(cnt, opts) // objs, err := s.loadObjects(cnt, opts)
if err != nil { // if err != nil {
objs, err = s.sw.ObjectsAll(cnt, opts) objs, err := s.sw.ObjectsAll(cnt, opts)
if err != nil { if err != nil {
fmt.Printf(err.Error()) fmt.Printf(err.Error())
return return
} }
s.saveObjects(cnt, objs, opts) s.saveObjects(cnt, objs, opts)
} // }
fmt.Printf("%+v\n", objs) fmt.Printf("%+v\n", objs)
files = append(files, NewDirItem(".", 4096, 0), NewDirItem("..", 4096, 0)) files = append(files, NewDirItem(".", 4096, 0), NewDirItem("..", 4096, 0))
var it os.FileInfo var it os.FileInfo
for _, obj := range objs { for _, obj := range objs {
if obj.SubDir != "" || strings.Index(obj.Name, "/") > 0 { obj.Name = strings.TrimPrefix(obj.Name, opts.Prefix)
continue if obj.PseudoDirectory || obj.ContentType == "application/directory" || obj.SubDir != "" {
} fmt.Printf("AAAAAA: %+v\n", obj)
if obj.PseudoDirectory || obj.ContentType == "application/directory" {
it = NewDirItem(obj.Name, obj.Bytes, 1) it = NewDirItem(obj.Name, obj.Bytes, 1)
} else { } else {
fmt.Printf("BBBBBBBB: %+v\n", obj)
it = NewFileItem(obj.Name, obj.Bytes, 1) it = NewFileItem(obj.Name, obj.Bytes, 1)
} }
files = append(files, it) files = append(files, it)

8
server.go
View File

@@ -14,7 +14,7 @@ var schema []string = []string{
`CREATE TABLE IF NOT EXISTS containers (ID int, Name string, Bytes int, Count int)`, `CREATE TABLE IF NOT EXISTS containers (ID int, Name string, Bytes int, Count int)`,
`CREATE UNIQUE INDEX IF NOT EXISTS containersID ON containers (ID)`, `CREATE UNIQUE INDEX IF NOT EXISTS containersID ON containers (ID)`,
`CREATE INDEX IF NOT EXISTS containersName ON containers (Name)`, `CREATE INDEX IF NOT EXISTS containersName ON containers (Name)`,
`CREATE TABLE IF NOT EXISTS objects (ID int, Container string, Prefix string, ContentType string, LastModified time, Name string, Bytes int, Count int)`, `CREATE TABLE IF NOT EXISTS objects (ID int, Container string, Prefix string, ContentType string, LastModified time, Name string, Bytes int, Count int, SubDir string, PseudoDir bool)`,
`CREATE UNIQUE INDEX IF NOT EXISTS objectsID ON objects (ID)`, `CREATE UNIQUE INDEX IF NOT EXISTS objectsID ON objects (ID)`,
`CREATE INDEX IF NOT EXISTS objectsName ON objects (Name)`, `CREATE INDEX IF NOT EXISTS objectsName ON objects (Name)`,
`CREATE INDEX IF NOT EXISTS objectsContainer ON objects (Container)`, `CREATE INDEX IF NOT EXISTS objectsContainer ON objects (Container)`,
@@ -102,7 +102,7 @@ func (c *Conn) saveObjects(cnt string, objs []swift.Object, opts *swift.ObjectsO
} }
for _, obj := range objs { for _, obj := range objs {
if _, err = tx.Exec(`INSERT INTO objects (Container, Prefix, ContentType, LastModified, Name, Bytes, Count) VALUES ($1, $2, $3, $4, $5, $6, $7)`, cnt, opts.Prefix, obj.ContentType, obj.LastModified, obj.Name, obj.Bytes, 1); err != nil { if _, err = tx.Exec(`INSERT INTO objects (Container, Prefix, ContentType, LastModified, Name, Bytes, Count, PseudoDir, SubDir) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`, cnt, opts.Prefix, obj.ContentType, obj.LastModified, obj.Name, obj.Bytes, 1, obj.PseudoDirectory, obj.SubDir); err != nil {
fmt.Printf("aaaa %s\n", err.Error()) fmt.Printf("aaaa %s\n", err.Error())
return err return err
} }
@@ -119,7 +119,7 @@ func (c *Conn) loadObjects(cnt string, opts *swift.ObjectsOpts) ([]swift.Object,
var objs []swift.Object var objs []swift.Object
var res swift.Object var res swift.Object
result, err := c.db.Query(`SELECT ContentType, LastModified, Name, Bytes from objects where Container==$1 && Prefix==$1`, cnt, opts.Prefix) result, err := c.db.Query(`SELECT ContentType, LastModified, Name, Bytes, PseudoDir, SubDir from objects where Container==$1 && Prefix==$2`, cnt, opts.Prefix)
if err != nil { if err != nil {
fmt.Printf("bbb %s\n", err.Error()) fmt.Printf("bbb %s\n", err.Error())
return objs, err return objs, err
@@ -127,7 +127,7 @@ func (c *Conn) loadObjects(cnt string, opts *swift.ObjectsOpts) ([]swift.Object,
defer result.Close() defer result.Close()
for result.Next() { for result.Next() {
if err = result.Scan(&res.ContentType, &res.LastModified, &res.Name, &res.Bytes); err != nil { if err = result.Scan(&res.ContentType, &res.LastModified, &res.Name, &res.Bytes, &res.PseudoDirectory, &res.SubDir); err != nil {
fmt.Printf("%s\n", err.Error()) fmt.Printf("%s\n", err.Error())
return objs, err return objs, err
} }