Launch `Add new repository` when `Add existing repository` fails/is not initialized. #1816

SAMAD101 · 2023-09-09T13:02:15Z

Description

The Add new window window will automatically pop up when an existing repository fails/is not initialized.
#1799

Motivation and Context

This will reduce confusion in adding new and adding existing repositories. Will fill some entries automatically when the add new repository window is opened through this route.

How Has This Been Tested?

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

I have read the CONTRIBUTING guide.
My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have added tests to cover my changes.
All new and existing tests passed.

I provide my contribution under the terms of the license of this repository and I affirm the Developer Certificate of Origin.

…epo in case the addition of an existing one fails/its not initialized

SAMAD101 · 2023-09-09T13:12:11Z

This PR is not complete yet. The problems I'm facing right now are:

When the add new window comes up through this route, the entries are filled, but when clicked on Add, the URL appears to be invalid. You have to reselect the repo (which is to be initialized)
Even if added, the window appears to have no current_profile.id
(src/vorta/store/models.py/BackupProfileMixin)

 return BackupProfileModel.get(id=self.window().current_profile.id)

I was wondering why this is happening?

real-yfprojects

You already did very well implementing this although I would suggest a little bit of restructuring.

Implement a from_values method for the repo winows.
Use a QMessageBox to inform the user about the failure and ask them whether they want to create a new repository instead.
When the user confirms, call a method on RepoTab that opens AddRepoWindow using the from_values method.

This will make the user experience more clear and the code more modular.

real-yfprojects · 2023-09-12T09:24:10Z

When the add new window comes up through this route, the entries are filled, but when clicked on Add, the URL appears to be invalid. You have to reselect the repo (which is to be initialized)

This due to the is_remote_repo attribute. It is checked here:

vorta/src/vorta/views/repo_add_dialog.py

Lines 105 to 107 in 55ede38

    
           if self.is_remote_repo and not re.match(r'.+:.+', self.values['repo_url']): 
        
               self._set_status(self.tr('Please enter a valid repo URL or select a local path.')) 
        
               return False

When using the file selector it is set to False:

vorta/src/vorta/views/repo_add_dialog.py

Line 72 in 55ede38

self.is_remote_repo = False

SAMAD101 · 2023-09-12T18:32:20Z

You already did very well implementing this although I would suggest a little bit of restructuring.
1. Implement a `from_values` method for  the repo winows.

2. Use a `QMessageBox` to inform the user about the failure and ask them whether they want to create a new repository instead.

3. When the user confirms, call a method on `RepoTab` that opens `AddRepoWindow` using the `from_values` method.
This will make the user experience more clear and the code more modular.

I've added the QMessageBox. I don't quite understand what you mean by the from_values method of RepoTab.
I've also tried launching the AddRepoWindow by using the new_repo() method of RepoTab, but the problem I faced was that importing RepoTab was giving this error:

from vorta.views.repo_tab import RepoTab

ImportError: cannot import name 'RepoTab' from partially initialized module 'vorta.views.repo_tab' (most likely due to a circular import) (/home/sam/Codes/vorta/src/vorta/views/repo_tab.py)

real-yfprojects · 2023-09-14T09:17:06Z

You already did very well implementing this although I would suggest a little bit of restructuring.
1. Implement a `from_values` method for  the repo winows.

2. Use a `QMessageBox` to inform the user about the failure and ask them whether they want to create a new repository instead.

3. When the user confirms, call a method on `RepoTab` that opens `AddRepoWindow` using the `from_values` method.
This will make the user experience more clear and the code more modular.
I've added the QMessageBox. I don't quite understand what you mean by the from_values method of RepoTab. I've also tried launching the AddRepoWindow by using the new_repo() method of RepoTab, but the problem I faced was that importing RepoTab was giving this error:
from vorta.views.repo_tab import RepoTab

ImportError: cannot import name 'RepoTab' from partially initialized module 'vorta.views.repo_tab' (most likely due to a circular import) (/home/sam/Codes/vorta/src/vorta/views/repo_tab.py)

If you only import vorta.views.repo_tab and reference the class later through repo_tab.RepoTab it works. However you shouldn't need to use the RepoTab class inside repo_add_dialog.py.

The add dialogs already have a values method returning all relevant data entered in the dialog. It would make sense to add a (possibly static) from_values method expecting those values. The from_values method would then initialize the dialog with the values provided.

real-yfprojects · 2023-09-14T09:18:42Z

src/vorta/views/repo_add_dialog.py

