• R/O
  • SSH
  • HTTPS

autocodeforsql: Commit


Commit MetaInfo

Revision362 (tree)
Time2020-05-27 15:43:41
Authorhilinwei

Log Message

Change Summary

Incremental Difference

--- AutoEpub3/AutoEpub7.vb (revision 361)
+++ AutoEpub3/AutoEpub7.vb (revision 362)
@@ -1453,9 +1453,21 @@
14531453 Dim serializer As System.Xml.Serialization.XmlSerializer = New System.Xml.Serialization.XmlSerializer(GetType(ncx))
14541454 Dim model As ncx = CType(serializer.Deserialize(fs), ncx)
14551455
1456+ Dim listSkip As New List(Of String)
1457+
1458+ listSkip.Add("折页")
1459+ listSkip.Add("封底")
1460+ listSkip.Add("封面")
1461+ listSkip.Add("前折页")
1462+ listSkip.Add("书名页")
1463+ listSkip.Add("目录")
1464+ listSkip.Add("版权页")
1465+
1466+
1467+
14561468 Dim mEpub As New List(Of modelChapter)
14571469
1458- For iCtr As Integer = 1 To 2
1470+ For iCtr As Integer = 1 To 1
14591471 Dim unitOne As ncxNavPoint = model.navMap(iCtr)
14601472
14611473
@@ -1471,47 +1483,68 @@
14711483
14721484 Dim mChapter As New modelChapter
14731485
1486+
1487+
14741488 mChapter.Title = eachNax.navLabel.text
1475- Dim sHtml As String = cTools.sFileReader(sPath, cEpub6.encUTF8)
14761489
1477- If sHtml.IndexOf("h1") > -1 Then
1478- Dim sTitle As String = cTools.listNav_SE(sHtml, "<h1", "</h1>", True)(0)
1479- If sTitle.IndexOf("href") > -1 Then
1480- Dim listHref As List(Of String) = cTools.listNav_SE(sTitle, "href=""", """>", True)
1481- For Each eachHref As String In listHref
1482- Dim sKey As String = eachHref.Split("#")(1).Replace(""">", "")
1483- sTitle = sTitle.Replace(eachHref, "href=""#" & sKey & """>")
1484- Next
1485- mChapter.TitleSP = mChapter.Title & "<a" & cTools.listNav_SE(sTitle, "<a", "</h1>", False)(0)
1486- End If
1490+
1491+ If listSkip.Any(Function(x) mChapter.Title.IndexOf(x) > -1) Then
1492+
1493+ Continue For
1494+
14871495 End If
14881496
14891497
1498+ Dim sTitleLev3 As String = mChapter.Title
14901499
14911500
1501+ Dim sHtml As String = cTools.sFileReader(sPath, cEpub6.encUTF8)
14921502
14931503 Dim listHref_Titl As List(Of String) = cTools.listNav_SE(sHtml, "<a href", """>", True).Where(Function(x) x.IndexOf("#") > -1).ToList()
1504+ For Each uHref As String In listHref_Titl
1505+ Dim sKeyHref As String = uHref.Split("#")(1).Split("""")(0)
1506+ sHtml = sHtml.Replace(uHref, "<a href=""#" & sKeyHref & """>")
1507+ Next
14941508
14951509
1496- For Each uHref As String In listHref_Titl
1510+ If sHtml.IndexOf("h1") > -1 Then
1511+ Dim sTitle As String = cTools.listNav_SE(sHtml, "<h1", "</h1>", True)(0)
1512+ If sTitle.IndexOf("href") > -1 Then
1513+ 'Dim listHref As List(Of String) = cTools.listNav_SE(sTitle, "href=""", """>", True)
1514+ 'For Each eachHref As String In listHref
1515+ ' Dim sKey As String = eachHref.Split("#")(1).Replace(""">", "")
1516+ ' sTitle = sTitle.Replace(eachHref, "href=""#" & sKey & """>")
1517+ 'Next
1518+ mChapter.TitleSP = cTools.listNav_SE(sTitle, "class=""front"">", "</h1>", False)(0)
14971519
1498- Dim sKeyHref As String = uHref.Split("#")(1).Split("""")(0)
1520+ sTitleLev3 = mChapter.TitleSP
1521+ End If
1522+ End If
14991523
1500- sHtml = sHtml.Replace(uHref, "<a href=""#" & sKeyHref & """>")
1524+ Dim listLev3 As List(Of String) = cTools.listNav_SE(sTitleLev3, "<a", "</a>", True)
15011525
1502- Next
1526+ Dim listParam As New List(Of cValues)
15031527
1528+ For Each uLev3 As String In listLev3
1529+ Dim sGuid As String = New Guid().ToString
1530+ listParam.Add(New cValues(uLev3, sGuid))
1531+ sTitleLev3 = sTitleLev3.Replace(uLev3, sGuid)
15041532
1533+ Next
15051534
1535+ sTitleLev3 = sTitleLev3.Replace(" ", "</br>")
15061536
1537+ For Each uP3 As cValues In listParam
1538+ sTitleLev3 = sTitleLev3.Replace(uP3.sValue2, uP3.sValue1)
1539+ Next
15071540
1541+ mChapter.TitleSP = sTitleLev3
15081542
1509-
15101543 Dim listImg As List(Of String) = cTools.listNav_SE(sHtml, "<img", "/>", True)
15111544
15121545 For Each uImg As String In listImg
15131546 Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0)
1514- If uImg.IndexOf("alone") > -1 Then
1547+ If uImg.IndexOf("calibre14") > -1 Then
15151548 Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Chapter)
15161549 sHtml = sHtml.Replace(uImg, sImgKey)
15171550 Else
@@ -1539,7 +1572,7 @@
15391572
15401573
15411574 Dim cEpub As New cEpub6(emEpub6.emEncCode.SHIFT_JIS, emEpub6.emLan.ZH, "红楼梦", "曹雪芹", "SDMZ_HLM_202005")
1542- cEpub.bConvertToMobi = False
1575+ cEpub.bConvertToMobi = True
15431576
15441577 cEpub.CreateEpub(mEpub)
15451578 MessageBox.Show("Finished")
--- AutoEpub3/cTools.vb (revision 361)
+++ AutoEpub3/cTools.vb (revision 362)
@@ -1196,8 +1196,11 @@
11961196 sScr = "../" & sScr
11971197 End If
11981198
1199- sGaiji = "<img class=""mobiImgChar_inline"" alt="""" src=""" & sScr & """/>"
1199+ sGaiji = "<img class=""width020per"" alt="""" src=""" & sScr & """/>"
12001200
1201+ 'sGaiji = "<span class=""gaiji"”><img src=""" & sScr & """ /></span>"
1202+
1203+
12011204 End Function
12021205
12031206
@@ -1218,7 +1221,7 @@
12181221 sScr = "../" & sScr
12191222 End If
12201223
1221- sMapImg = "<img class=""mobiImgMap"" alt="""" src=""" & sScr & """/>"
1224+ sMapImg = "<img Class=""mobiImgMap"" alt="""" src=""" & sScr & """/>"
12221225
12231226 End Function
12241227
Show on old repository browser