Removed pixhost.org and sharenxs.com;

Fixed compilation of ServerListTool
zenden2k · Jun 1, 2018 · 20a8ff8 · 20a8ff8
1 parent 4981e8f
commit 20a8ff8
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 65 deletions.
diff --git a/Data/Favicons/cubeupload.com.ico b/Data/Favicons/cubeupload.com.ico
diff --git a/Data/Favicons/pixhost.org.ico b/Data/Favicons/pixhost.org.ico
diff --git a/Data/Scripts/pixhostorg.nut b/Data/Scripts/pixhostorg.nut
diff --git a/Data/servers.xml b/Data/servers.xml
@@ -194,11 +194,6 @@
 		</Actions>
 	<Result ImageUrlTemplate="$(Image)" ThumbUrlTemplate="$(Thumb)"/>
 	</Server>
-	<Server Name="pixhost.org" Authorize="0" Debug="0" Type="image" MaxFileSize="10485760" Plugin="pixhostorg" >
-		<Actions>
-		</Actions>
-		<Result DirectUrlTemplate="stub" />
-	</Server>
 	<Server Name="datafilehost.com" FileHost="1">
 	<Actions>
 		<Action Type="upload" Url="http://www.datafilehost.com/upload.php" PostParams="MAX_FILE_SIZE=158334976;upfile=%filename%;" RegExp="name='download' size='\d+' value='(.+?)' " AssignVars="File:0;"/>
@@ -267,17 +262,6 @@
 		</Actions>
 		<Result DownloadUrlTemplate="http://$(Host)/$(Code)" />
 	</Server>--> 
-    <Server Name="sharenxs.com" Debug="0"> 
-        <Actions> 
-            <Action Type="get" Url="http://sharenxs.com/" RegExp="'directory': '([^']+)'" AssignVars="Dir:0" OnlyOnce="0" /> 
-            <Action Type="upload" Url="http://sharenxs.com/upload" 
-                PostParams="directory=$(Dir);safe=0;gallery=;qquuid=$(_THREADID)$(_RAND16BITS);qqfile=%filename%" 
-                RegExp="&quot;photo_link&quot;:&quot;\\\/photos\\\/(\w+)\\\/(\w+)\\\/(\w+)\\\/(\w+)\\\/([^&quot;]+)&quot;" 
-                AssignVars="Y:0;M:1;D:2;ID:3;Name:4" 
-            /> 
-        </Actions> 
-        <Result ImageUrlTemplate="http://sharenxs.com/photos/$(Y)/$(M)/$(D)/$(ID)/$(Name)" ThumbUrlTemplate="http://sharenxs.com/photos/$(Y)/$(M)/$(D)/$(ID)/smnxs-$(Name)"/> 
-    </Server>
 	 <Server Name="multiup.org" FileHost="1" MaxFileSize="2147483647"> 
         <Actions> 
             <Action Type="get" Url="http://www.multiup.org/api/get-fastest-server" 
@@ -330,7 +314,7 @@
 	</Server2>
 	<Server2 Name="is.gd" Debug="0" Type="urlshortening">
 		<Actions>
-			<Action Type="post" Url="http://is.gd/create.php?format=simple&amp;url=$(_ORIGINALURL|urlencode)" RegExp='^(.*?)$' AssignVars="ShortUrl:0;"/>
+			<Action Type="post" Url="https://is.gd/create.php?format=simple&amp;url=$(_ORIGINALURL|urlencode)" RegExp='^(.*?)$' AssignVars="ShortUrl:0;"/>
 		</Actions>
 		<Result DirectUrlTemplate="$(ShortUrl)" />
 	</Server2>
@@ -363,12 +347,12 @@
 		</Actions>
 		<Result ImageUrlTemplate="$(Image)" ThumbUrlTemplate="$(Thumb)" DownloadUrlTemplate="$(DownloadUrl)"/>
 	</Server>
-	<Server Name="pixic.ru">
+	<!--<Server Name="pixic.ru">
 		<Actions>
 			<Action Type="upload" Url="http://www.pixic.ru/" PostParams="submit=Загрузить;files=;file1=%filename%;orig_resize=500;res_select=500;orig_rotate=0;jpeg_quality=75;check_thumb=size;thumb_text=Увеличить;thumb_size=170;send=1;" RegExp="\[IMG\]([\s\S]*?)\[IMG\](.*?)\[([\s\S]*?)\[IMG\](.*?)\[" AssignVars="Image:1;Thumb:3;"/>
 		</Actions>
 		<Result ImageUrlTemplate="$(Image)" ThumbUrlTemplate="$(Thumb)"/>
-	</Server>
+	</Server>-->
 	<Server Name="ovrload.ru" FileHost="1" Type="file" Types="image,file">
 		<Actions>
 			<Action Type="upload" Url="https://ovrload.ru/" PostParams="clipboard=;fileframe=true;file=%filename%;" RegExp="&quot;(https:\/\/ovrload\.ru:443\/.*?)&quot;" AssignVars="File:0;"/>
@@ -389,11 +373,12 @@
         </Actions>
         <Result ImageUrlTemplate="$(Image)" ThumbUrlTemplate="$(Thumb)"/>
     </Server>