+            self.exception_handler()
+
+    def exception_handler(self):
+        exception_window = QMessageBox.question(


Wouldn't answer be a better name for this variable?

…ting setting of values from the values method

SAMAD101 · 2023-09-15T13:38:03Z

@real-yfprojects I've implemented the setting of values from the values method. However, for some reason, the repo addition is still failing for some reason.
Its just saying Unable to add your repository. Just have to fix this now.

…ting setting of values from the values method

SAMAD101 · 2023-09-19T12:47:16Z

@real-yfprojects I've made the necessary changes.

This improves the code that open the `AddRepoWindow` when one tries to add an existing repo although it doesn't exist. * src/vorta/views/repo_add_dialog.py

This allows accessing `msgid` from `ExistingRepoWindow`. * src/vorta/application.py * src/vorta/borg/borg_job.py * src/vorta/views/repo_add_dialog.py * tests/unit/test_repo.py

SAMAD101 · 2023-10-20T17:04:52Z

wow, that simplifies a lot of things, the 'confirm password' field is not auto-filled. And, the repo is still unable to be added for some reason.

real-yfprojects · 2023-10-20T17:40:20Z

the 'confirm password' field is not auto-filled

I implemented that on purpose.

he repo is still unable to be added for some reason

You are right. Fixed that in the following commit.

Now when the `AddRepoWindow` with the values from `ExistingRepoWindow` the `is_remote_repo` attribute will be restored, preventing an error message when trying to add the repository. * src/vorta/views/repo_add_dialog.py

m3nu · 2023-10-20T19:13:51Z

Looks like all macOS tests are timing out on Github today. Likely unrelated to this PR, seeing it elsewhere too.

real-yfprojects · 2023-11-23T20:52:23Z

@m3nu ping

m3nu · 2024-01-10T11:20:34Z

This is what I get when adding an empty repo as existing repo. There is no change in dialog.

SAMAD101 · 2024-01-11T11:26:31Z

This is what I get when adding an empty repo as existing repo. There is no change in dialog.

@m3nu Works fine on mine. When you try to add an empty directory which is not a repository already. It will simply ask you to make it into one. Maybe, you're not running the same branch issue1799.
Here's a video:

untitled.mp4

m3nu · 2024-01-11T11:29:05Z

I tried with a remote repo. Maybe that's the reason?

Should it also work for an empty remote repo?

SAMAD101 · 2024-01-12T06:06:53Z

I tried with a remote repo. Maybe that's the reason?

Should it also work for an empty remote repo?

that's odd, the from_values function should deal with (empty) remote repos too. Lemme check once again, will fix this behavior soon

SAMAD101 · 2024-01-13T10:59:08Z

src/vorta/views/repo_add_dialog.py

+                if 'msgid' in error and error['msgid'] in ['Repository.DoesNotExist', 'Repository.InvalidRepository']:
+                    self.init_new_repo()
+                    break


@real-yfprojects need some help here.
It seems like this condition is not turning True in case of uninitiated (empty) remote repos, while it is working fine for local repos. What could be going wrong here?
And due to this, the new init_new_repo method is never called.

Not sure. E.g. by using the cmd, can you find out what the command outputs as an error/warning. Use the json flag so that you can find out which msgid is used.

Got it, for remote repository it was just InvalidRepository
So now it works for both local and remote repositories.

real-yfprojects · 2024-04-01T13:05:01Z

@m3nu Can you check again?

SAMAD101 added 5 commits September 1, 2023 23:13

added peewee to requirements.d/dev.txt

6abd0f5

removed peewee from requirements: not necessary

7b80066

Merge branch 'borgbase:master' into master

5f07abd

Merge branch 'borgbase:master' into master

b4f2e64

some enhancements to ExistingRepoWindow: to allow creation of a new r…

55ede38

…epo in case the addition of an existing one fails/its not initialized

real-yfprojects reviewed Sep 12, 2023

View reviewed changes

SAMAD101 added 2 commits September 12, 2023 23:26

added qmessagebox for an extra alert

690d837

added qmessagebox

e8afe15

real-yfprojects reviewed Sep 14, 2023

View reviewed changes

added differentiation for adding repo via folder and remote, implemen…

44639da

…ting setting of values from the values method

SAMAD101 added 2 commits September 15, 2023 19:14

added differentiation for adding repo via folder and remote, implemen…

7023ab6

…ting setting of values from the values method

shortened

780082e

SAMAD101 and others added 5 commits September 20, 2023 17:02

Merge branch 'borgbase:master' into issue1799

92cc9ae

Merge branch 'borgbase:master' into issue1799

0ec083e

Merge branch 'borgbase:master' into issue1799

b0ec304

Simplify code, make it more modular.

45176f8

This improves the code that open the `AddRepoWindow` when one tries to add an existing repo although it doesn't exist. * src/vorta/views/repo_add_dialog.py

Store full error (log) messages for borg jobs and fix new feature.

f71c8f8

This allows accessing `msgid` from `ExistingRepoWindow`. * src/vorta/application.py * src/vorta/borg/borg_job.py * src/vorta/views/repo_add_dialog.py * tests/unit/test_repo.py

real-yfprojects requested a review from m3nu October 6, 2023 17:18

Pass is_remote_repo attribute between the dialog.

cff9e3a

Now when the `AddRepoWindow` with the values from `ExistingRepoWindow` the `is_remote_repo` attribute will be restored, preventing an error message when trying to add the repository. * src/vorta/views/repo_add_dialog.py

SAMAD101 added 2 commits November 8, 2023 15:35

Merge branch 'borgbase:master' into issue1799

1b57400

Merge branch 'borgbase:master' into issue1799

75f276e

Merge branch 'master' into issue1799

115ec28

Merge branch 'borgbase:master' into issue1799

d332042

SAMAD101 commented Jan 13, 2024

View reviewed changes

Merge branch 'borgbase:master' into issue1799

88cb2dc

SAMAD101 force-pushed the issue1799 branch from 378ea6c to 41ea359 Compare February 25, 2024 07:23

SAMAD101 and others added 2 commits February 25, 2024 12:54

fix for remote repos

41ea359

Merge branch 'master' into issue1799

978304f

Merge branch 'borgbase:master' into issue1799

49bfe55

SAMAD101 requested a review from real-yfprojects April 7, 2024 11:39

Merge branch 'master' into issue1799

3c3c197

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Launch `Add new repository` when `Add existing repository` fails/is not initialized. #1816

Launch `Add new repository` when `Add existing repository` fails/is not initialized. #1816

SAMAD101 commented Sep 9, 2023 •

edited

SAMAD101 commented Sep 9, 2023

real-yfprojects left a comment

real-yfprojects commented Sep 12, 2023

SAMAD101 commented Sep 12, 2023

real-yfprojects commented Sep 14, 2023

real-yfprojects Sep 14, 2023

SAMAD101 commented Sep 15, 2023 •

edited

SAMAD101 commented Sep 19, 2023

SAMAD101 commented Oct 20, 2023 •

edited

real-yfprojects commented Oct 20, 2023

m3nu commented Oct 20, 2023

real-yfprojects commented Nov 23, 2023

m3nu commented Jan 10, 2024

SAMAD101 commented Jan 11, 2024

m3nu commented Jan 11, 2024

SAMAD101 commented Jan 12, 2024 •

edited

SAMAD101 Jan 13, 2024

real-yfprojects Feb 9, 2024

SAMAD101 Feb 25, 2024

real-yfprojects commented Apr 1, 2024

Launch Add new repository when Add existing repository fails/is not initialized. #1816

Are you sure you want to change the base?

Launch Add new repository when Add existing repository fails/is not initialized. #1816

Conversation

SAMAD101 commented Sep 9, 2023 • edited

Description

Motivation and Context

How Has This Been Tested?

Types of changes

Checklist:

SAMAD101 commented Sep 9, 2023

real-yfprojects left a comment

Choose a reason for hiding this comment

real-yfprojects commented Sep 12, 2023

SAMAD101 commented Sep 12, 2023

real-yfprojects commented Sep 14, 2023

real-yfprojects Sep 14, 2023

Choose a reason for hiding this comment

SAMAD101 commented Sep 15, 2023 • edited

SAMAD101 commented Sep 19, 2023

SAMAD101 commented Oct 20, 2023 • edited

real-yfprojects commented Oct 20, 2023

m3nu commented Oct 20, 2023

real-yfprojects commented Nov 23, 2023

m3nu commented Jan 10, 2024

SAMAD101 commented Jan 11, 2024

m3nu commented Jan 11, 2024

SAMAD101 commented Jan 12, 2024 • edited

SAMAD101 Jan 13, 2024

Choose a reason for hiding this comment

real-yfprojects Feb 9, 2024

Choose a reason for hiding this comment

SAMAD101 Feb 25, 2024

Choose a reason for hiding this comment

real-yfprojects commented Apr 1, 2024

Launch `Add new repository` when `Add existing repository` fails/is not initialized. #1816

Launch `Add new repository` when `Add existing repository` fails/is not initialized. #1816

SAMAD101 commented Sep 9, 2023 •

edited

SAMAD101 commented Sep 15, 2023 •

edited

SAMAD101 commented Oct 20, 2023 •

edited

SAMAD101 commented Jan 12, 2024 •

edited