Update to v1.80.

Author: bengarrett

docs/CHANGES.md

@@ -2,9 +2,33 @@
 
 ## Changes and updates
 
+### v1.8.0
+
+- Fixed DOSee incorrectly interpreting backslashes as new commands,
+  even though they're common DOS program arguments, ie, `EXAMPLE.EXE /?`.
+- DOSee (`dosee:run:filename`) can handle chained DOS and DOSBox commands, these are separated by a Bash-style `&&` (AND) separator.
+  For example, `@ECHO Hello&&PAUSE&&CLS` would print Hello, prompt for any key press to continue and then clear the screen.
+- Added a Update DOSee and the service worker button on the `index.html` running example.
+  Clicking this removes all stored DOSee files in the browser cache.
+- Added apple-touch-icon meta link to examples.
+- Renamed the internal drive letters to make their purpose clearer.
+- Updated the content of the Utilities `U:` drive.
+- - Renamed `ALIASES` dir to `ALIAS`
+- - Renamed `TOOLS` dir to `FILEHACK`
+- - Renamed `REPAIR` to `FIX`
+- - Renamed `DF2DOS` to `UTIL`
+- - Moved `FIX\TP-FIX` into `FILEHACK`
+- - Added the dependency `CWSDPMI.EXE` to `UTIL`
+- - Added an ANSI `WELCOME` help screen.
+- - Removed the DOSzip commander tool `DZ.EXE` as it ran too slow.
+- - Removed the unused `DRIVER` directory.
+- - Replaced Open Cubic Player with the performant XTC-PLAY v0.47.
+- - Replaced Acidview with Insane View v2.01b.
+
 ### v1.71
- - Fixed yarn/npm build error caused by an invalid type used in `workbox-config.js`.
- <br>`[InjectManifest.maximumFileSizeToCacheInBytes] 'maximumFileSizeToCacheInBytes' property type must be number.`
+
+- Fixed yarn/npm build error caused by an invalid type used in `workbox-config.js`.
+  <br>`[InjectManifest.maximumFileSizeToCacheInBytes] 'maximumFileSizeToCacheInBytes' property type must be number.`
 
 ### v1.70
 

docs/README.md

@@ -60,6 +60,7 @@ cd DOSee
 # run the container (tap Ctrl-C to exit)
 docker compose up
 ```
+
 Point a web browser to http://localhost:8086
 
 ```bash
@@ -85,24 +86,15 @@ If you edit the source files in `src/` you will need to rebuild the application.
 cd DOSee
 
 # re-build DOSee using your edits
-yarn # npm run install
+yarn run install # npm run install
 
 # serve the modified DOSee over port 8086
 yarn run serve # npm run serve
 ```
 
 Point a web browser to http://localhost:8086
 
-Due to a PWA offline caching feature, web browsers must clear the application storage and unregister the service workers to reflect changes to the application code.
-
-- In Chrome/Edge bring up the browser Dev Tools in using <kbd>Ctrl</kbd> <kbd>Shift</kbd> <kbd>J</kbd>.<br>
-  Select the Application and Storage tab.<br>
-  Check the Application Unregister service workers checkbox.<br>
-  Press the Clear site data button.
-
-- In Firefox bring up the browser Developer Tools in using <kbd>Ctrl</kbd> <kbd>Shift</kbd> <kbd>I</kbd>.<br>
-  Select the Application and Service Workers tab.<br>
-  Press the Unregister button.
+Due to the PWA offline feature, web browsers need to unregister the service workers to reflect any changes to the application code. There is a red _Update DOSee and the service worker_ button on the index.html example that will do this and then reload the browser window. The eventListener code for this button can be found in the `src/js/dosee-sw.js` file.
 
 ### License
 

docs/USAGE.md

@@ -47,10 +47,12 @@ The meta _content_ attribute must be a relative path from the webroot and must p
 
 ### `<meta name="dosee:run:filename">`
 
-The filename of the MS-DOS program DOSee should launch. The program file needs to exist in the ZIP archive provided to _dosee:zip:path_.
+The filenames of the MS-DOS programs or DOSBox commands DOSee should launch. Any programs need to exist in the ZIP archive provided to _dosee:zip:path_.
 
 DOS usually uses the following file extensions to identify a program: `.exe` `.com` `.bat`. Other than these, there is no standard file naming convention to identify which file should launch a piece of DOS software.
 
+Multiple programs and commands can be chained together using an `&&` separator.
+
 If the content is left blank or the filename doesn't exist in the archive, DOSee will launch into a DOS `C:` prompt.
 
 ✓
@@ -59,6 +61,12 @@ If the content is left blank or the filename doesn't exist in the archive, DOSee
 <meta name="dosee:run:filename" content="game.exe" />
 ```
 
