Changeset 1494 in ProjectBuilder

Timestamp:

Apr 30, 2012, 2:58:47 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Add support for cbplugindirsandfiles. This param provides support for direstories and all their children, whereas cbplugindirs is restricted to the directory alone. Usefull for named support
• Add named plugin
• cbusterize wworks now mostly for named (access to root owned file is still aproblem to solve)
• cb also supports the new cbplugindirsandfiles param

Location:

projects/casparbuster/devel

Files:

• bin/cb (modified) (6 diffs)
• bin/cbusterize (modified) (11 diffs)
• etc/cb/plugins/named.conf (added)
• lib/CasparBuster/Plugin.pm (modified) (2 diffs)

projects/casparbuster/devel/bin/cb

@@ -257 +257 @@
         $cbp = cb_plugin_get($p,$cbp);
         # Adds mtime info to the plugin structure
-        foreach my $type ('files','dirs') {
+        foreach my $type ('files','dirs','dirsandfiles') {
             foreach my $f (keys %{$cbp->{$p}->{$type}}) {
                 my $tdir = $dest;
@@ -282 +282 @@
     my $type = 'files';
     if (-d $fullsource) {
-        $type = 'dirs';
+        $type = 'dirsandfiles';
     }
     die "ERROR: Only able to handle files or dirs with option --source\n" if ((! -d $fullsource) && (! -f $fullsource));
@@ -321 +321 @@
     # Check what in cbp is in the DB and deploy only if necessary
     foreach my $k (keys %{$cbp}) {
-        foreach my $type ('files','dirs') {
+        foreach my $type ('files','dirs','dirsandfiles') {
             foreach my $o (keys %{$cbp->{$k}->{$type}}) {
                 # Compare with info from DB
@@ -353 +353 @@
 my $curdate = time();
 foreach my $k (keys %{$cbp}) {
-    foreach my $type ('files','dirs') {
+    foreach my $type ('files','dirs','dirsandfiles') {
+        # TODO: for dirs we may remove the files below ?
         foreach my $o ((keys %{$cbp->{$k}->{$type}})) {
             if (not defined $cbp->{$k}->{$type}->{$o}->{'deleted'}) {
@@ -426 +427 @@
 
 foreach my $k (keys %{$cbp}) {
-    foreach my $type ('files','dirs') {
+    foreach my $type ('files','dirs','dirsandfiles') {
+        # TODO: do we act recursively for dirsandfiles at least for uid/gid ?
         foreach my $o ((keys %{$cbp->{$k}->{$type}})) {
             if (not defined $cbp->{$k}->{$type}->{$o}->{'deleted'}) {
@@ -441 +443 @@
     if (defined $cbp->{$k}->{'reloadscript'}) {
         if ($debug) {
-            pb_log(1,"INFO: Executing (on $mac) sudo $cbp->{$k}->{'reloadscript'}\n");
+            pb_log(1,"INFO: Executing (on $mac) $cbp->{$k}->{'reloadscript'}\n");
         } else {
-            &$func("sudo $cbp->{$k}->{'reloadscript'}");
+            &$func("$cbp->{$k}->{'reloadscript'}");
         }
     }

projects/casparbuster/devel/bin/cbusterize

@@ -115 +115 @@
 use Pod::Usage;
 use Data::Dumper;
+use Net::SSH2;
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
@@ -202 +203 @@
 # Use potentially a remote account if defined
 my $account = undef;
-my $remote = $machine;
+my $remote = undef;
 ($account) = pb_conf_get_if("cbaccount") if (defined $machine);
-$remote = $account->{$machine}."@".$machine if ((defined $account) && (defined $account->{$machine}));
-pb_log(1, "DEBUG: remote = $remote\n") if (defined $remote);
+$remote = $account->{$machine} if ((defined $account) && (defined $machine) && (defined $account->{$machine}));
+pb_log(1, "DEBUG: remote account1 = $remote\n") if (defined $remote);
+$remote = getpwuid($<) if (not defined $remote);
+pb_log(1, "DEBUG: remote account2 = $remote\n");
 
 # Create basedir if it doesn't exist
@@ -218 +221 @@
 if (defined $source) {
     foreach my $f (split(/,/,$source)) {    
-        cb_busterize($f);
+        cb_busterize($f,"true");
     }
 }
@@ -230 +233 @@
         $cbp = cb_plugin_get($p,$cbp);
         pb_log(2,"cbp: ".Dumper($cbp)."\n");
-        foreach my $k ((keys %{$cbp->{$plugin}->{'files'}}),(keys %{$cbp->{$plugin}->{'dirs'}})) {
-            cb_busterize($k);
+        foreach my $k (keys %{$cbp->{$plugin}->{'dirsandfiles'}}) {
+            cb_busterize($k,"true");
+        }
+        foreach my $k ((keys %{$cbp->{$plugin}->{'dirs'}}),(keys %{$cbp->{$plugin}->{'files'}})) {
+            cb_busterize($k,"false");
         }
     }
@@ -239 +245 @@
 
 my $source = shift;
+my $recur = shift;
 
 pb_log(2,"Entering cb_busterize source: $source\n");
@@ -245 +252 @@
 my $srcfile = undef;
 my $cmd = undef;
+my $ssh2;
+my $sftp;
 
 if (not defined $machine) {
@@ -254 +263 @@
     }
 } else {
-    $cmd = "ssh -q $remote \'echo \"if [ -d $source ]; then exit 0; else exit -1; fi\" | sudo bash\'";
-    my $res = pb_system($cmd,"","quiet");
-    pb_log(2,"DEBUG: Found res = $res\n");
-    if ($res == 0) {
-        $srcdir = $source;
-        pb_log(1,"DEBUG: Found remote dir = $source\n");
-    } else {
-        $srcdir = dirname($source);
-        $srcfile = basename($source);
-        pb_log(1,"DEBUG: Found remote file = $source\n");
+    $ssh2 = Net::SSH2->new();
+    $ssh2->connect($machine);
+    my $hdir = (getpwnam(getpwuid($<)))[7];
+    if ($ssh2->auth_publickey($remote,"$hdir/.ssh/id_dsa.pub","$hdir/.ssh/id_dsa")) {
+        $sftp = $ssh2->sftp;
+        my %dirs = $sftp->stat("$source/.");
+        my $res = 0;
+        $res = -1 if (not defined $dirs{'mode'});
+        pb_log(2,"DEBUG: Found res = $res\n");
+        if ($res == 0) {
+            $srcdir = $source;
+            pb_log(1,"DEBUG: Found remote dir = $source\n");
+        } else {
+            $srcdir = dirname($source);
+            $srcfile = basename($source);
+            pb_log(1,"DEBUG: Found remote file = $source\n");
+        }
     }
 }
@@ -284 +300 @@
 $target = basename($target) if ((not defined $srcfile) && (-d $target));
 
-# Create target if it doesn't exist when we have to copy a file
-if ((not -d $target) && (defined $srcfile)) {
+# Create target if it doesn't exist
+if (not -d $target) {
     if ($debug) {
         pb_log(1,"DEBUG: Creating recursively directory $target\n");
     } else {
         pb_mkdir_p($target) || die "Unable to recursively create $target: $!";
-        pb_vcs_add($scheme,$target);
-        pb_log(0,"INFO: Created $target and added it to your $scheme system\n");
+    }
+    # Add all the dirs in it to VCS (in reverse order)
+    my $tdir = $target;
+    my @tab = ();
+    while ($tdir ne $basedir) {
+        push(@tab,$tdir);
+        $tdir = dirname($tdir);
+        pb_log(3,"tdir is now $tdir\n");
+    }
+    if ($debug) {
+        pb_log(0,"INFO: Added to your $scheme system the dirs: ".join(' ',reverse(@tab))."\n");
+    } else {
+        pb_vcs_add($scheme,reverse(@tab));
     }
 }
@@ -302 +329 @@
 
 if (defined $machine) {
-    $cmd = "scp -p -q $cmdopt $remote:$source $target";
+    $cmd = "scp -p -q $cmdopt $remote\@$machine:\'$source\' $target";
 } else {
     $cmd = "cp -p $cmdopt $source $target";
@@ -310 +337 @@
 if (defined $srcfile) {
     # File case
-    if ((! -f "$target/$srcfile") || (defined $force)){
+    if ((! -f "$target/$srcfile") || (defined $force)) {
         if ($debug) {
             pb_log(1,"DEBUG: launching $cmd\n");
@@ -324 +351 @@
     # Directory case
     if ($debug) {
-        pb_log(1,"DEBUG: launching $cmd\n");
-    } else {
-        pb_system($cmd);
+        if ($recur eq "true") {
+            pb_log(1,"DEBUG: launching $cmd\n");
+        } else {
+            pb_log(1,"DEBUG: mkdir -p $target\n");
+        }
+    } else {
+        if ($recur eq "true") {
+            pb_system($cmd);
+        }
         pb_vcs_add($scheme,"$target");
         pb_log(0,"INFO: Created $target and added it to your $scheme system\n");
     }
 }
+$ssh2->disconnect() if (defined $machine);
 pb_log(2,"Exiting cb_busterize\n");
 }

projects/casparbuster/devel/lib/CasparBuster/Plugin.pm

@@ -78 +78 @@
 
 pb_log(2,"Entering cb_plugin_get for plugin $plugin\n");
-my ($flist,$dlist,$slist) = pb_conf_get_if("cbpluginfiles","cbplugindirs","cbpluginreload");
+my ($flist,$dlist,$dflist,$slist) = pb_conf_get_if("cbpluginfiles","cbplugindirs","cbplugindirsandfiles","cbpluginreload");
 if ((defined $flist) && (defined $flist->{$plugin}) && ($flist->{$plugin} !~ /^\s*$/)) {
     foreach my $block (split(/;/,$flist->{$plugin})) {
@@ -93 +93 @@
     }
 }
+if ((defined $dflist) && (defined $dflist->{$plugin}) && ($dflist->{$plugin} !~ /^\s*$/)) {
+    foreach my $block (split(/;/,$dflist->{$plugin})) {
+        pb_log(3,"block : $block\n");
+        my ($name,$tmp) = split(/\|/,$block);
+        ($cbp->{$plugin}->{'dirsandfiles'}->{$name}->{'uid'},$cbp->{$plugin}->{'dirsandfiles'}->{$name}->{'gid'},$cbp->{$plugin}->{'dirsandfiles'}->{$name}->{'mode'}) = split(/\,/,$tmp);
+    }
+}
 if ((defined $slist) && (defined $slist->{$plugin})) {
     $cbp->{$plugin}->{'reloadscript'} = $slist->{$plugin};