move CodeNotesModel to devkit

src/RA_Integration.vcxproj

@@ -82,7 +82,6 @@
     <ClCompile Include="data\context\GameContext.cpp" />
     <ClCompile Include="data\context\SessionTracker.cpp" />
     <ClCompile Include="data\models\AchievementModel.cpp" />
-    <ClCompile Include="data\models\CodeNotesModel.cpp" />
     <ClCompile Include="data\models\LeaderboardModel.cpp" />
     <ClCompile Include="data\models\LocalBadgesModel.cpp" />
     <ClCompile Include="data\models\RichPresenceModel.cpp" />
@@ -199,7 +198,6 @@
     <ClInclude Include="api\DeleteCodeNote.hh" />
     <ClInclude Include="api\FetchAchievementInfo.hh" />
     <ClInclude Include="api\FetchBadgeIds.hh" />
-    <ClInclude Include="api\FetchCodeNotes.hh" />
     <ClInclude Include="api\FetchLeaderboardInfo.hh" />
     <ClInclude Include="api\FetchUserFriends.hh" />
     <ClInclude Include="api\impl\ConnectedServer.hh" />
@@ -218,7 +216,6 @@
     <ClInclude Include="data\context\GameContext.hh" />
     <ClInclude Include="data\context\SessionTracker.hh" />
     <ClInclude Include="data\models\AchievementModel.hh" />
-    <ClInclude Include="data\models\CodeNotesModel.hh" />
     <ClInclude Include="data\models\LeaderboardModel.hh" />
     <ClInclude Include="data\models\LocalBadgesModel.hh" />
     <ClInclude Include="data\models\RichPresenceModel.hh" />
@@ -244,7 +241,6 @@
     <ClInclude Include="services\IAudioSystem.hh" />
     <ClInclude Include="services\IClipboard.hh" />
     <ClInclude Include="services\IConfiguration.hh" />
-    <ClInclude Include="services\ILocalStorage.hh" />
     <ClInclude Include="services\ILoginService.hh" />
     <ClInclude Include="services\impl\FileLocalStorage.hh" />
     <ClInclude Include="services\impl\FileLogger.hh" />

src/RA_Integration.vcxproj.filters

@@ -354,9 +354,6 @@
     <ClCompile Include="data\models\RichPresenceModel.cpp">
       <Filter>Data\Models</Filter>
     </ClCompile>
-    <ClCompile Include="data\models\CodeNotesModel.cpp">
-      <Filter>Data\Models</Filter>
-    </ClCompile>
     <ClCompile Include="ui\viewmodels\EmulatorViewModel.cpp">
       <Filter>UI\ViewModels</Filter>
     </ClCompile>
@@ -497,9 +494,6 @@
     <ClInclude Include="ui\viewmodels\WindowManager.hh">
       <Filter>UI\ViewModels</Filter>
     </ClInclude>
-    <ClInclude Include="services\ILocalStorage.hh">
-      <Filter>Services</Filter>
-    </ClInclude>
     <ClInclude Include="services\impl\FileLocalStorage.hh">
       <Filter>Services\Impl</Filter>
     </ClInclude>
@@ -668,9 +662,6 @@
     <ClInclude Include="ui\win32\bindings\RadioButtonBinding.hh">
       <Filter>UI\Win32\Bindings</Filter>
     </ClInclude>
-    <ClInclude Include="api\FetchCodeNotes.hh">
-      <Filter>API</Filter>
-    </ClInclude>
     <ClInclude Include="api\UpdateCodeNote.hh">
       <Filter>API</Filter>
     </ClInclude>
@@ -866,9 +857,6 @@
     <ClInclude Include="data\models\RichPresenceModel.hh">
       <Filter>Data\Models</Filter>
     </ClInclude>
-    <ClInclude Include="data\models\CodeNotesModel.hh">
-      <Filter>Data\Models</Filter>
-    </ClInclude>
     <ClInclude Include="ui\viewmodels\PointerFinderViewModel.hh">
       <Filter>UI\ViewModels</Filter>
     </ClInclude>

src/api/ApiCall.cpp

@@ -14,7 +14,6 @@ static ra::api::IServer& Server()
 
 FetchUserFriends::Response FetchUserFriends::Request::Call() const { return Server().FetchUserFriends(*this); }
 ResolveHash::Response ResolveHash::Request::Call() const { return Server().ResolveHash(*this); }
-FetchCodeNotes::Response FetchCodeNotes::Request::Call() const { return Server().FetchCodeNotes(*this); }
 UpdateCodeNote::Response UpdateCodeNote::Request::Call() const { return Server().UpdateCodeNote(*this); }
 DeleteCodeNote::Response DeleteCodeNote::Request::Call() const { return Server().DeleteCodeNote(*this); }
 UpdateAchievement::Response UpdateAchievement::Request::Call() const { return Server().UpdateAchievement(*this); }

src/api/IServer.hh