+✓
+
+```html
+<meta name="dosee:run:filename" content="CLS&&@ECHO Loading game&&game.exe" />
+```
+
 ## Optional
 
 ### `<meta name="dosee:capture:filename">`
@@ -157,7 +165,7 @@ The default and initial selection for the **Graphic adapter** hardware. Possible
 
 The default and initial selection for the **Audio addon** hardware. Possible values are:
 
-- `gus`<br>**Gravis Ultrasound** offers high quality 14 channel, 16-bit, 44 KHz digital playback.
+- `gus`<br>**Gravis UltraSound** offers high quality 14 channel, 16-bit, 44 KHz digital playback.
 - `covox`<br>**Covox** Covox Speech Accelerator is an external audio device and speaker with mono digital playback.
 - `sb16`<br>**Sound Blaster 16** Creative Labs Sound Blaster 16 offers stereo, 16-bit, 44 KHz digital playback.
 - `sb1`<br>**Sound Blaster 1.0** Creative Labs Sound Blaster v1.0 offers mono, 8-bit, 22 KHz digital playback.
@@ -173,7 +181,7 @@ The default and initial selection for the **Audio addon** hardware. Possible val
 
 #### `<meta name="dosee:audio:gus">`
 
-When set to `true`, it tells DOSee to mount a collection of Gravis Ultrasound audio drivers and tools accessible from the `G:` drive. These drivers are always loaded by DOSee whenever the Gravis Ultrasound audio option is selected. So this should still be left to `false`.
+When set to `true`, it tells DOSee to mount a collection of Gravis UltraSound audio drivers and tools accessible from the `G:` drive. These drivers are always loaded by DOSee whenever the Gravis UltraSound audio option is selected. So this should still be left to `false`.
 
 #### Sample programs
 

package.json

@@ -23,8 +23,8 @@
   },
   "homepage": "https://github.com/bengarrett/DOSee",
   "funding": {
-    "type" : "individual",
-    "url" : "https://www.buymeacoffee.com/4rtEGvUIY"
+    "type": "individual",
+    "url": "https://www.buymeacoffee.com/4rtEGvUIY"
   },
   "license": "GPL-3.0-or-later",
   "name": "dosee",
@@ -39,5 +39,6 @@
     "serve": "npx http-server build -p 8086",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "1.7.0"
+  "version": "1.8.0",
+  "packageManager": "[email protected]"
 }

src/disk_drives/s_drive.zip

@@ -11,9 +11,10 @@
   <!-- PWA configuration -->
   <meta name="theme-color" content="#1524eb" />
   <link rel="manifest" href="/manifest.json" />
+  <link rel="apple-touch-icon" href="/images/dosee-icon-192x192.png">
 
   <!-- DOSee initialisation options -->
- <meta name="dosee:zip:path" content="dos_programs/program_0/agi_demo_pack_1.zip" />
+  <meta name="dosee:zip:path" content="dos_programs/program_0/agi_demo_pack_1.zip" />
   <meta name="dosee:run:filename" content="sierra.com" />
   <meta name="dosee:capture:filename" content="screenshot.png" />
   <meta name="dosee:utilities" content="false" />
@@ -54,12 +55,13 @@
   <div>
     <h2>
       DOSee
-      <small><a href="#doseeTabs" id="doseeInstall" class="hidden">+Install</a></small>
+      <small><em>A DOS era, PC emulator for the web</em>
+        <a href="#doseeTabs" id="doseeInstall" class="hidden">+Install</a>
+      </small>
     </h2>
     <hr />
     <h2>
-      <small>Emulating<span id="doseeOffline" class="hidden"> offline</span> …
-        <span id="doseeH2">Something</span></small>
+      <small>Emulating<span id="doseeOffline" class="hidden"> offline</span> <span id="doseeH2">something</span></small>
     </h2>
     <div class="row" id="doseeCrashed">
       <div class="card fluid error">
@@ -136,7 +138,7 @@ <h2>
         <legend>Audio addon</legend>
         <label>
           <input type="radio" name="dosaudio" id="dosaudio1" value="gus" />
-          Gravis Ultrasound
+          Gravis UltraSound
         </label>
         <label>
           <input type="radio" name="dosaudio" id="dosaudio4" value="covox" />
