Skip to content
This repository was archived by the owner on Mar 27, 2026. It is now read-only.

Commit edfda74

Browse files
author
Alexander Sergeev
committed
Исправил ошибки обновлённых библиотек, исправил ошибку нулевого хеша.
1 parent 4ea32a8 commit edfda74

4 files changed

Lines changed: 27 additions & 20 deletions

File tree

‎App.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
1414
<dependentAssembly>
1515
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
16-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.2" />
16+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="9.0.0.0" />
1717
</dependentAssembly>
1818
<dependentAssembly>
1919
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
@@ -29,15 +29,15 @@
2929
</dependentAssembly>
3030
<dependentAssembly>
3131
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
32-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
32+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="9.0.0.0" />
3333
</dependentAssembly>
3434
<dependentAssembly>
3535
<assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
3636
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
3737
</dependentAssembly>
3838
<dependentAssembly>
3939
<assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
40-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
40+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
4141
</dependentAssembly>
4242
<dependentAssembly>
4343
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -81,11 +81,11 @@
8181
</dependentAssembly>
8282
<dependentAssembly>
8383
<assemblyIdentity name="Microsoft.Extensions.Configuration.Binder" publicKeyToken="adb9793829ddae60" culture="neutral" />
84-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
84+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
8585
</dependentAssembly>
8686
<dependentAssembly>
8787
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
88-
<bindingRedirect oldVersion="0.0.0.0-8.0.0.3" newVersion="8.0.0.3" />
88+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.3" newVersion="9.0.0.0" />
8989
</dependentAssembly>
9090
</assemblyBinding>
9191
</runtime>

‎FirehoseFinder.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,18 @@
1414
<Deterministic>true</Deterministic>
1515
<NuGetPackageImportStamp>
1616
</NuGetPackageImportStamp>
17-
<IsWebBootstrapper>false</IsWebBootstrapper>
18-
<PublishUrl>C:\Users\hoplik\OneDrive\Рабочий стол\Publishing\</PublishUrl>
17+
<IsWebBootstrapper>true</IsWebBootstrapper>
18+
<PublishUrl>ftp://yggno.de:21/</PublishUrl>
1919
<Install>true</Install>
20-
<InstallFrom>Disk</InstallFrom>
20+
<InstallFrom>Web</InstallFrom>
2121
<UpdateEnabled>true</UpdateEnabled>
2222
<UpdateMode>Foreground</UpdateMode>
2323
<UpdateInterval>7</UpdateInterval>
2424
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
2525
<UpdatePeriodically>false</UpdatePeriodically>
2626
<UpdateRequired>false</UpdateRequired>
2727
<MapFileExtensions>true</MapFileExtensions>
28+
<InstallUrl>https://fhf.yggno.de/</InstallUrl>
2829
<UpdateUrl>https://fhf.yggno.de/</UpdateUrl>
2930
<SupportUrl>https://github.com/hoplik/Firehose-Finder/</SupportUrl>
3031
<ErrorReportUrl>https://github.com/hoplik/Firehose-Finder/issues</ErrorReportUrl>
@@ -37,7 +38,7 @@
3738
<OpenBrowserOnPublish>false</OpenBrowserOnPublish>
3839
<AutorunEnabled>true</AutorunEnabled>
3940
<ApplicationRevision>0</ApplicationRevision>
40-
<ApplicationVersion>25.1.11.0</ApplicationVersion>
41+
<ApplicationVersion>25.1.14.0</ApplicationVersion>
4142
<UseApplicationTrust>false</UseApplicationTrust>
4243
<CreateDesktopShortcut>true</CreateDesktopShortcut>
4344
<PublishWizardCompleted>true</PublishWizardCompleted>
@@ -576,7 +577,7 @@
576577
<PackageReference Include="NuGet.Packaging">
577578
<Version>6.12.1</Version>
578579
</PackageReference>
579-
<PackageReference Include="SharpAdbClient">
580+
<PackageReference Include="sharpadbclient">
580581
<Version>2.3.23</Version>
581582
</PackageReference>
582583
<PackageReference Include="System.AppContext">

