ncm: GetContentAccessibilities, GetContentInfo*

libraries/libstratosphere/include/stratosphere/fs/fs_content_attributes.hpp

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include <stratosphere/fs/fs_common.hpp>
+#include <stratosphere/ncm/ncm_ids.hpp>
+
+namespace ams::fs {
+
+    /* ACCURATE_TO_VERSION: Unknown */
+    enum ContentAttributes : u8 {
+        ContentAttributes_None = 0,
+    };
+
+}

libraries/libstratosphere/include/stratosphere/ncm.hpp

@@ -21,6 +21,7 @@
 #include <stratosphere/ncm/ncm_program_location.hpp>
 #include <stratosphere/ncm/ncm_auto_buffer.hpp>
 #include <stratosphere/ncm/ncm_make_path.hpp>
+#include <stratosphere/ncm/ncm_content_attributes.hpp>
 #include <stratosphere/ncm/ncm_content_id_utils.hpp>
 #include <stratosphere/ncm/ncm_content_info_utils.hpp>
 #include <stratosphere/ncm/ncm_content_meta.hpp>

libraries/libstratosphere/include/stratosphere/ncm/ncm_content_attributes.hpp

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Atmosphère-NX
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include <vapours.hpp>
+#include <stratosphere/fs/fs_content_attributes.hpp>
+
+namespace ams::ncm {
+
+    /* TODO: What is this struct, really? It is presumably not ContentAttributes/has more fields. */
+    struct ContentAttributes {
+        fs::ContentAttributes content_attributes;
+        u8 unknown[0xF];
+
+        static constexpr ALWAYS_INLINE ContentAttributes Make(fs::ContentAttributes attr) {
+            return { attr, };
+        }
+    };
+    static_assert(util::is_pod<ContentAttributes>::value);
+    static_assert(sizeof(ContentAttributes) == 0x10);
+
+    constexpr inline const ContentAttributes DefaultContentAttributes = ContentAttributes::Make(fs::ContentAttributes_None);
+
+}

libraries/libstratosphere/include/stratosphere/ncm/ncm_content_info.hpp