@@ -5,12 +5,10 @@
 #include "api/DeleteCodeNote.hh"
 #include "api/FetchAchievementInfo.hh"
 #include "api/FetchBadgeIds.hh"
-#include "api/FetchCodeNotes.hh"
 #include "api/FetchLeaderboardInfo.hh"
 #include "api/FetchUserFriends.hh"
 #include "api/LatestClient.hh"
 #include "api/ResolveHash.hh"
-#include "api/SubmitTicket.hh"
 #include "api/UpdateAchievement.hh"
 #include "api/UpdateCodeNote.hh"
 #include "api/UpdateLeaderboard.hh"
@@ -30,7 +28,6 @@ public:
 
     // === game functions ===
     virtual ResolveHash::Response ResolveHash(const ResolveHash::Request& request) = 0;
-    virtual FetchCodeNotes::Response FetchCodeNotes(const FetchCodeNotes::Request& request) = 0;
     virtual UpdateCodeNote::Response UpdateCodeNote(const UpdateCodeNote::Request& request) = 0;
     virtual DeleteCodeNote::Response DeleteCodeNote(const DeleteCodeNote::Request& request) = 0;
     virtual UpdateAchievement::Response UpdateAchievement(const UpdateAchievement::Request& request) = 0;

src/api/impl/ConnectedServer.cpp

@@ -534,81 +534,6 @@ ResolveHash::Response ConnectedServer::ResolveHash(const ResolveHash::Request& r
     return response;
 }
 
-FetchCodeNotes::Response ConnectedServer::FetchCodeNotes(const FetchCodeNotes::Request& request)
-{
-    FetchCodeNotes::Response response;
-
-    rc_api_fetch_code_notes_request_t api_params;
-    memset(&api_params, 0, sizeof(api_params));
-
-    api_params.game_id = request.GameId;
-
-    rc_api_request_t api_request;
-    const int result = rc_api_init_fetch_code_notes_request(&api_request, &api_params);
-    if (result == RC_OK)
-    {
-        ra::services::Http::Response httpResponse;
-        if (DoRequest(api_request, FetchCodeNotes::Name(), httpResponse, response))
-        {
-            rc_api_fetch_code_notes_response_t api_response;
-            rc_api_server_response_t server_response;
-            HttpResponseToServerResponse(httpResponse, &server_response);
-
-            const auto nResult = rc_api_process_fetch_code_notes_server_response(&api_response, &server_response);
-
-            if (ValidateResponse(nResult, api_response.response, FetchCodeNotes::Name(), httpResponse.StatusCode(), response))
-            {
-                // store a copy in the cache for offline mode
-                auto& pLocalStorage = ra::services::ServiceLocator::GetMutable<ra::services::ILocalStorage>();
-                auto pData = pLocalStorage.WriteText(ra::services::StorageItemType::CodeNotes, std::to_wstring(request.GameId));
-                if (pData != nullptr)
-                {
-                    std::string sContent(httpResponse.Content());
-                    auto nIndex = sContent.find('[');
-                    sContent.erase(0, nIndex);
-                    nIndex = sContent.find_last_of(']');
-                    sContent.erase(nIndex + 1);
-                    pData->Write(sContent);
-                }
-
-                response.Result = ApiResult::Success;
-
-                ProcessCodeNotes(response, &api_response);
-            }
-
-            rc_api_destroy_fetch_code_notes_response(&api_response);
-        }
-    }
-    else
-    {
-        response.Result = ApiResult::Failed;
-        response.ErrorMessage = rc_error_str(result);
-    }
-
-    rc_api_destroy_request(&api_request);
-    return response;
-}
-
-#pragma warning(push)
-#pragma warning(disable : 5045)
-void ConnectedServer::ProcessCodeNotes(FetchCodeNotes::Response& response, const void* api_response)
-{
-    const rc_api_fetch_code_notes_response_t* fetch_code_notes_response =
-        static_cast<const rc_api_fetch_code_notes_response_t*>(api_response);
-    const rc_api_code_note_t* note = fetch_code_notes_response->notes;
-    const rc_api_code_note_t* stop = fetch_code_notes_response->notes + fetch_code_notes_response->num_notes;
-    for (; note < stop; ++note)
-    {
-        auto& pNote = response.Notes.emplace_back();
-        pNote.Author = note->author;
-        pNote.Address = note->address;
-        pNote.Note = ra::util::String::Widen(note->note);
-
-        ra::util::String::NormalizeLineEndings(pNote.Note);
-    }
-}
-#pragma warning(pop)
-
 static void SetCodeNote(ApiResponseBase& response, const char* sApiName,
     unsigned nGameId, ra::data::ByteAddress nAddress, const char* sNote)
 {

src/api/impl/ConnectedServer.hh

@@ -17,7 +17,6 @@ public:
 
     FetchUserFriends::Response FetchUserFriends(const FetchUserFriends::Request& request) override;
     ResolveHash::Response ResolveHash(const ResolveHash::Request& request) override;
-    FetchCodeNotes::Response FetchCodeNotes(const FetchCodeNotes::Request& request) override;
     UpdateCodeNote::Response UpdateCodeNote(const UpdateCodeNote::Request& request) override;
     DeleteCodeNote::Response DeleteCodeNote(const DeleteCodeNote::Request& request) override;
     UpdateAchievement::Response UpdateAchievement(const UpdateAchievement::Request& request) override;
@@ -29,8 +28,6 @@ public:
     FetchBadgeIds::Response FetchBadgeIds(const FetchBadgeIds::Request& request) override;
     UploadBadge::Response UploadBadge(const UploadBadge::Request& request) override;
 
-    static void ProcessCodeNotes(FetchCodeNotes::Response &response, const void* api_response);
-
 private:
     const std::string m_sHost;
 };

