Skip to content

Commit

Permalink
v0.1.1.4
Browse files Browse the repository at this point in the history 
- Removing reading by HTML. Instead of this using only RSS in all functions.
- Fixing chest names
- Editing in license. Now is GNU GPLv3.
  • Loading branch information
@ibkucher
ibkucher committed Sep 4, 2020
1 parent c9e2cd3 commit 62d73c1
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 38 deletions.
6 changes: 3 additions & 3 deletions RaidBossChecker/Languages/English.xaml
View file
Expand Up @@ -48,13 +48,13 @@
<system:String x:Key="lang_Version">Version: </system:String>
<system:String x:Key="lang_Copyright">Copyright ©</system:String>
<system:String x:Key="lang_AllRightsReserved">Bohdan Kucher. All rights reserved.</system:String>
<system:String x:Key="lang_License">License: Freeware, for more information see </system:String>
<system:String x:Key="lang_License">License: GNU AGPLv3, for more information see </system:String>
<system:String x:Key="lang_TermOfUse">Term of Use</system:String>
<!--TERM OF USE-->
<system:String x:Key="lang_TermOfUse_Title">Raid Boss Checker &quot;Term of Use&quot;</system:String>
<system:String x:Key="lang_TermOfUse_General">For using this software you must follow and obey the following items:</system:String>
<system:String x:Key="lang_TermOfUse_1">This program is freeware you can use and distribute it without any payment, but NOT for commercial use.</system:String>
<system:String x:Key="lang_TermOfUse_2">You are NOT ALLOW to make any changes in this program by hacking softwares or in any other ways.</system:String>
<system:String x:Key="lang_TermOfUse_1">This program is freeware you can use and distribute it without any payment.</system:String>
<system:String x:Key="lang_TermOfUse_2">For any changes to the source code of the program, you must always indicate the copyright and license.</system:String>
<system:String x:Key="lang_TermOfUse_3">This program's owner is Bohdan Kucher and always refer to him.</system:String>
<system:String x:Key="lang_TermOfUse_4">This program does not guarantee from damages to your files or system and the developer does not have any warranty.</system:String>
<!--GUIDE PAGE-->
Expand Down
6 changes: 3 additions & 3 deletions RaidBossChecker/Languages/Russian.xaml
View file
Expand Up @@ -48,13 +48,13 @@
<system:String x:Key="lang_Version">Версия: </system:String>
<system:String x:Key="lang_Copyright">Авторское право ©</system:String>
<system:String x:Key="lang_AllRightsReserved">Богдан Кучер. Все права защищены.</system:String>
<system:String x:Key="lang_License">Лицензия: Freeware, для получения дополнительной информации см. </system:String>
<system:String x:Key="lang_License">Лицензия: GNU AGPLv3, для получения дополнительной информации см. </system:String>
<system:String x:Key="lang_TermOfUse">Условия пользования</system:String>
<!--TERM OF USE-->
<system:String x:Key="lang_TermOfUse_Title">Raid Boss Checker &quot;Условия пользования&quot;</system:String>
<system:String x:Key="lang_TermOfUse_General">Для использования этого программного обеспечения вы должны следовать и соблюдать следующие пункты:</system:String>
<system:String x:Key="lang_TermOfUse_1">Эта программа является бесплатной. Вы можете использовать ее и распространять без какой-либо оплаты, но НЕ для коммерческого использования.</system:String>
<system:String x:Key="lang_TermOfUse_2">Вы НЕ можете вносить какие-либо изменения в эту программу путем взлома программного обеспечения или любым другим способом.</system:String>
<system:String x:Key="lang_TermOfUse_1">Эта программа является бесплатной. Вы можете использовать ее и распространять без какой-либо оплаты.</system:String>
<system:String x:Key="lang_TermOfUse_2">При любых изменениях в исходном коде программы, вы обязаны всегда указывать авторское право и лицензию.</system:String>
<system:String x:Key="lang_TermOfUse_3">Владельцем этой программы является Богдан Кучер и всегда является им.</system:String>
<system:String x:Key="lang_TermOfUse_4">Владелец программы не несет ответственность за повреждения ваших файлов или системы при использовании данной программы.</system:String>
<!--GUIDE PAGE-->
Expand Down
60 changes: 32 additions & 28 deletions RaidBossChecker/MainWindow.xaml.cs
View file
Expand Up @@ -52,7 +52,7 @@ private void LoadServerList()



