Dev changes

andrey18106 · andrey18106 · commit 5a86d4aedecb · 2022-12-09T21:29:46.000+02:00
diff --git a/.gitattributes b/.gitattributes
@@ -4,7 +4,6 @@
 # Denote all files that are truly binary and should not be modified
 js/* binary
 screenshots/* binary
-lib/Proto/* binary
 lib/TProto/* binary
 img/* binary
 
diff --git a/.l10nignore b/.l10nignore
@@ -1,2 +1,3 @@
 js/
 vendor/
+3rdparty/
diff --git a/.nextcloudignore b/.nextcloudignore
@@ -1,31 +1,39 @@
 .git
 .github
+.tx
+.vscode
+/build
 /node_modules
 /screenshots
 /src
 tests
+/vendor
 /.eslintrc.js
 /.gitattributes
 /.gitignore
 /.l10nignore
 /.nextcloudignore
-/.pgp_cs.dist
-/.pylintrc
+/.php-cs-fixer.dist.php
+.pre-commit-config.yaml
 /babel.config.js
+/CODE_OF_CONDUCT.md
 /composer.json
 /composer.lock
-/krankerl.toml
+/jest.config.js
 /Makefile
+/MANIFEST.in
 /package-lock.json
 /package.json
 /postcss.config.js
 /psalm.xml
+/pyproject.toml
+/setup.cfg
+/setup.py
 /stylelint.config.js
-/webpack.*
+/webpack.config.js
+
 /docs
 /nc_py_api
 /proto
 /tmp
 .readthedocs.yaml
-pyproject.toml
-/pyfrm/_srv_example.py
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -17,6 +17,7 @@ Nextcloud Python API Framework
 	<documentation>
 		<admin>https://github.com/cloud_py_api/cloud_py_api/wiki</admin>
 	</documentation>
+	<category>integration</category>
 	<category>tools</category>
 	<website>https://github.com/cloud_py_api/cloud_py_api</website>
 	<bugs>https://github.com/cloud_py_api/cloud_py_api/issues</bugs>
@@ -29,9 +30,6 @@ Nextcloud Python API Framework
 		<install>
 			<step>OCA\Cloud_Py_API\Migration\AppDataInitializationStep</step>
 		</install>
-		<pre-migration>
-			<step>OCA\Cloud_Py_API\Migration\AppUpdateStep</step>
-		</pre-migration>
 	</repair-steps>
 	<commands>
 		<command>OCA\Cloud_Py_API\Command\GetFileContentsCommand</command>
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -30,6 +30,10 @@
 	'routes' => [
 		// SETTINGS API
 		['name' => 'settings#index', 'url' => '/api/v1/settings', 'verb' => 'GET'],
-		['name' => 'settings#systemInfo', 'url' => '/api/v1/system-info', 'verb' => 'GET'],
+		['name' => 'settings#update', 'url' => '/api/v1/settings', 'verb' => 'PUT'],
+		['name' => 'settings#getSettingById', 'url' => '/api/v1/settings/{id}', 'verb' => 'GET'],
+		['name' => 'settings#getSettingByName', 'url' => '/api/v1/settings/name/{name}', 'verb' => 'GET'],
+		['name' => 'settings#updateSetting', 'url' => '/api/v1/settings/name/{name}', 'verb' => 'PUT'],
+		['name' => 'settings#systemInfo', 'url' => '/api/v1/system-info', 'verb' => 'GET']
 	]
 ];
diff --git a/js/cloud_py_api-main.js b/js/cloud_py_api-main.js
diff --git a/js/cloud_py_api-main.js.LICENSE.txt b/js/cloud_py_api-main.js.LICENSE.txt
@@ -24,6 +24,8 @@
  * @license MIT
  */
 
+/*! For license information please see NcCheckboxRadioSwitch.js.LICENSE.txt */
+
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
diff --git a/js/cloud_py_api-main.js.map b/js/cloud_py_api-main.js.map
diff --git a/lib/Migration/data/AppInitialData.php b/lib/Migration/data/AppInitialData.php
@@ -41,6 +41,13 @@ class AppInitialData {
 				"description" => "Absolute path to the python runnable (e.g. \"/usr/bin/python3\"). Can be obtained by `which python3` command.",
 				"helpUrl" => "https://cloud-py-api.readthedocs.io/{todo-url:/settings/setting_name}"
 			],