@@ -14,15 +14,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
+#include <stratosphere/fs/fs_content_attributes.hpp>
 #include <stratosphere/ncm/ncm_content_id.hpp>
 #include <stratosphere/ncm/ncm_content_type.hpp>
 
 namespace ams::ncm {
 
     struct ContentInfo {
+        static constexpr fs::ContentAttributes DefaultContentAttributes = fs::ContentAttributes_None;
+
         ContentId content_id;
         u32 size_low;
-        u16 size_high;
+        u8 size_high;
+        u8 content_attributes;
         ContentType content_type;
         u8 id_offset;
 
@@ -34,6 +38,10 @@ namespace ams::ncm {
             return (static_cast<u64>(this->size_high) << 32) | static_cast<u64>(this->size_low);
         }
 
+        constexpr fs::ContentAttributes GetContentAttributes() const {
+            return static_cast<fs::ContentAttributes>(this->content_attributes & 0xF);
+        }
+
         constexpr ContentType GetType() const {
             return this->content_type;
         }
@@ -42,13 +50,14 @@ namespace ams::ncm {
             return this->id_offset;
         }
 
-        static constexpr ContentInfo Make(ContentId id, u64 size, ContentType type, u8 id_ofs = 0) {
+        static constexpr ContentInfo Make(ContentId id, u64 size, fs::ContentAttributes attr, ContentType type, u8 id_ofs = 0) {
             const u32 size_low = size & 0xFFFFFFFFu;
-            const u16 size_high = static_cast<u16>(size >> 32);
+            const u8 size_high = static_cast<u8>(size >> 32);
             return {
                 .content_id         = id,
                 .size_low           = size_low,
                 .size_high          = size_high,
+                .content_attributes = attr,
                 .content_type       = type,
                 .id_offset          = id_ofs,
             };

libraries/libstratosphere/include/stratosphere/ncm/ncm_content_info_data.hpp

@@ -40,6 +40,10 @@ namespace ams::ncm {
             return this->info.GetId();
         }
 
+        constexpr fs::ContentAttributes GetContentAttributes() const {
+            return this->info.GetContentAttributes();
+        }
+
         constexpr ContentType GetType() const {
             return this->info.GetType();
         }
@@ -72,6 +76,10 @@ namespace ams::ncm {
             return this->info.GetSize();
         }
 
+        constexpr fs::ContentAttributes GetContentAttributes() const {
+            return this->info.GetContentAttributes();
+        }
+
         constexpr ContentType GetType() const {
             return this->info.GetType();
         }

libraries/libstratosphere/include/stratosphere/ncm/ncm_content_meta.hpp

@@ -97,6 +97,14 @@ namespace ams::ncm {
     };
 
     struct AddOnContentMetaExtendedHeader {
+        ApplicationId application_id;
+        u32 required_application_version;
+        u8 content_accessibilities;
+        u8 padding[3];
+        u64 data_patch_id; /* TODO: DataPatchId? */
+    };
+
+    struct LegacyAddOnContentMetaExtendedHeader {
         ApplicationId application_id;
         u32 required_application_version;
         u32 padding;

libraries/libstratosphere/include/stratosphere/ncm/ncm_content_meta_database.hpp

@@ -63,10 +63,20 @@ namespace ams::ncm {
                 R_RETURN(m_interface->GetContentIdByType(out, ContentMetaKey::MakeUnknownType(id.value, version), ContentType::Kind));   \
             }                                                                                                                            \
                                                                                                                                          \
+            Result Get##Kind(ContentInfo *out, IdType##Id id, u32 version) {                                                             \
+                R_RETURN(m_interface->GetContentInfoByType(out, ContentMetaKey::MakeUnknownType(id.value, version), ContentType::Kind)); \
+            }                                                                                                                            \
+                                                                                                                                         \
             Result GetLatest##Kind(ContentId *out, IdType##Id id) {                                                                      \
                 ContentMetaKey latest_key;                                                                                               \
                 R_TRY(m_interface->GetLatestContentMetaKey(std::addressof(latest_key), id.value));                                       \
                 R_RETURN(m_interface->GetContentIdByType(out, latest_key, ContentType::Kind));                                           \
+            }                                                                                                                            \
+                                                                                                                                         \
+            Result GetLatest##Kind(ContentInfo *out, IdType##Id id) {                                                                    \
+                ContentMetaKey latest_key;                                                                                               \
+                R_TRY(m_interface->GetLatestContentMetaKey(std::addressof(latest_key), id.value));                                       \
+                R_RETURN(m_interface->GetContentInfoByType(out, latest_key, ContentType::Kind));                                         \
             }
 
             AMS_NCM_DEFINE_GETTERS(Program,          Program)
@@ -189,6 +199,21 @@ namespace ams::ncm {
                 AMS_ASSERT(m_interface != nullptr);
                 R_RETURN(m_interface->GetRequiredApplicationVersion(out_version, key));
             }
+
+            Result GetContentAccessibilities(u8 *out_accessibilities, const ContentMetaKey &key) {
+                AMS_ASSERT(m_interface != nullptr);
+                R_RETURN(m_interface->GetContentAccessibilities(out_accessibilities, key));
+            }
+
+            Result GetContentInfoByType(ContentInfo *out_content_info, const ContentMetaKey &key, ContentType type) {
+                AMS_ASSERT(m_interface != nullptr);
+                R_RETURN(m_interface->GetContentInfoByType(out_content_info, key, type));
+            }
+
+            Result GetContentInfoByTypeAndIdOffset(ContentInfo *out_content_info, const ContentMetaKey &key, ContentType type, u8 id_offset) {
+                AMS_ASSERT(m_interface != nullptr);
+                R_RETURN(m_interface->GetContentInfoByTypeAndIdOffset(out_content_info, key, type, id_offset));
+            }
     };
 
 }

libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_meta_database.hpp

@@ -40,6 +40,10 @@
     AMS_SF_METHOD_INFO(C, H, 19, Result, GetRequiredApplicationVersion,   (sf::Out<u32> out_version, const ncm::ContentMetaKey &key),                                                                                                                                                                                       (out_version, key),                                                                                    hos::Version_2_0_0)  \
     AMS_SF_METHOD_INFO(C, H, 20, Result, GetContentIdByTypeAndIdOffset,   (sf::Out<ncm::ContentId> out_content_id, const ncm::ContentMetaKey &key, ncm::ContentType type, u8 id_offset),                                                                                                                                    (out_content_id, key, type, id_offset),                                                                hos::Version_5_0_0)  \
     AMS_SF_METHOD_INFO(C, H, 21, Result, GetCount,                        (sf::Out<u32> out_count),                                                                                                                                                                                                                         (out_count),                                                                                           hos::Version_10_0_0) \
