Added footer/author notes

LordZero25 · Jun 23, 2018 · 0baf8f8 · 0baf8f8
1 parent b2c317c
commit 0baf8f8
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@
 ################################################################################
 
 /src/syosetuDownloader/bin
+/src/syosetuDownloader/obj/x86
+/src/.vs
diff --git a/src/syosetuDownloader/Properties/AssemblyInfo.cs b/src/syosetuDownloader/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.3.0")]
-[assembly: AssemblyFileVersion("2.3.0")]
+[assembly: AssemblyVersion("2.3.1")]
+[assembly: AssemblyFileVersion("2.3.1")]
diff --git a/src/syosetuDownloader/Syousetsu.cs b/src/syosetuDownloader/Syousetsu.cs
@@ -142,9 +142,17 @@ public static string GetChapterTitle(HtmlDocument doc)
         public static string GetNovelBody(HtmlDocument doc, Constants.FileType fileType)
         {
             HtmlNode novelNode = doc.DocumentNode.SelectSingleNode("//div[@id='novel_honbun']");
+            HtmlNode footerNode = doc.DocumentNode.SelectSingleNode("//div[@id='novel_a']");
             if (fileType == Constants.FileType.Text)
             {
-                return novelNode.InnerText;
+                string s = novelNode.InnerText;
+                if (footerNode != null)
+                {
+                    s += Environment.NewLine + "=====" + Environment.NewLine;
+                    s += footerNode.InnerText;
+                }
+
+                return s;
             }
             else if (fileType == Constants.FileType.HTML)
             {
@@ -153,9 +161,22 @@ public static string GetNovelBody(HtmlDocument doc, Constants.FileType fileType)
                 StringBuilder sb = new StringBuilder();
                 foreach (String str in s)
                 {
-                    string temp = (str != "") ? ("<p>" + str + "</p>\n") : ("<p><br/></p>\n");
-                    sb.Append(temp);
+                    string temp = (str != "") ? ("<p>" + str + "</p>") : ("<p><br/></p>");
+                    sb.AppendLine(temp);
                 }
+
+                if (footerNode != null)
+                {
+                    sb.AppendLine("<hr/>");
+
+                    s = footerNode.InnerText.Split(new string[] { "\r\n", "\n" }, StringSplitOptions.None);
+                    foreach (String str in s)
+                    {
+                        string temp = (str != "") ? ("<p>" + str + "</p>") : ("<p><br/></p>");
+                        sb.AppendLine(temp);
+                    }
+                }
+
                 return sb.ToString();
             }
             return String.Empty;
@@ -285,7 +306,7 @@ public static string[] GenerateContents(Syousetsu.Constants details, HtmlDocumen
                 if (doc.DocumentNode.SelectSingleNode("//div[@id='novel_honbun']").InnerHtml.Contains("<img"))
                 {
                     string subLink = String.Format("{0}{1}", details.Link, current);
-                    chapter[1] += String.Format("\n\n===\n\nContains image(s): {0}\n\n===", subLink);
+                    chapter[1] += String.Format("\n\n===\n\n<a href=\"{0}\">Contains image(s)</a>\n\n===", subLink);
                 }
             }
             return chapter;
@@ -409,8 +430,8 @@ private static string CheckDirectory(Syousetsu.Constants details)
                 temp = temp.Take(temp.Length - 1).ToArray();
                 string tempFormat = (temp.Length > 1) ? String.Join("\\", temp) : temp[0];
 
-                path = Path.Combine(new string[] { 
-                    Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), 
+                path = Path.Combine(new string[] {
+                    Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
                     details.SeriesTitle,
                     String.Format(tempFormat, new object[]{ 0, details.ChapterTitle[0], details.SeriesCode})
                 });
@@ -434,8 +455,8 @@ private static string CheckDirectory(Syousetsu.Constants details, int current)
                 temp = temp.Take(temp.Length - 1).ToArray();
                 string tempFormat = (temp.Length > 1) ? String.Join("\\", temp) : temp[0];
 
-                path = Path.Combine(new string[] { 
-                    Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), 
+                path = Path.Combine(new string[] {
+                    Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
                     details.SeriesTitle,
                     String.Format(tempFormat, new object[]{ current, details.ChapterTitle[current], details.SeriesCode})
                 });

diff --git a/src/syosetuDownloader/syosetuDownloader.csproj.user b/src/syosetuDownloader/syosetuDownloader.csproj.user
@@ -5,7 +5,8 @@
     </StartArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <StartArguments>-h</StartArguments>
+    <StartArguments>
+    </StartArguments>
   </PropertyGroup>
   <PropertyGroup>
     <PublishUrlHistory>publish\</PublishUrlHistory>