Mercurial > hg > egg-tcls

comparison urllog.tcl @ 424:825cac46b1cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic / stray trailing whitespace cleanup.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 08 Jan 2017 03:55:55 +0200
parents 880a07485275
children e5810c52d376
comparison
equal deleted inserted replaced
423:44c9128097cd 424:825cac46b1cb
37 ########################################################################## 37 ##########################################################################
38 set urllog_name "URLLog" 38 set urllog_name "URLLog"
39 set urllog_version "2.4.2" 39 set urllog_version "2.4.2"
40 40
41 set urllog_tld_list [split $urllog_tld_list ","] 41 set urllog_tld_list [split $urllog_tld_list ","]
42 set urllog_httprep [split "\@|%40|{|%7B|}|%7D|\[|%5B|\]|%5D" "|"] 42 set urllog_httprep [split "\@|%40|{|%7B|}|%7D|\[|%5B|\]|%5D" "|"]
43 43
44 44
45 ### Require packages 45 ### Require packages
46 package require sqlite3 46 package require sqlite3
47 package require http 47 package require http
118 global urllog_preferredmsg 118 global urllog_preferredmsg
119 119
120 if {$apublic == 1} { 120 if {$apublic == 1} {
121 putserv "$urllog_preferredmsg $achan :$amsg" 121 putserv "$urllog_preferredmsg $achan :$amsg"
122 } else { 122 } else {
123 putserv "$urllog_preferredmsg $anick :$amsg" 123 putserv "$urllog_preferredmsg $anick :$amsg"
124 } 124 }
125 } 125 }
126 126
127 127
128 proc urllog_verb_msg {anick achan amsg} { 128 proc urllog_verb_msg {anick achan amsg} {
188 if {[string length $utitle] > 0} { 188 if {[string length $utitle] > 0} {
189 set qstr "$urlmsg_alreadyknown - '$utitle' $qstr" 189 set qstr "$urlmsg_alreadyknown - '$utitle' $qstr"
190 } else { 190 } else {
191 set qstr "$urlmsg_alreadyknown $qstr" 191 set qstr "$urlmsg_alreadyknown $qstr"
192 } 192 }
193 193
194 if {[utl_match_delim_list $urllog_msg_channels $uchan]} { 194 if {[utl_match_delim_list $urllog_msg_channels $uchan]} {
195 urllog_verb_msg $urlNick $urlChan $qstr 195 urllog_verb_msg $urlNick $urlChan $qstr
196 } 196 }
197 return 0 197 return 0
198 } 198 }
371 371
372 ### Does the URL already exist? 372 ### Does the URL already exist?
373 if {![urllog_exists $urlStr $urlNick $urlHost $urlChan]} { 373 if {![urllog_exists $urlStr $urlNick $urlHost $urlChan]} {
374 return 1 374 return 1
375 } 375 }
376 376
377 ### Validate URL compoments, etc. 377 ### Validate URL compoments, etc.
378 set urlProto "" 378 set urlProto ""
379 set urlHostName "" 379 set urlHostName ""
380 if {![urllog_validate_url $urlNick $urlChan urlStr urlProto urlHostName]} { 380 if {![urllog_validate_url $urlNick $urlChan urlStr urlProto urlHostName]} {
381 return 1 381 return 1
469 # KLUDGE! 469 # KLUDGE!
470 set uencoding $uenc_http2 470 set uencoding $uenc_http2
471 if {$uencoding == "" && $uenc_doc2 != ""} { 471 if {$uencoding == "" && $uenc_doc2 != ""} {
472 set uencoding $uenc_doc2 472 set uencoding $uenc_doc2
473 } elseif {$uencoding == ""} { 473 } elseif {$uencoding == ""} {
474 # If _NO_ known encoding of any kind, assume the default of iso8859-1 474 # If _NO_ known encoding of any kind, assume the default of iso8859-1
475 set uencoding "iso8859-1" 475 set uencoding "iso8859-1"
476 } 476 }
477 477
478 urllog_log "Charsets: http='$uenc_http', doc='$uenc_doc' / sanitized http='$uenc_http2', doc='$uenc_doc2' -> '$uencoding'" 478 urllog_log "Charsets: http='$uenc_http', doc='$uenc_doc' / sanitized http='$uenc_http2', doc='$uenc_doc2' -> '$uencoding'"
479 479
608 if {$urllog_shorturl != 0 && $uid != ""} { 608 if {$urllog_shorturl != 0 && $uid != ""} {
609 set shortURL "$shortURL [urllog_get_short $uid]" 609 set shortURL "$shortURL [urllog_get_short $uid]"
610 } 610 }
611 urllog_msg $upublic $unick $uchan "#$iresults: $shortURL ($uuser@[utl_ctime $utime])" 611 urllog_msg $upublic $unick $uchan "#$iresults: $shortURL ($uuser@[utl_ctime $utime])"
612 } 612 }
613 613
614 if {$iresults == 0} { 614 if {$iresults == 0} {
615 # If no URLs were found 615 # If no URLs were found
616 urllog_msg $upublic $unick $uchan $urlmsg_nomatch 616 urllog_msg $upublic $unick $uchan $urlmsg_nomatch
617 } 617 }
618 618