@@ -102,7 +102,7 @@ | ||
102 | 102 | |
103 | 103 | Dim iTemp As Integer = 1 |
104 | 104 | |
105 | - For ctrChapter As Integer = indexFrom + 1 To indexTo - 1 | |
105 | + For ctrChapter As Integer = indexFrom + 1 To indexTo | |
106 | 106 | |
107 | 107 | |
108 | 108 | Dim ncxChapter As ncxNavPointNavPoint = ncxSection.navPoint(ctrChapter) |
@@ -6,7 +6,7 @@ | ||
6 | 6 | |
7 | 7 | Public mEpub As New List(Of modelSection) |
8 | 8 | |
9 | - Dim listSkip As List(Of String) = {"版权", "目录", "书名页", "版权页", "作家榜经典文库", "勇者物语", "书籍导读", "封面", "书名页", "扉页"}.ToList | |
9 | + Dim listSkip As List(Of String) = {"版权", "目录", "书名页", "版权页", "作家榜经典文库", "勇者物语", "书籍导读", "封面", "书名页", "扉页", "书名", "麒麟之翼", "作者简介", "内容简介"}.ToList | |
10 | 10 | Dim listMobiRight As List(Of String) = {"signature"}.ToList() |
11 | 11 | |
12 | 12 |
@@ -43,12 +43,10 @@ | ||
43 | 43 | Dim mSection As New modelSection() |
44 | 44 | mSection.Title = cTools.listNav_SE(ncxSection.navLabel.text, "《", "》", False)(0) |
45 | 45 | |
46 | - If mSection.Title.IndexOf("第一章") > -1 Then | |
47 | - Dim sStop As String = "1" | |
48 | - End If | |
49 | 46 | |
50 | - Dim ncxVolume As List(Of ncxNavPointNavPoint) = ncxSection.navPoint.Where(Function(x) x.navLabel.text.IndexOf("第") > -1).ToList() | |
51 | 47 | |
48 | + Dim ncxVolume As List(Of ncxNavPointNavPoint) = ncxSection.navPoint.Where(Function(x) x.navLabel.text.IndexOf("章") > -1).ToList() | |
49 | + | |
52 | 50 | If ncxVolume.Count = 0 Then |
53 | 51 | ncxVolume = ncxSection.navPoint.ToList() |
54 | 52 | End If |
@@ -59,7 +57,14 @@ | ||
59 | 57 | Dim mVolume As New modelVolume |
60 | 58 | mVolume.Title = ncxVolume(ctrVolume).navLabel.text |
61 | 59 | |
60 | + mVolume.Title = mVolume.Title.Replace("《", "") | |
61 | + mVolume.Title = mVolume.Title.Replace("》", "") | |
62 | + mVolume.Title = mVolume.Title.Replace("卷", "") | |
62 | 63 | |
64 | + If mVolume.Title = "第四章" Then | |
65 | + Dim sStop As String = "" | |
66 | + End If | |
67 | + | |
63 | 68 | If listSkip.Any(Function(x) mVolume.Title.IndexOf(x) > -1) Then |
64 | 69 | Continue For |
65 | 70 | End If |
@@ -97,46 +102,59 @@ | ||
97 | 102 | |
98 | 103 | mVolume.listText = listText |
99 | 104 | |
100 | - End If | |
105 | + Else | |
101 | 106 | |
107 | + Dim iTemp As Integer = 1 | |
102 | 108 | |
103 | - Dim iTemp As Integer = 1 | |
109 | + For ctrChapter As Integer = indexFrom + 1 To indexTo | |
104 | 110 | |
105 | - For ctrChapter As Integer = indexFrom + 1 To indexTo - 1 | |
106 | 111 | |
112 | + Dim ncxChapter As ncxNavPointNavPoint = ncxSection.navPoint(ctrChapter) | |
107 | 113 | |
108 | - Dim ncxChapter As ncxNavPointNavPoint = ncxSection.navPoint(ctrChapter) | |
114 | + Dim mChapter As New modelChapter | |
109 | 115 | |
110 | - Dim mChapter As New modelChapter | |
116 | + mChapter.Title = iTemp | |
117 | + mChapter.Scr = ncxChapter.content.src | |
111 | 118 | |
112 | - mChapter.Title = iTemp | |
113 | - mChapter.Scr = ncxChapter.content.src | |
119 | + If listSkip.Any(Function(x) mChapter.Title.IndexOf(x) > -1) Then | |
120 | + Continue For | |
121 | + End If | |
114 | 122 | |
115 | - If listSkip.Any(Function(x) mChapter.Title.IndexOf(x) > -1) Then | |
116 | - Continue For | |
117 | - End If | |
123 | + If mChapter.Scr.IndexOf("text00989") > -1 Then | |
124 | + Dim sStop As String = "" | |
125 | + End If | |
118 | 126 | |
119 | 127 | |
120 | - Dim sPath As String = Path.Combine(bookPath, mChapter.Scr).Split("#").ToList(0) | |
121 | 128 | |
122 | - Dim sChapter As String = sFileEditRead(sPath, emEpub6.emDep.Dep3) | |
123 | - Dim listText As List(Of String) = cTools.listText_P(sChapter) | |
129 | + Dim sPath As String = Path.Combine(bookPath, mChapter.Scr).Split("#").ToList(0) | |
124 | 130 | |
125 | - mChapter.listText = listText | |
131 | + Dim sChapter As String = sFileEditRead(sPath, emEpub6.emDep.Dep3) | |
132 | + Dim listText As List(Of String) = cTools.listText_P(sChapter) | |
126 | 133 | |
127 | - 'If listText.Count > 0 Then | |
128 | - ' If listText(0).Trim().IndexOf(mVolume.Title) > -1 Then | |
129 | - ' listText.RemoveAt(0) | |
130 | - ' End If | |
131 | - 'End If | |
134 | + mChapter.listText = listText | |
132 | 135 | |
136 | + 'If listText.Count > 0 Then | |
137 | + ' If listText(0).Trim().IndexOf(mVolume.Title) > -1 Then | |
138 | + ' listText.RemoveAt(0) | |
139 | + ' End If | |
140 | + 'End If | |
133 | 141 | |
134 | - mVolume.listChapter.Add(mChapter) | |
135 | 142 | |
136 | - iTemp += 1 | |
137 | - Next | |
143 | + mVolume.listChapter.Add(mChapter) | |
138 | 144 | |
145 | + iTemp += 1 | |
139 | 146 | |
147 | + Next | |
148 | + | |
149 | + | |
150 | + | |
151 | + End If | |
152 | + | |
153 | + | |
154 | + | |
155 | + | |
156 | + | |
157 | + | |
140 | 158 | mSection.listVolume.Add(mVolume) |
141 | 159 | |
142 | 160 | Next |
@@ -174,10 +192,27 @@ | ||
174 | 192 | |
175 | 193 | If listDel1 IsNot Nothing Then |
176 | 194 | For Each uDel As HtmlAgilityPack.HtmlNode In listDel1 |
195 | + Console.WriteLine(uDel.InnerText) | |
177 | 196 | sHtml = sHtml.Replace(uDel.OuterHtml, "") |
178 | 197 | Next |
179 | 198 | End If |
180 | 199 | |
200 | + | |
201 | + | |
202 | + Dim listDel2 = hapHtml.DocumentNode.SelectNodes(("//h[contains(@class, 'calibre8')]")) | |
203 | + | |
204 | + If listDel2 IsNot Nothing Then | |
205 | + For Each uDel As HtmlAgilityPack.HtmlNode In listDel2 | |
206 | + Console.WriteLine(uDel.InnerText) | |
207 | + sHtml = sHtml.Replace(uDel.OuterHtml, "") | |
208 | + Next | |
209 | + End If | |
210 | + | |
211 | + | |
212 | + | |
213 | + | |
214 | + | |
215 | + | |
181 | 216 | End Sub |
182 | 217 | |
183 | 218 | Private Sub EditHref00(ByRef sHtml As String) |
@@ -356,6 +391,8 @@ | ||
356 | 391 | |
357 | 392 | For iCtr3 As Integer = 0 To mEpub(iCtr1).listVolume(iCtr2).listChapter.Count - 1 |
358 | 393 | chkListTopLine(mEpub(iCtr1).listVolume(iCtr2).listChapter(iCtr3).listText, mEpub(iCtr1).listVolume(iCtr2).listChapter(iCtr3).Title) |
394 | + chkListTopLine(mEpub(iCtr1).listVolume(iCtr2).listChapter(iCtr3).listText, mEpub(iCtr1).listVolume(iCtr2).Title) | |
395 | + | |
359 | 396 | Next |
360 | 397 | Next |
361 | 398 | Next |