-    AMS_SF_METHOD_INFO(C, H, 22, Result, GetOwnerApplicationId,         (sf::Out<ncm::ApplicationId> out_id, const ncm::ContentMetaKey &key),                                                                                                                                                                             (out_id, key),                                                                                         hos::Version_10_0_0)
+    AMS_SF_METHOD_INFO(C, H, 22, Result, GetOwnerApplicationId,           (sf::Out<ncm::ApplicationId> out_id, const ncm::ContentMetaKey &key),                                                                                                                                                                             (out_id, key),                                                                                         hos::Version_10_0_0) \
+    AMS_SF_METHOD_INFO(C, H, 23, Result, GetContentAccessibilities,       (sf::Out<u8> out_accessibilities, const ncm::ContentMetaKey &key),                                                                                                                                                                                (out_accessibilities, key),                                                                            hos::Version_15_0_0) \
+    AMS_SF_METHOD_INFO(C, H, 24, Result, GetContentInfoByType,            (sf::Out<ncm::ContentInfo> out_content_info, const ncm::ContentMetaKey &key, ncm::ContentType type),                                                                                                                                              (out_content_info, key, type),                                                                         hos::Version_15_0_0) \
+    AMS_SF_METHOD_INFO(C, H, 25, Result, GetContentInfoByTypeAndIdOffset, (sf::Out<ncm::ContentInfo> out_content_info, const ncm::ContentMetaKey &key, ncm::ContentType type, u8 id_offset),                                                                                                                                (out_content_info, key, type, id_offset),                                                              hos::Version_15_0_0)
+
 
 AMS_SF_DEFINE_INTERFACE(ams::ncm, IContentMetaDatabase, AMS_NCM_I_CONTENT_META_DATABASE_INTERFACE_INFO, 0x58021FEC)

libraries/libstratosphere/source/fs/impl/fs_id_string_impl.os.generic.cpp

@@ -21,7 +21,7 @@ namespace ams::fs::impl {
     #define ADD_ENUM_CASE(v) case v: return #v
 
     template<> const char *IdString::ToString<pkg1::KeyGeneration>(pkg1::KeyGeneration id) {
-        static_assert(pkg1::KeyGeneration_Current == pkg1::KeyGeneration_14_0_0);
+        static_assert(pkg1::KeyGeneration_Current == pkg1::KeyGeneration_15_0_0);
         switch (id) {
             using enum pkg1::KeyGeneration;
             case KeyGeneration_1_0_0:  return "1.0.0-2.3.0";
@@ -37,7 +37,8 @@ namespace ams::fs::impl {
             case KeyGeneration_9_1_0:  return "9.1.0-12.0.3";
             case KeyGeneration_12_1_0: return "12.1.0";
             case KeyGeneration_13_0_0: return "13.0.0-13.2.1";
-            case KeyGeneration_14_0_0: return "14.0.0-";
+            case KeyGeneration_14_0_0: return "14.0.0-14.1.2";
+            case KeyGeneration_15_0_0: return "15.0.0-";
             default: return "Unknown";
         }
     }

libraries/libstratosphere/source/ncm/ncm_content_management_utils.cpp

@@ -114,7 +114,7 @@ namespace ams::ncm {
                     R_TRY(storage->GetSize(std::addressof(size), content_id));
 
                     /* Build. */
-                    R_TRY(this->BuildFromPackageContentMeta(package_meta.Get(), package_meta.GetSize(), ContentInfo::Make(content_id, size, ContentType::Meta)));
+                    R_TRY(this->BuildFromPackageContentMeta(package_meta.Get(), package_meta.GetSize(), ContentInfo::Make(content_id, size, ContentInfo::DefaultContentAttributes, ContentType::Meta)));
                 }
             }
 
@@ -144,7 +144,7 @@ namespace ams::ncm {
             R_UNLESS(content_id, ncm::ResultInvalidPackageFormat());
 
             /* Build using the meta. */
-            R_RETURN(this->BuildFromPackageContentMeta(package_meta.Get(), package_meta.GetSize(), ContentInfo::Make(*content_id, entry.file_size, ContentType::Meta)));
+            R_RETURN(this->BuildFromPackageContentMeta(package_meta.Get(), package_meta.GetSize(), ContentInfo::Make(*content_id, entry.file_size, ContentInfo::DefaultContentAttributes, ContentType::Meta)));
         }));
 
         /* Commit our changes. */

