0.5 Rc1 - Reimplement port change+tray, fix IPT+SSC. Installer fixes.

2025-09-17 17:34:09 +02:00 · 2015-07-22 23:00:52 +01:00
parent 9ca7f641ad
commit c4d653bc2e
39 changed files with 1144 additions and 274 deletions
--- a/src/Jackett/Utils/Clients/UnixSafeCurlWebClient.cs
+++ b/src/Jackett/Utils/Clients/UnixSafeCurlWebClient.cs
@@ -0,0 +1,126 @@
+using Jackett.Models;
+using Jackett.Services;
+using NLog;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jackett.Utils.Clients
+{
+    public class UnixSafeCurlWebClient : IWebClient
+    {
+        private IProcessService processService;
+        private Logger logger;
+
+        public UnixSafeCurlWebClient(IProcessService p, Logger l)
+        {
+            processService = p;
+            logger = l;
+        }
+
+        public Task<WebClientByteResult> GetBytes(WebRequest request)
+        {
+            logger.Debug(string.Format("UnixSafeCurlWebClient:GetBytes(Url:{0})", request.Url));
+            return Run(request);
+        }
+
+        public async Task<WebClientStringResult> GetString(WebRequest request)
+        {
+            logger.Debug(string.Format("UnixSafeCurlWebClient:GetString(Url:{0})", request.Url));
+            var byteResult = await Run(request);
+            return new WebClientStringResult()
+            {
+                Cookies = byteResult.Cookies,
+                Status = byteResult.Status,
+                Content = Encoding.UTF8.GetString(byteResult.Content)
+            };
+        }
+
+        private async Task<WebClientByteResult> Run(WebRequest request)
+        {
+            var args = new StringBuilder();
+            args.AppendFormat("--url \"{0}\" ", request.Url);
+
+            args.AppendFormat("-i  -sS --user-agent \"{0}\" ", BrowserUtil.ChromeUserAgent);
+
+            if (!string.IsNullOrWhiteSpace(request.Cookies))
+            {
+                args.AppendFormat("--cookie \"{0}\" ", request.Cookies);
+            }
+
+            if (!string.IsNullOrWhiteSpace(request.Referer))
+            {
+                args.AppendFormat("--referer \"{0}\" ", request.Referer);
+            }
+
+            if (request.PostData != null && request.PostData.Count > 0)
+            {
+                var postString = new FormUrlEncodedContent(request.PostData).ReadAsStringAsync().Result;
+                args.AppendFormat("--data \"{0}\" ", postString);
+            }
+
+            var tempFile = Path.GetTempFileName();
+
+            args.AppendFormat("--output \"{0}\" ", tempFile);
+
+            string stdout = null;
+            await Task.Run(() =>
+            {
+                stdout = processService.StartProcessAndGetOutput("curl", args.ToString(), true);
+            });
+
+            var outputData = File.ReadAllBytes(tempFile);
+            File.Delete(tempFile);
+
+            stdout = Encoding.UTF8.GetString(outputData);
+
+            var result = new WebClientByteResult();
+            var headSplit = stdout.IndexOf("\r\n\r\n");
+            if (headSplit < 0)
+                throw new Exception("Invalid response");
+            var headers = stdout.Substring(0, headSplit);
+            var headerCount = 0;
+            foreach (var header in headers.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries))
+            {
+                if (headerCount == 0)
+                {
+                    var responseCode = int.Parse(header.Split(' ')[1]);
+                    result.Status = (HttpStatusCode)responseCode;
+                }
+                else
+                {
+                    var headerSplitIndex = header.IndexOf(':');
+                    if (headerSplitIndex > 0)
+                    {
+                        var name = header.Substring(0, headerSplitIndex);
+                        var value = header.Substring(headerSplitIndex + 1);
+                        if (string.Equals(name, "set-cookie", StringComparison.InvariantCultureIgnoreCase))
+                        {
+                            var cookieDataSplit = value.IndexOf(';');
+                            if (cookieDataSplit > 0)
+                            {
+                                result.Cookies += value.Substring(0, cookieDataSplit + 1) + " ";
+                            }
+                        }
+                    }
+                }
+                headerCount++;
+            }
+
+            result.Content = new byte[outputData.Length - (headSplit + 3)];
+            var dest = 0;
+            for (int i= headSplit+4;i< outputData.Length; i++)
+            {
+                result.Content[dest] = outputData[i];
+                dest++;
+            }
+
+            return result;
+        }
+    }
+}