root/trunk/ImportImpl/unit_ImportFBDThread.pas
| 469 | 479 | ||
|---|---|---|---|
34 | uses | 34 | uses |
35 | Classes, | 35 | Classes, |
36 | SysUtils, | 36 | SysUtils, |
37 | IOUtils, | ||
37 | unit_WorkerThread, | 38 | unit_WorkerThread, |
38 | FictionBook_21, | 39 | FictionBook_21, |
39 | unit_Consts, | 40 | unit_Consts, |
... | ... | ||
48 | begin | 49 | begin |
49 | NewFolder := GetNewFolder(Settings.FBDFolderTemplate, R); | 50 | NewFolder := GetNewFolder(Settings.FBDFolderTemplate, R); |
50 | 51 | ||
51 | CreateFolders(FRootPath,NewFolder); | 52 | CreateFolders(FRootPath, NewFolder); |
52 | CopyFile(Settings.InputFolder + R.FileName, | 53 | CopyFile(Settings.ImportPath + R.FileName, FRootPath + NewFolder + R.FileName); |
53 | FRootPath + NewFolder + R.FileName); | ||
54 | R.Folder := NewFolder; | 54 | R.Folder := NewFolder; |
55 | 55 | ||
56 | NewFileName := GetNewFileName(Settings.FBDFileTemplate, R); | 56 | NewFileName := GetNewFileName(Settings.FBDFileTemplate, R); |
57 | if NewFileName <> '' then | 57 | if NewFileName <> '' then |
58 | begin | 58 | begin |
59 | NewFileName := NewFileName; | 59 | NewFileName := NewFileName; |
60 | RenameFile(FRootPath + NewFolder + R.FileName, | 60 | RenameFile(FRootPath + NewFolder + R.FileName, FRootPath + NewFolder + NewFileName + ZIP_EXTENSION); |
61 | FRootPath + NewFolder + NewFileName + ZIP_EXTENSION); | ||
62 | R.FileName := NewFileName + ZIP_EXTENSION; | 61 | R.FileName := NewFileName + ZIP_EXTENSION; |
63 | 62 | ||
64 | try | 63 | try |
... | ... | ||
131 | book := LoadFictionBook(FS); | 130 | book := LoadFictionBook(FS); |
132 | GetBookInfo(book, R); | 131 | GetBookInfo(book, R); |
133 | IsValid := True; | 132 | IsValid := True; |
134 | FBDFileName := ExtractShortFileName(ArchiveItem.FileName); | 133 | FBDFileName := TPath.GetFileNameWithoutExtension(ArchiveItem.FileName); |
135 | except | 134 | except |
136 | on e: Exception do | 135 | on e: Exception do |
137 | begin | 136 | begin |
... | ... | ||
147 | begin | 146 | begin |
148 | R.InsideNo := j; | 147 | R.InsideNo := j; |
149 | R.FileExt := Ext; | 148 | R.FileExt := Ext; |
150 | BookFileName := ExtractShortFileName(ArchiveItem.FileName); | 149 | BookFileName := TPath.GetFileNameWithoutExtension(ArchiveItem.FileName); |
151 | R.Size := FZipper.Size; | 150 | R.Size := FZipper.Size; |
152 | end; | 151 | end; |
153 | inc(j); | 152 | inc(j); |
Download diff