Changeset 1489 in ProjectBuilder

Timestamp:

Apr 29, 2012, 3:58:30 AM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix syntac erros in previous verion of cb. Ready for first level of test

Location:

projects/casparbuster/devel

Files:

• bin/cb (modified) (9 diffs)
• lib/CasparBuster/Plugin.pm (modified) (1 diff)

projects/casparbuster/devel/bin/cb

@@ -13 +13 @@
    --help   |-h         brief help message
    --man            full documentation
-   --force   |-f            force copy of files, even if they exist
+   --force  |-f         force copy of files, even if they exist
    --source |-s <file/dir>  directory or files to copy from the CasparBuster tree (',' separated if many) to the target
    --plugin |-p <plugin name>   plugin defining what to copy from the CasparBuster tree (',' separated if many) to the target
@@ -156 +156 @@
 # Get configuration parameters
 my %cb;
+my $cbp = ();
 my $cb = \%cb;
 ($cb->{'basedir'},$cb->{'usemachines'},$cb->{'cms'},$cb->{'database'}) = pb_conf_get("cbbasedir","cbusemachines","cbcms","cbdatabase");
@@ -204 +205 @@
 
 # Now distribute to the right machines
-if defined ($machine) {
+if (defined $machine) {
     cb_distribute($machine);
 } else {
@@ -243 +244 @@
 
 # Now handle plugins if any
-my $cbp = ();
-
-# Handle plugins
 if (defined $plugin) {
     foreach my $p (split(/,/,$plugin)) {    
@@ -284 +282 @@
     $cbp->{"cb.source"}->{$type}->{$source}->{'mode'} = $mode;
     $cbp->{"cb.source"}->{$type}->{$source}->{'mtime'} = $mtime;
-    }
 }
 
@@ -295 +292 @@
     }
 }
-pb_log(2,"INFO: RAW cbp: ".Dumper($cbp)."\n");
+pb_log(2,"INFO: RAW cbp: ".Dumper(%$cbp)."\n");
 
 # Clean up cbp structure by comparing with data stored in the DB
@@ -311 +308 @@
                 # If less recent than in the DB remove it
                 delete($cbp->{$k}->{$type}->{$o}) if (($file eq $o) && ($date > $cbp->{$k}->{$type}->{$o}->{'mtime'}));
-                }   
             }
         }
@@ -320 +316 @@
 # Now create a tar containing all the relevant content
 my $tar = Archive::Tar->new;
-$tar->add_files((keys %{$cbp->{$k}->{'files'}}),(keys %{$cbp->{$k}->{'dirs'}}));
-$tar->write("$ENV{'TMPDIR'}/content$$.tar");
-
+foreach my $k (keys %{$cbp}) {
+    $tar->add_files((keys %{$cbp->{$k}->{'files'}}),(keys %{$cbp->{$k}->{'dirs'}}));
+    # Add an entryo to the DB
+}
+my $tarfile = "$ENV{'TMPDIR'}/content$$.tar";
+$tar->write("$tarfile");
+
+my $cmd = "";
 # Copy the tar file and extract it + set up modes/uids/gids
 if (defined $machine) {
-    $cmd = "scp -p -q $remote:$source $target";
+    $cmd = "scp -p -q $tarfile $remote:/tmp";
 } else {
-    $cmd = "cp -p $source $target";
+    $cmd = "cp -p $source /tmp";
 }
 
@@ -334 +335 @@
 } else {
     pb_system($cmd);
-    pb_log(0,"INFO: Created $target/$srcfile and added it to your $scheme system\n");
+    pb_log(0,"INFO: \n");
 }
 pb_log(2,"Exiting cb_distribute\n");

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

@@ -88 +88 @@
     foreach my $block (split(/;/,$dlist->{$plugin})) {
         pb_log(3,"block : $block\n");
-        ($name,$tmp) = split(/\|/,$block);
+        my ($name,$tmp) = split(/\|/,$block);
         ($cbp->{$plugin}->{'dirs'}->{$name}->{'uid'},$cbp->{$plugin}->{'dirs'}->{$name}->{'gid'},$cbp->{$plugin}->{'dirs'}->{$name}->{'mode'}) = split(/\,/,$tmp);
     }