Mirror updates

libgenapps · Dec 31, 2018 · 857d097 · 857d097
1 parent 6c643f1
commit 857d097
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 50 deletions.
diff --git a/LibgenDesktop.Setup/AppFiles.cs b/LibgenDesktop.Setup/AppFiles.cs
@@ -34,6 +34,7 @@ static AppFiles()
             AddFile(@"Mirrors\libgen_io_nonfiction.xslt");
             AddFile(@"Mirrors\libgen_io_fiction.xslt");
             AddFile(@"Mirrors\libgen_io_scimag.xslt");
+            AddFile(@"Mirrors\gen_lib_rus_ec_nonfiction.xslt");
             AddFile(@"Mirrors\libgen_pw_nonfiction_step1.xslt");
             AddFile(@"Mirrors\libgen_pw_nonfiction_step2.xslt");
             AddFile(@"Mirrors\libgen_pw_fiction_step1.xslt");
@@ -43,8 +44,6 @@ static AppFiles()
             AddFile(@"Mirrors\bookfi_net.xslt");
             AddFile(@"Mirrors\b_ok_xyz_step1.xslt");
             AddFile(@"Mirrors\b_ok_xyz_step2.xslt");
-            AddFile(@"Mirrors\b_ok_tor_step1.xslt");
-            AddFile(@"Mirrors\b_ok_tor_step2.xslt");
             AddFile(@"Mirrors\booksc_org_step1.xslt");
             AddFile(@"Mirrors\booksc_org_step2.xslt");
         }

diff --git a/LibgenDesktop.Setup/Constants.cs b/LibgenDesktop.Setup/Constants.cs
@@ -2,8 +2,8 @@
 {
     internal static class Constants
     {
-        public const string CURRENT_VERSION = "1.2.1";
-        public const string TITLE_VERSION = "1.2.1";
+        public const string CURRENT_VERSION = "1.2.2";
+        public const string TITLE_VERSION = "1.2.2";
         public const string PRODUCT_TITLE_FORMAT = "Libgen Desktop " + TITLE_VERSION + " ({0}-bit)";
         public const string SHORTCUT_TITLE_FORMAT = "Libgen Desktop ({0}-bit)";
         public const string PRODUCT_COMPANY = "Libgen Apps";

diff --git a/LibgenDesktop/Common/Constants.cs b/LibgenDesktop/Common/Constants.cs
@@ -5,9 +5,9 @@ namespace LibgenDesktop.Common
     internal static class Constants
     {
         public const string DATABASE_METADATA_APP_NAME = "LibgenDesktop";
-        public const string CURRENT_VERSION = "1.2.1";
-        public const string CURRENT_GITHUB_RELEASE_NAME = "1.2.1";
-        public static readonly DateTime CURRENT_GITHUB_RELEASE_DATE = new DateTime(2018, 11, 30);
+        public const string CURRENT_VERSION = "1.2.2";
+        public const string CURRENT_GITHUB_RELEASE_NAME = "1.2.2";
+        public static readonly DateTime CURRENT_GITHUB_RELEASE_DATE = new DateTime(2018, 12, 31);
         public const string CURRENT_DATABASE_VERSION = "1.2.1";
 
         public const string APP_SETTINGS_FILE_NAME = "libgen.config";

diff --git a/LibgenDesktop/LibgenDesktop.csproj b/LibgenDesktop/LibgenDesktop.csproj
@@ -677,6 +677,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>Mirrors\libgen_io_scimag.xslt</TargetPath>
     </ContentWithTargetPath>
+    <ContentWithTargetPath Include="Resources\Mirrors\gen_lib_rus_ec_nonfiction.xslt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <TargetPath>Mirrors\gen_lib_rus_ec_nonfiction.xslt</TargetPath>
+    </ContentWithTargetPath>
     <ContentWithTargetPath Include="Resources\Mirrors\libgen_pw_nonfiction_step1.xslt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>Mirrors\libgen_pw_nonfiction_step1.xslt</TargetPath>
@@ -713,14 +717,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>Mirrors\b_ok_xyz_step2.xslt</TargetPath>
     </ContentWithTargetPath>
-    <ContentWithTargetPath Include="Resources\Mirrors\b_ok_tor_step1.xslt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>Mirrors\b_ok_tor_step1.xslt</TargetPath>
-    </ContentWithTargetPath>
-    <ContentWithTargetPath Include="Resources\Mirrors\b_ok_tor_step2.xslt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <TargetPath>Mirrors\b_ok_tor_step2.xslt</TargetPath>
-    </ContentWithTargetPath>
     <ContentWithTargetPath Include="Resources\Mirrors\booksc_org_step1.xslt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <TargetPath>Mirrors\booksc_org_step1.xslt</TargetPath>

diff --git a/LibgenDesktop/Resources/Mirrors/b_ok_tor_step1.xslt b/LibgenDesktop/Resources/Mirrors/b_ok_tor_step1.xslt
diff --git a/LibgenDesktop/Resources/Mirrors/b_ok_tor_step2.xslt b/LibgenDesktop/Resources/Mirrors/b_ok_tor_step2.xslt
diff --git a/LibgenDesktop/Resources/Mirrors/booksc_org.xslt b/LibgenDesktop/Resources/Mirrors/booksc_org.xslt
diff --git a/...enDesktop/Resources/Mirrors/b_ok_org.xslt → ...es/Mirrors/gen_lib_rus_ec_nonfiction.xslt b/...enDesktop/Resources/Mirrors/b_ok_org.xslt → ...es/Mirrors/gen_lib_rus_ec_nonfiction.xslt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:transform version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   <xsl:template match="/">
-    <xsl:for-each select="(//a[starts-with(@href, 'http://b-ok.org/dl/')])[1]">
+    <xsl:for-each select="(//a[contains(@href, '/main/')])[1]">
       <xsl:value-of select="@href" />
     </xsl:for-each>
   </xsl:template>

diff --git a/LibgenDesktop/Resources/Mirrors/mirrors.config b/LibgenDesktop/Resources/Mirrors/mirrors.config
@@ -14,6 +14,8 @@
     },
     "gen.lib.rus.ec":
     {
+        "NonFictionDownloadUrl": "http://library1.org/_ads/{md5}",
+        "NonFictionDownloadTransformations": "gen_lib_rus_ec_nonfiction",
         "NonFictionCoverUrl": "http://gen.lib.rus.ec/covers/{cover-url}",
         "NonFictionSynchronizationUrl": "http://gen.lib.rus.ec/json.php"
     },
@@ -56,13 +58,5 @@
         "NonFictionDownloadUrl": "http://genotypeinczgrxr.onion/LG/{thousand-index}/{md5:l}",
         "FictionDownloadUrl": "http://genotypeinczgrxr.onion/FF/{thousand-index}/{md5:l}.{ext}",
         "RestartSessionOnTimeout": false
-    },
-    "b-ok (TOR)":
-    {
-        "NonFictionDownloadUrl": "http://zlibraryexau2g3p.onion/md5/{md5}",
-        "NonFictionDownloadTransformations": "b_ok_tor_step1,b_ok_tor_step2",
-        "FictionDownloadUrl": "http://zlibraryexau2g3p.onion/md5/{md5}",
-        "FictionDownloadTransformations": "b_ok_tor_step1,b_ok_tor_step2",
-        "RestartSessionOnTimeout": false
     }
 }