Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: TetradogBeta/FenixWebViewer
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: VBot1.2
Choose a base ref
...
head repository: TetradogBeta/FenixWebViewer
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jul 9, 2021

  1. Copy the full SHA
    0cee997 View commit details
  2. commit

    tetradog committed Jul 9, 2021
    Copy the full SHA
    7db7833 View commit details
  3. Copy the full SHA
    6cae527 View commit details
  4. Copy the full SHA
    cd21aab View commit details
  5. Copy the full SHA
    9da06d0 View commit details
  6. acabado :)

    tetradog committed Jul 9, 2021
    Copy the full SHA
    85aaf35 View commit details
  7. commit

    tetradog committed Jul 9, 2021
    Copy the full SHA
    5e66ed1 View commit details
  8. subir requirements.txt

    tetradog committed Jul 9, 2021
    Copy the full SHA
    4042929 View commit details

Commits on Jul 10, 2021

  1. commit

    tetradog committed Jul 10, 2021
    Copy the full SHA
    0a05b22 View commit details

Commits on Jul 11, 2021

  1. reorganizando codigo

    tetradog committed Jul 11, 2021
    Copy the full SHA
    95b695a View commit details
  2. Copy the full SHA
    d2d642d View commit details

Commits on Jul 13, 2021

  1. Copy the full SHA
    82c2049 View commit details
  2. Copy the full SHA
    64d305a View commit details
  3. arreglando bugesitos

    tetradog committed Jul 13, 2021
    Copy the full SHA
    26ef408 View commit details
  4. desarrollando

    tetradog committed Jul 13, 2021
    Copy the full SHA
    5e8ed32 View commit details
  5. Copy the full SHA
    ee7b746 View commit details
  6. Update Checker.py

    tetradog authored Jul 13, 2021
    Copy the full SHA
    8acd9de View commit details
  7. Update Checker.py

    tetradog authored Jul 13, 2021
    Copy the full SHA
    ddc7d84 View commit details

Commits on Jul 27, 2021

  1. actualizado a los cambios en la web (ahora tienen Cloudflare para evi…

    …tar ataques DDos y se ha tenido que desarrollar la parte de cargar el contenido, así que va un poco más lento)
    tetradog committed Jul 27, 2021
    Copy the full SHA
    d42174e View commit details
  2. Copy the full SHA
    8194fcb View commit details
  3. commit

    tetradog committed Jul 27, 2021
    Copy the full SHA
    70687b5 View commit details

Commits on Jul 28, 2021

  1. Copy the full SHA
    deb3dcb View commit details
  2. Copy the full SHA
    bc2f7d1 View commit details

Commits on Jul 31, 2021

  1. commit

    tetradog committed Jul 31, 2021
    Copy the full SHA
    35870bf View commit details

Commits on Sep 18, 2021

  1. cambiar nombre

    tetradog committed Sep 18, 2021
    Copy the full SHA
    81c9cda View commit details
