pricecharts

commit 1d9830ea94075d991ad8fd4410679aaf07970970
parent 75d1489a4eac9a03ed0009a73b8932d3725e4927
Author: Kyle Milz <kyle@getaddrinfo.net>
Date:   Tue, 11 Nov 2014 16:30:56 -0700

config: don't use general section anymore

Diffstat:
M
product_scraper.pl
 | 
4
++--
M
shared.pm
 | 
15
++++++---------

2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/product_scraper.pl b/product_scraper.pl
@@ -159,7 +159,7 @@ $mail .= $errors           if ($errors);
 my $email = Email::Simple->create(
 	header => [
 		From	=> "Santa Claus <sc\@np.com>",
-		To	=> $cfg->{general}{email},
+		To	=> $cfg->{email},
 		Subject	=> "PriceChart product scrape",
 	],
 	body => $mail);
@@ -169,7 +169,7 @@ if ($args{v}) {
 }
 else {
 	my $sender = Email::Send->new({mailer => 'SMTP'});
-	$sender->mailer_args([Host => $cfg->{general}{smtp}]);
+	$sender->mailer_args([Host => $cfg->{smtp}]);
 	$sender->send($email->as_string()) || print "Couldn't send email\n";
 }
 
diff --git a/shared.pm b/shared.pm
@@ -12,14 +12,11 @@ use POSIX;
 sub get_config
 {
 	my $parser = Config::Grammar->new({
-		_sections => ['general'],
-		general => {
-			_vars => [
-				'user_agent',
-				'email',
-				'smtp',
-			],
-		},
+		_vars => [
+			'user_agent',
+			'email',
+			'smtp',
+		],
 	});
 	my $cfg_file = "/etc/pricechart.cfg";
 	return $parser->parse($cfg_file) or die "error: $parser->{err}\n";
@@ -56,7 +53,7 @@ sub get_ua
 {
 	my $cfg = shift;
 
-	my $ua = LWP::UserAgent->new(agent => $cfg->{general}{user_agent});
+	my $ua = LWP::UserAgent->new(agent => $cfg->{user_agent});
 	$ua->default_header("Accept" => "*/*");
 
 	return $ua;