diff --git a/include/bottles.hpp b/include/bottles.hpp index a29ccad..ea68db0 100644 --- a/include/bottles.hpp +++ b/include/bottles.hpp @@ -18,7 +18,8 @@ namespace cellar { bottle_error, bottle_anonymous, bottle_labelled, - bottle_symlink + bottle_symlink, + bottle_steam }; /** diff --git a/include/internal/steam.hpp b/include/internal/steam.hpp new file mode 100644 index 0000000..669a901 --- /dev/null +++ b/include/internal/steam.hpp @@ -0,0 +1,13 @@ +#pragma once + +#include +#include +#include + +#include "commands.hpp" + +namespace cellar { + namespace steam { + extern std::vector find_steam_libraries(); + } +} \ No newline at end of file diff --git a/include/internal/steam.hpp.cog b/include/internal/steam.hpp.cog deleted file mode 100644 index 4e30664..0000000 --- a/include/internal/steam.hpp.cog +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include -#include -#include - -#include "commands.hpp" - -namespace cellar { - namespace steam { - extern std::vector find_steam_libraries(); - extern void test_command(int argc, std::vector 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);".format(item[1])) - ]]]*/ - //[[[end]]] - } - namespace commands { - extern std::map steam_commands(); - } -} \ No newline at end of file diff --git a/src/bottles/bottles.cpp b/src/bottles/bottles.cpp index 06195ae..960ac79 100644 --- a/src/bottles/bottles.cpp +++ b/src/bottles/bottles.cpp @@ -163,6 +163,9 @@ void cellar::bottles::print_bottles(int argc, vector 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"; } diff --git a/src/steam/bottles.cpp b/src/steam/bottles.cpp index eee9a50..b368a80 100644 --- a/src/steam/bottles.cpp +++ b/src/steam/bottles.cpp @@ -44,6 +44,7 @@ std::map 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;