root/trunk/ImportImpl/unit_ImportFB2ThreadBase.pas
Download diff| 469 | 479 | ||
|---|---|---|---|
151 | NewFolder := GetNewFolder(Settings.FB2FolderTemplate, R); | 151 | NewFolder := GetNewFolder(Settings.FB2FolderTemplate, R); |
152 | 152 | ||
153 | CreateFolders(FRootPath, NewFolder); | 153 | CreateFolders(FRootPath, NewFolder); |
154 | CopyFile(Settings.InputFolder + R.FileName + R.FileExt, FRootPath + NewFolder + R.FileName + R.FileExt); | 154 | CopyFile(Settings.ImportPath + R.FileName + R.FileExt, FRootPath + NewFolder + R.FileName + R.FileExt); |
155 | R.Folder := NewFolder; | 155 | R.Folder := NewFolder; |
156 | 156 | ||
157 | NewFilename := GetNewFileName(Settings.FB2FileTemplate, R); | 157 | NewFilename := GetNewFileName(Settings.FB2FileTemplate, R); |
... | ... | ||
214 | if not Settings.EnableSort then | 214 | if not Settings.EnableSort then |
215 | FFilesList.TargetPath := IncludeTrailingPathDelimiter(DMUser.ActiveCollection.RootFolder) | 215 | FFilesList.TargetPath := IncludeTrailingPathDelimiter(DMUser.ActiveCollection.RootFolder) |
216 | else | 216 | else |
217 | FFilesList.TargetPath := IncludeTrailingPathDelimiter(Settings.InputFolder); | 217 | FFilesList.TargetPath := Settings.ImportPath; |
218 | 218 | ||
219 | FFilesList.OnDirectory := ShowCurrentDir; | 219 | FFilesList.OnDirectory := ShowCurrentDir; |
220 | try | 220 | try |