Seperate sites.pm into reusable functions

PlayBot/sites.pm

@@ -16,14 +16,12 @@ our $regex;
 
 
 sub parse {
-	my ($kernel, $user, $chan, $msg) = @_;
+	my ($kernel, $user, $chan, $msg, $playlist) = @_;
 	my ($nick,$mask) = split(/!/,$user);
 
     my $chan_conf = PlayBot::utils::db::chan->new($chan);
 
     my %content;
-    my $id;
-    my $dbh = PlayBot::utils::db::main_session();
 
     my $matching_url;
     my @matching_tags;
@@ -49,6 +47,21 @@ sub parse {
 
     # if we get a new content, we must save it
     if (%content) {
+        @matching_tags = insert_content($kernel, $nick, $chan, \%content, $msg);
+    }
+
+    return (
+        $matching_url,
+        @matching_tags
+    );
+}
+
+sub insert_content
+{
+    my ($kernel, $nick, $chan, $content, $msg) = @_;
+    my $dbh = PlayBot::utils::db::main_session();
+    my $id;
+
     # we assume it's a new content
     my $new = 1;
 
@@ -61,11 +74,11 @@ sub parse {
 		$log->error("Couldn't prepare querie; aborting") unless (defined $sth);
 
 		$sth->execute(
-                $content{'site'},
-                $content{'url'},
-                $content{'author'},
-                $content{'title'},
-                $content{'duration'}
+            $content->{'site'},
+            $content->{'url'},
+            $content->{'author'},
+            $content->{'title'},
+            $content->{'duration'}
         );
     };
     if ($@) {
@@ -82,10 +95,10 @@ sub parse {
 		$log->error("Couldn't prepare querie; aborting") unless (defined $sth);
 
 		$sth->execute(
-                $content{'author'},
-                $content{'title'},
-                $content{'duration'},
-                $content{'url'},
+            $content->{'author'},
+            $content->{'title'},
+            $content->{'duration'},
+            $content->{'url'},
         );
     }
 
@@ -93,7 +106,7 @@ sub parse {
 	my $sth = $dbh->prepare('SELECT id FROM playbot WHERE url = ?');
 	$log->error("Couldn't prepare querie; aborting") unless (defined $sth);
 
-		$sth->execute($content{'url'})
+	$sth->execute($content->{'url'})
         or $log->error("Couldn't finish transaction: " . $dbh->errstr);
 
 	$id = $sth->fetch->[0];
@@ -109,7 +122,7 @@ sub parse {
 
     $dbh->commit;
 
-        @matching_tags = PlayBot::commands::parser::tag($msg, $chan);
+    my @matching_tags = PlayBot::commands::parser::tag($msg, $chan);
 
     my @tags;
     # get tags
@@ -128,24 +141,20 @@ sub parse {
 
     if ($new) {
         # schedule download
-            $kernel->post('downloader' => 'ddl' => $id, $content{url});
+        $kernel->post('downloader' => 'ddl' => $id, $content->{url});
 
-            $content{'id'} = '+'.$id;
+        $content->{'id'} = '+'.$id;
     }
     else {
-            $content{'id'} = $id;
+        $content->{'id'} = $id;
     }
-        $content{'tags'} = \@tags;
-        delete $content{'url'};
+    $content->{'tags'} = \@tags;
+    delete $content->{'url'};
 
     # message sur irc
-		$irc->yield(privmsg => $chan => PlayBot::utils::print::print(\%content));
-    }
+	$irc->yield(privmsg => $chan => PlayBot::utils::print::print($content));
 
-    return (
-        $matching_url,
-        @matching_tags
-    );
+    return @matching_tags;
 }
 
 1;