mirror of
https://github.com/loot/libloot-python.git
synced 2026-07-27 14:14:13 -07:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5450709ebe | ||
|
|
3a9ff95de2 | ||
|
|
1298fce6fd | ||
|
|
21242f359d | ||
|
|
6579eb5178 | ||
|
|
61a74b6984 | ||
|
|
66f84d4848 | ||
|
|
5f5c0e3949 | ||
|
|
ab926c8755 | ||
|
|
35475b292f | ||
|
|
51e2e4e4fa | ||
|
|
c17437a579 | ||
|
|
49204621c5 | ||
|
|
3098ffa692 | ||
|
|
392a090823 | ||
|
|
e98b43a4b1 | ||
|
|
a957ece62b |
+27
-19
@@ -6,6 +6,10 @@ include(ExternalProject)
|
|||||||
set(EXTERNAL_PROJECTS_PATH "${CMAKE_BINARY_DIR}/external/src")
|
set(EXTERNAL_PROJECTS_PATH "${CMAKE_BINARY_DIR}/external/src")
|
||||||
make_directory(${EXTERNAL_PROJECTS_PATH})
|
make_directory(${EXTERNAL_PROJECTS_PATH})
|
||||||
|
|
||||||
|
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||||
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
|
||||||
##############################
|
##############################
|
||||||
# Get Build Revision
|
# Get Build Revision
|
||||||
##############################
|
##############################
|
||||||
@@ -30,7 +34,7 @@ configure_file("${CMAKE_SOURCE_DIR}/src/wrapper_version.cpp.in" "${CMAKE_BINARY_
|
|||||||
# pybind11
|
# pybind11
|
||||||
#######################################
|
#######################################
|
||||||
|
|
||||||
set(PYBIND11_VERSION "2.1.1")
|
set(PYBIND11_VERSION "2.2.4")
|
||||||
set(PYBIND11_URL "https://github.com/pybind/pybind11/archive/v${PYBIND11_VERSION}.tar.gz")
|
set(PYBIND11_URL "https://github.com/pybind/pybind11/archive/v${PYBIND11_VERSION}.tar.gz")
|
||||||
set(PYBIND11_DOWNLOAD_PATH "${EXTERNAL_PROJECTS_PATH}/pybind11-${PYBIND11_VERSION}.tar.gz")
|
set(PYBIND11_DOWNLOAD_PATH "${EXTERNAL_PROJECTS_PATH}/pybind11-${PYBIND11_VERSION}.tar.gz")
|
||||||
set(PYBIND11_EXTRACTED_PATH "${EXTERNAL_PROJECTS_PATH}/pybind11-${PYBIND11_VERSION}")
|
set(PYBIND11_EXTRACTED_PATH "${EXTERNAL_PROJECTS_PATH}/pybind11-${PYBIND11_VERSION}")
|
||||||
@@ -50,25 +54,29 @@ add_subdirectory(${PYBIND11_EXTRACTED_PATH})
|
|||||||
#######################################
|
#######################################
|
||||||
|
|
||||||
if (CMAKE_SYSTEM_NAME MATCHES "Windows")
|
if (CMAKE_SYSTEM_NAME MATCHES "Windows")
|
||||||
set(LOOT_API_URL "https://github.com/loot/loot-api/releases/download/0.13.2/loot_api-0.13.2-0-g5956e60_dev-win32.7z")
|
if (NOT "${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)")
|
||||||
|
set(LIBLOOT_URL "https://github.com/loot/libloot/releases/download/0.14.1/libloot-0.14.1-0-gc8090fe_dev-win32.7z")
|
||||||
else()
|
else()
|
||||||
set(LOOT_API_URL "https://github.com/loot/loot-api/releases/download/0.13.2/loot-api.tar.xz")
|
set(LIBLOOT_URL "https://github.com/loot/libloot/releases/download/0.14.1/libloot-0.14.1-0-gc8090fe_dev-win64.7z")
|
||||||
|
endif()
|
||||||
|
else()
|
||||||
|
set(LIBLOOT_URL "https://github.com/loot/libloot/releases/download/0.14.1/libloot.tar.xz")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
ExternalProject_Add(loot-api-c++
|
ExternalProject_Add(libloot
|
||||||
PREFIX "external"
|
PREFIX "external"
|
||||||
URL ${LOOT_API_URL}
|
URL ${LIBLOOT_URL}
|
||||||
CONFIGURE_COMMAND ""
|
CONFIGURE_COMMAND ""
|
||||||
BUILD_COMMAND ""
|
BUILD_COMMAND ""
|
||||||
INSTALL_COMMAND "")
|
INSTALL_COMMAND "")
|
||||||
ExternalProject_Get_Property(loot-api-c++ SOURCE_DIR)
|
ExternalProject_Get_Property(libloot SOURCE_DIR)
|
||||||
set(LOOT_API_EXTRACTED_PATH ${SOURCE_DIR})
|
set(LIBLOOT_EXTRACTED_PATH ${SOURCE_DIR})
|
||||||
|
|
||||||
include_directories("${CMAKE_SOURCE_DIR}/src"
|
include_directories("${CMAKE_SOURCE_DIR}/src"
|
||||||
"${LOOT_API_EXTRACTED_PATH}/include")
|
"${LIBLOOT_EXTRACTED_PATH}/include")
|
||||||
link_directories(${LOOT_API_EXTRACTED_PATH})
|
link_directories(${LIBLOOT_EXTRACTED_PATH})
|
||||||
set(LOOT_API_STATIC_LIBRARY "${CMAKE_STATIC_LIBRARY_PREFIX}loot_api${CMAKE_STATIC_LIBRARY_SUFFIX}")
|
set(LIBLOOT_STATIC_LIBRARY "${CMAKE_STATIC_LIBRARY_PREFIX}loot${CMAKE_STATIC_LIBRARY_SUFFIX}")
|
||||||
set(LOOT_API_SHARED_LIBRARY "${CMAKE_SHARED_LIBRARY_PREFIX}loot_api${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
set(LIBLOOT_SHARED_LIBRARY "${CMAKE_SHARED_LIBRARY_PREFIX}loot${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
||||||
|
|
||||||
#######################################
|
#######################################
|
||||||
# Test Masterlist
|
# Test Masterlist
|
||||||
@@ -76,7 +84,7 @@ set(LOOT_API_SHARED_LIBRARY "${CMAKE_SHARED_LIBRARY_PREFIX}loot_api${CMAKE_SHARE
|
|||||||
|
|
||||||
ExternalProject_Add(test-masterlist
|
ExternalProject_Add(test-masterlist
|
||||||
PREFIX "external"
|
PREFIX "external"
|
||||||
URL "https://github.com/loot/oblivion/archive/09286601739c11a3a3e4552c6ddbdcaeffd1a8d3.zip"
|
URL "https://github.com/loot/oblivion/archive/7f125ae4464224ff785111c7667c2cff85c896ec.zip"
|
||||||
CONFIGURE_COMMAND ""
|
CONFIGURE_COMMAND ""
|
||||||
BUILD_COMMAND ""
|
BUILD_COMMAND ""
|
||||||
INSTALL_COMMAND "")
|
INSTALL_COMMAND "")
|
||||||
@@ -89,12 +97,12 @@ pybind11_add_module(loot_api "${CMAKE_SOURCE_DIR}/src/main.cpp"
|
|||||||
"${CMAKE_SOURCE_DIR}/src/convenience.cpp"
|
"${CMAKE_SOURCE_DIR}/src/convenience.cpp"
|
||||||
"${CMAKE_BINARY_DIR}/generated/wrapper_version.cpp")
|
"${CMAKE_BINARY_DIR}/generated/wrapper_version.cpp")
|
||||||
|
|
||||||
add_dependencies(loot_api loot-api-c++ test-masterlist)
|
add_dependencies(loot_api libloot test-masterlist)
|
||||||
|
|
||||||
if (CMAKE_SYSTEM_NAME MATCHES "Windows")
|
if (CMAKE_SYSTEM_NAME MATCHES "Windows")
|
||||||
target_link_libraries(loot_api PRIVATE ${LOOT_API_STATIC_LIBRARY})
|
target_link_libraries(loot_api PRIVATE ${LIBLOOT_STATIC_LIBRARY})
|
||||||
else()
|
else()
|
||||||
target_link_libraries(loot_api PRIVATE ${LOOT_API_SHARED_LIBRARY})
|
target_link_libraries(loot_api PRIVATE ${LIBLOOT_SHARED_LIBRARY})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
########################################
|
########################################
|
||||||
@@ -106,8 +114,8 @@ find_package(PythonInterp REQUIRED)
|
|||||||
# Copy the API binary to the build directory.
|
# Copy the API binary to the build directory.
|
||||||
add_custom_command(TARGET loot_api POST_BUILD
|
add_custom_command(TARGET loot_api POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||||
"${LOOT_API_EXTRACTED_PATH}/${LOOT_API_SHARED_LIBRARY}"
|
"${LIBLOOT_EXTRACTED_PATH}/${LIBLOOT_SHARED_LIBRARY}"
|
||||||
"$<TARGET_FILE_DIR:loot_api>/${LOOT_API_SHARED_LIBRARY}")
|
"$<TARGET_FILE_DIR:loot_api>/${LIBLOOT_SHARED_LIBRARY}")
|
||||||
|
|
||||||
# Copy the test masterlist to the build directory.
|
# Copy the test masterlist to the build directory.
|
||||||
ExternalProject_Get_Property(test-masterlist SOURCE_DIR)
|
ExternalProject_Get_Property(test-masterlist SOURCE_DIR)
|
||||||
@@ -130,7 +138,7 @@ install(TARGETS loot_api
|
|||||||
DESTINATION "."
|
DESTINATION "."
|
||||||
CONFIGURATIONS Release RelWithDebInfo)
|
CONFIGURATIONS Release RelWithDebInfo)
|
||||||
|
|
||||||
install(FILES "${LOOT_API_EXTRACTED_PATH}/${LOOT_API_SHARED_LIBRARY}"
|
install(FILES "${LIBLOOT_EXTRACTED_PATH}/${LIBLOOT_SHARED_LIBRARY}"
|
||||||
"${CMAKE_SOURCE_DIR}/docs/README.md"
|
"${CMAKE_SOURCE_DIR}/docs/README.md"
|
||||||
DESTINATION "."
|
DESTINATION "."
|
||||||
CONFIGURATIONS Release RelWithDebInfo)
|
CONFIGURATIONS Release RelWithDebInfo)
|
||||||
@@ -171,7 +179,7 @@ else()
|
|||||||
set(CPACK_GENERATOR "TXZ")
|
set(CPACK_GENERATOR "TXZ")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(CPACK_PACKAGE_VERSION ${GIT_DESCRIBE_STRING})
|
set(CPACK_PACKAGE_VERSION "${GIT_DESCRIBE_STRING}-python$ENV{PYTHON_VERSION}")
|
||||||
set(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}/package")
|
set(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}/package")
|
||||||
|
|
||||||
include(CPack)
|
include(CPack)
|
||||||
|
|||||||
@@ -1,21 +1,20 @@
|
|||||||
LOOT API Python Module
|
LOOT API Python Module
|
||||||
=======================
|
=======================
|
||||||
|
|
||||||
[](https://ci.appveyor.com/project/WrinklyNinja/loot-api-python)
|
[](https://ci.appveyor.com/project/LOOT/loot-api-python/branch/master)
|
||||||
[](https://travis-ci.org/loot/loot-api-python)
|
|
||||||
[](http://loot-api-python.readthedocs.io/)
|
[](http://loot-api-python.readthedocs.io/)
|
||||||
|
|
||||||
A Python module that wraps the LOOT API, generated by [pybind11](https://github.com/pybind/pybind11). Not everything in the API is exposed: coverage can be extended on request (or by pull request).
|
A Python module that wraps libloot, generated by [pybind11](https://github.com/pybind/pybind11). Not everything in the API is exposed: coverage can be extended on request (or by pull request).
|
||||||
|
|
||||||
## Downloads
|
## Downloads
|
||||||
|
|
||||||
Snapshot builds are available on [Bintray](https://bintray.com/wrinklyninja/loot/loot-api-python). The snapshot build archives are named like so:
|
Snapshot builds are available on [Bintray](https://bintray.com/loot/snapshots/loot-api-python). The snapshot build archives are named like so:
|
||||||
|
|
||||||
```
|
```
|
||||||
loot_api_python-<short revision ID>-win32.7z
|
loot_api_python-<short revision ID>-python<python version>-win<architecture>.7z
|
||||||
```
|
```
|
||||||
|
|
||||||
For example `loot_api_python-94de368-win32.7z` was built using the revision with shortened commit ID `94de368`.
|
For example `loot_api_python-94de368-python2.7-win32.7z` was built using the revision with shortened commit ID `94de368`.
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
@@ -23,6 +22,6 @@ The documentation can be found online at [Read The Docs](http://loot-api-python.
|
|||||||
|
|
||||||
## Build Instructions
|
## Build Instructions
|
||||||
|
|
||||||
The module's build system uses [CMake](https://cmake.org/) and requires [Python](https://www.python.org) (tested with 2.7). Make sure they're installed, then run CMake, and build the generated solution file.
|
The module's build system uses [CMake](https://cmake.org/) and requires [Python](https://www.python.org). Make sure they're installed, then run CMake, and build the generated solution file.
|
||||||
|
|
||||||
Only Windows support has been tested, though Linux builds should also be possible.
|
Only Windows support has been tested, though Linux builds should also be possible.
|
||||||
|
|||||||
+29
-12
@@ -1,21 +1,37 @@
|
|||||||
os: Visual Studio 2015
|
os: Visual Studio 2017
|
||||||
|
|
||||||
version: "{build}-{branch}"
|
version: "{build}-{branch}"
|
||||||
|
|
||||||
configuration: RelWithDebInfo
|
configuration: RelWithDebInfo
|
||||||
|
|
||||||
|
platform:
|
||||||
|
- Win32
|
||||||
|
- x64
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
bintray_auth_token:
|
bintray_auth_token:
|
||||||
secure: fBQJmUDK/EgEUWjjbo6bWcitczeFTJZT4OZ3ZZ4FoUT6soBsTWPQJnr8YEVMFhGP
|
secure: PgsEA6TjHVf718zMnK7J/fT1hUAVNKBeWhpYgYaeCyeZk37VT4Ics6j7+B7ElLEr
|
||||||
|
github_auth_token:
|
||||||
|
secure: yDqT5l/e5MntbW99V6+MHlfFgNv+UIogFfeyUVqtFk5lFRB/dAraLLwKCLl6y+DH
|
||||||
|
|
||||||
|
matrix:
|
||||||
|
- PYTHON_VERSION: 2.7
|
||||||
|
- PYTHON_VERSION: 3.7
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- ps: (New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/WrinklyNinja/ci-scripts/1.1.0/delete_old_bintray_versions.py', "$env:APPVEYOR_BUILD_FOLDER\delete_old_bintray_versions.py")
|
- ps: (New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/Ortham/ci-scripts/2.0.0/delete_old_bintray_versions.py', "$env:APPVEYOR_BUILD_FOLDER\delete_old_bintray_versions.py")
|
||||||
|
|
||||||
before_build:
|
before_build:
|
||||||
|
- ps: $env:PYTHON_DIRECTORY_VERSION=$env:PYTHON_VERSION.Replace(".", "")
|
||||||
- cd %APPVEYOR_BUILD_FOLDER%
|
- cd %APPVEYOR_BUILD_FOLDER%
|
||||||
- ps: mkdir build
|
- ps: mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
- cmake .. -G "Visual Studio 14 2015"
|
- ps: |
|
||||||
|
if ($env:PLATFORM -eq 'Win32') {
|
||||||
|
cmake .. -G "Visual Studio 15 2017" -DPYTHON_EXECUTABLE="C:\Python${env:PYTHON_DIRECTORY_VERSION}\python.exe"
|
||||||
|
} else {
|
||||||
|
cmake .. -G "Visual Studio 15 2017 Win64" -DPYTHON_EXECUTABLE="C:\Python${env:PYTHON_DIRECTORY_VERSION}-x64\python.exe"
|
||||||
|
}
|
||||||
|
|
||||||
build:
|
build:
|
||||||
verbosity: minimal
|
verbosity: minimal
|
||||||
@@ -23,7 +39,8 @@ build:
|
|||||||
|
|
||||||
test_script:
|
test_script:
|
||||||
- cd %APPVEYOR_BUILD_FOLDER%\build\%CONFIGURATION%
|
- cd %APPVEYOR_BUILD_FOLDER%\build\%CONFIGURATION%
|
||||||
- python -m unittest test
|
- ps: $env:ARCHITECTURE=$env:PLATFORM.Substring($env:PLATFORM.Length - 2)
|
||||||
|
- py -%PYTHON_VERSION%-%ARCHITECTURE% -m unittest test
|
||||||
|
|
||||||
after_test:
|
after_test:
|
||||||
- cd %APPVEYOR_BUILD_FOLDER%\build
|
- cd %APPVEYOR_BUILD_FOLDER%\build
|
||||||
@@ -33,16 +50,16 @@ after_test:
|
|||||||
- ps: $env:GIT_DESCRIBE = ((git describe --tags --long --always) | Out-String) -replace "`n|`r", ""
|
- ps: $env:GIT_DESCRIBE = ((git describe --tags --long --always) | Out-String) -replace "`n|`r", ""
|
||||||
|
|
||||||
artifacts:
|
artifacts:
|
||||||
- path: build\package\loot_api_python-$(GIT_DESCRIBE)_$(APPVEYOR_REPO_BRANCH)-win32.7z
|
- path: build\package\loot_api_python-$(GIT_DESCRIBE)_$(APPVEYOR_REPO_BRANCH)-python$(PYTHON_VERSION)-win$(ARCHITECTURE).7z
|
||||||
name: loot_api_python
|
name: loot_api_python
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
- provider: BinTray
|
- provider: BinTray
|
||||||
username: wrinklyninja
|
username: wrinklyninja
|
||||||
api_key:
|
api_key:
|
||||||
secure: fBQJmUDK/EgEUWjjbo6bWcitczeFTJZT4OZ3ZZ4FoUT6soBsTWPQJnr8YEVMFhGP
|
secure: PgsEA6TjHVf718zMnK7J/fT1hUAVNKBeWhpYgYaeCyeZk37VT4Ics6j7+B7ElLEr
|
||||||
subject: wrinklyninja
|
subject: loot
|
||||||
repo: loot
|
repo: snapshots
|
||||||
package: loot-api-python
|
package: loot-api-python
|
||||||
version: $(GIT_DESCRIBE)_$(APPVEYOR_REPO_BRANCH)
|
version: $(GIT_DESCRIBE)_$(APPVEYOR_REPO_BRANCH)
|
||||||
publish: true
|
publish: true
|
||||||
@@ -52,13 +69,13 @@ deploy:
|
|||||||
tag: $(APPVEYOR_REPO_TAG_NAME)
|
tag: $(APPVEYOR_REPO_TAG_NAME)
|
||||||
release: LOOT API Python Module v$(APPVEYOR_REPO_TAG_NAME)
|
release: LOOT API Python Module v$(APPVEYOR_REPO_TAG_NAME)
|
||||||
description: |
|
description: |
|
||||||
Requires Windows 7 or later and the [MSVC 2015 x86 redistributable](https://download.microsoft.com/download/6/A/A/6AA4EDFF-645B-48C5-81CC-ED5963AEAD48/vc_redist.x86.exe), and [7-Zip](http://www.7-zip.org/) to extract the archive.
|
Requires Windows 7 or later and the [MSVC 2017 x86 redistributable](https://download.visualstudio.microsoft.com/download/pr/749aa419-f9e4-4578-a417-a43786af205e/d59197078cc425377be301faba7dd87a/vc_redist.x86.exe), and [7-Zip](http://www.7-zip.org/) to extract the archive.
|
||||||
auth_token:
|
auth_token:
|
||||||
secure: V1GojGQfrAiQtUWtNNXfm3samiH+1yNF5UYhkn8B8mbif20IGTGWNlBS9E4S0SUC
|
secure: yDqT5l/e5MntbW99V6+MHlfFgNv+UIogFfeyUVqtFk5lFRB/dAraLLwKCLl6y+DH
|
||||||
artifact: loot_api_python
|
artifact: loot_api_python
|
||||||
draft: false
|
draft: false
|
||||||
on:
|
on:
|
||||||
appveyor_repo_tag: true
|
appveyor_repo_tag: true
|
||||||
|
|
||||||
on_success:
|
on_success:
|
||||||
- ps: python "$env:APPVEYOR_BUILD_FOLDER\delete_old_bintray_versions.py" -o loot -g loot-api-python -u wrinklyninja -b loot -p loot-api-python -t $env:bintray_auth_token -n 30
|
- ps: python "$env:APPVEYOR_BUILD_FOLDER\delete_old_bintray_versions.py" -g loot/loot-api-python -b loot/snapshots/loot-api-python -u wrinklyninja -k $env:bintray_auth_token -t $env:github_auth_token -n 30
|
||||||
|
|||||||
+2
-2
@@ -55,7 +55,7 @@ master_doc = 'index'
|
|||||||
|
|
||||||
# General information about the project.
|
# General information about the project.
|
||||||
project = u'LOOT API Python Module'
|
project = u'LOOT API Python Module'
|
||||||
copyright = u'2016, WrinklyNinja'
|
copyright = u'2019, WrinklyNinja'
|
||||||
author = u'WrinklyNinja'
|
author = u'WrinklyNinja'
|
||||||
|
|
||||||
# The version info for the project you're documenting, acts as replacement for
|
# The version info for the project you're documenting, acts as replacement for
|
||||||
@@ -346,5 +346,5 @@ texinfo_documents = [
|
|||||||
|
|
||||||
# Example configuration for intersphinx: refer to the Python standard library.
|
# Example configuration for intersphinx: refer to the Python standard library.
|
||||||
intersphinx_mapping = {
|
intersphinx_mapping = {
|
||||||
'loot_api': ('http://loot.readthedocs.io/en/0.10.2/', None),
|
'loot_api': ('http://loot.readthedocs.io/en/0.14.1/', None),
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -28,7 +28,7 @@ To check if the module loaded is compatible with the version of the API that you
|
|||||||
developed against::
|
developed against::
|
||||||
|
|
||||||
>>> import loot_api
|
>>> import loot_api
|
||||||
>>> loot_api.is_compatible(0,12,0)
|
>>> loot_api.is_compatible(0,14,0)
|
||||||
True
|
True
|
||||||
>>> loot_api.is_compatible(0,9,0)
|
>>> loot_api.is_compatible(0,9,0)
|
||||||
False
|
False
|
||||||
|
|||||||
+16
-8
@@ -31,21 +31,25 @@ PluginTags GetPluginTags(const std::shared_ptr<DatabaseInterface> db, const std:
|
|||||||
PluginTags tags;
|
PluginTags tags;
|
||||||
|
|
||||||
auto metadata = db->GetPluginMetadata(plugin, false, evaluateConditions);
|
auto metadata = db->GetPluginMetadata(plugin, false, evaluateConditions);
|
||||||
for (const auto &tag : metadata.GetTags()) {
|
if (metadata.has_value()) {
|
||||||
|
for (const auto &tag : metadata.value().GetTags()) {
|
||||||
if (tag.IsAddition())
|
if (tag.IsAddition())
|
||||||
tags.added.insert(tag.GetName());
|
tags.added.insert(tag.GetName());
|
||||||
else
|
else
|
||||||
tags.removed.insert(tag.GetName());
|
tags.removed.insert(tag.GetName());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
metadata = db->GetPluginUserMetadata(plugin, evaluateConditions);
|
metadata = db->GetPluginUserMetadata(plugin, evaluateConditions);
|
||||||
tags.userlist_modified = !metadata.GetTags().empty();
|
if (metadata.has_value()) {
|
||||||
for (const auto &tag : metadata.GetTags()) {
|
tags.userlist_modified = !metadata.value().GetTags().empty();
|
||||||
|
for (const auto &tag : metadata.value().GetTags()) {
|
||||||
if (tag.IsAddition())
|
if (tag.IsAddition())
|
||||||
tags.added.insert(tag.GetName());
|
tags.added.insert(tag.GetName());
|
||||||
else
|
else
|
||||||
tags.removed.insert(tag.GetName());
|
tags.removed.insert(tag.GetName());
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return tags;
|
return tags;
|
||||||
}
|
}
|
||||||
@@ -53,21 +57,25 @@ PluginTags GetPluginTags(const std::shared_ptr<DatabaseInterface> db, const std:
|
|||||||
PluginCleanliness GetPluginCleanliness(const std::shared_ptr<DatabaseInterface> db, const std::string& plugin, bool evaluateConditions) {
|
PluginCleanliness GetPluginCleanliness(const std::shared_ptr<DatabaseInterface> db, const std::string& plugin, bool evaluateConditions) {
|
||||||
auto metadata = db->GetPluginMetadata(plugin, true, evaluateConditions);
|
auto metadata = db->GetPluginMetadata(plugin, true, evaluateConditions);
|
||||||
|
|
||||||
if (metadata.GetDirtyInfo().empty()) {
|
if (metadata.has_value()) {
|
||||||
if (metadata.GetCleanInfo().empty()) {
|
if (metadata.value().GetDirtyInfo().empty()) {
|
||||||
|
if (metadata.value().GetCleanInfo().empty()) {
|
||||||
return PluginCleanliness::unknown;
|
return PluginCleanliness::unknown;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
return PluginCleanliness::clean;
|
return PluginCleanliness::clean;
|
||||||
}
|
}
|
||||||
} else if (!metadata.GetCleanInfo().empty()) {
|
}
|
||||||
|
else if (!metadata.value().GetCleanInfo().empty()) {
|
||||||
return PluginCleanliness::unknown;
|
return PluginCleanliness::unknown;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const auto& info : metadata.GetDirtyInfo()) {
|
for (const auto& info : metadata.value().GetDirtyInfo()) {
|
||||||
if (info.ChooseInfo("en").GetText().find("Do not clean") != std::string::npos) {
|
if (info.ChooseInfo("en").GetText().find("Do not clean") != std::string::npos) {
|
||||||
return PluginCleanliness::do_not_clean;
|
return PluginCleanliness::do_not_clean;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return PluginCleanliness::unknown;
|
return PluginCleanliness::unknown;
|
||||||
}
|
}
|
||||||
|
|||||||
+30
-6
@@ -34,8 +34,32 @@ using pybind11::arg;
|
|||||||
using pybind11::enum_;
|
using pybind11::enum_;
|
||||||
using pybind11::class_;
|
using pybind11::class_;
|
||||||
using pybind11::metaclass;
|
using pybind11::metaclass;
|
||||||
|
using std::filesystem::path;
|
||||||
|
using std::filesystem::u8path;
|
||||||
|
|
||||||
namespace loot {
|
namespace loot {
|
||||||
|
namespace py {
|
||||||
|
std::shared_ptr<GameInterface> CreateGameHandle(GameType gameType, std::string gamePath, std::string gameLocalPath) {
|
||||||
|
return CreateGameHandle(gameType, u8path(gamePath), u8path(gameLocalPath));
|
||||||
|
}
|
||||||
|
|
||||||
|
void LoadLists(std::shared_ptr<DatabaseInterface> db, std::string masterlistPath, std::string userlistPath) {
|
||||||
|
return db->LoadLists(u8path(masterlistPath), u8path(userlistPath));
|
||||||
|
}
|
||||||
|
|
||||||
|
void WriteMinimalList(std::shared_ptr<DatabaseInterface> db, std::string outputFile, bool overwrite) {
|
||||||
|
return db->WriteMinimalList(u8path(outputFile), overwrite);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool UpdateMasterlist(std::shared_ptr<DatabaseInterface> db, std::string masterlistPath, std::string remoteUrl, std::string remoteBranch) {
|
||||||
|
return db->UpdateMasterlist(u8path(masterlistPath), remoteUrl, remoteBranch);
|
||||||
|
}
|
||||||
|
|
||||||
|
MasterlistInfo GetMasterlistRevision(std::shared_ptr<DatabaseInterface> db, std::string masterlistPath, bool getShortId) {
|
||||||
|
return db->GetMasterlistRevision(u8path(masterlistPath), getShortId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void bindEnums(pybind11::module& module) {
|
void bindEnums(pybind11::module& module) {
|
||||||
enum_<GameType>(module, "GameType")
|
enum_<GameType>(module, "GameType")
|
||||||
.value("tes4", GameType::tes4)
|
.value("tes4", GameType::tes4)
|
||||||
@@ -94,7 +118,7 @@ void bindVersionClasses(pybind11::module& module) {
|
|||||||
.def_readonly_static("minor", &LootVersion::minor)
|
.def_readonly_static("minor", &LootVersion::minor)
|
||||||
.def_readonly_static("patch", &LootVersion::patch)
|
.def_readonly_static("patch", &LootVersion::patch)
|
||||||
.def_readonly_static("revision", &LootVersion::revision)
|
.def_readonly_static("revision", &LootVersion::revision)
|
||||||
.def_static("string", LootVersion::string);
|
.def_static("string", LootVersion::GetVersionString);
|
||||||
|
|
||||||
class_<WrapperVersion>(module, "WrapperVersion")
|
class_<WrapperVersion>(module, "WrapperVersion")
|
||||||
.def_readonly_static("major", &WrapperVersion::major)
|
.def_readonly_static("major", &WrapperVersion::major)
|
||||||
@@ -110,9 +134,9 @@ void bindInterfaceClasses(pybind11::module& module) {
|
|||||||
.def("get_database", &GameInterface::GetDatabase);
|
.def("get_database", &GameInterface::GetDatabase);
|
||||||
|
|
||||||
class_<DatabaseInterface, std::shared_ptr<DatabaseInterface>>(module, "DatabaseInterface")
|
class_<DatabaseInterface, std::shared_ptr<DatabaseInterface>>(module, "DatabaseInterface")
|
||||||
.def("load_lists", &DatabaseInterface::LoadLists, arg("masterlist_path"), arg("userlist_path") = "")
|
.def("load_lists", &py::LoadLists, arg("masterlist_path"), arg("userlist_path") = "")
|
||||||
.def("update_masterlist", &DatabaseInterface::UpdateMasterlist)
|
.def("update_masterlist", &py::UpdateMasterlist)
|
||||||
.def("get_masterlist_revision", &DatabaseInterface::GetMasterlistRevision)
|
.def("get_masterlist_revision", &py::GetMasterlistRevision)
|
||||||
.def("get_plugin_metadata", &DatabaseInterface::GetPluginMetadata,
|
.def("get_plugin_metadata", &DatabaseInterface::GetPluginMetadata,
|
||||||
arg("plugin"),
|
arg("plugin"),
|
||||||
arg("includeUserMetadata") = true,
|
arg("includeUserMetadata") = true,
|
||||||
@@ -123,7 +147,7 @@ void bindInterfaceClasses(pybind11::module& module) {
|
|||||||
.def("get_plugin_cleanliness", &GetPluginCleanliness,
|
.def("get_plugin_cleanliness", &GetPluginCleanliness,
|
||||||
arg("plugin"),
|
arg("plugin"),
|
||||||
arg("evaluateConditions") = false)
|
arg("evaluateConditions") = false)
|
||||||
.def("write_minimal_list", &DatabaseInterface::WriteMinimalList);
|
.def("write_minimal_list", &py::WriteMinimalList);
|
||||||
}
|
}
|
||||||
|
|
||||||
void bindClasses(pybind11::module& module) {
|
void bindClasses(pybind11::module& module) {
|
||||||
@@ -139,7 +163,7 @@ void bindFunctions(pybind11::module& module) {
|
|||||||
|
|
||||||
module.def("initialise_locale", &InitialiseLocale, arg("id") = "");
|
module.def("initialise_locale", &InitialiseLocale, arg("id") = "");
|
||||||
|
|
||||||
module.def("create_game_handle", &CreateGameHandle,
|
module.def("create_game_handle", &py::CreateGameHandle,
|
||||||
arg("game"),
|
arg("game"),
|
||||||
arg("game_path"),
|
arg("game_path"),
|
||||||
arg("game_local_path") = "");
|
arg("game_local_path") = "");
|
||||||
|
|||||||
+8
-8
@@ -40,22 +40,22 @@ class GameFixture(unittest.TestCase):
|
|||||||
class TestLootApi(GameFixture):
|
class TestLootApi(GameFixture):
|
||||||
def test_is_compatible(self):
|
def test_is_compatible(self):
|
||||||
self.assertFalse(is_compatible(0, 9, 0))
|
self.assertFalse(is_compatible(0, 9, 0))
|
||||||
self.assertTrue(is_compatible(0, 13, 0))
|
self.assertTrue(is_compatible(0, 14, 0))
|
||||||
|
|
||||||
def test_version(self):
|
def test_version(self):
|
||||||
self.assertEqual(Version.major, 0)
|
self.assertEqual(Version.major, 0)
|
||||||
self.assertEqual(Version.minor, 13)
|
self.assertEqual(Version.minor, 14)
|
||||||
self.assertEqual(Version.patch, 2)
|
self.assertEqual(Version.patch, 1)
|
||||||
self.assertNotEqual(Version.revision, u'')
|
self.assertNotEqual(Version.revision, u'')
|
||||||
self.assertEqual(Version.string(), "0.13.2")
|
self.assertEqual(Version.string(), "0.14.1")
|
||||||
|
|
||||||
def test_wrapper_version(self):
|
def test_wrapper_version(self):
|
||||||
self.assertEqual(WrapperVersion.major, 3)
|
self.assertEqual(WrapperVersion.major, 4)
|
||||||
self.assertEqual(WrapperVersion.minor, 1)
|
self.assertEqual(WrapperVersion.minor, 0)
|
||||||
self.assertEqual(WrapperVersion.patch, 1)
|
self.assertEqual(WrapperVersion.patch, 0)
|
||||||
self.assertNotEqual(WrapperVersion.revision, u'')
|
self.assertNotEqual(WrapperVersion.revision, u'')
|
||||||
self.assertNotEqual(WrapperVersion.revision, Version.revision)
|
self.assertNotEqual(WrapperVersion.revision, Version.revision)
|
||||||
self.assertEqual(WrapperVersion.string(), "3.1.1")
|
self.assertEqual(WrapperVersion.string(), "4.0.0")
|
||||||
|
|
||||||
def test_create_db(self):
|
def test_create_db(self):
|
||||||
game = create_game_handle(GameType.tes4, self.game_path, self.local_path)
|
game = create_game_handle(GameType.tes4, self.game_path, self.local_path)
|
||||||
|
|||||||
@@ -25,9 +25,9 @@
|
|||||||
#include "wrapper_version.h"
|
#include "wrapper_version.h"
|
||||||
|
|
||||||
namespace loot {
|
namespace loot {
|
||||||
const unsigned int WrapperVersion::major = 3;
|
const unsigned int WrapperVersion::major = 4;
|
||||||
const unsigned int WrapperVersion::minor = 1;
|
const unsigned int WrapperVersion::minor = 0;
|
||||||
const unsigned int WrapperVersion::patch = 1;
|
const unsigned int WrapperVersion::patch = 0;
|
||||||
const std::string WrapperVersion::revision = "@GIT_COMMIT_STRING@";
|
const std::string WrapperVersion::revision = "@GIT_COMMIT_STRING@";
|
||||||
|
|
||||||
std::string WrapperVersion::string() {
|
std::string WrapperVersion::string() {
|
||||||
|
|||||||
Reference in New Issue
Block a user