Increase page length for ANSI, and minor updates

This commit is contained in:
Deon George 2019-01-02 20:56:03 +11:00
parent 390f52a460
commit f2e6a250cc
8 changed files with 51 additions and 38 deletions

1
.gitattributes vendored
View File

@ -2,4 +2,5 @@
*.css linguist-vendored *.css linguist-vendored
*.scss linguist-vendored *.scss linguist-vendored
*.js linguist-vendored *.js linguist-vendored
*.ans text eol=crlf
CHANGELOG.md export-ignore CHANGELOG.md export-ignore

View File

@ -346,7 +346,7 @@ abstract class Frame
*/ */
private function render_page(int $num,string $frame) private function render_page(int $num,string $frame)
{ {
if ($num > 999999999) if ($num > (int)str_repeat(9,static::$pagenum_length))
throw new \Exception('Page Number too big',500); throw new \Exception('Page Number too big',500);
if (strlen($frame) !== 1) if (strlen($frame) !== 1)
@ -400,7 +400,7 @@ abstract class Frame
// Header // Header
$sid = R_RED.'T'.R_BLUE.'E'.R_GREEN.'S'.R_YELLOW.'T'; $sid = R_RED.'T'.R_BLUE.'E'.R_GREEN.'S'.R_YELLOW.'T';
$content .= substr($sid.'-'.str_repeat('12345678901234567890',4),0,static::$header_length+(strlen($sid)-$so->strlenv($sid))). $content .= substr($sid.'-'.str_repeat('12345678901234567890',4),0,static::$header_length+(strlen($sid)-$so->strlenv($sid))).
R_WHITE.'999999999a'.R_RED.sprintf('%07.0f',999).'u'; R_WHITE.str_repeat('9',static::$pagenum_length).'a'.R_RED.sprintf('%07.0f',999).'u';
$content .= R_WHITE.str_repeat('+-',static::$frame_width/2-3).' '.R_RED.'01'; $content .= R_WHITE.str_repeat('+-',static::$frame_width/2-3).' '.R_RED.'01';
$content .= R_WHITE.'Name: '.ESC.str_repeat('t',5).' |'.str_repeat('+-',static::$frame_width/2-8).'|'; $content .= R_WHITE.'Name: '.ESC.str_repeat('t',5).' |'.str_repeat('+-',static::$frame_width/2-8).'|';

View File

@ -12,8 +12,8 @@ class Ansi extends AbstractFrame
public static $frame_length = 22; public static $frame_length = 22;
public static $frame_width = 80; public static $frame_width = 80;
public static $header_length = 60; public static $header_length = 58;
public static $pagenum_length = 9; public static $pagenum_length = 11;
public static $cost_length = 7; public static $cost_length = 7;
public static $cost_unit = 'u'; public static $cost_unit = 'u';

View File

@ -584,10 +584,18 @@ abstract class Server {
break; break;
} }
// Bookmark page
if ($cmd === '05') {
$this->sendBaseline($client, RED.'NOT IMPLEMENTED YET?');
$mode = FALSE;
break;
}
// Report a problem // Report a problem
if ($cmd === '08') { if ($cmd === '08') {
$this->sendBaseline($client, RED.'NOT IMPLEMENTED YET?'); $this->sendBaseline($client, RED.'NOT IMPLEMENTED YET?');
$read = STAR; $mode = FALSE;
break; break;
} }
@ -617,7 +625,7 @@ abstract class Server {
$current['fieldreset'] = TRUE; $current['fieldreset'] = TRUE;
} else { } else {
$mode = false; $mode = FALSE;
} }
break; break;

View File

@ -76,16 +76,21 @@ class FrameImport extends Command
$o->frame = $this->argument('frame'); $o->frame = $this->argument('frame');
$o->index = $this->argument('index'); $o->index = $this->argument('index');
$o->mode_id = $mo->id; $o->mode_id = $mo->id;
$o->access = $this->option('access');
$o->public = $this->option('public');
$o->cost = $this->option('cost');
$o->type = $this->option('type');
} }
// We need to escape any back slashes.
$o->content = str_replace('\\','\\\\',($this->option('trim')) $o->content = str_replace('\\','\\\\',($this->option('trim'))
? substr(file_get_contents($this->argument('file')),40) ? substr(file_get_contents($this->argument('file')),40)
: file_get_contents($this->argument('file'))); : file_get_contents($this->argument('file')));
$o->access = $this->option('access'); // If we have 0x1aSAUCE, we'll discard the sauce.
$o->public = $this->option('public'); if ($x = strpos($o->content,chr(0x1a).'SAUCE')) {
$o->cost = $this->option('cost'); $o->content = substr($o->content,0,$x-1).chr(0x0a);
$o->type = $this->option('type'); }
$o->save(); $o->save();
} }

View File

@ -1,8 +1,8 @@
 レトトトトトトトソ レトトトトトトトソレトトトトトトトソ レトトトトトトトソ  レトトトトトトトソ レトトトトトトトソレトトトトトトトソ レトトトトトトトソ
