Move HttpBlockDisk to formats

Author: whscullin

js/components/util/files.ts

@@ -11,9 +11,9 @@ import {
     JSONDisk,
     MassStorage,
 } from 'js/formats/types';
+import { HttpBlockDisk } from 'js/formats/http_block_disk';
 import { includes, word } from 'js/types';
 import { initGamepad } from 'js/ui/gamepad';
-import { HttpBlockDisk } from './http_block_disk';
 
 type ProgressCallback = (current: number, total: number) => void;
 

js/components/util/http_block_disk.ts js/formats/http_block_disk.ts

@@ -61,7 +61,7 @@ export class HttpBlockDisk implements BlockDisk {
     }
 
     async read(blockNumber: number): Promise<Uint8Array> {
-        const blockShift = 5;
+        const blockShift = 6;
         if (!this.blocks[blockNumber]) {
             const fetchBlock = blockNumber >> blockShift;
             const deferred = this.fetchMap[fetchBlock];

js/ui/apple2.ts

@@ -38,7 +38,7 @@ import { Screen, SCREEN_FULL_PAGE } from './screen';
 import { JoyStick } from './joystick';
 import { System } from './system';
 import { Options } from '../options';
-import { HttpBlockDisk } from 'js/components/util/http_block_disk';
+import { HttpBlockDisk } from 'js/formats/http_block_disk';
 
 let paused = false;