[2.090517.55] 09/05/17 at 08:53 PM | 1 updated tm modules | by DashBot

Author: bradennapier

cluster-1.1.2.tm cluster-1.1.3.tmcluster-1.1.2.tm renamed to cluster-1.1.3.tm

@@ -23,6 +23,7 @@ if {$::cluster::script_dir ni [::tcl::tm::path list]} {
 
 package require bpacket
 package require unix 1.1 ; # Need this for initial OSX Support
+package require shortid
 
 # Source our general utilities first since they
 # are needed for the evaluation below.
@@ -121,7 +122,7 @@ proc ::cluster::source {} {
   foreach file [glob -directory $protocol_directory *.tcl] {
    uplevel #0 [list source $file]
   }
-  set utils_directory [file join [file dirname $::cluster::script_dir cluster utils]
+  set utils_directory [file join $::cluster::script_dir cluster utils]
   foreach file [glob -directory $utils_directory *.tcl] {
     if {[string match *general.tcl $file]} { continue }
     uplevel #0 [list source $file]

cluster/utils/packet.tcl

@@ -1,3 +1,5 @@
+package require bpacket;
+
 namespace eval ::cluster {}
 namespace eval ::cluster::packet {
   variable total_encoded 0

cluster/utils/shortid.tcl tcl-modules/shortid-1.0.0.tmcluster/utils/shortid.tcl renamed to tcl-modules/shortid-1.0.0.tm

@@ -1,7 +1,10 @@
-namespace eval ::cluster {}
-namespace eval ::cluster::shortid { variable i 0; variable n 1 }
+namespace eval ::shortid { variable i 0; variable n 1 }
 
-proc ::cluster::shortid::shuffle { list {max {}}} {
+proc ::shortid::rand {min max} {
+  expr { int(rand() * ($max - $min + 1) + $min)}
+}
+
+proc ::shortid::shuffle { list {max {}}} {
  set l1 {}; set l2 {}; set l3 {}; set l4 {}
  foreach le $list[set list {}] {
    if {rand()<.5} {
@@ -14,39 +17,39 @@ proc ::cluster::shortid::shuffle { list {max {}}} {
  return [concat $l1 $l2 $l3 $l4]
 }
 
-proc ::cluster::shortid::encode { str {type base64} } {
+proc ::shortid::encode { str {type base64} } {
   return [string map { {=} {} } [binary encode $type $str]]
 }
 
-proc ::cluster::shortid::shuffle_string { str {max {}} } { 
-  join [shuffle [split $str {}] $max] {} 
+proc ::shortid::shuffle_string { str {max {}} } {
+  join [shuffle [split $str {}] $max] {}
 }
 
-proc ::cluster::shortid::generate { {max_length 8} } {
+proc ::shortid::generate { {max_length 8} } {
 
   set i [incr [namespace current]::i]
-  
+
   lassign [shuffle [list 1 2 3 4]] 1 2 3 4
-  
+
   set clicks [clock clicks]
   set cmds   [string map { {=} {} } [binary encode base64 [join [shuffle [info commands] 20] {}]]]
 
   set cl [expr { [string length $cmds] - 5 }]
-  set c1 [::cluster::rand $1 $cl]; set c2 [::cluster::rand $3 $cl]
-  
+  set c1 [::shortid::rand $1 $cl]; set c2 [::shortid::rand $3 $cl]
+
   set uuid [string range [shuffle_string [format {%s%s%s} \
     [ incr i ] \
     [ string range $cmds $c1 [expr { $c1 + 8 }] ] \
     [ string range $cmds $c2 [expr { $c2 + 8 }] ]
-  ] ] $1 [expr { $1 + [expr { round ( $max_length / 2 ) }] }]]
-  
+  ] ] $1 [expr { $1 + [expr {round( $max_length / 2 )}] }]]
+
   switch --  $1 {
     1 { set op1 [incr [namespace current]::n]${i}$::tcl_platform(os)$::tcl_platform(osVersion) }
     2 { set op1 $::tcl_platform(machine)${i}$::tcl_platform(user)[incr [namespace current]::n] }
     3 { set op1 [string range $cmds 5 30][expr { int( rand() * [info cmdcount] + 1 ) }] }
     4 { set op1 $cmds }
   }
-  
+
   switch -- $2 {
     1 { set op2 $::tcl_platform(os)[incr [namespace current]::n][pid] }
     2 { set op2 [incr [namespace current]::n]$::tcl_platform(machine)$::tcl_platform(user)${i} }
@@ -55,21 +58,21 @@ proc ::cluster::shortid::generate { {max_length 8} } {
   }
 
   lassign [shuffle [list 1 2 3 4]] 1 2 3 4
-  
+
   binary scan [ format {%s%s} \
     [string range $op1 $1 [expr { $1 + 8 }]] [string range [encode $op2 uuencode] $2 [expr { $2 + 8 }]] \
   ] H* h1
-  
+
   binary scan [ format {%s%s} \
     [string range $op2 $3 [expr { $3 + 8 }]] [string range [encode $op1 uuencode] $4 [expr { $4 + 8 }]] \
   ] h* h2
-  
-  append uuid [string range [ shuffle_string [ format {%s%s%s%s} \
+
+  append uuid [string range [shuffle_string [ format {%s%s%s%s} \
     $h1 $i [string toupper $h2] [string range $clicks 9 14] \
   ] ] 0 [ expr { $max_length - [string length $uuid] }]]
 
   return [string range $uuid 0 [expr { $max_length - 1 }]]
-  
+
 }
 
-proc ::cluster::shortid { {max_length 8} } { tailcall ::cluster::shortid::generate $max_length }
+proc ::shortid { {max_length 8} } { tailcall ::shortid::generate $max_length }