ͳù Õ¸Õ¸ú³Í³ù Õ͸ù³Ô͸ù Õ;ͳù Õ͸ú³  ddddddddddddddddd ³ ³Ô¾³ ³ ³ ÀÄÙ ³²²³ ³°² ³ ³²³ ³ ͳù Õ¸Õ¸ú³Í³ù Õ͸ù³Ô͸ù Õ;ͳù Õ͸ú³Í  ddddddddddddddddd ³ ³Ô¾³ ³ ³ ÀÄÙ ³²²³ ³°² ³ ³²³ ³ 
°³ ³²±³ ³°³ Õ͸ ³°°³ ³²Û°³ ³±³ ³ °³ ³²±³ ³°³ Õ͸ ³°°³ ³²Û°³ ³±³ ³°
±³ ³±°³ ³±³ ³°³ ³±±³ ³°±±³ ³°³ ³ ±³ ³±°³ ³±³ ³°³ ³±±³ ³°±±³ ³°³ ³±
ͳù ³Íͳù³Í³ù ³Í³ù³ÚÄÙù ÀĿͳù ³Í³ù³  *0# to get back here anytime ÔÍ; Ô; ÔÍÍ; Ô;ÔÍÍÍÍÍÍ; ÔÍÍ; Ô; ͳù ³Íͳù³Í³ù ³Í³ù³ÚÄÙù ÀĿͳù ³Í³ù³Í  *0# to get back here anytime ÔÍ; Ô; ÔÍÍ; Ô;ÔÍÍÍÍÍÍ; ÔÍÍ; Ô;
 ゚ ゚ ゚゚゚ ゚゚ワ ゚゚゚ ゚゚゚  ゚ ゚ ゚゚゚ ゚゚ワ ゚゚゚ ゚゚゚
 ワ ワ ワ ワ ワ ワ ワ゚  ワ゚ワ  ワ ワ ワ ワ ワ ワ ワ゚  ワ゚ワ

View File

@ -1,8 +1,8 @@
 レトトトトトトトソ レトトトトトトトソ レトトトトトトトソ レトトトトトトソ レトトトトトトトソ レトトトソ レトソ レトトトトトトトソ  レトトトトトトトソ レトトトトトトトソ レトトトトトトトソ レトトトトトトソ レトトトトトトトソ レトトトソ レトソ レトトトトトトトソ
ͳù ÕÍÍ;ͳù Õ͸ù³Í³ù Õ͸ù³Í³ù Õ͸À¿Í³ù Õ͸ù³Í³ù ³Í³ù³Í³ù Õ͸ù³ ͳù ÕÍÍ;ͳù Õ͸ù³Í³ù Õ͸ù³Í³ù Õ͸À¿Í³ù Õ͸ù³Í³ù ³Í³ù³Í³ù Õ͸ù³Í
 ³ ³ÚÄÄ¿°³ ³Û³ ³°³ ³Û³ ³°³ ³Û³ ³ ³ ÀÄÙÚÙ ³ ÀÄÙ ³ ³ À¿ÀÄÙ  ³ ³ÚÄÄ¿°³ ³Û³ ³°³ ³Û³ ³°³ ³Û³ ³ ³ ÀÄÙÚÙ ³ ÀÄÙ ³ ³ À¿ÀÄÙ 
°³ ³À¿ú³±³ ³²³ ³±³ ³²³ ³±³ ³²³ ³°³ ÚÄ¿Ô¸°ÔÍÍÍÍ͸ ³°³ ÚÙÚÄ¿ °³ ³À¿ú³±³ ³²³ ³±³ ³²³ ³±³ ³²³ ³°³ ÚÄ¿Ô¸°ÔÍÍÍÍ͸ ³°³ ÚÙÚÄ¿°
±³ ³°³ ³²³ ÀÄÙ ³²³ ÀÄÙ ³²³ ÀÄÙ ³±³ ³°³ ³±ÚÄÄÄÄÄÙ ³±³ ³°³ ³ ±³ ³°³ ³²³ ÀÄÙ ³²³ ÀÄÙ ³²³ ÀÄÙ ³±³ ³°³ ³±ÚÄÄÄÄÄÙ ³±³ ³°³ ³±
ͳù Ô;ù³Í³ùù³Í³ùù³Í³ùÚÙͳù Ô;ù³Í³ùù³Í³ù Ô;ù³ ͳù Ô;ù³Í³ùù³Í³ùù³Í³ùÚÙͳù Ô;ù³Í³ùù³Í³ù Ô;ù³Í
 ÔÍÍÍÍÍÍ; ÔÍÍÍÍÍÍ; ÔÍÍÍÍÍÍ; ÔÍÍÍÍÍ; ÔÍÍÍÍÍÍ; ÔÍÍÍÍÍÍ; ÔÍÍÍÍÍÍ;  ÔÍÍÍÍÍÍ; ÔÍÍÍÍÍÍ; ÔÍÍÍÍÍÍ; ÔÍÍÍÍÍ; ÔÍÍÍÍÍÍ; ÔÍÍÍÍÍÍ; ÔÍÍÍÍÍÍ;
 Thanks for calling. Please come back again...  Thanks for calling. Please come back again... 

View File

@ -16,7 +16,7 @@ class CreateFramemeta extends Migration
$this->down(); $this->down();
Schema::create('framemeta', function (Blueprint $table) { Schema::create('framemeta', function (Blueprint $table) {
$table->integer('frame_id')->index(); $table->integer('frame_id')->index()->unique();
$table->string('r0')->default('*'); $table->string('r0')->default('*');
$table->string('r1')->default('*'); $table->string('r1')->default('*');
$table->string('r2')->default('*'); $table->string('r2')->default('*');
@ -27,7 +27,6 @@ class CreateFramemeta extends Migration
$table->string('r7')->default('*'); $table->string('r7')->default('*');
$table->string('r8')->default('*'); $table->string('r8')->default('*');
$table->string('r9')->default('*'); $table->string('r9')->default('*');
}); });
Schema::table('framemeta', function (Blueprint $table) { Schema::table('framemeta', function (Blueprint $table) {