-    <Server Name="cubeupload.com">
+    <Server Name="cubeupload.com" Authorize="2" MaxFileSize="5000000">
         <Actions>
+            <Action Type="login" Url="https://cubeupload.com/login" PostParams="cube_username=$(_LOGIN);cube_password=$(_PASSWORD);login=Login" OnlyOnce="1"/>
             <Action Type="upload" Url="https://cubeupload.com/upload_json.php" PostParams="name=$(FILENAME);userHash=false;userID=false;fileinput[0]=%filename%;" RegExp="&quot;file_name&quot;:&quot;(.+?)&quot;" AssignVars="Id:0"/>
         </Actions>
-        <Result ImageUrlTemplate="http://i.cubeupload.com/$(Id)" ThumbUrlTemplate="http://i.cubeupload.com/t/$(Id)"/>
+        <Result ImageUrlTemplate="http://u.cubeupload.com/$(_LOGIN)/$(Id)" ThumbUrlTemplate="http://u.cubeupload.com/$(_LOGIN)/t/$(Id)"/>
     </Server>
 	<Server Name="picabox.ru" Authorize="0" FileHost="0" Debug="0" Plugin="picabox">
 		<Actions>

diff --git a/Source/ServerListTool/ServerListTool.vcxproj b/Source/ServerListTool/ServerListTool.vcxproj
@@ -166,7 +166,7 @@
       <AdditionalOptions>-MP$(NUMBER_OF_PROCESSORS) %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(SolutionDir)\Source\ServerListTool;$(SolutionDir)\Contrib\Include\DX;$(SolutionDir)\Contrib\Include\BaseClasses;$(SolutionDir)\Contrib\Include\WTL;$(SolutionDir)\Contrib\Include\;$(SolutionDir)\Contrib\Include\pcre;$(SolutionDir)\Contrib\Include\tinyxml;$(SolutionDir)\Contrib\Include\squirrel;$(SolutionDir)\Source;$(SolutionDir)\Contrib\Include\libs;$(SolutionDir)\Contrib\Source\boost\;$(SolutionDir)\Contrib\Include\gumbo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;NDEBUG;IU_SERVERLISTTOOL;CURL_STATICLIB;PCRE_STATIC;TIXML_USE_STL;IU_WTL;GOOGLE_GLOG_DLL_DECL=;WIN32_LEAN_AND_MEAN;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;NDEBUG;IU_SERVERLISTTOOL;CURL_STATICLIB;PCRE_STATIC;TIXML_USE_STL;IU_WTL;GOOGLE_GLOG_DLL_DECL=;WIN32_LEAN_AND_MEAN;NOMINMAX;ENABLE_SYNC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -184,7 +184,7 @@
       <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>minizip.lib;zlibd.lib;ws2_32.lib;Wldap32.lib;ssleay32.lib;libeay32.lib;gdiplus.lib;dwmapi.lib;pcre.lib;libcurl.lib;squirrel.lib;sqstdlib.lib;Oleacc.lib;gumbo.lib;jsoncpp.lib;libglog_static.lib;Winhttp.lib;base64.lib;libwebpdecoder.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>minizip.lib;zlibd.lib;ws2_32.lib;Wldap32.lib;ssleay32.lib;libeay32.lib;gdiplus.lib;dwmapi.lib;pcre.lib;libcurl.lib;squirrel.lib;sqstdlib.lib;Oleacc.lib;gumbo.lib;jsoncpp.lib;libglog_static.lib;Winhttp.lib;base64.lib;libwebpdecoder.lib;libwebpdemux.lib;mega.lib;cryptopp.lib;cares.lib;libuv.lib;Userenv.lib;Psapi.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)\Contrib\Lib\Debug;$(SolutionDir)Contrib\Lib\;$(SolutionDir)\Contrib\Source\boost\stage\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <IgnoreSpecificDefaultLibraries>libcmt.lib;msvcrt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -263,7 +263,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)\Include\DX;$(SolutionDir)\Include\BaseClasses;$(SolutionDir)\Include\WTL;$(SolutionDir)\Include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>minizip.lib;zlib.lib;ws2_32.lib;Wldap32.lib;ssleay32.lib;libeay32.lib;gdiplus.lib;dwmapi.lib;pcre.lib;libcurl.lib;squirrel.lib;sqstdlib.lib;libglog_static.lib;jsoncpp.lib;Oleacc.lib;gumbo.lib;base64.lib;Winhttp.lib;libwebpdecoder.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>minizip.lib;zlib.lib;ws2_32.lib;Wldap32.lib;ssleay32.lib;libeay32.lib;gdiplus.lib;dwmapi.lib;pcre.lib;libcurl.lib;squirrel.lib;sqstdlib.lib;libglog_static.lib;jsoncpp.lib;Oleacc.lib;gumbo.lib;base64.lib;Winhttp.lib;libwebpdecoder.lib;libwebpdemux.lib;mega.lib;cryptopp.lib;cares.lib;libuv.lib;Userenv.lib;Psapi.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)\Contrib\Lib\Release;$(SolutionDir)\Contrib\Lib\;$(SolutionDir)\Contrib\Source\boost\stage\lib\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -404,7 +404,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)\Include\DX;$(SolutionDir)\Include\BaseClasses;$(SolutionDir)\Include\WTL;$(SolutionDir)\Include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>minizip.lib;zlib.lib;ws2_32.lib;Wldap32.lib;ssleay32.lib;libeay32.lib;gdiplus.lib;zthread.lib;dwmapi.lib;pcre.lib;libcurl.lib;squirrel.lib;sqstdlib.lib;sqplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>minizip.lib;zlib.lib;ws2_32.lib;Wldap32.lib;ssleay32.lib;libeay32.lib;gdiplus.lib;zthread.lib;dwmapi.lib;pcre.lib;libcurl.lib;squirrel.lib;sqstdlib.lib;sqplus.lib;mega.lib;cryptopp.lib;cares.lib;libuv.lib;Userenv.lib;Psapi.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(SolutionDir)\Libs;d:\Projects\Image Uploader\Image Uploader\Libs\;$(SolutionDir)\Libs\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SubSystem>Windows</SubSystem>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -499,13 +499,15 @@
     <ClCompile Include="..\Core\Settings\EncodedPassword.cpp" />
     <ClCompile Include="..\Core\TempFileDeleter.cpp" />
     <ClCompile Include="..\Core\ThreadSync.cpp" />
