Moved MyCurl to a separate repistory.

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "StoryToEbook/MyCurl"]
+	path = StoryToEbook/MyCurl
+	url = https://github.com/GhostWriterTNCS/MyCurl.git

StoryToEbook/MainWindow.cpp

@@ -6,8 +6,7 @@
 #include <QString>
 #include <QTextStream>
 #include "MainWindow.h"
-#include "MyCurl.h"
-#include "MyUtils.h"
+#include "MyQtUtils.h"
 #include "Website.h"
 
 MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) {

StoryToEbook/MainWindow.ui

@@ -22,7 +22,7 @@
     <item>
      <widget class="QLabel" name="label_3">
       <property name="text">
-       <string>Paste here the url of the story or of a chapter</string>
+       <string>Paste here the url of the story or of a chapter:</string>
       </property>
      </widget>
     </item>

StoryToEbook/MyUtils.cpp → StoryToEbook/MyQtUtils.cpp

@@ -1,6 +1,7 @@
-#include "MyUtils.h"
+#include "MyCurl.h"
+#include "MyQtUtils.h"
 
-namespace MyUtils {
+namespace MyQtUtils {
 
 QString readFile(QString filename) {
 	QFile file(filename);
@@ -56,4 +57,12 @@ QString advancedReplace(QString str, QString startReplace, QString endReplace, Q
 	return str;
 }
 
-} // namespace MyUtils
+QString urlToQString(QString url) {
+	return QString::fromLocal8Bit(MyCurl::urlToString(url.toStdString()).c_str());
+}
+
+QString redirectedUrlQt(QString url) {
+	return QString::fromLocal8Bit(MyCurl::redirectedUrl(url.toStdString()).c_str());
+}
+
+} // namespace MyQtUtils

StoryToEbook/MyUtils.h → StoryToEbook/MyQtUtils.h

@@ -4,12 +4,16 @@
 #include <QString>
 #include <QTextStream>
 
-namespace MyUtils {
+namespace MyQtUtils {
 
 QString readFile(QString filename);
 QString validateFilename(QString filename);
 bool writeFile(QString filename, QString content);
+
 QString substring(QString str, QString start, QString end = "");
 QString advancedReplace(QString str, QString startReplace, QString endReplace, QString newText);
 
-} // namespace MyUtils
+QString urlToQString(QString url);
+QString redirectedUrlQt(QString url);
+
+} // namespace MyQtUtils

StoryToEbook/StoryToEbook.vcxproj

@@ -31,15 +31,15 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(SolutionDir)\bin\$(Configuration)\</OutDir>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)\include;$(ProjectDir)\websites</IncludePath>
-    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86;$(ProjectDir)\lib</LibraryPath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)\MyCurl;$(ProjectDir)\websites</IncludePath>
+    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86;$(ProjectDir)\MyCurl</LibraryPath>
     <SourcePath>$(VC_SourcePath);$(ProjectDir)\websites</SourcePath>
     <TargetName>Story to ebook</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)\bin\$(Configuration)\</OutDir>
-    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)\include;$(ProjectDir)\websites</IncludePath>
-    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86;$(ProjectDir)\lib</LibraryPath>
+    <IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)\MyCurl;$(ProjectDir)\websites</IncludePath>
+    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86;$(ProjectDir)\MyCurl</LibraryPath>
     <SourcePath>$(VC_SourcePath);$(ProjectDir)\websites</SourcePath>
     <TargetName>Story to ebook</TargetName>
   </PropertyGroup>
@@ -83,8 +83,8 @@
   <ItemGroup>
     <ClCompile Include="main.cpp" />
     <ClCompile Include="MainWindow.cpp" />
-    <ClCompile Include="MyCurl.cpp" />
-    <ClCompile Include="MyUtils.cpp" />
+    <ClCompile Include="MyCurl\MyCurl.cpp" />
+    <ClCompile Include="MyQtUtils.cpp" />
     <ClCompile Include="QtGeneratedFiles\Debug\moc_MainWindow.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
@@ -126,8 +126,8 @@
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="MyCurl.h" />
-    <ClInclude Include="MyUtils.h" />
+    <ClInclude Include="MyCurl\MyCurl.h" />
+    <ClInclude Include="MyQtUtils.h" />
     <ClInclude Include="QtGeneratedFiles\ui_MainWindow.h" />
     <ClInclude Include="resource.h" />
     <ClInclude Include="Website.h" />
@@ -150,7 +150,7 @@
     <ResourceCompile Include="StoryToEbook.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Image Include="Resources\icon.ico" />
+    <Image Include="resources\icon.ico" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

StoryToEbook/StoryToEbook.vcxproj.filters

@@ -46,12 +46,6 @@
     <ClCompile Include="MainWindow.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="MyCurl.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MyUtils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="websites\Wattpad.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -70,6 +64,12 @@
     <ClCompile Include="websites\EFP.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="MyQtUtils.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MyCurl\MyCurl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="MainWindow.h">
@@ -86,12 +86,6 @@
     <ClInclude Include="resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="MyCurl.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="MyUtils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="websites\Wattpad.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -104,11 +98,17 @@
     <ClInclude Include="websites\EFP.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="MyQtUtils.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MyCurl\MyCurl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="StoryToEbook.rc" />
   </ItemGroup>
   <ItemGroup>
-    <Image Include="Resources\icon.ico" />
+    <Image Include="resources\icon.ico" />
   </ItemGroup>
 </Project>

StoryToEbook/Website.cpp

@@ -1,5 +1,5 @@
 #include <QFileInfo>
-#include "MyUtils.h"
+#include "MyQtUtils.h"
 #include "Wattpad.h"
 #include "Website.h"
 
@@ -47,15 +47,15 @@ QString Website::createEbook(QString extension, bool downloadCover, QString fold
 		folder = folder.replace("/", "\\");
 	}
 
-	Website::title = MyUtils::validateFilename(Website::title);
+	Website::title = MyQtUtils::validateFilename(Website::title);
 	if (extension == "html") {
-		MyUtils::writeFile(Website::title + ".html", Website::story);
+		MyQtUtils::writeFile(Website::title + ".html", Website::story);
 	} else {
 		int i = 0;
 		QFile file;
 		while (file.exists(QString::number(i) + ".htm"))
 			i++;
-		MyUtils::writeFile(QString::number(i) + ".htm", Website::story);
+		MyQtUtils::writeFile(QString::number(i) + ".htm", Website::story);
 
 		if (downloadCover && !Website::cover.isEmpty()) {
 			Website::cover = Website::cover.replace(" ", "%20");