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

feat: exclude gui #1742

Closed
wants to merge 40 commits into from
Closed

feat: exclude gui #1742

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
21c86cd
feat: exclude gui
diivi Jun 23, 2023
e46e1f1
add and remove patterns from custom table
diivi Jun 27, 2023
a2cd061
database integration for adding and removing custom patterns
diivi Jun 27, 2023
e4b2640
complete custom presets tab frontend
diivi Jun 27, 2023
28c082d
remove unnecessary array dependency
diivi Jun 29, 2023
bd2367d
custom presets
diivi Jul 6, 2023
1b4548f
remove all leading slashes and work on code review
diivi Jul 18, 2023
a1fc018
Merge branch 'master' into feat/exclude-gui
diivi Jul 18, 2023
62d8e10
pass the exclusions to borg!
diivi Jul 19, 2023
fccea56
add migration for raw exclusions field
diivi Jul 21, 2023
b8899ab
review changes: context menu, remove save button for raw text, copy t…
diivi Jul 23, 2023
f8f4372
qdialogbuttonbox close
diivi Jul 24, 2023
c9c6ede
test
diivi Jul 24, 2023
5955113
sort presets
diivi Jul 24, 2023
5e255dd
change help texts
diivi Aug 1, 2023
a2f8d8b
help text formatting to pass tests
diivi Aug 1, 2023
9fe6b7e
yf-projects Help text suggestions
diivi Aug 5, 2023
ae2e948
use translate method
diivi Aug 15, 2023
6da86d7
merge with github changes
diivi Aug 15, 2023
9dbfe1a
make context menu work for multiple items
diivi Aug 15, 2023
96e3fa7
delete custom items with the delete key
diivi Aug 15, 2023
1f9014a
Merge branch 'master' into feat/exclude-gui
diivi Aug 15, 2023
3bcd08b
make main window uninteractable when the exclude dialog opens
diivi Aug 16, 2023
328b46f
show a default exclusion
diivi Aug 19, 2023
f27c653
convert old exclude patterns to new objects
diivi Aug 19, 2023
b00779c
handle integrity error during migration and allow selecting multiple …
diivi Aug 21, 2023
5d8885d
Merge branch 'master' into feat/exclude-gui
m3nu Aug 21, 2023
9188265
reduce item padding
diivi Aug 22, 2023
c50f211
Merge branch 'feat/exclude-gui' of https://github.com/diivi/vorta int…
diivi Aug 22, 2023
3c2e4c2
remove styling from elements and add back exclude_if_present box
diivi Aug 23, 2023
4522a5b
add exclude if present dialog
diivi Aug 24, 2023
423aa4d
update exclude if present window title
diivi Aug 24, 2023
cae7ba4
add test for exclude if present dialog
diivi Aug 24, 2023
1cf2223
move tests
diivi Aug 27, 2023
5d71208
Merge branch 'master' into feat/exclude-gui
diivi Aug 27, 2023
15c87e6
remove duplicate MandatoryInputItemModel
diivi Sep 1, 2023
25a44d6
Merge branch 'master' into feat/exclude-gui
diivi Oct 13, 2023
c74853d
partial for file exclusions
diivi Oct 13, 2023
85cff58
Merge branch 'master' into feat/exclude-gui
m3nu Oct 24, 2023
3566e0d
Merge branch 'master' into feat/exclude-gui
m3nu Nov 16, 2023
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
158 changes: 158 additions & 0 deletions src/vorta/assets/UI/excludedialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>Dialog</class>
<widget class="QDialog" name="Dialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>504</width>
<height>426</height>
</rect>
</property>
<property name="windowTitle">
<string>Add patterns to exclude</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="topMargin">
<number>10</number>
</property>
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
<string>Custom</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Some instruction text here maybe to tell the user what they are doing. ignore the non SFPro font. more lorem ipsum.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QListView" name="customExclusionsList"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="bAddPattern"/>
</item>
<item>
<widget class="QToolButton" name="bRemovePattern"/>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
<attribute name="title">
<string>Presets</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Some instruction text here maybe to tell the user what they are doing. ignore the non SFPro font. more lorem ipsum.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QListView" name="exclusionPresetsList"/>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_4">
<attribute name="title">
<string>Raw</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Some instruction text here maybe to tell the user what they are doing. ignore the non SFPro font. more lorem ipsum.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPlainTextEdit" name="rawExclusionsText"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="rawExclusionsSaveButton">
<property name="text">
<string>Save</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="tab_3">
<attribute name="title">
<string>Preview</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Some instruction text here maybe to tell the user what they are doing. ignore the non SFPro font. more lorem ipsum.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPlainTextEdit" name="exclusionsPreviewText"/>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
85 changes: 25 additions & 60 deletions src/vorta/assets/UI/sourcetab.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="2,1">
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="2">
<property name="spacing">
<number>12</number>
</property>
Expand Down Expand Up @@ -103,6 +103,30 @@
</column>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="bExclude">
<property name="text">
<string>Select Exclude Patterns...</string>
diivi marked this conversation as resolved.
Show resolved Hide resolved
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
Expand Down Expand Up @@ -147,65 +171,6 @@
</layout>
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout" rowstretch="0,1">
<property name="topMargin">
<number>12</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Exclude Patterns (&lt;a href=&quot;https://borgbackup.readthedocs.io/en/stable/usage/help.html#borg-help-patterns&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0984e3;&quot;&gt;more&lt;/span&gt;&lt;/a&gt;):&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Exclude If Present (exclude folders with these files):</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QPlainTextEdit" name="excludePatternsField">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
</property>
<property name="plainText">
<string/>
</property>
<property name="placeholderText">
<string>E.g. */.cache</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPlainTextEdit" name="excludeIfPresentField">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="sizeAdjustPolicy">
<enum>QAbstractScrollArea::AdjustToContentsOnFirstShow</enum>
</property>
<property name="placeholderText">
<string>E.g. .nobackup</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
Expand Down
67 changes: 67 additions & 0 deletions src/vorta/assets/exclusion_presets/browsers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
[
{
"name": "Chromium cache and config files",
"patterns":
[
"fm:/.config/chromium/*/Local Storage",
Hofer-Julian marked this conversation as resolved.
Show resolved Hide resolved
"fm:/.config/chromium/*/Session Storage",
"fm:/.config/chromium/*/Service Worker/CacheStorage",
"fm:/.config/chromium/*/Application Cache",
"fm:/.config/chromium/*/History Index *",
"fm:/snap/chromium/common/.cache",
"fm:/snap/chromium/*/.config/chromium/*/Service Worker/CacheStorage",
"fm:/snap/chromium/*/.local/share/"
diivi marked this conversation as resolved.
Show resolved Hide resolved
],
"tags":["application:chromium", "type:browser", "os:linux"],
"author": "Divi"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is the author key needed for anything?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope, only to attribute the author.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Does that make sense? Contributors might modify presets in the future. Furthermore since the author isn't shown in the GUI.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@m3nu I had the same thought regarding edits and revisions.

},
{
"name": "Google Chrome cache and config files",
"patterns":
[
"fm:.config/google-chrome/ShaderCache",
"fm:.config/google-chrome/*/Local Storage",
"fm:.config/google-chrome/*/Session Storage",
"fm:.config/google-chrome/*/Application Cache",
"fm:.config/google-chrome/*/History Index *",
"fm:.config/google-chrome/*/Service Worker/CacheStorage"
],
"tags": ["application:chrome", "type:browser", "os:linux"],
"author": "Divi"
},
{
"name": "Brave cache and config files",
"patterns":[
"fm:.config/BraveSoftware/Brave-Browser/*/Feature Engagement Tracker/",
"fm:.config/BraveSoftware/Brave-Browser/*/Local Storage/",
"fm:.config/BraveSoftware/Brave-Browser/*/Service Worker/CacheStorage/",
"fm:.config/BraveSoftware/Brave-Browser/*/Session Storage/",
"fm:.config/BraveSoftware/Brave-Browser/Safe Browsing/",
"fm:.config/BraveSoftware/Brave-Browser/ShaderCache/"
],
"tags": ["application:brave", "type:browser", "os:linux"],
"author": "Divi"
},
{
"name": "Mozilla Firefox cache and config files",
"patterns":[
"fm:.mozilla/firefox/*/Cache",
"fm:.mozilla/firefox/*/minidumps",
"fm:.mozilla/firefox/*/.parentlock",
"fm:.mozilla/firefox/*/urlclassifier3.sqlite",
"fm:.mozilla/firefox/*/blocklist.xml",
"fm:.mozilla/firefox/*/extensions.sqlite",
"fm:./mozilla/firefox/*/extensions.sqlite-journal",
"fm:./mozilla/firefox/*/extensions.rdf",
"fm:./mozilla/firefox/*/extensions.ini",
"fm:./mozilla/firefox/*/extensions.cache",
"fm:./mozilla/firefox/*/XUL.mfasl",
"fm:./mozilla/firefox/*/XPC.mfasl",
"fm:./mozilla/firefox/*/xpti.dat",
"fm:./mozilla/firefox/*/compreg.dat",
"fm:./mozilla/firefox/*/pluginreg.dat"
],
"tags": ["application:firefox", "type:browser", "os:linux"],
"author": "Divi"
}
]
35 changes: 35 additions & 0 deletions src/vorta/assets/exclusion_presets/dev.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
[
{
"name": "Node Modules and package manager cache",
"patterns":
[
"fm:/node_modules",
"fm:.npm"
],
"tags": ["type:dev", "lang:javascript", "os:linux", "os:macos"],
"author": "Divi"
},
{
"name": "Python cache and virtualenv",
"patterns":
[
"fm:__pycache__",
"fm:.pyc",
"fm:.pyo",
"fm:.env",
"fm:/.virtualenvs"
],
"tags": ["type:dev", "lang:python", "os:linux", "os:macos"],
"author": "Divi"
},
{
"name": "Rust artefacts",
Hofer-Julian marked this conversation as resolved.
Show resolved Hide resolved
"patterns":
[
"fm:.cargo",
"fm:.rustup"
],
"tags": ["type:dev", "lang:rust", "os:linux", "os:macos"],
"author": "Divi"
}
]
4 changes: 4 additions & 0 deletions src/vorta/store/connection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
ArchiveModel,
BackupProfileModel,
EventLogModel,
ExclusionModel,
RawExclusionModel,
RepoModel,
RepoPassword,
SchemaVersion,
Expand Down Expand Up @@ -52,6 +54,8 @@ def init_db(con=None):
WifiSettingModel,
EventLogModel,
SchemaVersion,
ExclusionModel,
RawExclusionModel,
]
)

Expand Down
Loading