‎Forms/Form1.cs‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -912,12 +912,15 @@ private bool ProgNoServer()
912912
{
913913
string swtype = "3";
914914
string swver = string.Empty;
915+
string PK_Hash = "????????";
915916
if (!string.IsNullOrEmpty(dataGridView_FInd_Server["SWType", i].Value.ToString())) swtype = dataGridView_FInd_Server["SWType", i].Value.ToString();
916-
if (!string.IsNullOrEmpty(dataGridView_FInd_Server["SWVer", i].Value.ToString())) swver = "(" + dataGridView_FInd_Server["SWVer", i].Value.ToString() + ")";
917-
string somerec = string.Format("{0}-{1}-{2}-{3}-{4}", dataGridView_FInd_Server["HW_FH", i].Value.ToString(),
917+
if (!string.IsNullOrEmpty(dataGridView_FInd_Server["SWVer", i].Value.ToString())) swver = string.Format("({0})", dataGridView_FInd_Server["SWVer", i].Value.ToString());
918+
if (!string.IsNullOrEmpty(dataGridView_FInd_Server["HASH_FH", i].Value.ToString())) PK_Hash = dataGridView_FInd_Server["HASH_FH", i].Value.ToString().Substring(dataGridView_FInd_Server["HASH_FH", i].Value.ToString().Length - 8);
919+
string somerec = string.Format("{0}-{1}-{2}-{3}-{4}",
920+
dataGridView_FInd_Server["HW_FH", i].Value.ToString(),
918921
dataGridView_FInd_Server["OEM_FH", i].Value.ToString(),
919922
dataGridView_FInd_Server["MODEL_FH", i].Value.ToString(),
920-
dataGridView_FInd_Server["HASH_FH", i].Value.ToString().Substring(dataGridView_FInd_Server["HASH_FH", i].Value.ToString().Length - 8),
923+
PK_Hash,
921924
swtype + swver);
922925
serverprogs.Add(somerec);
923926
}
@@ -1662,7 +1665,7 @@ private void Button_path_Click(object sender, EventArgs e)
16621665
{
16631666
string swtype = "3";
16641667
string swver = string.Empty;
1665-
string nozero_hash = string.Empty;
1668+
string nozero_hash = "????????";
16661669
if (!string.IsNullOrEmpty(dataGridView_FInd_Server["SWType", i].Value.ToString())) swtype = dataGridView_FInd_Server["SWType", i].Value.ToString();
16671670
if (!string.IsNullOrEmpty(dataGridView_FInd_Server["SWVer", i].Value.ToString())) swver = "(" + dataGridView_FInd_Server["SWVer", i].Value.ToString() + ")";
16681671
if (!string.IsNullOrEmpty(dataGridView_FInd_Server["HASH_FH", i].Value.ToString()) && dataGridView_FInd_Server["HASH_FH", i].Value.ToString().Length >= 8)
@@ -2173,9 +2176,8 @@ private byte Rating(string[] id_str, int Currnum)
21732176
{
21742177
byte gross = 0; //Рейтинг файла
21752178
string sw_type = string.Empty;
2176-
string oemhash;
2177-
if (id_str[3].Length < 8) oemhash = id_str[3];
2178-
else oemhash = id_str[3].Substring(id_str[3].Length - 8);
2179+
string oemhash = "????????";
2180+
if (id_str[3].Length >= 8) oemhash = id_str[3].Substring(id_str[3].Length - 8);
21792181
dataGridView_final["Column_id", Currnum].Value = id_str[0] + '\u002D' + id_str[1] + '\u002D' + id_str[2] + '\u002D' + oemhash + '\u002D' + id_str[4] + id_str[5];
21802182
if (guide.SW_ID_type.ContainsKey(id_str[4])) sw_type = guide.SW_ID_type[id_str[4]];
21812183
dataGridView_final["Column_SW_type", Currnum].Value = sw_type;
@@ -3363,7 +3365,11 @@ private async void ОтправкаПрограммераToolStripMenuItem_Click
33633365
$"[{Settings.Default.userFN} {Settings.Default.userLN} ({Settings.Default.userN})](tg://user?id={Settings.Default.userID})" + '\u0020' +
33643366
LocRes.GetString("thanks_u_data") + '\u0020' +
33653367
LocRes.GetString("increase_rating");
3366-
await Guide._botClient.SendDocumentAsync(guide.channel, onlineFile, null, null, mess_to_post, Telegram.Bot.Types.Enums.ParseMode.Markdown);
3368+
await Guide._botClient.SendDocument(
3369+
chatId: guide.channel,
3370+
onlineFile,
3371+
caption: mess_to_post,
3372+
parseMode: Telegram.Bot.Types.Enums.ParseMode.Markdown);
33673373
textBox_soft_term.AppendText(LocRes.GetString("sent") + Environment.NewLine);
33683374
}
33693375
catch (Exception ex)

‎Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
// Можно задать все значения или принять номера сборки и редакции по умолчанию
3333
// используя "*", как показано ниже:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("25.1.11.0")]
36-
[assembly: AssemblyFileVersion("25.1.11.0")]
35+
[assembly: AssemblyVersion("25.1.14.0")]
36+
[assembly: AssemblyFileVersion("25.1.14.0")]
3737
[assembly: NeutralResourcesLanguage("ru-RU")]

0 commit comments

Comments
 (0)