@@ -227,19 +229,30 @@ <h4>Sierra - AGI Demo Pack 1</h4>
         <p>Released: 1987</p>
         <p>Uses 16 color Tandy or EGA graphics and enhanced, 3 channel Tandy audio</p>
         <p>
-          <a href="?dosspeed=386&dosmachine=tandy&dosaudio=none">Reset to recommended hardware</a>
+          <a href="?dosspeed=auto&dosmachine=tandy&dosaudio=none">Reset to recommended hardware</a>
         </p>
       </div>
       <div id="helpTabNA">
         <p>No help available</p>
       </div>
     </form>
-    <hr>
-    <p>
-      Example programs: <a href="/">Tandy 1000</a> - <a href="/index_1.html">EGA plus AdLib</a> - <a href="/index_2.html">Gravis Ultrasound</a> - <a href="/index_3.html">VGA plus AdLib</a>
-    </p>
+    <div class="row">
+      <div class="col-sm-12">
+        <div class="card fluid">
+          <h5>Switch the example machines and programs,</h5>
+          <p> ✱ <a href="/">1987, Tandy 1000</a> ✱ <a href="/index_1.html">1990, EGA+AdLib</a> ✱ <a
+              href="/index_2.html">1994, Gravis
+              UltraSound</a> ✱ <a href="/index_3.html">1996, VGA+AdLib</a></p>
+        </div>
+      </div>
+      <div class="col-sm-12">
+        <div class="card fluid">
+          <input type="button" id="updateDOSeeSW" class="small secondary" value="Update DOSee and the service worker" />
+        </div>
+      </div>
+    </div>
     <footer>
-      © 2021 - Ben Garrett |
+      © 2022 - Ben Garrett |
       <a href="//github.com/bengarrett/DOSee" target="_blank" rel="noopener">GitHub</a> |
       <a href="https://dosee.link" target="_blank" rel="nopener">DOSee online</a>
       <p>

src/disk_drives/u_drive.zip

@@ -11,9 +11,10 @@
   <!-- PWA configuration -->
   <meta name="theme-color" content="#1524eb" />
   <link rel="manifest" href="/manifest.json" />
+  <link rel="apple-touch-icon" href="/images/dosee-icon-192x192.png">
 
   <!-- DOSee initialisation options -->
- <meta name="dosee:zip:path" content="dos_programs/program_1/loom.zip" />
+  <meta name="dosee:zip:path" content="dos_programs/program_1/loom.zip" />
   <meta name="dosee:run:filename" content="SAMPLER.EXE" />
   <meta name="dosee:capture:filename" content="screenshot.png" />
   <meta name="dosee:utilities" content="false" />
@@ -54,12 +55,13 @@
   <div>
     <h2>
       DOSee
-      <small><a href="#doseeTabs" id="doseeInstall" class="hidden">+Install</a></small>
+      <small><em>A DOS era, PC emulator for the web</em>
+        <a href="#doseeTabs" id="doseeInstall" class="hidden">+Install</a>
+      </small>
     </h2>
     <hr />
     <h2>
-      <small>Emulating<span id="doseeOffline" class="hidden"> offline</span> …
-        <span id="doseeH2">Something</span></small>
+      <small>Emulating<span id="doseeOffline" class="hidden"> offline</span> <span id="doseeH2">something</span></small>
     </h2>
     <div class="row" id="doseeCrashed">
       <div class="card fluid error">
@@ -136,7 +138,7 @@ <h2>
         <legend>Audio addon</legend>
         <label>
           <input type="radio" name="dosaudio" id="dosaudio1" value="gus" />
-          Gravis Ultrasound
+          Gravis UltraSound
         </label>
         <label>
           <input type="radio" name="dosaudio" id="dosaudio4" value="covox" />
@@ -234,12 +236,19 @@ <h4>Lucasfilm passport to adventure</h4>
         <p>No help available</p>
       </div>
     </form>
-    <hr>
-    <p>
-      Example programs: <a href="/">Tandy 1000</a> - <a href="/index_1.html">EGA plus AdLib</a> - <a href="/index_2.html">Gravis Ultrasound</a> - <a href="/index_3.html">VGA plus AdLib</a>
-    </p>
+    <div class="row">
+      <div class="col-sm-12">
+        <div class="card fluid">
+          <h5>Switch the example machines and programs,</h5>
+          <p> ✱ <a href="/">1987, Tandy 1000</a> ✱ <a href="/index_1.html">1990, EGA+AdLib</a> ✱ <a
+              href="/index_2.html">1994,
+              Gravis
+              UltraSound</a> ✱ <a href="/index_3.html">1996, VGA+AdLib</a></p>
+        </div>
+      </div>
+    </div>
     <footer>