// HTML READER START
// HTML READER START - not in use
private HtmlDocument htmlDocument;
private async Task ReaderHtml(string filter, int count, bool search)
{
Expand Down Expand Up @@ -94,19 +94,21 @@ private async Task ReaderHtml(string filter, int count, bool search)
rbInfo.Add(new RaidBoss() { Name = nameBoss, TimeKilled = dateKilledLocal, RespawnStart = respawnStart, RespawnEnd = respawnEnd }); // time killed computer time
}

}
if (checkBoxMskTime.IsChecked == true)
{
lblLastTimeUpdated.Content = DateTime.UtcNow.AddHours(3).ToString("dd.MM.yyyy HH:mm:ss"); // Last time updated by MSK time
}

}
if (checkBoxMskTime.IsChecked == false)
{
lblLastTimeUpdated.Content = DateTime.Now.ToString("dd.MM.yyyy HH:mm:ss"); // last time updated by computer time
}
}

if (checkBoxMskTime.IsChecked == true)
{
lblLastTimeUpdated.Content = DateTime.UtcNow.AddHours(3).ToString("dd.MM.yyyy HH:mm:ss"); // Last time updated by MSK time

}


if (checkBoxMskTime.IsChecked == false)
{
lblLastTimeUpdated.Content = DateTime.Now.ToString("dd.MM.yyyy HH:mm:ss"); // last time updated by computer time
}

}
// HTML READER END

Expand Down Expand Up @@ -137,17 +139,13 @@ private async Task ReaderRss(bool search)
feedAllBosses = new SyndicationFeed(feedKey.Items.Union(feedEpic.Items));
});

//var feed = FeedReader.Read(@"https://asterios.tm/index.php?cmd=rss&serv=" + cboxServerList.SelectedValue + "&filter=" + filter + "&out=xml"); // link cboxServerList.SelectedValue

foreach (SyndicationItem item in feedAllBosses.Items)
{
String title = item.Title.Text
.Replace("Boss ", String.Empty)
.Replace(" was killed", String.Empty)
.Replace("Убит босс ", String.Empty); // Remove some words from rss

//listBox.Items.Add(item.Title + " - " + item.PublishingDate); // ONLY FOR TEST

if (!search || (item.PublishDate.UtcDateTime.AddMinutes(showTime[0]) >= DateTime.UtcNow & item.PublishDate.UtcDateTime <= DateTime.UtcNow)) // если время респа + добавленное время больше текущего тогда показываем
{

Expand All @@ -169,17 +167,18 @@ private async Task ReaderRss(bool search)
}

}
if (checkBoxMskTime.IsChecked == true)
{
lblLastTimeUpdated.Content = DateTime.UtcNow.AddHours(3).ToString("dd.MM.yyyy HH:mm:ss"); // Last time updated by MSK time

}

}
if (checkBoxMskTime.IsChecked == false)
{
lblLastTimeUpdated.Content = DateTime.Now.ToString("dd.MM.yyyy HH:mm:ss"); // last time updated by computer time
}
if (checkBoxMskTime.IsChecked == true)
{
lblLastTimeUpdated.Content = DateTime.UtcNow.AddHours(3).ToString("dd.MM.yyyy HH:mm:ss"); // Last time updated by MSK time

}
if (checkBoxMskTime.IsChecked == false)
{
lblLastTimeUpdated.Content = DateTime.Now.ToString("dd.MM.yyyy HH:mm:ss"); // last time updated by computer time
}
}
// RSS READER FOR BOSSES END

