Skip to content

Commit 6679341

Browse files
committed
Merge remote-tracking branch 'upstream/main' into subtag_parent_backend
2 parents 09775ba + f6a1ca6 commit 6679341

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2666
-375
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ cython_debug/
163163
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
164164
# and can be added to the global gitignore or merged into this file. For a more nuclear
165165
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
166-
#.idea/
166+
.idea/
167167

168168
### Python Patch ###
169169
# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration

CONTRIBUTING.md

Lines changed: 103 additions & 87 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ As of writing (Alpha v9.3.0) the project is in a useable state, however it lacks
190190
### What Features Are You Planning on Adding?
191191

192192
> [!IMPORTANT]
193-
> See the [Planned Features](/docs/updates/planned_features.md) documentation for the latest feature lists. The lists here are currently being migrated over there with individual pages for larger features.
193+
> See the [Feature Roadmap](/docs/updates/roadmap.md) documentation for the latest feature lists. The lists here are currently being migrated over there with individual pages for larger features.
194194
195195
Of the several features I have planned for the project, these are broken up into “priority” features and “future” features. Priority features were originally intended for the first public release, however are currently absent from the Alpha v9.x.x builds.
196196

docs/index.md

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ title: Home
99

1010
![TagStudio Alpha](assets/github_header.png)
1111

12-
1312
TagStudio is a photo & file organization application with an underlying system that focuses on giving freedom and flexibility to the user. No proprietary programs or formats, no sea of sidecar files, and no complete upheaval of your filesystem structure.
1413

1514
<figure markdown="span">
@@ -19,11 +18,11 @@ TagStudio is a photo & file organization application with an underlying system t
1918

2019
## Goals
2120

22-
- To achieve a portable, privacy-oriented, open, extensible, and feature-rich system of organizing and rediscovering files.
23-
- To provide powerful methods for organization, notably the concept of tag composition, or “taggable tags”.
24-
- To create an implementation of such a system that is resilient against a user’s actions outside the program (modifying, moving, or renaming files) while also not burdening the user with mandatory sidecar files or otherwise requiring them to change their existing file structures and workflows.
25-
- To support a wide range of users spanning across different platforms, multi-user setups, and those with large (several terabyte) libraries.
26-
- To make the darn thing look like nice, too. It’s 2024, not 1994.
21+
- To achieve a portable, privacy-oriented, open, extensible, and feature-rich system of organizing and rediscovering files.
22+
- To provide powerful methods for organization, notably the concept of tag composition, or “taggable tags”.
23+
- To create an implementation of such a system that is resilient against a user’s actions outside the program (modifying, moving, or renaming files) while also not burdening the user with mandatory sidecar files or otherwise requiring them to change their existing file structures and workflows.
24+
- To support a wide range of users spanning across different platforms, multi-user setups, and those with large (several terabyte) libraries.
25+
- To make the darn thing look like nice, too. It’s 2024, not 1994.
2726

2827
## Priorities
2928

@@ -32,16 +31,20 @@ TagStudio is a photo & file organization application with an underlying system t
3231
3. **The application.** If nothing else, TagStudio the application serves as the first (and so far only) implementation for this system of metadata management. This has the responsibility of doing the idea justice and showing just what’s possible when it comes to user file management.
3332
4. (The name.) I think it’s fine for an app or client, but it doesn’t really make sense for a system or standard. I suppose this will evolve with time.
3433

34+
## Feature Roadmap
35+
36+
The [Feature Roadmap](updates/roadmap.md) lists all of the planned core features for TagStudio to be considered "feature complete" along with estimated release milestones. The development and testing of these features takes priority over all other requested or submitted features unless they are later added to this roadmap. This helps ensure that TagStudio eventually sees a full release and becomes more usable by more people more quickly.
37+
3538
## Current Features
3639

37-
- Create libraries/vaults centered around a system directory. Libraries contain a series of entries: the representations of your files combined with metadata fields. Each entry represents a file in your library’s directory, and is linked to its location.
38-
- Add metadata to your library entries, including:
39-
- Name, Author, Artist (Single-Line Text Fields)
40-
- Description, Notes (Multiline Text Fields)
41-
- Tags, Meta Tags, Content Tags (Tag Boxes)
42-
- Create rich tags composed of a name, a list of aliases, and a list of “subtags” - being tags in which these tags inherit values from.
43-
- Search for entries based on tags, ~~metadata~~ (TBA), or filenames/filetypes (using `filename: <query>`)
44-
- Special search conditions for entries that are: `untagged`/`no tags` and `empty`/`no fields`.
40+
- Create libraries/vaults centered around a system directory. Libraries contain a series of entries: the representations of your files combined with metadata fields. Each entry represents a file in your library’s directory, and is linked to its location.
41+
- Add metadata to your library entries, including:
42+
- Name, Author, Artist (Single-Line Text Fields)
43+
- Description, Notes (Multiline Text Fields)
44+
- Tags, Meta Tags, Content Tags (Tag Boxes)
45+
- Create rich tags composed of a name, a list of aliases, and a list of “subtags” - being tags in which these tags inherit values from.
46+
- Search for entries based on tags, ~~metadata~~ (TBA), or filenames/filetypes (using `filename: <query>`)
47+
- Special search conditions for entries that are: `untagged`/`no tags` and `empty`/`no fields`.
4548

4649
## Important Updates
4750

docs/updates/planned_features.md

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)