+			[
+				"name" => "remote_filesize_limit",
+				"value" => 536870912,
+				"displayName" => "Remote/Encrypted file size limit to process",
+				"description" => "Maximum file size for requesting from php core. Used when file hosts on remote NC instance or have encrypted flag. Must be less then total available RAM size.",
+				"helpUrl" => "https://cloud-py-api.readthedocs.io/{todo-url:/settings/setting_name}"
+			],
 			[
 				"name" => "use_php_path_from_settings",
 				"value" => false,
@@ -73,6 +80,8 @@ private function _stringsForL10N(): void {
 		// TRANSLATORS Admin settings strings for localization (Eng versions stored in the database and translated on front-end)
 		$this->l10n->t("Full path to python interpreter");
 		$this->l10n->t("Absolute path to the python runnable (e.g. \"/usr/bin/python3\"). Can be obtained by `which python3` command.");
+		$this->l10n->t("Remote/Encrypted file size limit to process");
+		$this->l10n->t("Maximum file size for requesting from php core. Used when file hosts on remote NC instance or have encrypted flag. Must be less then total available RAM size.");
 		$this->l10n->t("Use path to PHP interpreter for Python from settings");
 		$this->l10n->t("Determine whether to use path from settings or detect it automatically (may not work with some unusual PHP install locations). Used in Python part.");
 		$this->l10n->t("Full path to PHP interpreter for Python");
diff --git a/lib/Service/UtilsService.php b/lib/Service/UtilsService.php
@@ -268,7 +268,8 @@ private function checkForNewSettings(array $app_data, array $settings): void {
 						json_encode($setting['value'])
 						: str_replace('\\', '', json_encode($setting['value'])),
 					'displayName' => $setting['displayName'],
-					'description' => $setting['description']
+					'description' => $setting['description'],
+					'helpUrl' => $setting['helpUrl']
 				]));
 			}
 		}