Expand Down Expand Up @@ -208,7 +207,8 @@ private async Task CheckSpecificRaidBossAsync()
rbInfo.Clear();
listView.Items.Clear();

await ReaderHtml("keyboss", 5, true); // search only in first 10 keybosses and compair their time to our
//await ReaderHtml("keyboss", 5, true); // search only in first 10 keybosses and compair their time to our
await ReaderRss(true);

// filtring and sending rbInfo list information to ListView
if (rbInfo.Count > 0)
Expand Down Expand Up @@ -357,6 +357,7 @@ private void btnStart_Click(object sender, RoutedEventArgs e)
listView.Visibility = Visibility.Visible; // показывать ListView на переднем плане
listViewAllRB.Visibility = Visibility.Hidden; // скрыть ListViewAllRB на задний план
listView.Items.Clear(); // предварительно очистить лист от предыдущих записей
lblLastTimeUpdated.Content = "---";
// SOUND
Sound.SaveSoundToDisk(); // save selected sound to temp folder
// Server List
Expand Down Expand Up @@ -427,8 +428,10 @@ private async void btnGetAllKeyBosses_Click(object sender, RoutedEventArgs e)
listViewAllRB.Visibility = Visibility.Hidden;
rbInfo.Clear();
listView.Items.Clear();
lblLastTimeUpdated.Content = "---"; // Last time updated

await ReaderHtml("keyboss", 50, false);
// await ReaderHtml("keyboss", 50, false);
await ReaderRss(false);

rbInfo.Where(x => rbAllKeybossNames.Count(y => x.Name.Contains(y)) != 0)
.GroupBy(x => x.Name).Select(g => g.First()) // this line is to remove duplicates from the list
Expand All @@ -446,6 +449,7 @@ private async void btnGetAllBosses_Click(object sender, RoutedEventArgs e)
listViewAllRB.Visibility = Visibility.Visible;
rbInfo.Clear();
listViewAllRB.Items.Clear();
lblLastTimeUpdated.Content = "---"; // Last time updated

await ReaderRss(false);

Expand Down Expand Up @@ -618,17 +622,17 @@ private void BtnChestCabrio_Click(object sender, RoutedEventArgs e)

private void BtnChestKernon_Click(object sender, RoutedEventArgs e)
{
TopBarMessageShowAndCopy("/target Hallate's chest");
TopBarMessageShowAndCopy("/target Chest of Kernon");
}

private void BtnChestHallate_Click(object sender, RoutedEventArgs e)
{
TopBarMessageShowAndCopy("/target Chest of Kernon");
TopBarMessageShowAndCopy("/target Hallate's chest");
}

private void BtnChestGolkonda_Click(object sender, RoutedEventArgs e)
{
TopBarMessageShowAndCopy("/target Chest of Golkonda");
TopBarMessageShowAndCopy("/target Chest of Golkonda");
}

// GUIDE PAGE
Expand Down
6 changes: 3 additions & 3 deletions RaidBossChecker/Properties/AssemblyInfo.cs
View file
Expand Up @@ -12,7 +12,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("RaidBossChecker")]
[assembly: AssemblyProduct("RaidBossChecker")]
[assembly: AssemblyCopyright("Copyright © 2020 Bohdan Kucher")]
[assembly: AssemblyCopyright("Copyright © Bohdan Kucher")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down Expand Up @@ -51,5 +51,5 @@
// Можно задать все значения или принять номера сборки и редакции по умолчанию
// используя "*", как показано ниже:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.1.1.3")]
[assembly: AssemblyFileVersion("0.1.1.3")]
[assembly: AssemblyVersion("0.1.1.4")]
[assembly: AssemblyFileVersion("0.1.1.4")]
2 changes: 1 addition & 1 deletion RaidBossChecker/RaidBossChecker.csproj
View file
Expand Up @@ -17,6 +17,7 @@
<Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -29,7 +30,6 @@
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
Expand Down

0 comments on commit 62d73c1

Please sign in to comment.