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.

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

Spelling #9044

Open
wants to merge 147 commits into
base: master
Choose a base branch
from
Open

Spelling #9044

wants to merge 147 commits into from

Conversation

jsoref
Copy link

@jsoref jsoref commented Sep 17, 2021

This PR corrects misspellings identified by the check-spelling action.

The misspellings have been reported at jsoref@d234b5c#commitcomment-56639815

The action reports that the changes in this PR would make it happy: jsoref@dc7338c

Note: this PR does not include the action. If you're interested in running a spell check on every PR and push, that can be offered separately.

@CLAassistant
Copy link

CLAassistant commented Sep 17, 2021

CLA assistant check
All committers have signed the CLA.

@TheOneRing
Copy link
Member

Woa sounds great and I'd love a spell checker action.
I will need some time to check those.
Note: Some of the files where auto generated to fixing the spelling in the changelog.md for example doesn't make much sense.
I also saw some unrelated code style changes?

Copy link
Author

@jsoref jsoref left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This correction pass was almost entirely made by Google Sheets.

I sometimes look for non-existent variants and similar, but didn't here.

I'm happy to make fixes (but probably won't have time for a while).

CHANGELOG.md Outdated Show resolved Hide resolved
# Dimensions taken from https://www.apriorit.com/dev-blog/357-shell-extentions-basics-samples-common-problems#_Toc408244375
# Dimensions taken from https://www.apriorit.com/dev-blog/357-shell-extensions-basics-samples-common-problems#_Toc408244375
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment on lines +20 to +27
#include <QDir>
#include <QElapsedTimer>
#include <QFile>
#include <QLoggingCategory>
#include <QStringList>
#include <QElapsedTimer>
#include <QUrl>
#include <QDir>
#include <sqlite3.h>
#include <cstring>
#include <sqlite3.h>
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This reordering is done in a distinct commit before my work because my work tripped on a linter. I think that I've included enough to prevent this from happening to the next hapless contributor, but I'd encourage someone to check.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TheOneRing re #9044 (comment) this is:
jsoref@51b6bb7

I'd encourage you to merge that commit outside of this PR, since it really doesn't belong, but the linter failed and it was way too messy for me to handle it any other way here. -- And the only way to show it mattered was to compose this PR.

@@ -831,7 +833,7 @@ bool SyncJournalDb::updateErrorBlacklistTableStructure()
SqlQuery query(_db);
query.prepare("CREATE INDEX IF NOT EXISTS blacklist_index ON blacklist(path collate nocase);");
if (!query.exec()) {
sqlFail(QStringLiteral("updateErrorBlacklistTableStructure: create index blacklit"), query);
sqlFail(QStringLiteral("updateErrorBlacklistTableStructure: create index blacklist"), query);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: I'm only running a spell checker. Modern practices discourage the use of this term entirely, and that's far beyond the scope of this PR.

(If you adopt a spell checker, you could add this word to a reject list to prevent people from using it going forward...)

@@ -213,11 +213,11 @@ class OCSYNC_EXPORT SyncJournalDb : public QObject
* This usually creates some temporary files next to the db file, like
* $dbfile-shm or $dbfile-wal.
*
* returns true if it could be openend or is currently opened.
* returns true if it could be opened or is currently opened.
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a purely spell-checking oriented PR. Grammatically, I'd probably write is currently or could be opened.

@@ -252,7 +252,7 @@ private slots:
QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fingerprintRequests, 2);
auto currentState = fakeFolder.currentLocalState();
// Altough the local file is kept as a conflict, the server file is downloaded
// Although the local file is kept as a conflict, the server file is downloaded
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although


QVERIFY(fakeFolder.syncOnce());
QCOMPARE(fakeFolder.currentLocalState(), FileInfo{}); // all files should be one localy
QCOMPARE(fakeFolder.currentLocalState(), FileInfo {}); // all files should be one locally
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

locally

