Skip to content

Commit

Permalink
Cleaning up names
Browse files Browse the repository at this point in the history
  • Loading branch information
Ralim committed Apr 24, 2022
1 parent fede56f commit ef52efe
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
switchhost
*.json
*.etag
.idea/
6 changes: 3 additions & 3 deletions server/virtualftp/fltp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ func TestAuthPutFile(t *testing.T) {

func TestAuthCheckPasswd(t *testing.T) {

temp_folder, err := os.MkdirTemp("", "unit_test")
tempFolder, err := os.MkdirTemp("", "unit_test")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(temp_folder)
setting := settings.NewSettings(path.Join(temp_folder, "settings.json"))
defer os.RemoveAll(tempFolder)
setting := settings.NewSettings(path.Join(tempFolder, "settings.json"))
setting.UploadingAllowed = false
driver := NewDriver(nil, setting)
ctx := &ftpserver.Context{
Expand Down
14 changes: 7 additions & 7 deletions server/virtualftp/ftp.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ func (driver *FTPDriver) dirPathToTitleID(path string) (uint64, error) {
titleID, err := strconv.ParseUint(match[1], 10, 64)
return titleID, err
}
return 0, errors.New("couldnt parse")
return 0, errors.New("couldn't parse")
}

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

Expand All @@ -113,20 +113,20 @@ func (driver *FTPDriver) ListDir(ctx *ftpserver.Context, path string, callback f
if titleID, err := driver.dirPathToTitleID(path); err == nil {
val, ok := driver.library.FileIndex.GetFilesForTitleID(titleID)
if ok {
//Now need to yield os info's for all of the underlying files
//Now need to yield os info's for all the underlying files
for _, file := range val.GetFiles() {
info, err := os.Stat(file.Path)
if err == nil {
fakefile := NewFakeFile(driver.getfakepathForRealFile(file), info)
_ = callback(&fakefile)
fakeFile := NewFakeFile(driver.getFakePathForRealFile(file), info)
_ = callback(&fakeFile)
}
}
}
}
}
return nil
}
func (driver *FTPDriver) getfakepathForRealFile(file index.FileOnDiskRecord) string {
func (driver *FTPDriver) getFakePathForRealFile(file index.FileOnDiskRecord) string {
ext := path.Ext(file.Path)
fileTitle := fmt.Sprintf("%s - [%d][%d]%s", file.Name, file.TitleID, file.Version, ext)
return path.Join(fileTitle)
Expand Down

0 comments on commit ef52efe

Please sign in to comment.