Skip to content

Commit ef52efe

Browse files
committed
Cleaning up names
1 parent fede56f commit ef52efe

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
switchhost
22
*.json
33
*.etag
4+
.idea/

server/virtualftp/fltp_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ func TestAuthPutFile(t *testing.T) {
5353

5454
func TestAuthCheckPasswd(t *testing.T) {
5555

56-
temp_folder, err := os.MkdirTemp("", "unit_test")
56+
tempFolder, err := os.MkdirTemp("", "unit_test")
5757
if err != nil {
5858
t.Fatal(err)
5959
}
60-
defer os.RemoveAll(temp_folder)
61-
setting := settings.NewSettings(path.Join(temp_folder, "settings.json"))
60+
defer os.RemoveAll(tempFolder)
61+
setting := settings.NewSettings(path.Join(tempFolder, "settings.json"))
6262
setting.UploadingAllowed = false
6363
driver := NewDriver(nil, setting)
6464
ctx := &ftpserver.Context{

server/virtualftp/ftp.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ func (driver *FTPDriver) dirPathToTitleID(path string) (uint64, error) {
8888
titleID, err := strconv.ParseUint(match[1], 10, 64)
8989
return titleID, err
9090
}
91-
return 0, errors.New("couldnt parse")
91+
return 0, errors.New("couldn't parse")
9292
}
9393

9494
func (driver *FTPDriver) getFakeFolderFileInfo(titleInfo index.FileOnDiskRecord) os.FileInfo {
95-
virtualpath := fmt.Sprintf("%s [%d]", utilities.CleanName(titleInfo.Name), titleInfo.TitleID)
96-
info := NewFakeFolder(virtualpath)
95+
virtualPath := fmt.Sprintf("%s [%d]", utilities.CleanName(titleInfo.Name), titleInfo.TitleID)
96+
info := NewFakeFolder(virtualPath)
9797
return &info
9898
}
9999

@@ -113,20 +113,20 @@ func (driver *FTPDriver) ListDir(ctx *ftpserver.Context, path string, callback f
113113
if titleID, err := driver.dirPathToTitleID(path); err == nil {
114114
val, ok := driver.library.FileIndex.GetFilesForTitleID(titleID)
115115
if ok {
116-
//Now need to yield os info's for all of the underlying files
116+
//Now need to yield os info's for all the underlying files
117117
for _, file := range val.GetFiles() {
118118
info, err := os.Stat(file.Path)
119119
if err == nil {
120-
fakefile := NewFakeFile(driver.getfakepathForRealFile(file), info)
121-
_ = callback(&fakefile)
120+
fakeFile := NewFakeFile(driver.getFakePathForRealFile(file), info)
121+
_ = callback(&fakeFile)
122122
}
123123
}
124124
}
125125
}
126126
}
127127
return nil
128128
}
129-
func (driver *FTPDriver) getfakepathForRealFile(file index.FileOnDiskRecord) string {
129+
func (driver *FTPDriver) getFakePathForRealFile(file index.FileOnDiskRecord) string {
130130
ext := path.Ext(file.Path)
131131
fileTitle := fmt.Sprintf("%s - [%d][%d]%s", file.Name, file.TitleID, file.Version, ext)
132132
return path.Join(fileTitle)

0 commit comments

Comments
 (0)