test/testcookies.cpp Outdated Show resolved Hide resolved
Comment on lines -126 to +130
void serverMaintenence() {
void serverMaintenance()
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

serverMaintenance

test/testexcludedfiles.cpp Outdated Show resolved Hide resolved
@jsoref
Copy link
Author

jsoref commented Sep 17, 2021

Fwiw, this is what I used to ignore files:
https://github.com/jsoref/owncloud-client/blob/spell-check/.github/actions/spelling/excludes.txt

Files that were ignored weren't checked for typos, and as long as I didn't make any mistakes, ignored files weren't changed either (beyond the linter changes which are really an entirely unrelated kettle of fish).

I specifically ignored ^changelog/[^/]*_ for this repository (but not some of the others), this may have been the wrong choice. It isn't terribly hard for me to unignore items, either. The spell checker uses fairly naive heuristics to suggest exclusions, and I generalize based on my experience w/ things, but I'm human and the spell-checker was written by me, so both stages can make mistakes.

If you can identify other files you don't want changed, it's trivial for me to add them to excludes and to drop their changes from this PR (or its relatives for the other owncloud repositories).

If there's an upstream for typos, feel free to identify them, I have an imaginary queue of things to check, and will happily add items to the queue, although I make no promises about when i'll get to items in it 😺.

@github-actions github-actions bot added the Stale label Mar 20, 2022
@github-actions github-actions bot closed this Mar 27, 2022
@TheOneRing TheOneRing removed the Stale label Mar 27, 2022
@TheOneRing TheOneRing reopened this Mar 27, 2022
@jsoref jsoref force-pushed the spelling branch 2 times, most recently from f4abd2c to 4a818de Compare March 27, 2022 21:56
Copy link
Author

@jsoref jsoref left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the risk of losing GitHub's fancy review features, you can use:
6cf9783...4a818de to confirm that the only commit that's changing style is 6cf9783 -- it's necessary because the linter screams at me if I don't do it (as noted earlier).

Note: the repository has lots of files that would fail the linter, it's really an obstacle for drive-by-contributions. If this were my project, I'd apply the linter to all files at once so that any new change wouldn't be forced to deal w/ files that aren't linter-stable.

Bugfix: Client warns about non exisitng files
Bugfix: Client warns about nonexistent files
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is listed as unreleased, does that mean I can still change it? Or should I exclude this folder as well?

version 0.91.4 (released 2013-12-12, ownCloud Cleint 1.5.0)
version 0.91.4 (released 2013-12-12, ownCloud Client 1.5.0)
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should I exclude this file / this folder?

Write-Host "update_corlor.ps1 `"#B5B6BB`""
Write-Host "update_color.ps1 `"#B5B6BB`""
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes the output match the filename...

// If the local virtual file file is removed, it'll just be recreated
// If the local virtual file is removed, it'll just be recreated
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've recently added some code to detect word duplication. I can certainly suppress it if it's annoying, but on average it's pretty accurate (and a handful of additional patterns are sufficient to cover the edge cases where it's wrong).

Comment on lines -487 to +488
rm.insert("changeonly/sub1/filetorname1a");
rm.insert("changeonly/sub1/filetorname1z");
rm.insert("changeonly/sub1/filetorename1a");
rm.insert("changeonly/sub1/filetorename1z");
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't see any particular reason to omit the e from rename

void testDataFingetPrint_data()
void testDataFingerPrint_data()
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

finger

@@ -2,7 +2,7 @@ Feature: Visually check all tabs

As a user
I want to visually check all tabs in client
So that I can performe all the actions related to client
So that I can perform all the actions related to client


Scenario: Tabs in toolbar looks correct
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The folder below is gaining an e in delete:

TEST_CASES=tst_addAccount tst_sharing tst_syncing tst_loginLogout tst_removeAccountConnection tst_checkAlltabs tst_vfs tst_deletFilesFolders tst_editFiles
TEST_CASES=tst_addAccount tst_sharing tst_syncing tst_loginLogout tst_removeAccountConnection tst_checkAlltabs tst_vfs tst_deleteFilesFolders tst_editFiles
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test case is gaining an e in delete (see renames below)

* reimplementable for legacy reasons.
* overridable for legacy reasons.
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Notable

// this defines which handler has prededence, so
// we order this in terms of likelyhood
// this defines which handler has precedence, so
// we order this in terms of likelihood
switch (_state) {
case State_OK:
*pPriority = 0; break;
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The below file is being renamed from deprACtion to depreCAtion:

@github-actions github-actions bot added the Stale label Apr 27, 2022
@github-actions github-actions bot closed this May 5, 2022
@TheOneRing TheOneRing reopened this May 5, 2022
@TheOneRing TheOneRing removed the Stale label May 5, 2022
@TheOneRing TheOneRing added this to the 2.12 milestone May 5, 2022
jsoref added 13 commits May 12, 2022 00:44
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
jsoref added 27 commits May 12, 2022 00:47
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
@ownclouders
Copy link
Contributor

Results for GUI-tests https://drone.owncloud.com/owncloud/client/11728/6/1

💥 The GUI tests failed.

GUI Logs: https://cache.owncloud.com/public/owncloud/client/11728/guiReportUpload/index.html

Server Logs: https://cache.owncloud.com/public/owncloud/client/11728/guiReportUpload/serverlog.log

Screenshots:

@TheOneRing TheOneRing removed this from the Desktop Client 4.0 milestone Apr 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants