Merge pull request #689 from fuxiaohei/develop

code style simplify

@@ -60,12 +60,10 @@ func NewFileCache() *FileCache {
 
 
 // Start and begin gc for file cache.
 // Start and begin gc for file cache.
 // the config need to be like {CachePath:"/cache","FileSuffix":".bin","DirectoryLevel":2,"EmbedExpiry":0}
 // the config need to be like {CachePath:"/cache","FileSuffix":".bin","DirectoryLevel":2,"EmbedExpiry":0}
-func (this *FileCache) StartAndGC(config string) error {
+func (fc *FileCache) StartAndGC(config string) error {
 
 
 	var cfg map[string]string
 	var cfg map[string]string
 	json.Unmarshal([]byte(config), &cfg)
 	json.Unmarshal([]byte(config), &cfg)
-	//fmt.Println(cfg)
-	//fmt.Println(config)
 	if _, ok := cfg["CachePath"]; !ok {
 	if _, ok := cfg["CachePath"]; !ok {
 		cfg["CachePath"] = FileCachePath
 		cfg["CachePath"] = FileCachePath
 	}
 	}
@@ -78,69 +76,53 @@ func (this *FileCache) StartAndGC(config string) error {
 	if _, ok := cfg["EmbedExpiry"]; !ok {
 	if _, ok := cfg["EmbedExpiry"]; !ok {
 		cfg["EmbedExpiry"] = strconv.FormatInt(FileCacheEmbedExpiry, 10)
 		cfg["EmbedExpiry"] = strconv.FormatInt(FileCacheEmbedExpiry, 10)
 	}
 	}
-	this.CachePath = cfg["CachePath"]
-	this.FileSuffix = cfg["FileSuffix"]
-	this.DirectoryLevel, _ = strconv.Atoi(cfg["DirectoryLevel"])
-	this.EmbedExpiry, _ = strconv.Atoi(cfg["EmbedExpiry"])
+	fc.CachePath = cfg["CachePath"]
+	fc.FileSuffix = cfg["FileSuffix"]
+	fc.DirectoryLevel, _ = strconv.Atoi(cfg["DirectoryLevel"])
+	fc.EmbedExpiry, _ = strconv.Atoi(cfg["EmbedExpiry"])
 
 
-	this.Init()
+	fc.Init()
 	return nil
 	return nil
 }
 }
 
 
 // Init will make new dir for file cache if not exist.
 // Init will make new dir for file cache if not exist.
-func (this *FileCache) Init() {
+func (fc *FileCache) Init() {
 	app := filepath.Dir(os.Args[0])
 	app := filepath.Dir(os.Args[0])
-	this.CachePath = filepath.Join(app, this.CachePath)
-	ok, err := exists(this.CachePath)
-	if err != nil { // print error
-		//fmt.Println(err)
+	fc.CachePath = filepath.Join(app, fc.CachePath)
+	if ok, _ := exists(fc.CachePath); !ok { // todo : error handle
+		_ = os.MkdirAll(fc.CachePath, os.ModePerm) // todo : error handle
 	}
 	}
-	if !ok {
-		if err = os.Mkdir(this.CachePath, os.ModePerm); err != nil {
-			//fmt.Println(err);
-		}
-	}
-	//fmt.Println(this.getCacheFileName("123456"));
 }
 }
 
 
 // get cached file name. it's md5 encoded.
 // get cached file name. it's md5 encoded.
-func (this *FileCache) getCacheFileName(key string) string {
+func (fc *FileCache) getCacheFileName(key string) string {
 	m := md5.New()
 	m := md5.New()
 	io.WriteString(m, key)
 	io.WriteString(m, key)
 	keyMd5 := hex.EncodeToString(m.Sum(nil))
 	keyMd5 := hex.EncodeToString(m.Sum(nil))
-	cachePath := this.CachePath
-	//fmt.Println("cachepath : " , cachePath)
-	//fmt.Println("md5" , keyMd5);
-	switch this.DirectoryLevel {
+	cachePath := fc.CachePath
+	switch fc.DirectoryLevel {
 	case 2:
 	case 2:
 		cachePath = filepath.Join(cachePath, keyMd5[0:2], keyMd5[2:4])
 		cachePath = filepath.Join(cachePath, keyMd5[0:2], keyMd5[2:4])
 	case 1:
 	case 1:
 		cachePath = filepath.Join(cachePath, keyMd5[0:2])
 		cachePath = filepath.Join(cachePath, keyMd5[0:2])
 	}
 	}
 
 
-	ok, err := exists(cachePath)
-	if err != nil {
-		//fmt.Println(err)
-	}
-	if !ok {
-		if err = os.MkdirAll(cachePath, os.ModePerm); err != nil {
-			//fmt.Println(err);
-		}
+	if ok, _ := exists(cachePath); !ok { // todo : error handle
+		_ = os.MkdirAll(cachePath, os.ModePerm) // todo : error handle
 	}
 	}
-	return filepath.Join(cachePath, fmt.Sprintf("%s%s", keyMd5, this.FileSuffix))
+
+	return filepath.Join(cachePath, fmt.Sprintf("%s%s", keyMd5, fc.FileSuffix))
 }
 }
 
 
 // Get value from file cache.
 // Get value from file cache.
 // if non-exist or expired, return empty string.
 // if non-exist or expired, return empty string.
-func (this *FileCache) Get(key string) interface{} {
-	filename := this.getCacheFileName(key)
-	filedata, err := File_get_contents(filename)
-	//fmt.Println("get length:" , len(filedata));
+func (fc *FileCache) Get(key string) interface{} {
+	fileData, err := File_get_contents(fc.getCacheFileName(key))
 	if err != nil {
 	if err != nil {
 		return ""
 		return ""
 	}
 	}
 	var to FileCacheItem
 	var to FileCacheItem
-	Gob_decode(filedata, &to)
+	Gob_decode(fileData, &to)
 	if to.Expired < time.Now().Unix() {
 	if to.Expired < time.Now().Unix() {
 		return ""
 		return ""
 	}
 	}
@@ -150,12 +132,10 @@ func (this *FileCache) Get(key string) interface{} {
 // Put value into file cache.
 // Put value into file cache.
 // timeout means how long to keep this file, unit of ms.
 // timeout means how long to keep this file, unit of ms.
 // if timeout equals FileCacheEmbedExpiry(default is 0), cache this item forever.
 // if timeout equals FileCacheEmbedExpiry(default is 0), cache this item forever.
-func (this *FileCache) Put(key string, val interface{}, timeout int64) error {
+func (fc *FileCache) Put(key string, val interface{}, timeout int64) error {
 	gob.Register(val)
 	gob.Register(val)
 
 
-	filename := this.getCacheFileName(key)
-	var item FileCacheItem
-	item.Data = val
+	item := FileCacheItem{Data: val}
 	if timeout == FileCacheEmbedExpiry {
 	if timeout == FileCacheEmbedExpiry {
 		item.Expired = time.Now().Unix() + (86400 * 365 * 10) // ten years
 		item.Expired = time.Now().Unix() + (86400 * 365 * 10) // ten years
 	} else {
 	} else {
@@ -166,13 +146,12 @@ func (this *FileCache) Put(key string, val interface{}, timeout int64) error {
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
-	err = File_put_contents(filename, data)
-	return err
+	return File_put_contents(fc.getCacheFileName(key), data)
 }
 }
 
 
 // Delete file cache value.
 // Delete file cache value.
-func (this *FileCache) Delete(key string) error {
-	filename := this.getCacheFileName(key)
+func (fc *FileCache) Delete(key string) error {
+	filename := fc.getCacheFileName(key)
 	if ok, _ := exists(filename); ok {
 	if ok, _ := exists(filename); ok {
 		return os.Remove(filename)
 		return os.Remove(filename)
 	}
 	}
@@ -180,44 +159,41 @@ func (this *FileCache) Delete(key string) error {
 }
 }
 
 
 // Increase cached int value.
 // Increase cached int value.
-// this value is saving forever unless Delete.
-func (this *FileCache) Incr(key string) error {
-	data := this.Get(key)
+// fc value is saving forever unless Delete.
+func (fc *FileCache) Incr(key string) error {
+	data := fc.Get(key)
 	var incr int
 	var incr int
-	//fmt.Println(reflect.TypeOf(data).Name())
 	if reflect.TypeOf(data).Name() != "int" {
 	if reflect.TypeOf(data).Name() != "int" {
 		incr = 0
 		incr = 0
 	} else {
 	} else {
 		incr = data.(int) + 1
 		incr = data.(int) + 1
 	}
 	}
-	this.Put(key, incr, FileCacheEmbedExpiry)
+	fc.Put(key, incr, FileCacheEmbedExpiry)
 	return nil
 	return nil
 }
 }
 
 
 // Decrease cached int value.
 // Decrease cached int value.
-func (this *FileCache) Decr(key string) error {
-	data := this.Get(key)
+func (fc *FileCache) Decr(key string) error {
+	data := fc.Get(key)
 	var decr int
 	var decr int
 	if reflect.TypeOf(data).Name() != "int" || data.(int)-1 <= 0 {
 	if reflect.TypeOf(data).Name() != "int" || data.(int)-1 <= 0 {
 		decr = 0
 		decr = 0
 	} else {
 	} else {
 		decr = data.(int) - 1
 		decr = data.(int) - 1
 	}
 	}
-	this.Put(key, decr, FileCacheEmbedExpiry)
+	fc.Put(key, decr, FileCacheEmbedExpiry)
 	return nil
 	return nil
 }
 }
 
 
 // Check value is exist.
 // Check value is exist.
-func (this *FileCache) IsExist(key string) bool {
-	filename := this.getCacheFileName(key)
-	ret, _ := exists(filename)
+func (fc *FileCache) IsExist(key string) bool {
+	ret, _ := exists(fc.getCacheFileName(key))
 	return ret
 	return ret
 }
 }
 
 
 // Clean cached files.
 // Clean cached files.
 // not implemented.
 // not implemented.
-func (this *FileCache) ClearAll() error {
-	//this.CachePath
+func (fc *FileCache) ClearAll() error {
 	return nil
 	return nil
 }
 }
 
 
@@ -235,22 +211,22 @@ func exists(path string) (bool, error) {
 
 
 // Get bytes to file.
 // Get bytes to file.
 // if non-exist, create this file.
 // if non-exist, create this file.
-func File_get_contents(filename string) ([]byte, error) {
-	f, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE, os.ModePerm)
-	if err != nil {
-		return []byte(""), err
+func File_get_contents(filename string) (data []byte, e error) {
+	f, e := os.OpenFile(filename, os.O_RDWR|os.O_CREATE, os.ModePerm)
+	if e != nil {
+		return
 	}
 	}
 	defer f.Close()
 	defer f.Close()
-	stat, err := f.Stat()
-	if err != nil {
-		return []byte(""), err
+	stat, e := f.Stat()
+	if e != nil {
+		return
 	}
 	}
-	data := make([]byte, stat.Size())
-	result, err := f.Read(data)
-	if int64(result) == stat.Size() {
-		return data, err
+	data = make([]byte, stat.Size())
+	result, e := f.Read(data)
+	if e != nil || int64(result) != stat.Size() {
+		return nil, e
 	}
 	}
-	return []byte(""), err
+	return
 }
 }
 
 
 // Put bytes to file.
 // Put bytes to file.