diff --git a/proto/thrift/fs.thrift b/proto/thrift/fs.thrift
@@ -43,7 +43,7 @@ struct FsGetInfoRequest {
 }
 
 struct FsNodeInfo {
-    1: fsId fileId,
+    1: i64 fileId,
     2: bool is_dir,
     3: bool is_local,
     4: string mimetype,
@@ -57,7 +57,7 @@ struct FsNodeInfo {
     12: bool encrypted,
     13: string etag,
     14: string ownerName,
-    15: string storageId,
+    15: i64 storageId,
     16: i64 mountId
 }
 
diff --git a/src/components/settings/AdminSettings.vue b/src/components/settings/AdminSettings.vue
@@ -29,23 +29,50 @@
 				{{ t('cloud_py_api', 'Cloud Python API (Framework)') }}
 			</h2>
 		</div>
-		<div v-if="settings.length > 0">
-			<NcSettingsSection v-for="setting of settings"
-				:key="setting.id"
-				:title="t('cloud_py_api', setting.name)"
-				:description="t('cloud_py_api', setting.description)">
-				<p>
-					{{ t('cloud_py_api', 'Display name: ') }}
-					{{ t('cloud_py_api', setting.display_name) }}
-				</p>
-				<p>
-					{{ t('cloud_py_api', 'Value: ') }}
-					{{ t('cloud_py_api', setting.value) }}
-				</p>
-				<p>
-					{{ t('cloud_py_api', 'Help url: ') }}
-					{{ setting.help_url }}
-				</p>
+		<div v-if="settings.length > 0" class="settings">
+			<NcSettingsSection :title="t('cloud_py_api', mappedSettings.python_command.display_name)"
+				:description="t('cloud_py_api', mappedSettings.python_command.description)"
+				:doc-url="mappedSettings.python_command.help_url">
+				<input id="python_command"
+					v-model="mappedSettings.python_command.value"
+					type="text"
+					name="python_command"
+					@change="saveChanges">
+			</NcSettingsSection>
+			<NcSettingsSection :title="t('cloud_py_api', mappedSettings.remote_filesize_limit.display_name)"
+				:description="t('cloud_py_api', mappedSettings.remote_filesize_limit.description)"
+				:doc-url="mappedSettings.remote_filesize_limit.help_url">
+				<input id="remote_filesize_limit"
+					v-model="remote_filesize_limit"
+					type="number"
+					name="remote_filesize_limit"
+					min="0"
+					step="0.1"
+					@input="updateRemoteFilesizeLimit"
+					@change="saveChanges">
+			</NcSettingsSection>
+			<NcSettingsSection :title="t('cloud_py_api', mappedSettings.use_php_path_from_settings.display_name)"
+				:description="t('cloud_py_api', mappedSettings.use_php_path_from_settings.description)"
+				:doc-url="mappedSettings.use_php_path_from_settings.help_url">
+				<NcCheckboxRadioSwitch :checked.sync="usePhpPathFromSettings" @update:checked="updateUsePhpPathFromSettings">
+					{{ t('cloud_py_api', 'Use PHP path from settings') }}
+				</NcCheckboxRadioSwitch>
+			</NcSettingsSection>
+			<NcSettingsSection :title="t('cloud_py_api', mappedSettings.php_path.display_name)"
+				:description="t('cloud_py_api', mappedSettings.php_path.description)"
+				:doc-url="mappedSettings.php_path.help_url">
+				<input id="php_path"
+					v-model="mappedSettings.php_path.value"
+					type="text"
+					name="php_path"
+					@change="saveChanges">
+			</NcSettingsSection>
+			<NcSettingsSection :title="t('cloud_py_api', mappedSettings.python_binary.display_name)"
+				:description="t('cloud_py_api', mappedSettings.python_binary.description)"
+				:doc-url="mappedSettings.python_binary.help_url">
+				<NcCheckboxRadioSwitch :checked.sync="python_binary" @update:checked="updatePythonBinary">
+					{{ t('cloud_py_api', 'Use pre-compiled Python binaries') }}
+				</NcCheckboxRadioSwitch>
 			</NcSettingsSection>
 		</div>
 		<NcSettingsSection :title="t('cloud_py_api', 'Bug report')">
@@ -55,27 +82,65 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex'
+import { mapActions } from 'vuex'
+import { showError } from '@nextcloud/dialogs'
 import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection.js'
+import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 
 import BugReport from './BugReport.vue'
 
 export default {
 	name: 'AdminSettings',
 	components: {
 		NcSettingsSection,
+		NcCheckboxRadioSwitch,
 		BugReport,
 	},
-	computed: {
-		...mapGetters([
-			'settings',
-		]),
+	data() {
+		return {
+			settings: [],
+			mappedSettings: {},
+			remote_filesize_limit: null,
+			usePhpPathFromSettings: false,
+			python_binary: true,
+		}
 	},
 	beforeMount() {
-		this.getSettings()
+		this.getSettings().then((res) => {
+			this.settings = res.data
+			this.settings.forEach(setting => {
+				this.mappedSettings[setting.name] = setting
+			})
+			this.remote_filesize_limit = this.fromBytesToGBytes(Number(this.mappedSettings.remote_filesize_limit.value))
+			this.usePhpPathFromSettings = JSON.parse(this.mappedSettings.use_php_path_from_settings.value)
+			this.python_binary = JSON.parse(this.mappedSettings.python_binary.value)
+		})
 	},
 	methods: {
-		...mapActions(['getSettings']),
+		...mapActions(['getSettings', 'updateSettings']),
+		saveChanges() {
+			this.updateSettings(this.settings).catch(err => {
+				console.debug(err)
+				showError(this.t('cloud_py_api', 'Some error occurred while updating settings'))
+			})
+		},
+		fromBytesToGBytes(bytes) {
+			return bytes / Math.pow(1024, 3)
+		},
+		fromGBytesToBytes(GBytes) {
+			return GBytes * Math.pow(1024, 3)
+		},
+		updateRemoteFilesizeLimit() {
+			this.mappedSettings.remote_filesize_limit.value = this.fromGBytesToBytes(Number(this.remote_filesize_limit))
+		},
+		updateUsePhpPathFromSettings() {
+			this.mappedSettings.use_php_path_from_settings.value = JSON.stringify(this.usePhpPathFromSettings)
+			this.saveChanges()
+		},
+		updatePythonBinary() {
+			this.mappedSettings.python_binary.value = JSON.stringify(this.python_binary)
+			this.saveChanges()
+		},
 	},
 }
 </script>
diff --git a/src/store/settings.js b/src/store/settings.js
@@ -100,11 +100,27 @@ const actions = {
 	async getSettings({ commit }) {
 		return axios.get(generateUrl('/apps/cloud_py_api/api/v1/settings')).then(res => {
 			commit('setSettings', res.data)
-			return res.data
+			return res
 		}).catch(err => {
 			console.debug(err)
 		})
 	},
+
+	/**
+	 * Update and commit list of settings
+	 *
+	 * @param {object} context the store object
+	 * @param {Array} settings list of settings
+	 * @return {Promise<object>}
+	 */
+	async updateSettings(context, settings) {
+		return axios.put(generateUrl('/apps/cloud_py_api/api/v1/settings'), { settings }).then(res => {
+			if (res.data.success) {
+				context.commit('setSettings', res.data.updated_settings)
+			}
+			return res
+		})
+	},
 }
 
 export default { state, mutations, getters, actions }

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,8 @@ private function checkForNewSettings(array $app_data, array $settings): void {`
`268`	`268`	`json_encode($setting['value'])`
`269`	`269`	`: str_replace('\\', '', json_encode($setting['value'])),`
`270`	`270`	`'displayName' => $setting['displayName'],`
`271`		`- 'description' => $setting['description']`
	`271`	`+ 'description' => $setting['description'],`
	`272`	`+ 'helpUrl' => $setting['helpUrl']`
`272`	`273`	`]));`
`273`	`274`	`}`
`274`	`275`	`}`