Compare commits

...

2 commits

Author SHA1 Message Date
562b1330c9
initial work on saving settings 2020-09-02 14:12:56 +10:00
80488d7c71
adding urls works, wahooooo 2020-09-02 13:21:32 +10:00
4 changed files with 76 additions and 18 deletions

View file

@ -1,5 +1,6 @@
using System; using System;
using Gtk; using Gtk;
using System.Text.RegularExpressions;
namespace Buypeeb { namespace Buypeeb {
class BuypeebApp { class BuypeebApp {
@ -16,5 +17,16 @@ namespace Buypeeb {
win.Show(); win.Show();
Application.Run(); Application.Run();
} }
public static string IDFromURL(string url) {
// TODO: handle invalid URLs better, or at all really
Regex rx = new Regex(@"^([^?]+)");
url = rx.Match(url).Groups[1].Value; // remove query params (if any)
rx = new Regex(@".+\/(.+?)/?$");
string id = rx.Match(url).Groups[1].Value; // extracts "k12345" from "https://buypeeb.biz/whatever/k12345/"
return id;
}
} }
} }

View file

@ -3,13 +3,13 @@ using System.Globalization;
namespace Buypeeb { namespace Buypeeb {
class Listing { class Listing {
public string url; public string url { get; set; }
public string id; public string id { get; set; }
public string name; public string name { get; set; }
public int price; public int price;
public int win_price; public int win_price;
public string original_name; public string original_name;
public bool favourite; public bool favourite { get; set; } = false;
// start_date, end_date // start_date, end_date
public int bids; public int bids;
public bool auto_extension; public bool auto_extension;

View file

@ -32,22 +32,19 @@ namespace Buypeeb {
class MainWindow : Window { class MainWindow : Window {
private ListStore Items; private ListStore items;
private Settings Settings; private Settings settings;
public MainWindow() : this(new Builder("main.glade")) { } public MainWindow() : this(new Builder("main.glade")) { }
private MainWindow(Builder builder) : base(builder.GetObject("wndMain").Handle) { private MainWindow(Builder builder) : base(builder.GetObject("wndMain").Handle) {
this.Settings = new Settings(); this.settings = new Settings();
this.settings.Save();
this.Title = "Buypeeb"; this.Title = "Buypeeb";
builder.Autoconnect(this); builder.Autoconnect(this);
this.Items = (ListStore)builder.GetObject("ListItems"); this.items = (ListStore)builder.GetObject("ListItems");
this.Items.Clear(); this.RenderList();
foreach (KeyValuePair<string, Listing> entry in Settings.watchlist) { foreach (object[] row in this.items) {
string[] values = new[] { entry.Value.name, entry.Value.PriceJPY(), entry.Value.PriceAUD(), "whenever", entry.Value.id };
this.Items.AppendValues(values);
}
foreach (object[] row in this.Items) {
Console.WriteLine(row[(int)ItemColumns.Name]); Console.WriteLine(row[(int)ItemColumns.Name]);
} }
DeleteEvent += Window_Shutdown; DeleteEvent += Window_Shutdown;
@ -82,6 +79,14 @@ namespace Buypeeb {
} }
private void RenderList() {
this.items.Clear();
foreach (KeyValuePair<string, Listing> entry in settings.watchlist) {
string[] values = new[] { entry.Value.name, entry.Value.PriceJPY(), entry.Value.PriceAUD(), "whenever", entry.Value.id };
this.items.AppendValues(values);
}
}
// button handlers // button handlers
private void ButtonAddClicked(object sender, EventArgs a) { private void ButtonAddClicked(object sender, EventArgs a) {
@ -96,6 +101,8 @@ namespace Buypeeb {
Regex rx = new Regex(@"^http.+yahoo.+"); Regex rx = new Regex(@"^http.+yahoo.+");
if (rx.IsMatch(url)) { if (rx.IsMatch(url)) {
Console.WriteLine("{0} will be added", url); Console.WriteLine("{0} will be added", url);
this.settings.Watch(url, name);
this.RenderList();
} }
else { else {
Console.WriteLine("{0} is an invalid url", url); Console.WriteLine("{0} is an invalid url", url);

View file

@ -1,14 +1,53 @@
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Text.Json;
namespace Buypeeb { namespace Buypeeb {
class Settings { class Settings {
public Dictionary<string, Listing> watchlist; private string location;
public int updateInterval { get; set; } = 10 * 60;
public int favouriteUpdateInterval { get; set; } = 5 * 60;
public int updateIntervalCritical { get; set; } = 60;
public int favouriteUpdateIntervalCritical { get; set; } = 30;
public Dictionary<string, Listing> watchlist {
get; set;
}
public Settings() { public Settings() {
this.watchlist = new Dictionary<string, Listing>(); if (Environment.OSVersion.Platform == PlatformID.Win32NT) {
string id = "k12345"; // C:\Users\Beebus\AppData\Roaming\Lynnear Software\buypeeb
this.watchlist.Add(id, new Listing("https://yahoo.jp", id, "my thingy")); this.location = Path.Combine(Environment.ExpandEnvironmentVariables("%APPDATA%"), "Lynnear Software", "buypeeb");
this.watchlist[id].Update();
} }
else {
// ~/.config/Lynnear Software/buypeeb
this.location = Path.Combine(Environment.GetEnvironmentVariable("HOME"), ".config", "Lynnear Software", "buypeeb");
}
this.watchlist = new Dictionary<string, Listing>();
this.Watch("https://buypeeb.biz/whatever/k12345", "my thingy");
this.watchlist["k12345"].Update();
}
public void Watch(string url, string name) {
string id = BuypeebApp.IDFromURL(url);
Console.WriteLine(id);
this.watchlist[id] = new Listing(url, id, name);
foreach (KeyValuePair<string, Listing> entry in this.watchlist) {
Console.WriteLine("{0} - {1}", entry.Value.name, entry.Value.price);
}
}
public void Save() {
string j = JsonSerializer.Serialize(this);
Console.WriteLine(j);
}
// public void Load() {
// }
} }
} }