2929
3030package cc .arduino .contributions .libraries ;
3131
32- import cc .arduino .Constants ;
33- import cc .arduino .contributions .DownloadableContributionsDownloader ;
34- import cc .arduino .contributions .GZippedJsonDownloader ;
32+ import static processing .app .I18n .tr ;
33+
34+ import java .util .Optional ;
35+
3536import cc .arduino .contributions .ProgressListener ;
36- import cc .arduino .utils .ArchiveExtractor ;
3737import cc .arduino .utils .MultiStepProgress ;
3838import processing .app .BaseNoGui ;
3939import processing .app .I18n ;
40- import processing .app .Platform ;
41- import processing .app .helpers .FileUtils ;
42-
43- import java .io .File ;
44- import java .io .IOException ;
45- import java .net .URL ;
46- import java .util .Optional ;
47-
48- import static processing .app .I18n .tr ;
40+ import processing .app .helpers .ProcessUtils ;
4941
5042public class LibraryInstaller {
5143
52- private final Platform platform ;
53-
54- public LibraryInstaller (Platform platform ) {
55- this .platform = platform ;
56- }
57-
5844 public synchronized void updateIndex (ProgressListener progressListener ) throws Exception {
5945 final MultiStepProgress progress = new MultiStepProgress (3 );
6046
61- DownloadableContributionsDownloader downloader = new DownloadableContributionsDownloader (BaseNoGui .librariesIndexer .getStagingFolder ());
62- // Step 1: Download index
63- File outputFile = BaseNoGui .librariesIndexer .getIndexFile ();
64- File tmpFile = new File (outputFile .getAbsolutePath () + ".tmp" );
65- try {
66- GZippedJsonDownloader gZippedJsonDownloader = new GZippedJsonDownloader (downloader , new URL (Constants .LIBRARY_INDEX_URL ), new URL (Constants .LIBRARY_INDEX_URL_GZ ));
67- gZippedJsonDownloader .download (tmpFile , progress , tr ("Downloading libraries index..." ), progressListener );
68- } catch (InterruptedException e ) {
69- // Download interrupted... just exit
70- return ;
71- }
47+ progress .setStatus (tr ("Updating library index" ));
7248 progress .stepDone ();
49+ progressListener .onProgress (progress );
7350
74- // TODO: Check downloaded index
75-
76- // Replace old index with the updated one
77- if (outputFile .exists ())
78- outputFile .delete ();
79- if (!tmpFile .renameTo (outputFile ))
51+ Process pr = ProcessUtils .exec (new String [] { //
52+ BaseNoGui .getArduinoCliPath (), "lib" , "update-index" });
53+ int exitCode = pr .waitFor ();
54+ if (exitCode != 0 ) {
8055 throw new Exception (tr ("An error occurred while updating libraries index!" ));
56+ }
57+ progress .stepDone ();
8158
8259 // Step 2: Parse index
8360 BaseNoGui .librariesIndexer .parseIndex ();
@@ -86,65 +63,55 @@ public synchronized void updateIndex(ProgressListener progressListener) throws E
8663 rescanLibraryIndex (progress , progressListener );
8764 }
8865
89- public synchronized void install (ContributedLibrary lib , Optional <ContributedLibrary > mayReplacedLib , ProgressListener progressListener ) throws Exception {
66+ public synchronized void install (ContributedLibrary lib , ProgressListener progressListener ) throws Exception {
67+ if (lib .isIDEBuiltIn ()) {
68+ // If the desired library is available as builtin in the IDE just remove
69+ // the other installed in sketchbook...
70+ Optional <ContributedLibrary > current = lib .getReleases ().getInstalled ();
71+ if (current .isPresent ()) {
72+ System .out .println (
73+ I18n .format (tr ("Library {0} is available as built-in in the IDE.\n Removing the other version {1} installed in the sketchbook..." ),
74+ lib .getName () + ":" + lib .getVersion (), current .get ().getVersion ()));
75+ remove (current .get (), progressListener );
76+ return ;
77+ }
78+ // ...otherwise output "library already installed"
79+ }
80+
9081 if (lib .isLibraryInstalled ()) {
91- System .out .println (I18n .format (tr ("Library is already installed: {0}:{1}" ), lib .getName (), lib .getParsedVersion ()));
82+ System .out .println (I18n .format (tr ("Library is already installed: {0}:{1}" ), lib .getName (), lib .getVersion ()));
9283 return ;
9384 }
9485
95- DownloadableContributionsDownloader downloader = new DownloadableContributionsDownloader (BaseNoGui .librariesIndexer .getStagingFolder ());
96-
9786 final MultiStepProgress progress = new MultiStepProgress (3 );
9887
9988 // Step 1: Download library
100- try {
101- downloader .download (lib , progress , I18n .format (tr ("Downloading library: {0}" ), lib .getName ()), progressListener );
102- } catch (InterruptedException e ) {
103- // Download interrupted... just exit
104- return ;
89+ String libTag = lib .getName () + "@" + lib .getVersion ();
90+ Process pr = ProcessUtils .exec (new String [] { //
91+ BaseNoGui .getArduinoCliPath (), "lib" , "install" , libTag });
92+ int exitCode = pr .waitFor ();
93+ if (exitCode != 0 ) {
94+ throw new Exception (tr ("An error occurred while installing library!" ));
10595 }
10696
107- // TODO: Extract to temporary folders and move to the final destination only
108- // once everything is successfully unpacked. If the operation fails remove
109- // all the temporary folders and abort installation.
110-
11197 // Step 2: Unpack library on the correct location
112- progress .setStatus (I18n .format (tr ("Installing library: {0}:{1}" ), lib .getName (), lib .getParsedVersion ()));
113- progressListener .onProgress (progress );
114- File libsFolder = BaseNoGui .getSketchbookLibrariesFolder ().folder ;
115- File tmpFolder = FileUtils .createTempFolder (libsFolder );
116- try {
117- new ArchiveExtractor (platform ).extract (lib .getDownloadedFile (), tmpFolder , 1 );
118- } catch (Exception e ) {
119- if (tmpFolder .exists ())
120- FileUtils .recursiveDelete (tmpFolder );
121- }
122- progress .stepDone ();
123-
124- // Step 3: Remove replaced library and move installed one to the correct location
125- // TODO: Fix progress bar...
126- if (mayReplacedLib .isPresent ()) {
127- remove (mayReplacedLib .get (), progressListener );
128- }
129- File destFolder = new File (libsFolder , lib .getName ().replaceAll (" " , "_" ));
130- tmpFolder .renameTo (destFolder );
13198 progress .stepDone ();
13299
133- // Step 4 : Rescan index
100+ // Step 3 : Rescan index
134101 rescanLibraryIndex (progress , progressListener );
135102 }
136103
137- public synchronized void remove (ContributedLibrary lib , ProgressListener progressListener ) throws IOException {
138- if (lib .isIDEBuiltIn ()) {
139- return ;
140- }
141-
104+ public synchronized void remove (ContributedLibrary lib , ProgressListener progressListener ) throws Exception {
142105 final MultiStepProgress progress = new MultiStepProgress (2 );
143106
144107 // Step 1: Remove library
145- progress .setStatus (I18n .format (tr ("Removing library: {0}:{1}" ), lib .getName (), lib .getParsedVersion ()));
146- progressListener .onProgress (progress );
147- FileUtils .recursiveDelete (lib .getInstalledLibrary ().get ().getInstalledFolder ());
108+ String libTag = lib .getName () + "@" + lib .getVersion ();
109+ Process pr = ProcessUtils .exec (new String [] { //
110+ BaseNoGui .getArduinoCliPath (), "lib" , "uninstall" , libTag });
111+ int exitCode = pr .waitFor ();
112+ if (exitCode != 0 ) {
113+ throw new Exception (tr ("An error occurred while uninstalling library!" ));
114+ }
148115 progress .stepDone ();
149116
150117 // Step 2: Rescan index
@@ -157,4 +124,11 @@ private void rescanLibraryIndex(MultiStepProgress progress, ProgressListener pro
157124 BaseNoGui .librariesIndexer .rescanLibraries ();
158125 progress .stepDone ();
159126 }
127+
128+ // TODO: legacy messages already translated, keeping here until reused
129+ static {
130+ I18n .format (tr ("Downloading library: {0}" ), "libname" );
131+ I18n .format (tr ("Installing library: {0}:{1}" ), "libname" , "libversion" );
132+ I18n .format (tr ("Removing library: {0}:{1}" ), "libname" , "libversion" );
133+ }
160134}
0 commit comments