• R/O
  • SSH
  • HTTPS

autocodeforsql: 提交


Commit MetaInfo

修订版405 (tree)
时间2020-11-06 16:39:20
作者hilinwei

Log Message

更改概述

差异

--- AutoEpub3/AutoEpub7.vb (revision 404)
+++ AutoEpub3/AutoEpub7.vb (revision 405)
@@ -101,7 +101,7 @@
101101 Dim sScr As String = eachImg.Split("/").ToList()(2).Split("""").ToList()(0)
102102
103103
104- Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emUrlImgDep.Chapter)
104+ Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emDep.Dep2)
105105
106106 eachChartLine = eachChartLine.Replace(eachImg, sNewImg)
107107
@@ -287,10 +287,10 @@
287287 For Each uImg As String In listImg
288288 Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0)
289289 If uImg.IndexOf("alone") > -1 Then
290- Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Chapter)
290+ Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emDep.Dep2)
291291 sChapter = sChapter.Replace(uImg, sImgKey)
292292 Else
293- Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Chapter)
293+ Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emDep.Dep2)
294294 sChapter = sChapter.Replace(uImg, sImgKey)
295295 End If
296296 Next
@@ -420,7 +420,7 @@
420420 For Each eachImg As String In listImg
421421
422422 Dim sScr As String = cTools.listNav_SE(eachImg, "src=""", """/>", False)(0)
423- Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emUrlImgDep.Chapter)
423+ Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emDep.Dep2)
424424
425425 mChapter.listText(ctrLine) = mChapter.listText(ctrLine).Replace(eachImg, sNewImg)
426426
@@ -441,7 +441,7 @@
441441 For Each eachImg As String In listImg
442442
443443 Dim sScr As String = cTools.listNav_SE(eachImg, "src=""", """/>", False)(0)
444- Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emUrlImgDep.Volume)
444+ Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emDep.Dep1)
445445
446446 mVolume.listText(ctrLine) = mVolume.listText(ctrLine).Replace(eachImg, sNewImg)
447447
@@ -461,7 +461,7 @@
461461 For Each eachImg As String In listImg
462462
463463 Dim sScr As String = cTools.listNav_SE(eachImg, "src=""", """/>", False)(0)
464- Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emUrlImgDep.Section)
464+ Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emDep.Dep1)
465465
466466 mSeciont.listText(ctrLine) = mSeciont.listText(ctrLine).Replace(eachImg, sNewImg)
467467
@@ -723,10 +723,10 @@
723723 For Each uImg As String In listImg
724724 Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0)
725725 If uImg.IndexOf("calibre2") > -1 Then
726- Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Volume)
726+ Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emDep.Dep1)
727727 sChapter = sChapter.Replace(uImg, sImgKey)
728728 Else
729- Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Volume)
729+ Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emDep.Dep1)
730730 sChapter = sChapter.Replace(uImg, sImgKey)
731731 End If
732732 Next
@@ -777,10 +777,10 @@
777777 For Each uImg As String In listImg
778778 Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0)
779779 If uImg.IndexOf("alone") > -1 Then
780- Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Volume)
780+ Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emDep.Dep1)
781781 sChapter = sChapter.Replace(uImg, sImgKey)
782782 Else
783- Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Volume)
783+ Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emDep.Dep1)
784784 sChapter = sChapter.Replace(uImg, sImgKey)
785785 End If
786786 Next
@@ -1436,10 +1436,10 @@
14361436 For Each uImg As String In listImg
14371437 Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0)
14381438 If uImg.IndexOf("calibre22") > -1 Then
1439- Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Volume)
1439+ Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emDep.Dep1)
14401440 sHtml = sHtml.Replace(uImg, sImgKey)
14411441 Else
1442- Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Volume)
1442+ Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emDep.Dep1)
14431443 sHtml = sHtml.Replace(uImg, sImgKey)
14441444 End If
14451445 Next
@@ -1572,10 +1572,10 @@
15721572 For Each uImg As String In listImg
15731573 Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0)
15741574 If uImg.IndexOf("calibre14") > -1 Then
1575- Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Chapter)
1575+ Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emDep.Dep2)
15761576 sHtml = sHtml.Replace(uImg, sImgKey)
15771577 Else
1578- Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Chapter)
1578+ Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emDep.Dep2)
15791579 sHtml = sHtml.Replace(uImg, sImgKey)
15801580 End If
15811581 Next
@@ -1827,10 +1827,10 @@
18271827 For Each uImg As String In listImg
18281828 Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0)
18291829 If uImg.IndexOf("imz") > -1 Then
1830- Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Chapter)
1830+ Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emDep.Dep2)
18311831 sHtml = sHtml.Replace(uImg, sImgKey)
18321832 Else
1833- Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Chapter)
1833+ Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emDep.Dep2)
18341834 sHtml = sHtml.Replace(uImg, sImgKey)
18351835 End If
18361836 Next
@@ -1981,10 +1981,10 @@
19811981 For Each uImg As String In listImg
19821982 Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0)
19831983 If uImg.IndexOf("imz") > -1 Then
1984- Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Chapter)
1984+ Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emDep.Dep2)
19851985 sHtml = sHtml.Replace(uImg, sImgKey)
19861986 Else
1987- Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Chapter)
1987+ Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emDep.Dep2)
19881988 sHtml = sHtml.Replace(uImg, sImgKey)
19891989 End If
19901990 Next
@@ -2136,10 +2136,10 @@
21362136 For Each uImg As String In listImg
21372137 Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0)
21382138 If uImg.IndexOf("imz") > -1 Then
2139- Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Chapter)
2139+ Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emDep.Dep2)
21402140 sHtml = sHtml.Replace(uImg, sImgKey)
21412141 Else
2142- Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Chapter)
2142+ Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emDep.Dep2)
21432143 sHtml = sHtml.Replace(uImg, sImgKey)
21442144 End If
21452145 Next
--- AutoEpub3/Logic/DEP2/cDep2_002.vb (revision 404)
+++ AutoEpub3/Logic/DEP2/cDep2_002.vb (revision 405)
@@ -88,10 +88,10 @@
8888 Dim listImg As List(Of String) = cTools.listNav_SE(sChapter, "<img", "/>", True)
8989 For Each eachImg As String In listImg
9090 Dim sScr As String = eachImg.Split("/").ToList()(2).Split("""").ToList()(0)
91- Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emUrlImgDep.Volume)
91+ Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emDep.Dep1)
9292
9393 If eachImg.IndexOf("calibre20") > -1 Then
94- sNewImg = cTools.sMapImg(sScr, emEpub6.emUrlImgDep.Volume)
94+ sNewImg = cTools.sMapImg(sScr, emEpub6.emDep.Dep1)
9595 End If
9696
9797 sChapter = sChapter.Replace(eachImg, sNewImg)
--- AutoEpub3/Logic/DEP2/cDep2_004.vb (revision 404)
+++ AutoEpub3/Logic/DEP2/cDep2_004.vb (revision 405)
@@ -89,10 +89,10 @@
8989 Dim listImg As List(Of String) = cTools.listNav_SE(sChapter, "<img", "/>", True)
9090 For Each eachImg As String In listImg
9191 Dim sScr As String = eachImg.Split("/").ToList()(2).Split("""").ToList()(0)
92- Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emUrlImgDep.Volume)
92+ Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emDep.Dep1)
9393
9494 If eachImg.IndexOf("calibre20") > -1 Then
95- sNewImg = cTools.sMapImg(sScr, emEpub6.emUrlImgDep.Volume)
95+ sNewImg = cTools.sMapImg(sScr, emEpub6.emDep.Dep1)
9696 End If
9797
9898 sChapter = sChapter.Replace(eachImg, sNewImg)
--- AutoEpub3/Logic/DEP2/cDep2_005.vb (revision 404)
+++ AutoEpub3/Logic/DEP2/cDep2_005.vb (revision 405)
@@ -89,10 +89,10 @@
8989 Dim listImg As List(Of String) = cTools.listNav_SE(sChapter, "<img", "/>", True)
9090 For Each eachImg As String In listImg
9191 Dim sScr As String = eachImg.Split("/").ToList()(2).Split("""").ToList()(0)
92- Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emUrlImgDep.Volume)
92+ Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emDep.Dep1)
9393
9494 If eachImg.IndexOf("calibre20") > -1 Then
95- sNewImg = cTools.sMapImg(sScr, emEpub6.emUrlImgDep.Volume)
95+ sNewImg = cTools.sMapImg(sScr, emEpub6.emDep.Dep1)
9696 End If
9797
9898 sChapter = sChapter.Replace(eachImg, sNewImg)
--- AutoEpub3/Logic/DEP3/cDep3_006.vb (revision 404)
+++ AutoEpub3/Logic/DEP3/cDep3_006.vb (revision 405)
@@ -4,7 +4,7 @@
44 Public Class cDep3_006
55
66 Dim bookPath As String
7- Dim emCurreDep As emEpub6.emUrlImgDep
7+ Dim emCurreDep As emEpub6.emDep
88
99 Public mEpub As New List(Of modelSection)
1010
@@ -31,7 +31,7 @@
3131
3232 For iCtrSection As Integer = 0 To model.navMap.Count - 1
3333
34- emCurreDep = emEpub6.emUrlImgDep.Section
34+ emCurreDep = emEpub6.emDep.Dep1
3535
3636 Dim ncxSection As ncxNavPoint = model.navMap(iCtrSection)
3737 Dim mSection As New modelSection()
@@ -56,7 +56,7 @@
5656
5757 For ctrVolume As Integer = 0 To ncxSection.navPoint.Count - 1
5858
59- emCurreDep = emEpub6.emUrlImgDep.Chapter
59+ emCurreDep = emEpub6.emDep.Dep2
6060 Dim ncxVolume As ncxNavPointNavPoint = ncxSection.navPoint(ctrVolume)
6161
6262
@@ -81,7 +81,7 @@
8181
8282 For ctrChapter As Integer = 0 To ncxVolume.navPoint.Count - 1
8383
84- emCurreDep = emEpub6.emUrlImgDep.Chapter
84+ emCurreDep = emEpub6.emDep.Dep2
8585 Dim ncxChapter As ncxNavPointNavPointNavPoint = ncxVolume.navPoint(ctrChapter)
8686
8787 Dim mChapter As New modelChapter
--- AutoEpub3/cEpub6.vb (revision 404)
+++ AutoEpub3/cEpub6.vb (revision 405)
@@ -1103,15 +1103,15 @@
11031103
11041104 Dim sScr As String = "Img/" & sText
11051105
1106- If kbnDEP = emEpub6.emUrlImgDep.Section Then
1106+ If kbnDEP = emEpub6.emDep.Dep0 Then
11071107 sScr = "" & sScr
11081108 End If
11091109
1110- If kbnDEP = emEpub6.emUrlImgDep.Volume Then
1110+ If kbnDEP = emEpub6.emDep.Dep1 Then
11111111 sScr = "../" & sScr
11121112 End If
11131113
1114- If kbnDEP = emEpub6.emUrlImgDep.Chapter Then
1114+ If kbnDEP = emEpub6.emDep.Dep2 Then
11151115 sScr = "../../" & sScr
11161116 End If
11171117
@@ -1146,15 +1146,15 @@
11461146
11471147 Dim sScr As String = "Img/" & sImgName
11481148
1149- If kbnDEP = emEpub6.emUrlImgDep.Section Then
1149+ If kbnDEP = emEpub6.emDep.Dep0 Then
11501150 sScr = "" & sScr
11511151 End If
11521152
1153- If kbnDEP = emEpub6.emUrlImgDep.Volume Then
1153+ If kbnDEP = emEpub6.emDep.Dep1 Then
11541154 sScr = "../" & sScr
11551155 End If
11561156
1157- If kbnDEP = emEpub6.emUrlImgDep.Chapter Then
1157+ If kbnDEP = emEpub6.emDep.Dep2 Then
11581158 sScr = "../../" & sScr
11591159 End If
11601160
@@ -1406,13 +1406,6 @@
14061406 Dep3
14071407 End Enum
14081408
1409- Enum emUrlImgDep As Integer
1410- Section
1411- Volume
1412- Chapter
1413- End Enum
1414-
1415-
14161409 Public Const spText_EmDash As String = "spText_EmDash"
14171410
14181411 Public Const spText_SubTitle As String = "spText_SubTitle"
--- AutoEpub3/cTools.vb (revision 404)
+++ AutoEpub3/cTools.vb (revision 405)
@@ -289,16 +289,16 @@
289289
290290 Dim listImg As List(Of String) = cTools.listNav_SE(sHtml, "<img", "/>", True)
291291
292- For Each uImg As String In listImg
293- Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0)
294- If uImg.IndexOf("kindle-cn-bodycontent-image-alone1") > -1 Then
295- Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Volume)
296- sHtml = sHtml.Replace(uImg, sImgKey)
297- Else
298- Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Volume)
299- sHtml = sHtml.Replace(uImg, sImgKey)
300- End If
301- Next
292+ 'For Each uImg As String In listImg
293+ ' Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0)
294+ ' If uImg.IndexOf("kindle-cn-bodycontent-image-alone1") > -1 Then
295+ ' Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Volume)
296+ ' sHtml = sHtml.Replace(uImg, sImgKey)
297+ ' Else
298+ ' Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Volume)
299+ ' sHtml = sHtml.Replace(uImg, sImgKey)
300+ ' End If
301+ 'Next
302302
303303
304304
@@ -1338,20 +1338,20 @@
13381338 sGetUriFile = listURL(listURL.Count - 1)
13391339 End Function
13401340
1341- Public Shared Function sGaiji(ByVal sScr As String, ByVal iDep As emEpub6.emUrlImgDep) As String
1341+ Public Shared Function sGaiji(ByVal sScr As String, ByVal iDep As emEpub6.emDep) As String
13421342
13431343 Dim listTemp As List(Of String) = sScr.Split("/").ToList()
13441344 sScr = "Img/" & listTemp(listTemp.Count - 1)
13451345
1346- If iDep = emEpub6.emUrlImgDep.Section Then
1346+ If iDep = emEpub6.emDep.Dep0 Then
13471347 sScr = "../../../" & sScr
13481348 End If
13491349
1350- If iDep = emEpub6.emUrlImgDep.Volume Then
1350+ If iDep = emEpub6.emDep.Dep1 Then
13511351 sScr = "../../" & sScr
13521352 End If
13531353
1354- If iDep = emEpub6.emUrlImgDep.Chapter Then
1354+ If iDep = emEpub6.emDep.Dep2 Then
13551355 sScr = "../" & sScr
13561356 End If
13571357
@@ -1361,20 +1361,20 @@
13611361 End Function
13621362
13631363
1364- Public Shared Function sMapImg(ByVal sScr As String, ByVal iDep As emEpub6.emUrlImgDep) As String
1364+ Public Shared Function sMapImg(ByVal sScr As String, ByVal iDep As emEpub6.emDep) As String
13651365
13661366 Dim listTemp As List(Of String) = sScr.Split("/").ToList()
13671367 sScr = "Img/" & listTemp(listTemp.Count - 1)
13681368
1369- If iDep = emEpub6.emUrlImgDep.Section Then
1369+ If iDep = emEpub6.emDep.Dep0 Then
13701370 sScr = "../" & sScr
13711371 End If
13721372
1373- If iDep = emEpub6.emUrlImgDep.Volume Then
1373+ If iDep = emEpub6.emDep.Dep1 Then
13741374 sScr = "../../" & sScr
13751375 End If
13761376
1377- If iDep = emEpub6.emUrlImgDep.Chapter Then
1377+ If iDep = emEpub6.emDep.Dep2 Then
13781378 sScr = "../../../" & sScr
13791379 End If
13801380
Show on old repository browser