-      © 2021 - Ben Garrett |
+      © 2022 - Ben Garrett |
       <a href="//github.com/bengarrett/DOSee" target="_blank" rel="noopener">GitHub</a> |
       <a href="https://dosee.link" target="_blank" rel="nopener">DOSee online</a>
       <p>

src/index.html

@@ -3,17 +3,18 @@
 
 <head>
   <meta charset="utf-8" />
-  <title>DOSee Gravis Ultrasound running example</title>
+  <title>DOSee Gravis UltraSound running example</title>
   <meta name="description" content="Verses by Electromotive Force running in DOSee" />
   <meta name="author" content="Ben Garrett" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
 
   <!-- PWA configuration -->
   <meta name="theme-color" content="#1524eb" />
   <link rel="manifest" href="/manifest.json" />
+  <link rel="apple-touch-icon" href="/images/dosee-icon-192x192.png">
 
   <!-- DOSee initialisation options -->
- <meta name="dosee:zip:path" content="dos_programs/program_2/emf_vrs2.zip" />
+  <meta name="dosee:zip:path" content="dos_programs/program_2/emf_vrs2.zip" />
   <meta name="dosee:run:filename" content="VERSES.EXE" />
   <meta name="dosee:capture:filename" content="screenshot.png" />
   <meta name="dosee:utilities" content="false" />
@@ -54,12 +55,13 @@
   <div>
     <h2>
       DOSee
-      <small><a href="#doseeTabs" id="doseeInstall" class="hidden">+Install</a></small>
+      <small><em>A DOS era, PC emulator for the web</em>
+        <a href="#doseeTabs" id="doseeInstall" class="hidden">+Install</a>
+      </small>
     </h2>
     <hr />
     <h2>
-      <small>Emulating<span id="doseeOffline" class="hidden"> offline</span> …
-        <span id="doseeH2">Something</span></small>
+      <small>Emulating<span id="doseeOffline" class="hidden"> offline</span> <span id="doseeH2">something</span></small>
     </h2>
     <div class="row" id="doseeCrashed">
       <div class="card fluid error">
@@ -136,7 +138,7 @@ <h2>
         <legend>Audio addon</legend>
         <label>
           <input type="radio" name="dosaudio" id="dosaudio1" value="gus" />
-          Gravis Ultrasound
+          Gravis UltraSound
         </label>
         <label>
           <input type="radio" name="dosaudio" id="dosaudio4" value="covox" />
@@ -225,7 +227,7 @@ <h2>
       <div id="helpProgram_2" class="hide">
         <h4>Verses by Electromotive Force</h4>
         <p>Released: 1994</p>
-        <p>Uses Gravis Ultrasound and 256 color VGA graphics</p>
+        <p>Uses Gravis UltraSound and 256 color VGA graphics</p>
         <p>
           <a href="?dosspeed=max&dosmachine=vga&dosaudio=gus">Reset to recommended hardware</a>
         </p>
@@ -234,12 +236,19 @@ <h4>Verses by Electromotive Force</h4>
         <p>No help available</p>
       </div>
     </form>
-    <hr>
-    <p>
-      Example programs: <a href="/">Tandy 1000</a> - <a href="/index_1.html">EGA plus AdLib</a> - <a href="/index_2.html">Gravis Ultrasound</a> - <a href="/index_3.html">VGA plus AdLib</a>
-    </p>
+    <div class="row">
+      <div class="col-sm-12">
+        <div class="card fluid">
+          <h5>Switch the example machines and programs,</h5>
+          <p> ✱ <a href="/">1987, Tandy 1000</a> ✱ <a href="/index_1.html">1990, EGA+AdLib</a> ✱ <a
+              href="/index_2.html">1994,
+              Gravis
+              UltraSound</a> ✱ <a href="/index_3.html">1996, VGA+AdLib</a></p>
+        </div>
+      </div>
+    </div>
     <footer>
-      © 2021 - Ben Garrett |
+      © 2022 - Ben Garrett |
       <a href="//github.com/bengarrett/DOSee" target="_blank" rel="noopener">GitHub</a> |
       <a href="https://dosee.link" target="_blank" rel="nopener">DOSee online</a>
       <p>