+    <ClCompile Include="..\Core\Upload\AdvancedUploadEngine.cpp" />
     <ClCompile Include="..\Core\Upload\DefaultUploadEngine.cpp" />
     <ClCompile Include="..\Core\Upload\FileQueueUploader.cpp" />
     <ClCompile Include="..\Core\Upload\FileQueueUploaderPrivate.cpp" />
     <ClCompile Include="..\Core\Upload\FileUploadTask.cpp" />
     <ClCompile Include="..\Core\Upload\Filters\UrlShorteningFilter.cpp" />
     <ClCompile Include="..\Core\Upload\Filters\UserFilter.cpp" />
     <ClCompile Include="..\Core\Upload\FolderList.cpp" />
+    <ClCompile Include="..\Core\Upload\MegaNzUploadEngine.cpp" />
     <ClCompile Include="..\Core\Upload\ScriptUploadEngine.cpp" />
     <ClCompile Include="..\Core\Upload\ServerProfile.cpp" />
     <ClCompile Include="..\Core\Upload\ServerSync.cpp" />
@@ -562,6 +564,8 @@
     <ClCompile Include="..\3rdpart\GdiplusH.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\Core\Upload\AdvancedUploadEngine.h" />
+    <ClInclude Include="..\Core\Upload\MegaNzUploadEngine.h" />
     <ClInclude Include="..\Core\Video\VideoUtils.h" />
     <ClInclude Include="..\Core\Utils\CoreTypes.h" />
     <ClInclude Include="..\Core\Utils\CryptoUtils.h" />

diff --git a/Source/ServerListTool/ServerListTool.vcxproj.filters b/Source/ServerListTool/ServerListTool.vcxproj.filters
@@ -378,6 +378,12 @@
     <ClCompile Include="..\Func\CmdLine.cpp">
       <Filter>Source Files\Func</Filter>
     </ClCompile>
+    <ClCompile Include="..\Core\Upload\AdvancedUploadEngine.cpp">
+      <Filter>Source Files\Core\Upload</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Core\Upload\MegaNzUploadEngine.cpp">
+      <Filter>Source Files\Core\Upload</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Core\Video\VideoUtils.h">
@@ -434,6 +440,12 @@
     <ClInclude Include="..\Core\Utils\utils_win.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\Core\Upload\AdvancedUploadEngine.h">
+      <Filter>Source Files\Core\Upload</Filter>
+    </ClInclude>
+    <ClInclude Include="..\Core\Upload\MegaNzUploadEngine.h">
+      <Filter>Source Files\Core\Upload</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="res\ServerListTool.ico">

diff --git a/changelog.txt b/changelog.txt
@@ -2,6 +2,13 @@
 #
 # hthttp://zenden2k.atwebpages.com/imageuploader
 
+1.3.2.4563
+[f] Fixed uploading to cubeupload.com
+[f] Fixed incorrect processing of images with EXIF orientation tag
+[f] Fixed uploading to imageban.ru
+[c] Use new styled file dialog for choosing video file
+[c] Double-click on history item now opens URL in browser
+
 1.3.2.4551
 [+] Added mega.nz cloud provider support
 

diff --git a/changelog_ru.txt b/changelog_ru.txt
@@ -2,6 +2,13 @@
 #
 # http://zenden2k.atwebpages.com/imageuploader
 
+1.3.2.4563
+[f] Исправлена загрузка на cubeupload.com
+[f] Исправлена неправильная обработка изображений с ориентацией, заданной в EXIF
+[f] Исправлена загрузка на imageban.ru
+[c] Новый стиль диалога выбора видеофайла
+[c] Двойной клик по элементу историю открывает адрес в браузере
+
 1.3.2.4559
 [f] Исправлена загрузка на fastpic.ru