Skip to content

Commit 567e896

Browse files
0cyn0cyn
committed
RepoPlugin -> Extension, Remove deprecated plugin init functions.
1 parent cd24bfe commit 567e896

File tree

6 files changed

+69
-78
lines changed

6 files changed

+69
-78
lines changed

‎binaryninjaapi.h‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2001,15 +2001,6 @@ namespace BinaryNinja {
20012001
void DisablePlugins();
20022002
bool IsPluginsEnabled();
20032003
bool InitPlugins(bool allowUserPlugins = true);
2004-
/*!
2005-
\deprecated Use `InitPlugins()`
2006-
*/
2007-
void InitCorePlugins(); // Deprecated, use InitPlugins
2008-
/*!
2009-
\deprecated Use `InitPlugins()`
2010-
*/
2011-
void InitUserPlugins(); // Deprecated, use InitPlugins
2012-
void InitRepoPlugins();
20132004

20142005
std::string GetBundledPluginDirectory();
20152006
void SetBundledPluginDirectory(const std::string& path);
@@ -18426,10 +18417,10 @@ namespace BinaryNinja {
1842618417
/*!
1842718418
\ingroup pluginmanager
1842818419
*/
18429-
class RepoPlugin : public CoreRefCountObject<BNPlugin, BNNewPluginReference, BNFreePlugin>
18420+
class Extension : public CoreRefCountObject<BNPlugin, BNNewPluginReference, BNFreePlugin>
1843018421
{
1843118422
public:
18432-
RepoPlugin(BNPlugin* plugin);
18423+
Extension(BNPlugin* plugin);
1843318424
PluginStatus GetPluginStatus() const;
1843418425
std::vector<std::string> GetApis() const;
1843518426
std::vector<std::string> GetInstallPlatforms() const;
@@ -18485,9 +18476,9 @@ namespace BinaryNinja {
1848518476
std::string GetRepoPath() const;
1848618477
std::string GetLocalReference() const;
1848718478
std::string GetRemoteReference() const;
18488-
std::vector<Ref<RepoPlugin>> GetPlugins() const;
18479+
std::vector<Ref<Extension>> GetPlugins() const;
1848918480
std::string GetPluginDirectory() const;
18490-
Ref<RepoPlugin> GetPluginByPath(const std::string& pluginPath);
18481+
Ref<Extension> GetPluginByPath(const std::string& pluginPath);
1849118482
std::string GetFullPath() const;
1849218483
};
1849318484

‎pluginmanager.cpp‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -12,42 +12,42 @@ using namespace std;
1212
return result; \
1313
} while (0)
1414

15-
RepoPlugin::RepoPlugin(BNPlugin* plugin)
15+
Extension::Extension(BNPlugin* plugin)
1616
{
1717
m_object = plugin;
1818
}
1919

20-
string RepoPlugin::GetPath() const
20+
string Extension::GetPath() const
2121
{
2222
RETURN_STRING(BNPluginGetPath(m_object));
2323
}
2424

25-
string RepoPlugin::GetSubdir() const
25+
string Extension::GetSubdir() const
2626
{
2727
RETURN_STRING(BNPluginGetSubdir(m_object));
2828
}
2929

30-
string RepoPlugin::GetDependencies() const
30+
string Extension::GetDependencies() const
3131
{
3232
RETURN_STRING(BNPluginGetDependencies(m_object));
3333
}
3434

35-
bool RepoPlugin::IsInstalled() const
35+
bool Extension::IsInstalled() const
3636
{
3737
return BNPluginIsInstalled(m_object);
3838
}
3939

40-
bool RepoPlugin::IsEnabled() const
40+
bool Extension::IsEnabled() const
4141
{
4242
return BNPluginIsEnabled(m_object);
4343
}
4444

45-
PluginStatus RepoPlugin::GetPluginStatus() const
45+
PluginStatus Extension::GetPluginStatus() const
4646
{
4747
return BNPluginGetPluginStatus(m_object);
4848
}
4949

50-
vector<string> RepoPlugin::GetApis() const
50+
vector<string> Extension::GetApis() const
5151
{
5252
vector<string> result;
5353
size_t count = 0;
@@ -60,27 +60,27 @@ vector<string> RepoPlugin::GetApis() const
6060
return result;
6161
}
6262

63-
string RepoPlugin::GetAuthor() const
63+
string Extension::GetAuthor() const
6464
{
6565
RETURN_STRING(BNPluginGetAuthor(m_object));
6666
}
6767

68-
string RepoPlugin::GetDescription() const
68+
string Extension::GetDescription() const
6969
{
7070
RETURN_STRING(BNPluginGetDescription(m_object));
7171
}
7272

73-
string RepoPlugin::GetLicenseText() const
73+
string Extension::GetLicenseText() const
7474
{
7575
RETURN_STRING(BNPluginGetLicenseText(m_object));
7676
}
7777

78-
string RepoPlugin::GetLongdescription() const
78+
string Extension::GetLongdescription() const
7979
{
8080
RETURN_STRING(BNPluginGetLongdescription(m_object));
8181
}
8282

83-
VersionInfo RepoPlugin::GetMinimumVersionInfo() const
83+
VersionInfo Extension::GetMinimumVersionInfo() const
8484
{
8585
auto coreInfo = BNPluginGetMinimumVersionInfo(m_object);
8686
VersionInfo result;
@@ -92,7 +92,7 @@ VersionInfo RepoPlugin::GetMinimumVersionInfo() const
9292
return result;
9393
}
9494

95-
VersionInfo RepoPlugin::GetMaximumVersionInfo() const
95+
VersionInfo Extension::GetMaximumVersionInfo() const
9696
{
9797
auto coreInfo = BNPluginGetMaximumVersionInfo(m_object);
9898
VersionInfo result;
@@ -104,12 +104,12 @@ VersionInfo RepoPlugin::GetMaximumVersionInfo() const
104104
return result;
105105
}
106106

107-
string RepoPlugin::GetName() const
107+
string Extension::GetName() const
108108
{
109109
RETURN_STRING(BNPluginGetName(m_object));
110110
}
111111

112-
vector<PluginType> RepoPlugin::GetPluginTypes() const
112+
vector<PluginType> Extension::GetPluginTypes() const
113113
{
114114
size_t count;
115115
BNPluginType* pluginTypesPtr = BNPluginGetPluginTypes(m_object, &count);
@@ -123,49 +123,49 @@ vector<PluginType> RepoPlugin::GetPluginTypes() const
123123
}
124124

125125

126-
string RepoPlugin::GetProjectUrl() const
126+
string Extension::GetProjectUrl() const
127127
{
128128
RETURN_STRING(BNPluginGetProjectUrl(m_object));
129129
}
130130

131131

132-
string RepoPlugin::GetPackageUrl() const
132+
string Extension::GetPackageUrl() const
133133
{
134134
RETURN_STRING(BNPluginGetPackageUrl(m_object));
135135
}
136136

137137

138-
string RepoPlugin::GetAuthorUrl() const
138+
string Extension::GetAuthorUrl() const
139139
{
140140
RETURN_STRING(BNPluginGetAuthorUrl(m_object));
141141
}
142142

143143

144-
string RepoPlugin::GetVersion() const
144+
string Extension::GetVersion() const
145145
{
146146
RETURN_STRING(BNPluginGetVersion(m_object));
147147
}
148148

149149

150-
string RepoPlugin::GetCommit() const
150+
string Extension::GetCommit() const
151151
{
152152
RETURN_STRING(BNPluginGetCommit(m_object));
153153
}
154154

155155

156-
bool RepoPlugin::IsViewOnly() const
156+
bool Extension::IsViewOnly() const
157157
{
158158
return BNPluginGetViewOnly(m_object);
159159
}
160160

161161

162-
string RepoPlugin::GetRepository() const
162+
string Extension::GetRepository() const
163163
{
164164
RETURN_STRING(BNPluginGetRepository(m_object));
165165
}
166166

167167

168-
vector<string> RepoPlugin::GetInstallPlatforms() const
168+
vector<string> Extension::GetInstallPlatforms() const
169169
{
170170
vector<string> result;
171171
size_t count = 0;
@@ -177,94 +177,94 @@ vector<string> RepoPlugin::GetInstallPlatforms() const
177177
}
178178

179179

180-
bool RepoPlugin::IsBeingDeleted() const
180+
bool Extension::IsBeingDeleted() const
181181
{
182182
return BNPluginIsBeingDeleted(m_object);
183183
}
184184

185-
bool RepoPlugin::IsBeingUpdated() const
185+
bool Extension::IsBeingUpdated() const
186186
{
187187
return BNPluginIsBeingUpdated(m_object);
188188
}
189189

190-
bool RepoPlugin::IsRunning() const
190+
bool Extension::IsRunning() const
191191
{
192192
return BNPluginIsRunning(m_object);
193193
}
194194

195195

196-
bool RepoPlugin::IsUpdatePending() const
196+
bool Extension::IsUpdatePending() const
197197
{
198198
return BNPluginIsUpdatePending(m_object);
199199
}
200200

201201

202-
bool RepoPlugin::IsDisablePending() const
202+
bool Extension::IsDisablePending() const
203203
{
204204
return BNPluginIsDisablePending(m_object);
205205
}
206206

207207

208-
bool RepoPlugin::IsDeletePending() const
208+
bool Extension::IsDeletePending() const
209209
{
210210
return BNPluginIsDeletePending(m_object);
211211
}
212212

213213

214-
bool RepoPlugin::IsUpdateAvailable() const
214+
bool Extension::IsUpdateAvailable() const
215215
{
216216
return BNPluginIsUpdateAvailable(m_object);
217217
}
218218

219219

220-
bool RepoPlugin::AreDependenciesBeingInstalled() const
220+
bool Extension::AreDependenciesBeingInstalled() const
221221
{
222222
return BNPluginAreDependenciesBeingInstalled(m_object);
223223
}
224224

225225

226-
uint64_t RepoPlugin::GetLastUpdate()
226+
uint64_t Extension::GetLastUpdate()
227227
{
228228
return BNPluginGetLastUpdate(m_object);
229229
}
230230

231-
string RepoPlugin::GetProjectData()
231+
string Extension::GetProjectData()
232232
{
233233
RETURN_STRING(BNPluginGetProjectData(m_object));
234234
}
235235

236236

237-
bool RepoPlugin::Uninstall()
237+
bool Extension::Uninstall()
238238
{
239239
return BNPluginUninstall(m_object);
240240
}
241241

242242

243-
bool RepoPlugin::Install()
243+
bool Extension::Install()
244244
{
245245
return BNPluginInstall(m_object);
246246
}
247247

248248

249-
bool RepoPlugin::InstallDependencies()
249+
bool Extension::InstallDependencies()
250250
{
251251
return BNPluginInstallDependencies(m_object);
252252
}
253253

254254

255-
bool RepoPlugin::Enable(bool force)
255+
bool Extension::Enable(bool force)
256256
{
257257
return BNPluginEnable(m_object, force);
258258
}
259259

260260

261-
bool RepoPlugin::Update()
261+
bool Extension::Update()
262262
{
263263
return BNPluginUpdate(m_object);
264264
}
265265

266266

267-
bool RepoPlugin::Disable()
267+
bool Extension::Disable()
268268
{
269269
return BNPluginDisable(m_object);
270270
}
@@ -287,22 +287,22 @@ string Repository::GetRepoPath() const
287287
}
288288

289289

290-
vector<Ref<RepoPlugin>> Repository::GetPlugins() const
290+
vector<Ref<Extension>> Repository::GetPlugins() const
291291
{
292-
vector<Ref<RepoPlugin>> plugins;
292+
vector<Ref<Extension>> plugins;
293293
size_t count = 0;
294294
BNPlugin** pluginsPtr = BNRepositoryGetPlugins(m_object, &count);
295295
plugins.reserve(count);
296296
for (size_t i = 0; i < count; i++)
297-
plugins.push_back(new RepoPlugin(BNNewPluginReference(pluginsPtr[i])));
297+
plugins.push_back(new Extension(BNNewPluginReference(pluginsPtr[i])));
298298
BNFreeRepositoryPluginList(pluginsPtr);
299299
return plugins;
300300
}
301301

302302

303-
Ref<RepoPlugin> Repository::GetPluginByPath(const string& pluginPath)
303+
Ref<Extension> Repository::GetPluginByPath(const string& pluginPath)
304304
{
305-
return new RepoPlugin(BNRepositoryGetPluginByPath(m_object, pluginPath.c_str()));
305+
return new Extension(BNRepositoryGetPluginByPath(m_object, pluginPath.c_str()));
306306
}
307307

308308
string Repository::GetFullPath() const

‎python/pluginmanager.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
from .enums import PluginType
3030

3131

32-
class RepoPlugin:
32+
class Extension:
3333
"""
34-
``RepoPlugin`` is mostly read-only, however you can install/uninstall enable/disable plugins. RepoPlugins are
34+
``Extension`` is mostly read-only, however you can install/uninstall enable/disable plugins. Extensions are
3535
created by parsing the plugins.json in a plugin repository.
3636
"""
3737
def __init__(self, handle: core.BNPluginHandle):
@@ -313,8 +313,8 @@ def full_path(self) -> str:
313313
return result
314314

315315
@property
316-
def plugins(self) -> List[RepoPlugin]:
317-
"""List of RepoPlugin objects contained within this repository"""
316+
def plugins(self) -> List[Extension]:
317+
"""List of Extension objects contained within this repository"""
318318
pluginlist = []
319319
count = ctypes.c_ulonglong(0)
320320
result = core.BNRepositoryGetPlugins(self.handle, count)
@@ -323,7 +323,7 @@ def plugins(self) -> List[RepoPlugin]:
323323
for i in range(count.value):
324324
plugin_ref = core.BNNewPluginReference(result[i])
325325
assert plugin_ref is not None, "core.BNNewPluginReference returned None"
326-
pluginlist.append(RepoPlugin(plugin_ref))
326+
pluginlist.append(Extension(plugin_ref))
327327
return pluginlist
328328
finally:
329329
core.BNFreeRepositoryPluginList(result)
@@ -365,8 +365,8 @@ def repositories(self) -> List[Repository]:
365365
core.BNFreeRepositoryManagerRepositoriesList(repos)
366366

367367
@property
368-
def plugins(self) -> Dict[str, List[RepoPlugin]]:
369-
"""List of all RepoPlugins in each repository"""
368+
def plugins(self) -> Dict[str, List[Extension]]:
369+
"""List of all Extensions in each repository"""
370370
plugin_list = {}
371371
for repo in self.repositories:
372372
plugin_list[repo.path] = repo.plugins

0 commit comments

Comments
 (0)