2 changes: 1 addition & 1 deletion CargarBD/CheckFenix.CargarBD.csproj
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Gabriel.Cat.S.Utilitats" Version="1.2.0" />
<PackageReference Include="Gabriel.Cat.S.Utilitats" Version="1.2.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.7">
15 changes: 12 additions & 3 deletions CargarBD/Program.cs
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ namespace CargarBD
public class Program
{
const string URL = "https://www.animefenix.com/";
static Random r = new Random();
public static void Main(params string[] args)
{
int lastIndex=-1;
@@ -23,9 +24,10 @@ public static void Main(params string[] args)
if (Equals(last, default) || last.LastPage>1)
{
lastIndex = Equals(last, default) ? Serie.GetSeriesFinalizadasLastIndex(url):last.LastPage;
Wait();
for (int i = lastIndex; i >0 ; i--)
{

Wait();
foreach (Serie serie in Serie.GetSeriesFinalizadas(url, i, false, 1))
{
if(Equals(context.Series.Find(serie.Pagina.AbsoluteUri),default))
@@ -42,6 +44,7 @@ public static void Main(params string[] args)
{
for (int i =1; !encontrado; i++)
{
Wait();
if (!Equals(context.Series.Find(Serie.GetSeriesFinalizadas(url, i).First().Pagina.AbsoluteUri), default))
{
encontrado = true;
@@ -52,8 +55,9 @@ public static void Main(params string[] args)
{

for (int i = last.LastPage == 0 ? 1 : last.LastPage; i <= lastIndex; i++)
{
Serie.GetSeriesFinalizadas(url, i, true, 1).WhileEach((serie) =>
{
Wait();
Serie.GetSeriesFinalizadas(url, i, true, 1).WhileEach((serie) =>
{
encontrado = !Equals(context.Series.Find(serie.Pagina.AbsoluteUri), default);
if (!encontrado)
@@ -70,5 +74,10 @@ public static void Main(params string[] args)
}

}

private static void Wait()
{
System.Threading.Thread.Sleep(r.Next(3 * 1000, 5 * 1000));
}
}
}
52 changes: 28 additions & 24 deletions CheckFenix.Core/Capitulo.cs
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ public class Capitulo


public Capitulo() { numero = -1; }
public Capitulo(Uri pagina):this()
public Capitulo(Uri pagina) : this()
{
Pagina = pagina;
}
@@ -41,14 +41,18 @@ public int Numero
return numero;
}
}
public Uri Picture {
get {
public Uri Picture
{
get
{
HtmlDocument htmlDocument;
if (Equals(picture, default))
{
picture = new Uri(new HtmlDocument().LoadUrl(Pagina).GetByClass("is-2by4").First().GetByTagName("img").First().Attributes["src"].Value);
htmlDocument = new HtmlDocument().LoadUrlCloudflare(Pagina);
picture = new Uri(htmlDocument.GetByClass("is-2by4").First().GetByTagName("img").First().Attributes["src"].Value);
}
return picture;
}
return picture;
}
set => picture = value;
}

@@ -89,21 +93,20 @@ public List<string> Links
}
set => links = value;
}
public async Task<Bitmap> GetImage()
public Bitmap GetImage()
{
Task<Bitmap> dwnImg;
Bitmap imgCapitulo;
string fileName = Path.GetFileName(Picture.AbsoluteUri);
string pathFile = Path.Combine(CacheFolder, fileName);

if (!Directory.Exists(CacheFolder))
Directory.CreateDirectory(CacheFolder);

if (!File.Exists(pathFile))
{
dwnImg = Picture.GetBitmap();
imgCapitulo = (await dwnImg);
imgCapitulo=imgCapitulo.Escala(0.35f);

imgCapitulo = Picture.GetBitmapCloudflare();
imgCapitulo = imgCapitulo.Escala(0.35f);
try
{
imgCapitulo.Save(pathFile);
@@ -119,14 +122,13 @@ public void Reload()
{
string url;
string html;
string htmlUri;
Regex regex;
Match match,matchUrl;

Match match, matchUrl;
try
{
html =Pagina.DownloadString();

html = Pagina.DownloadCloudflare();


}
catch
{
@@ -138,23 +140,23 @@ public void Reload()

while (match.Success)
{
url = HtmlNode.CreateNode("<iframe " + match.Value).Attributes["src"].Value.Replace("&amp;","&");
url = HtmlNode.CreateNode("<iframe " + match.Value).Attributes["src"].Value.Replace("&amp;", "&");
try
{
htmlUri = new Uri(url).DownloadString();
matchUrl = regex.Match(htmlUri);
html = new Uri(url).DownloadCloudflare();
matchUrl = regex.Match(html);
if (matchUrl.Success)
{
url = HtmlNode.CreateNode("<iframe " + matchUrl.Value).Attributes["src"].Value.Replace("&amp;", "&");

links.Add(url);
}
}
catch
{

}

match = match.NextMatch();


@@ -166,7 +168,7 @@ public bool AbrirLink()
string url;


url =GetLinkMega();
url = GetLinkMega();

if (!string.IsNullOrEmpty(url))
{
@@ -193,7 +195,9 @@ public override string ToString()

public static IEnumerable<Capitulo> GetCapitulosHome(string urlFenix)
{
return GetCapitulosHome(new HtmlDocument().LoadUrl(urlFenix).DocumentNode);
HtmlDocument tDoc = new HtmlDocument().LoadUrlCloudflare(urlFenix);

return GetCapitulosHome(tDoc.DocumentNode);
}

public static IEnumerable<Capitulo> GetCapitulosHome(HtmlNode nodePagina)
3 changes: 2 additions & 1 deletion CheckFenix.Core/CheckFenix.Core.csproj
Original file line number Diff line number Diff line change
@@ -5,7 +5,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Gabriel.Cat.S.Utilitats" Version="1.2.0" />
<PackageReference Include="Gabriel.Cat.S.Utilitats" Version="1.2.5" />
<PackageReference Include="Gabriel.Cat.S.Xarxa" Version="1.0.5" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.34" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
</ItemGroup>
8 changes: 5 additions & 3 deletions CheckFenix.Core/Comentario.cs
Original file line number Diff line number Diff line change
@@ -25,14 +25,16 @@ public Comentario(HtmlNode nodo)
public string Name { get; set; }
public string Mensaje { get; set; }

public async Task<Bitmap> GetImage()
public Bitmap GetImage()
{


Task<Bitmap> tBmp;
string name = Path.GetFileName(Picture.AbsoluteUri);
if (!DicPic.ContainsKey(name))
{
DicPic.Add(name, await Picture.GetBitmap());
tBmp = Picture.GetBitmap();
tBmp.Wait();
DicPic.Add(name, tBmp.Result);
}
return DicPic[name];

46 changes: 0 additions & 46 deletions CheckFenix.Core/Extension.cs

This file was deleted.

78 changes: 0 additions & 78 deletions CheckFenix.Core/HtmlDocumentExtension.cs

This file was deleted.

Loading