Replaced ScripProxy with MediaFileProxy

Emulator/Media/Script.cpp

@@ -32,11 +32,13 @@ Script::isCompatible(std::istream &stream)
     return true;
 }
 
+/*
 void
 Script::execute(VirtualC64 &c64)
 {
     string s((char *)data, size);
     try { c64.retroShell.execScript(s); } catch (util::Exception &) { }
 }
+*/
 
 }

Emulator/Media/Script.h

@@ -64,7 +64,7 @@ class Script : public AnyFile {
     //
 
     // Executes the script
-    void execute(VirtualC64 &c64);
+    // void execute(VirtualC64 &c64);
 };
 
 }

Emulator/Misc/RetroShell/RetroShell.cpp

@@ -522,6 +522,15 @@ RetroShell::execScript(const string &contents)
 }
 
 void 
+RetroShell::execScript(const MediaFile &file)
+{
+    if (file.type() != FILETYPE_SCRIPT) throw VC64Error(ERROR_FILE_TYPE_MISMATCH);
+
+    string s((char *)file.getData(), file.getSize());
+    try { execScript(s); } catch (util::Exception &) { }
+}
+
+void
 RetroShell::abortScript()
 {
     {   SYNCHRONIZED

Emulator/Misc/RetroShell/RetroShell.h

@@ -212,6 +212,7 @@ class RetroShell : public SubComponent {
     void execScript(std::stringstream &ss) throws;
     void execScript(const std::ifstream &fs) throws;
     void execScript(const string &contents) throws;
+    void execScript(const class MediaFile &script) throws;
     void abortScript();
 
 private:

Emulator/VirtualC64.cpp

@@ -993,6 +993,12 @@ RetroShellAPI::execScript(const string &contents)
     retroShell->execScript(contents);
 }
 
+void 
+RetroShellAPI::execScript(const MediaFile &file)
+{
+    retroShell->execScript(file);
+}
+
 void
 RetroShellAPI::setStream(std::ostream &os)
 {

Emulator/VirtualC64.h

@@ -685,6 +685,7 @@ struct RetroShellAPI : API {
     void execScript(std::stringstream &ss);
     void execScript(const std::ifstream &fs);
     void execScript(const string &contents);
+    void execScript(const MediaFile &file);
 
     /// @}
 

GUI/Layers/Console.swift

@@ -142,10 +142,9 @@ class Console: Layer {
 
     }
 
-    func runScript(script: ScriptProxy) {
-
-        // open()
-        script.execute(emu)
+    func runScript(script: MediaFileProxy) {
+
+        emu.retroShell.executeScript(script)
         isDirty = true
     }
 }

GUI/MediaManager.swift

@@ -159,7 +159,7 @@ class MediaManager {
                     return try MediaFileProxy.make(with: newUrl, type: .SNAPSHOT)
 
                 case .SCRIPT:
-                    return try ScriptProxy.make(with: newUrl)
+                    return try MediaFileProxy.make(with: newUrl, type: .SCRIPT)
 
                 case .CRT:
                     return try MediaFileProxy.make(with: newUrl, type: .CRT)
@@ -253,7 +253,7 @@ class MediaManager {
         }
     }
 
-    func addMedia(proxy: AnyFileProxy,
+    func addMedia(proxy: AnyFileProxy, // TODO: Change type to MediaFileProxy
                   drive: DriveProxy? = nil,
                   options: [Option] = []) throws {
 
@@ -294,15 +294,15 @@ class MediaManager {
                     drive!.insertMedia(proxy, protected: options.contains(.protect))
                 }
 
+            case .SCRIPT:
+
+                debug(.media, "Script")
+                console.runScript(script: proxy)
+
             default:
                 break
             }
 
-        case let proxy as ScriptProxy:
-
-            debug(.media, "Script")
-            console.runScript(script: proxy)
-
         default:
             fatalError()
         }
@@ -347,15 +347,15 @@ class MediaManager {
                     controller.renderer.rotateLeft()
                 }
 
+            case .SCRIPT:
+
+                debug(.media, "Script")
+                console.runScript(script: proxy)
+
             default:
                 break
             }
 
-        case let proxy as ScriptProxy:
-
-            debug(.media, "Script")
-            console.runScript(script: proxy)
-
         default:
             fatalError()
         }

Proxy/EmulatorProxy.h

@@ -39,7 +39,6 @@ using namespace vc64;
 @class MyController;
 @class RecorderProxy;
 @class RetroShellProxy;
-@class ScriptProxy;
 @class SIDProxy;
 @class VICIIProxy;
 @class VideoPortProxy;
@@ -611,6 +610,7 @@ struct GuardInfo {
 - (NSString *)getText;
 - (void)pressKey:(char)c;
 - (void)pressSpecialKey:(RetroShellKey)key;
+- (void)executeScript:(MediaFileProxy *)file;
 
 @end
 
@@ -688,20 +688,6 @@ struct GuardInfo {
 @end
 
 
-//
-// Script
-//
-
-@interface ScriptProxy : AnyFileProxy <MakeWithFile, MakeWithBuffer> { }
-
-+ (instancetype)makeWithFile:(NSString *)path exception:(ExceptionWrapper *)ex;
-+ (instancetype)makeWithBuffer:(const void *)buf length:(NSInteger)len exception:(ExceptionWrapper *)ex;
-
-- (void)execute:(EmulatorProxy *)proxy;
-
-@end
-
-
 //
 // Folder
 //

Proxy/EmulatorProxy.mm

@@ -1151,6 +1151,11 @@ - (void)pressSpecialKey:(RetroShellKey)key
     [self shell]->press(key);
 }
 
+- (void)executeScript:(MediaFileProxy *)file
+{
+    [self shell]->execScript(*(MediaFile *)file->obj);
+}
+
 @end
 
 
@@ -1333,44 +1338,6 @@ - (void)writeToFile:(NSString *)path exception:(ExceptionWrapper *)ex
 @end
 
 
-//
-// Script proxy
-//
-
-@implementation ScriptProxy
-
-- (Script *)script
-{
-    return (Script *)obj;
-}
-
-+ (instancetype)make:(Script *)file
-{
-    return file ? [[self alloc] initWith:file] : nil;
-}
-
-+ (instancetype)makeWithFile:(NSString *)path exception:(ExceptionWrapper *)ex
-{
-    try { return [self make: new Script([path fileSystemRepresentation])]; }
-    catch (VC64Error &error) { [ex save:error]; return nil; }
-}
-
-+ (instancetype)makeWithBuffer:(const void *)buf length:(NSInteger)len exception:(ExceptionWrapper *)ex
-{
-    try { return [self make: new Script((u8 *)buf, len)]; }
-    catch (VC64Error &error) { [ex save:error]; return nil; }    
-}
-
-- (void)execute:(EmulatorProxy *)proxy
-{
-    VirtualC64 *c64 = (VirtualC64 *)proxy->obj;
-
-    [self script]->execute(*c64);
-}
-
-@end
-
-
 //
 // FileSystem
 //