Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reset all sessions (in occ command and on upgrade) #5887

Merged
merged 2 commits into from
Jun 12, 2024
Merged

Reset all sessions (in occ command and on upgrade) #5887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14aaa24
feat(reset): Add `--all` option to `text:reset` occ command
mejo- Jun 11, 2024
5c021c7
fix(reset): Reset all document sessions on upgrades from 4.0.0 or below
mejo- Jun 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 39 additions & 17 deletions lib/Command/ResetDocument.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

namespace OCA\Text\Command;

use OCA\Text\Db\Document;
use OCA\Text\Exception\DocumentHasUnsavedChangesException;
use OCA\Text\Service\DocumentService;
use Symfony\Component\Console\Command\Command;
Expand All @@ -44,9 +45,15 @@ protected function configure(): void {
->setDescription('Reset a text document session to the current file content')
->addArgument(
'file-id',
InputArgument::REQUIRED,
InputArgument::OPTIONAL,
'File id of the document to reset'
)
->addOption(
'all',
'a',
null,
'Reset all document sessions'
)
->addOption(
'force',
'f',
Expand All @@ -56,30 +63,45 @@ protected function configure(): void {
;
}

/**
* @param InputInterface $input
* @param OutputInterface $output
* @return int
*/
protected function execute(InputInterface $input, OutputInterface $output): int {
$fileId = $input->getArgument('file-id');
$all = $input->getOption('all');
$fullReset = $input->getOption('force');

if ($fullReset) {
$output->writeln('Force-reset the document session for file ' . $fileId);
$this->documentService->resetDocument($fileId, true);
if (!$fileId && !$all) {
$output->writeln('<error>Either --all option or file-id argument is required.</error>');
return 1;
}
if ($fileId && $all) {
$output->writeln('<error>The --all option and file id argument are exclusionary.</error>');
return 1;
}

return 0;
if ($all) {
$fileIds = array_map(static function (Document $document) {
return $document->getId();
}, $this->documentService->getAll());
} else {
$fileIds = [$fileId];
}

$output->writeln('Reset the document session for file ' . $fileId);
try {
$this->documentService->resetDocument($fileId);
} catch (DocumentHasUnsavedChangesException) {
$output->writeln('Not resetting due to unsaved changes');
return 1;
$rc = 0;
foreach ($fileIds as $id) {
if ($fullReset) {
$output->writeln('Force-reset the document session for file ' . $id);
$this->documentService->resetDocument($id, true);
mejo- marked this conversation as resolved.
Show resolved Hide resolved
continue;
}

$output->writeln('Reset the document session for file ' . $id);
try {
$this->documentService->resetDocument($id);
} catch (DocumentHasUnsavedChangesException) {
$output->writeln('Not resetting due to unsaved changes');
$rc = 1;
}
}

return 0;
return $rc;
}
}
39 changes: 14 additions & 25 deletions lib/Migration/ResetSessionsBeforeYjs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,43 @@

namespace OCA\Text\Migration;

use OCA\Text\Db\SessionMapper;
use OCA\Text\Db\Document;
use OCA\Text\Service\DocumentService;
use OCP\IAppConfig;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;

class ResetSessionsBeforeYjs implements IRepairStep {
private IAppConfig $config;
private SessionMapper $sessionMapper;
private DocumentService $documentService;

public function __construct(IAppConfig $config,
SessionMapper $sessionMapper,
DocumentService $documentService) {
$this->config = $config;
$this->sessionMapper = $sessionMapper;
$this->documentService = $documentService;
public function __construct(private IAppConfig $config,
private DocumentService $documentService) {
}

/**
* @return string
*/
public function getName(): string {
return 'Force-reset all Text sessions before Yjs migration';
return 'Force-reset all Text document sessions';
}

/**
* @param IOutput $output
*
* @return void
*/
public function run(IOutput $output): void {
$appVersion = $this->config->getValueString('text', 'installed_version');

if (!$appVersion || version_compare($appVersion, '3.7.2') !== -1) {
if (!$appVersion || version_compare($appVersion, '4.0.1') !== -1) {
return;
}

$sessions = $this->sessionMapper->findAllDocuments();
if (!$sessions) {
$fileIds = array_map(static function (Document $document) {
return $document->getId();
}, $this->documentService->getAll());

if (!$fileIds) {
return;
}

$output->startProgress(count($sessions));
foreach ($sessions as $session) {
$documentId = $session->getDocumentId();
$this->documentService->unlock($documentId);
$this->documentService->resetDocument($documentId, true);
$output->startProgress(count($fileIds));
foreach ($fileIds as $fileId) {
$this->documentService->unlock($fileId);
$this->documentService->resetDocument($fileId, true);
$output->advance();
}
$output->finishProgress();
Expand Down
Loading