src/api/impl/OfflineServer.cpp

@@ -13,45 +13,6 @@ namespace ra {
 namespace api {
 namespace impl {
 
-FetchCodeNotes::Response OfflineServer::FetchCodeNotes(const FetchCodeNotes::Request& request)
-{
-    FetchCodeNotes::Response response;
-    rapidjson::Document document;
-
-    // see if the data is available in the cache
-    auto& pLocalStorage = ra::services::ServiceLocator::GetMutable<ra::services::ILocalStorage>();
-    auto pData = pLocalStorage.ReadText(ra::services::StorageItemType::CodeNotes, std::to_wstring(request.GameId));
-    if (pData == nullptr)
-    {
-        response.Result = ApiResult::Failed;
-        response.ErrorMessage = ra::util::String::Printf("Code notes for game %u not found in cache", request.GameId);
-        return response;
-    }
-
-    std::string sNotes;
-    if (!pData->GetLine(sNotes)) // ASSERT: entire JSON block is a single line
-    {
-        response.Result = ApiResult::Error;
-        response.ErrorMessage =
-            ra::util::String::Printf("%s (%zu)", GetParseError_En(document.GetParseError()), document.GetErrorOffset());
-    }
-    else
-    {
-        response.Result = ApiResult::Success;
-        sNotes.insert(0, "{\"Success\": true,\"CodeNotes\":");
-        sNotes.push_back('}');
-
-        rc_api_fetch_code_notes_response_t api_response;
-        const auto nResult = rc_api_process_fetch_code_notes_response(&api_response, sNotes.c_str());
-        if (nResult == RC_OK)
-            ConnectedServer::ProcessCodeNotes(response, &api_response);
-
-        rc_api_destroy_fetch_code_notes_response(&api_response);
-    }
-
-    return response;
-}
-
 LatestClient::Response OfflineServer::LatestClient(const LatestClient::Request&)
 {
     // all versions are newer than 0.0.0.0, and are therefore valid/allowed

src/api/impl/OfflineServer.hh

@@ -11,8 +11,6 @@ class OfflineServer : public ServerBase
 public:
     const char* Name() const noexcept override { return "offline client"; }
 
-    FetchCodeNotes::Response FetchCodeNotes(const FetchCodeNotes::Request& request) override;
-
     LatestClient::Response LatestClient(const LatestClient::Request& request) override;
 };
 

src/api/impl/ServerBase.hh

@@ -29,11 +29,6 @@ public:
         return UnsupportedApi<ResolveHash::Response>(ResolveHash::Name());
     }
 
-    FetchCodeNotes::Response FetchCodeNotes(const FetchCodeNotes::Request&) override
-    {
-        return UnsupportedApi<FetchCodeNotes::Response>(FetchCodeNotes::Name());
-    }
-
     UpdateCodeNote::Response UpdateCodeNote(const UpdateCodeNote::Request&) override
     {
         return UnsupportedApi<UpdateCodeNote::Response>(UpdateCodeNote::Name());

src/data/context/GameAssets.cpp

@@ -11,6 +11,8 @@
 #include "services\ILocalStorage.hh"
 #include "services\ServiceLocator.hh"
 
+#include "util\Strings.hh"
+
 namespace ra {
 namespace data {
 namespace context {

src/data/models/AchievementModel.cpp

@@ -11,6 +11,8 @@
 
 #include "services\ServiceLocator.hh"
 
+#include "util\Strings.hh"
+
 #include <rcheevos\src\rcheevos\rc_internal.h>
 #include <rcheevos\src\rc_client_internal.h>
 

src/data/models/LeaderboardModel.cpp

@@ -6,6 +6,8 @@
 
 #include "services\ServiceLocator.hh"
 
+#include "util\Strings.hh"
+
 #include <rcheevos\src\rc_client_internal.h>
 #include <rcheevos\src\rcheevos\rc_internal.h>
 

src/data/models/LocalBadgesModel.cpp

@@ -5,6 +5,8 @@
 
 #include "ui\ImageReference.hh"
 
+#include "util\Strings.hh"
+
 namespace ra {
 namespace data {
 namespace models {