libraries/libstratosphere/source/ncm/ncm_content_meta_database_impl.cpp

@@ -18,7 +18,7 @@
 
 namespace ams::ncm {
 
-    Result ContentMetaDatabaseImpl::GetContentIdImpl(ContentId *out, const ContentMetaKey &key, ContentType type, util::optional<u8> id_offset) const {
+    Result ContentMetaDatabaseImpl::GetContentInfoImpl(ContentInfo *out, const ContentMetaKey &key, ContentType type, util::optional<u8> id_offset) const {
         R_TRY(this->EnsureEnabled());
 
         /* Find the meta key. */
@@ -45,7 +45,7 @@ namespace ams::ncm {
         R_UNLESS(content_info != nullptr, ncm::ResultContentNotFound());
 
         /* Save output. */
-        *out = content_info->content_id;
+        *out = *content_info;
         R_SUCCEED();
     }
 
@@ -481,4 +481,31 @@ namespace ams::ncm {
         R_SUCCEED();
     }
 
+    Result ContentMetaDatabaseImpl::GetContentAccessibilities(sf::Out<u8> out_accessibilities, const ContentMetaKey &key) {
+        R_TRY(this->EnsureEnabled());
+
+        /* Ensure this type of key is for an add-on content. */
+        R_UNLESS(key.type == ContentMetaType::AddOnContent, ncm::ResultInvalidContentMetaKey());
+
+        /* Obtain the content meta for the key. */
+        const void *meta;
+        size_t meta_size;
+        R_TRY(this->GetContentMetaPointer(&meta, &meta_size, key));
+
+        /* Create a reader. */
+        ContentMetaReader reader(meta, meta_size);
+
+        /* Set the ouput value. */
+        out_accessibilities.SetValue(reader.GetExtendedHeader<AddOnContentMetaExtendedHeader>()->content_accessibilities);
+        R_SUCCEED();
+    }
+
+    Result ContentMetaDatabaseImpl::GetContentInfoByType(sf::Out<ContentInfo> out_content_info, const ContentMetaKey &key, ContentType type) {
+        R_RETURN(this->GetContentInfoImpl(out_content_info.GetPointer(), key, type, util::nullopt));
+    }
+
+    Result ContentMetaDatabaseImpl::GetContentInfoByTypeAndIdOffset(sf::Out<ContentInfo> out_content_info, const ContentMetaKey &key, ContentType type, u8 id_offset) {
+        R_RETURN(this->GetContentInfoImpl(out_content_info.GetPointer(), key, type, util::make_optional(id_offset)));
+    }
+
 }

libraries/libstratosphere/source/ncm/ncm_content_meta_database_impl.hpp

@@ -25,7 +25,17 @@ namespace ams::ncm {
             ContentMetaDatabaseImpl(ContentMetaKeyValueStore *kvs) : ContentMetaDatabaseImplBase(kvs) { /* ... */ }
         private:
             /* Helpers. */
-            Result GetContentIdImpl(ContentId *out, const ContentMetaKey &key, ContentType type, util::optional<u8> id_offset) const;
+            Result GetContentInfoImpl(ContentInfo *out, const ContentMetaKey &key, ContentType type, util::optional<u8> id_offset) const;
+
+            Result GetContentIdImpl(ContentId *out, const ContentMetaKey &key, ContentType type, util::optional<u8> id_offset) const {
+                /* Get the content info. */
+                ContentInfo content_info;
+                R_TRY(this->GetContentInfoImpl(std::addressof(content_info), key, type, id_offset));
+
+                /* Set the output id. */
+                *out = content_info.GetId();
+                R_SUCCEED();
+            }
         public:
             /* Actual commands. */
             virtual Result Set(const ContentMetaKey &key, const sf::InBuffer &value) override;
@@ -51,6 +61,9 @@ namespace ams::ncm {
             virtual Result GetContentIdByTypeAndIdOffset(sf::Out<ContentId> out_content_id, const ContentMetaKey &key, ContentType type, u8 id_offset) override;
             virtual Result GetCount(sf::Out<u32> out_count) override;
             virtual Result GetOwnerApplicationId(sf::Out<ApplicationId> out_id, const ContentMetaKey &key) override;
+            virtual Result GetContentAccessibilities(sf::Out<u8> out_accessibilities, const ContentMetaKey &key) override;
+            virtual Result GetContentInfoByType(sf::Out<ContentInfo> out_content_info, const ContentMetaKey &key, ContentType type) override;
+            virtual Result GetContentInfoByTypeAndIdOffset(sf::Out<ContentInfo> out_content_info, const ContentMetaKey &key, ContentType type, u8 id_offset) override;
     };
 
 }

libraries/libstratosphere/source/ncm/ncm_content_meta_database_impl_base.hpp

@@ -77,6 +77,9 @@ namespace ams::ncm {
             virtual Result GetContentIdByTypeAndIdOffset(sf::Out<ContentId> out_content_id, const ContentMetaKey &key, ContentType type, u8 id_offset) = 0;
             virtual Result GetCount(sf::Out<u32> out_count) = 0;
             virtual Result GetOwnerApplicationId(sf::Out<ApplicationId> out_id, const ContentMetaKey &key) = 0;
+            virtual Result GetContentAccessibilities(sf::Out<u8> out_accessibilities, const ContentMetaKey &key) = 0;
+            virtual Result GetContentInfoByType(sf::Out<ContentInfo> out_content_info, const ContentMetaKey &key, ContentType type) = 0;
+            virtual Result GetContentInfoByTypeAndIdOffset(sf::Out<ContentInfo> out_content_info, const ContentMetaKey &key, ContentType type, u8 id_offset) = 0;
     };
     static_assert(ncm::IsIContentMetaDatabase<ContentMetaDatabaseImplBase>);
 

libraries/libstratosphere/source/ncm/ncm_install_task_base.cpp

@@ -790,7 +790,7 @@ namespace ams::ncm {
         R_TRY(tmp_buffer.Initialize(reader.CalculateConvertInstallContentMetaSize()));
 
         /* Convert packaged content meta to install content meta. */
-        reader.ConvertToInstallContentMeta(tmp_buffer.Get(), tmp_buffer.GetSize(), InstallContentInfo::Make(ContentInfo::Make(content_id, size, ContentType::Meta), meta_type));
+        reader.ConvertToInstallContentMeta(tmp_buffer.Get(), tmp_buffer.GetSize(), InstallContentInfo::Make(ContentInfo::Make(content_id, size, ContentInfo::DefaultContentAttributes, ContentType::Meta), meta_type));
 
         /* Push the content meta. */
         m_data->Push(tmp_buffer.Get(), tmp_buffer.GetSize());
@@ -1028,7 +1028,7 @@ namespace ams::ncm {
     InstallContentInfo InstallTaskBase::MakeInstallContentInfoFrom(const InstallContentMetaInfo &info, const PlaceHolderId &placeholder_id, util::optional<bool> is_tmp) {
         return {
             .digest         = info.digest,
-            .info           = ContentInfo::Make(info.content_id, info.content_size, ContentType::Meta, 0),
+            .info           = ContentInfo::Make(info.content_id, info.content_size, ContentInfo::DefaultContentAttributes, ContentType::Meta, 0),
             .placeholder_id = placeholder_id,
             .meta_type      = info.key.type,
             .install_state  = InstallState::Prepared,

libraries/libstratosphere/source/ncm/ncm_remote_content_meta_database_impl.hpp

@@ -168,6 +168,24 @@ namespace ams::ncm {
                 AMS_UNUSED(out_id, key);
                 AMS_ABORT();
             }
+
+            Result GetContentAccessibilities(sf::Out<u8> out_accessibilities, const ContentMetaKey &key) {
+                /* TODO: libnx bindings */
+                AMS_UNUSED(out_accessibilities, key);
+                AMS_ABORT();
+            }
+
+            Result GetContentInfoByType(sf::Out<ContentInfo> out_content_info, const ContentMetaKey &key, ContentType type) {
+                /* TODO: libnx bindings */
+                AMS_UNUSED(out_content_info, key, type);
+                AMS_ABORT();
+            }
+
+            Result GetContentInfoByTypeAndIdOffset(sf::Out<ContentInfo> out_content_info, const ContentMetaKey &key, ContentType type, u8 id_offset) {
+                /* TODO: libnx bindings */
+                AMS_UNUSED(out_content_info, key, type, id_offset);
+                AMS_ABORT();
+            }
     };
     static_assert(ncm::IsIContentMetaDatabase<RemoteContentMetaDatabaseImpl>);
     #endif