Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 61a11a0

Browse files
Akos Kittakittaakos
Akos Kitta
authored andcommitted
Removed real_name of the libraries.
It has been removed from the gRPC API: arduino/arduino-cli#1890 This PR switches from `real_name` to `name` in the UI, as the `name` is the canonical form provided by the CLI. Closes #1525 Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
1 parent 0c20ae0 commit 61a11a0

File tree

6 files changed

+5
-47
lines changed

6 files changed

+5
-47
lines changed

‎arduino-ide-extension/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@
159159
"arduino": {
160160
"cli": {
161161
"version": {
162-
"owner": "cmaglie",
162+
"owner": "arduino",
163163
"repo": "arduino-cli",
164-
"commitish": "download_progress_refactor"
164+
"commitish": "c8ff042"
165165
}
166166
},
167167
"fwuploader": {

‎arduino-ide-extension/src/common/protocol/library-service.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,6 @@ export enum LibraryLocation {
162162
}
163163

164164
export interface LibraryPackage extends ArduinoComponent {
165-
/**
166-
* Same as [`Library#real_name`](https://arduino.github.io/arduino-cli/latest/rpc/commands/#library).
167-
* Should be used for the UI, and `name` is used to uniquely identify a library. It does not have an ID.
168-
*/
169-
readonly label: string;
170-
171165
/**
172166
* An array of string that should be included into the `ino` file if this library is used.
173167
* For example, including `SD` will prepend `#include <SD.h>` to the `ino` file. While including `Bridge`

‎arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/lib_pb.d.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -765,9 +765,6 @@ export class Library extends jspb.Message {
765765
getContainerPlatform(): string;
766766
setContainerPlatform(value: string): Library;
767767

768-
getRealName(): string;
769-
setRealName(value: string): Library;
770-
771768
getDotALinkage(): boolean;
772769
setDotALinkage(value: boolean): Library;
773770

@@ -836,7 +833,6 @@ export namespace Library {
836833
sourceDir: string,
837834
utilityDir: string,
838835
containerPlatform: string,
839-
realName: string,
840836
dotALinkage: boolean,
841837
precompiled: boolean,
842838
ldFlags: string,

‎arduino-ide-extension/src/node/cli-protocol/cc/arduino/cli/commands/v1/lib_pb.js‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5447,7 +5447,6 @@ proto.cc.arduino.cli.commands.v1.Library.toObject = function(includeInstance, ms
54475447
sourceDir: jspb.Message.getFieldWithDefault(msg, 11, ""),
54485448
utilityDir: jspb.Message.getFieldWithDefault(msg, 12, ""),
54495449
containerPlatform: jspb.Message.getFieldWithDefault(msg, 14, ""),
5450-
realName: jspb.Message.getFieldWithDefault(msg, 16, ""),
54515450
dotALinkage: jspb.Message.getBooleanFieldWithDefault(msg, 17, false),
54525451
precompiled: jspb.Message.getBooleanFieldWithDefault(msg, 18, false),
54535452
ldFlags: jspb.Message.getFieldWithDefault(msg, 19, ""),
@@ -5548,10 +5547,6 @@ proto.cc.arduino.cli.commands.v1.Library.deserializeBinaryFromReader = function(
55485547
var value = /** @type {string} */ (reader.readString());
55495548
msg.setContainerPlatform(value);
55505549
break;
5551-
case 16:
5552-
var value = /** @type {string} */ (reader.readString());
5553-
msg.setRealName(value);
5554-
break;
55555550
case 17:
55565551
var value = /** @type {boolean} */ (reader.readBool());
55575552
msg.setDotALinkage(value);
@@ -5724,13 +5719,6 @@ proto.cc.arduino.cli.commands.v1.Library.serializeBinaryToWriter = function(mess
57245719
f
57255720
);
57265721
}
5727-
f = message.getRealName();
5728-
if (f.length > 0) {
5729-
writer.writeString(
5730-
16,
5731-
f
5732-
);
5733-
}
57345722
f = message.getDotALinkage();
57355723
if (f) {
57365724
writer.writeBool(
@@ -6084,24 +6072,6 @@ proto.cc.arduino.cli.commands.v1.Library.prototype.setContainerPlatform = functi
60846072
};
60856073

60866074

6087-
/**
6088-
* optional string real_name = 16;
6089-
* @return {string}
6090-
*/
6091-
proto.cc.arduino.cli.commands.v1.Library.prototype.getRealName = function() {
6092-
return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 16, ""));
6093-
};
6094-
6095-
6096-
/**
6097-
* @param {string} value
6098-
* @return {!proto.cc.arduino.cli.commands.v1.Library} returns this
6099-
*/
6100-
proto.cc.arduino.cli.commands.v1.Library.prototype.setRealName = function(value) {
6101-
return jspb.Message.setProto3StringField(this, 16, value);
6102-
};
6103-
6104-
61056075
/**
61066076
* optional bool dot_a_linkage = 17;
61076077
* @return {boolean}

‎arduino-ide-extension/src/node/examples-service-impl.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ export class ExamplesServiceImpl implements ExamplesService {
124124
* location of the examples. Otherwise it creates the example container from the direct examples FS paths.
125125
*/
126126
private async tryGroupExamples({
127-
label,
127+
name,
128128
exampleUris,
129129
installDirUri,
130130
}: LibraryPackage): Promise<SketchContainer> {
131-
const container = SketchContainer.create(label);
131+
const container = SketchContainer.create(name);
132132
if (!installDirUri || !exampleUris.length) {
133133
return container;
134134
}

‎arduino-ide-extension/src/node/library-service-impl.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class LibraryServiceImpl
6666
if (installedLib.hasLibrary()) {
6767
const lib = installedLib.getLibrary();
6868
if (lib) {
69-
installedLibsIdx.set(lib.getRealName(), installedLib);
69+
installedLibsIdx.set(lib.getName(), installedLib);
7070
}
7171
}
7272
}
@@ -210,7 +210,6 @@ export class LibraryServiceImpl
210210
return toLibrary(
211211
{
212212
name: library.getName(),
213-
label: library.getRealName(),
214213
installedVersion,
215214
installable: true,
216215
description: library.getSentence(),
@@ -443,7 +442,6 @@ function toLibrary(
443442
): LibraryPackage {
444443
return {
445444
name: '',
446-
label: '',
447445
exampleUris: [],
448446
installable: false,
449447
deprecated: false,

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /