save
This commit is contained in:
		
							parent
							
								
									c360450e62
								
							
						
					
					
						commit
						560b20d20c
					
				
					 3 changed files with 16 additions and 1 deletions
				
			
		|  | @ -130,6 +130,7 @@ | ||||||
| #define LOGSEC_JS                   "javascript: " | #define LOGSEC_JS                   "javascript: " | ||||||
| #define LOGSEC_GUI                  "gui: " | #define LOGSEC_GUI                  "gui: " | ||||||
| #define LOGSEC_CORE                 "core: " | #define LOGSEC_CORE                 "core: " | ||||||
|  | #define LOGSEC_NODEJS               "nodejs: " | ||||||
| #define LOGSEC_DB                   "database: " | #define LOGSEC_DB                   "database: " | ||||||
| #define LOGSEC_NEXTCLOUD            "nextcloud: " | #define LOGSEC_NEXTCLOUD            "nextcloud: " | ||||||
| #define LOGSEC_GREADER              "greader: " | #define LOGSEC_GREADER              "greader: " | ||||||
|  |  | ||||||
|  | @ -3,6 +3,7 @@ | ||||||
| #include "miscellaneous/nodejs.h" | #include "miscellaneous/nodejs.h" | ||||||
| 
 | 
 | ||||||
| #include "exceptions/applicationexception.h" | #include "exceptions/applicationexception.h" | ||||||
|  | #include "miscellaneous/application.h" | ||||||
| #include "miscellaneous/iofactory.h" | #include "miscellaneous/iofactory.h" | ||||||
| #include "miscellaneous/settings.h" | #include "miscellaneous/settings.h" | ||||||
| 
 | 
 | ||||||
|  | @ -27,7 +28,19 @@ void NodeJs::setNpmExecutable(const QString& exe) const { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| QString NodeJs::packageFolder() const { | QString NodeJs::packageFolder() const { | ||||||
|   return QDir::toNativeSeparators(m_settings->value(GROUP(Node), SETTING(Node::PackageFolder)).toString()); |   QString path = QDir::toNativeSeparators(m_settings->value(GROUP(Node), SETTING(Node::PackageFolder)).toString()); | ||||||
|  | 
 | ||||||
|  |   return path; | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | QString NodeJs::processedPackageFolder() const { | ||||||
|  |   QString path = qApp->replaceDataUserDataFolderPlaceholder(packageFolder()); | ||||||
|  | 
 | ||||||
|  |   if (!QDir().mkpath(path)) { | ||||||
|  |     qCriticalNN << LOGSEC_NODEJS << "Failed to create package folder structure" << QUOTE_W_SPACE_DOT(path); | ||||||
|  |   } | ||||||
|  | 
 | ||||||
|  |   return path; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| void NodeJs::setPackageFolder(const QString& path) {} | void NodeJs::setPackageFolder(const QString& path) {} | ||||||
|  |  | ||||||
|  | @ -20,6 +20,7 @@ class NodeJs : public QObject { | ||||||
|     void setNpmExecutable(const QString& exe) const; |     void setNpmExecutable(const QString& exe) const; | ||||||
| 
 | 
 | ||||||
|     QString packageFolder() const; |     QString packageFolder() const; | ||||||
|  |     QString processedPackageFolder() const; | ||||||
|     void setPackageFolder(const QString& path); |     void setPackageFolder(const QString& path); | ||||||
| 
 | 
 | ||||||
|     QString nodejsVersion(const QString& nodejs_exe) const; |     QString nodejsVersion(const QString& nodejs_exe) const; | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue