bottle_steam type introduced

include/bottles.hpp

@@ -18,7 +18,8 @@ namespace cellar {
             bottle_error,
             bottle_anonymous,
             bottle_labelled,
-            bottle_symlink
+            bottle_symlink,
+            bottle_steam
         };
 
         /**

include/internal/steam.hpp

@@ -0,0 +1,13 @@
+#pragma once
+
+#include <map>
+#include <string>
+#include <vector>
+
+#include "commands.hpp"
+
+namespace cellar {
+    namespace steam {
+        extern std::vector<std::string> find_steam_libraries();
+    }
+}

include/internal/steam.hpp.cog

@@ -1,26 +0,0 @@
-#pragma once
-
-#include <map>
-#include <string>
-#include <vector>
-
-#include "commands.hpp"
-
-namespace cellar {
-    namespace steam {
-        extern std::vector<std::string> find_steam_libraries();
-        extern void test_command(int argc, std::vector<std::string> argv);
-        /*[[[cog
-            import cog
-         
-            with open("src/steam/commands.txt") as commandsfile:
-                for line in commandsfile:
-                    item = line.strip().split(" ")
-                    cog.outl("extern void {0} (int, vector<string>);".format(item[1]))
-        ]]]*/
-        //[[[end]]]
-    }
-    namespace commands {
-        extern std::map<std::string,cellar::commands::CommandFunction> steam_commands();
-    }
-}

src/bottles/bottles.cpp

@@ -163,6 +163,9 @@ void cellar::bottles::print_bottles(int argc, vector<string> argv) {
             case bottle_labelled:
                 outstr << bottle.config["name"];
                 break;
+            case bottle_steam:
+                outstr << "Steam managed bottle for " << bottle.config["name"];
+                break;
             default:
                 outstr << "broken or unsupported wine bottle";
         }

src/steam/bottles.cpp

@@ -44,6 +44,7 @@ std::map<std::string, cellar::bottles::Bottle> cellar::steam::get_app_bottles()
                 }
 
                 auto curbottle = cellar::bottles::Bottle((pth_appid / "pfx").string());
+                curbottle.type = cellar::bottles::bottle_steam;
                 curbottle.set_config("name", str_gamename);
                 curbottle.save_config();
                 result[std::string("steam:" + pth_appid.filename().string())] = curbottle;