ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/Main.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/Main.pm (file contents):
Revision 1.7 by root, Sat Dec 31 06:51:29 2011 UTC vs.
Revision 1.9 by root, Thu Jan 5 05:37:02 2012 UTC

… …
18} 18}
19 19
20use common::sense; 20use common::sense;
21use Carp 'verbose'; 21use Carp 'verbose';
22use Cwd (); 22use Cwd ();
23use Digest::MD5 ();
23use EV; 24use EV;
24BEGIN { *time = \&EV::time } 25BEGIN { *time = \&EV::time }
25 26
26use List::Util qw(max min); 27use List::Util qw(max min);
27 28
… …
522 523
523 DC::Mix_CloseAudio if $SDL_MIXER; 524 DC::Mix_CloseAudio if $SDL_MIXER;
524 undef $SDL_MIXER; 525 undef $SDL_MIXER;
525 526
526 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO; 527 DC::SDL_QuitSubSystem DC::SDL_INIT_AUDIO;
528}
529
530#############################################################################
531# Over-the-air updates
532
533sub ota_update {
534 my ($face, $size, $md5) = @_;
535
536 my $coro = Coro::async_pool {
537 my $override = "$Urlader::EXE_DIR/override";
538
539 $MESSAGE_DIST->add_channel ({
540 id => "ota_update",
541 title => "Update",
542 tooltip => "<b>Software Update Log</b>",
543 });
544
545 $MESSAGE_DIST->message ({ type => "ota_update", markup => "preparing override..." });
546
547 my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_WRONLY | IO::AIO::O_CREAT | IO::AIO::O_TRUNC, 0777;
548
549 unless ($fh) {
550 $MESSAGE_DIST->message ({ type => "ota_update", markup => (DC::asxml "unable to write software update:\n$Urlader::EXE_DIR/override.tmp:\n$!") });
551 return;
552 }
553
554 $MESSAGE_DIST->message ({ type => "ota_update", markup => "downloading $size bytes..." });
555
556 my $cv = AE::cv;
557 my $error;
558
559 $cv->begin (Coro::rouse_cb);
560 $CONN->ask_face (
561 $face,
562 -1000,
563 sub {
564 $STATUSBOX->add (
565 (sprintf "update download: %d/%d", $size - $_[1], $size),
566 pri => -9, group => "ota_update", timeout => 60, fg => [1, 1, 0, 1]
567 );
568
569 $cv->begin;
570 my $len = length $_[2];
571 IO::AIO::aio_write $fh, $_[1], $len, $_[2], undef, sub {
572 $error ||= $_[0] != $len;
573 $cv->end;
574 };
575 },
576 sub {
577 $cv->end;
578 },
579 );
580
581 Coro::rouse_wait;
582
583 $STATUSBOX->clr_group ("ota_update");
584
585 $error ||= Coro::AIO::aio_fsync $fh;
586 $error ||= Coro::AIO::aio_close $fh;
587
588 if ($error) {
589 $MESSAGE_DIST->message ({ type => "ota_update", markup => "file write error, update aborted." });
590 Coro::AIO::aio_unlink "$override.tmp";
591 return;
592 }
593
594 {
595 $MESSAGE_DIST->message ({ type => "ota_update", markup => "verifying update file..." });
596
597 my $fh = Coro::AIO::aio_open "$override.tmp", IO::AIO::O_RDONLY, 0;
598
599 if ($fh) {
600 $error ||= Coro::AIO::aio_stat "$override.tmp";
601 $error ||= -s _ != $size;
602 $error ||= Coro::AIO::aio_readahead $fh, 0, $size;
603
604 my $f_md5 = new Digest::MD5;
605 $f_md5->addfile ($fh);
606 $f_md5 = $f_md5->hexdigest;
607 $error ||= $md5 ne $f_md5;
608 }
609 }
610
611 if ($error) {
612 $MESSAGE_DIST->message ({ type => "ota_update", markup => "verification failed, update aborted." });
613 Coro::AIO::aio_unlink "$override.tmp";
614 return;
615 }
616
617 $MESSAGE_DIST->message ({ type => "ota_update", markup => "replacing override file..." });
618
619 if (Coro::AIO::aio_rename "$override.tmp", $override) {
620 $MESSAGE_DIST->message ({ type => "ota_update", markup => "unable to replace override file, update aborted." });
621 Coro::AIO::aio_unlink "$override.tmp";
622 }
623
624 $MESSAGE_DIST->message ({ type => "ota_update", markup => "success - update becomes active after restarting." });
625 };
626
627 $CONN->{ota_update} = Guard::guard {
628 $coro->cancel;
629 };
630}
631
632sub ota_update_ask {
633 my ($ok, $face, $ver, $size, $md5, $changes) = @_;
634
635 $CONN->{w}{ota_dialog} = my $dialog = new DC::UI::Toplevel
636 x => "center",
637 y => "center",
638 z => 55,
639 force_w => $::WIDTH * 0.7,
640 force_h => $::HEIGHT * 0.7,
641 title => "Software update available",
642 child => my $vbox = new DC::UI::VBox,
643 ;
644
645 $vbox->add (new DC::UI::Label
646 ellipsise => 0,
647 text => "The server offers a software update, "
648 . "do you want to start downloading this update in the background?",
649 );
650
651 $vbox->add (new DC::UI::FancyFrame
652 expand => 1,
653 label => "Details",
654 child => (new DC::UI::TextScroller
655 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4,
656 par => [{
657 markup => "<tt>Old revision: $Urlader::EXE_VER\n"
658 . "New revision: $ver\n"
659 . "Download size: $size bytes</tt>\n\n"
660 . "Changes:\n\n"
661 . DC::asxml $changes
662 }],
663 ),
664 );
665
666 $vbox->add (my $hbox = new DC::UI::HBox);
667
668 $hbox->add (new DC::UI::Button
669 expand => 1,
670 text => "Not now",
671 on_activate => sub {
672 $dialog->destroy;
673 0
674 }
675 );
676 $hbox->add (new DC::UI::Button
677 expand => 1,
678 text => "Yes, start downloading",
679 on_activate => sub {
680 $dialog->destroy;
681 ota_update $face, $size, $md5;
682 0
683 },
684 );
685
686 $dialog->show;
687}
688
689sub ota_update_check {
690 return unless defined $Urlader::EXE_ID;
691
692 ::message { markup => "Checking for software update..." };
693
694 $CONN->send_exti_req (ota_update => $Urlader::URLADER_VERSION, $Urlader::EXE_ID, $Urlader::EXE_VER, sub {
695 my ($ok, $face, $ver, $size, $md5, $changes) = @_;
696
697 if ($ok) {
698 if (defined $ver) {
699 ::message { markup => "Server offers version $ver (we are version $Urlader::EXE_VER)." };
700 &ota_update_ask;
701 } else {
702 ::message { markup => "Server has no newer version." };
703 }
704 } else {
705 ::message { markup => "Server does not support software update." };
706 }
707
708# $self->register_face_handler ($exp_table, sub {
709# my ($face) = @_;
710
711# $self->{exp_table} = $self->{json_coder}->decode (delete $face->{data});
712# $_->() for values %{ $self->{on_exp_update} || {} };
713# });
714
715 ()
716 });
527} 717}
528 718
529############################################################################# 719#############################################################################
530 720
531sub destroy_query_dialog { 721sub destroy_query_dialog {
… …
792 }, 982 },
793 983
794 on_connect => sub { 984 on_connect => sub {
795 if ($_[0]) { 985 if ($_[0]) {
796 DC::lowdelay fileno $CONN->{fh}; 986 DC::lowdelay fileno $CONN->{fh};
987
988 ota_update_check;
797 989
798 status "successfully connected to the server"; 990 status "successfully connected to the server";
799 } else { 991 } else {
800 undef $CONN; 992 undef $CONN;
801 status "unable to connect: $!"; 993 status "unable to connect: $!";
… …
1855 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $DC::DB::DBDIR, tooltip => ""); 2047 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $DC::DB::DBDIR, tooltip => "");
1856 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Urlader (Prebuilt)"); 2048 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Urlader (Prebuilt)");
1857 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_VERSION}, tooltip => ""); 2049 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_VERSION}, tooltip => "");
1858 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Branch (Prebuilt)"); 2050 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Branch (Prebuilt)");
1859 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_ID}, tooltip => ""); 2051 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_ID}, tooltip => "");
1860 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Version (Prebuilt)"); 2052 $table->add_at (0, $row , new DC::UI::Label align => 1, text => "Revision (Prebuilt)");
1861 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_VER}, tooltip => ""); 2053 $table->add_at (1, $row++, new DC::UI::Label align => 0, text => $ENV{URLADER_EXE_VER}, tooltip => "");
1862 } 2054 }
1863 2055
1864 $vbox 2056 $vbox
1865} 2057}
… …
2279sub open_quit_dialog { 2471sub open_quit_dialog {
2280 unless ($QUIT_DIALOG) { 2472 unless ($QUIT_DIALOG) {
2281 $QUIT_DIALOG = new DC::UI::Toplevel 2473 $QUIT_DIALOG = new DC::UI::Toplevel
2282 x => "center", 2474 x => "center",
2283 y => "center", 2475 y => "center",
2284 z => 50, 2476 z => 60,
2285 title => "Really Quit?", 2477 title => "Really Quit?",
2286 on_key_down => sub { 2478 on_key_down => sub {
2287 my ($dialog, $ev) = @_; 2479 my ($dialog, $ev) = @_;
2288 $ev->{sym} == 27 and $dialog->hide; 2480 $ev->{sym} == 27 and $dialog->hide;
2289 } 2481 }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines