Skip to content

Commit

Permalink
🔖 Merge dev into main (v0.1.3)
Browse files Browse the repository at this point in the history
  • Loading branch information
Vysp3r authored Nov 19, 2022
2 parents 01fc479 + f3f3ae6 commit 546d3f1
Show file tree
Hide file tree
Showing 16 changed files with 345 additions and 401 deletions.
Binary file modified Preview.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 13 additions & 13 deletions src/application.vala
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,22 @@ namespace ProtonPlus {

aboutDialog.set_application_name ("ProtonPlus");
aboutDialog.set_application_icon ("com.vysp3r.ProtonPlus");
aboutDialog.set_version ("v0.1.2");
aboutDialog.set_version ("v0.1.3");
aboutDialog.set_comments ("A simple compatibility tool manager ");
aboutDialog.add_link ("Github", "https://github.com/Vysp3r/ProtonPlus");
aboutDialog.set_release_notes ("<ul>
<li>📝 Update README.md</li>
<li>🐛 Fix Preferences window default size</li>
<li>💄 Move main window to Libadwaita</li>dep
<li>💄 Move about window to Libadwaita</li>
<li>⚰️ Remove dead code</li>
<li>💄 Update main window components to Libadwaita</li>
<li>⚰️ Remove dead code</li>
<li>💄 Add an effect when extracting a tool</li>
<li>🐛 Fix label not showing up</li>
<li>🐛 Fix wrong label showing up</li>
<li>💄 Update preferences window to Libadwaita</li>
<li>⬆️ Update the runtime version</li>
<li>✏️ Fix typo in the release notes</li>
<li>🍱 Update the preview image</li>
<li>⚰️ Remove unused custom widget</li>
<li>🚧 Add notifications tab</li>
<li>💄 Update selector window components to Libadwaita</li>
<li>🧱 Separate Release from CompatibilityTool</li>
<li>🧱 Rename CompatibilityTool to Tool</li>
<li>⚰️ Remove unused file</li>
<li>💄 Update home message dialog to libadwaita</li>
<li>⚰️ Remove unused custom widget</li>
<li>✨ Added a naming convention extracted directories</li>
<li>🚚 Rename compatibilitytool to tool</li>
<li>💬 Update the release notes</li>
</ul>");
aboutDialog.set_issue_url ("https://github.com/Vysp3r/ProtonPlus/issues/new/choose");
Expand Down
16 changes: 13 additions & 3 deletions src/manager/file.vala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace ProtonPlus.Manager {
public class File {
public static void Extract (string install_location, string archive_name) {
public static void Extract (string install_location, string launcher_name, string tool_name) {
Archive.Read archive = new Archive.Read ();
archive.support_format_all ();
archive.support_filter_all ();
Expand All @@ -15,17 +15,23 @@ namespace ProtonPlus.Manager {
ext.set_standard_lookup ();
ext.set_options (flags);

if (archive.open_filename (install_location + archive_name, 1920000) != Archive.Result.OK) return;
if (archive.open_filename (install_location + tool_name + ".tar.gz", 1920000) != Archive.Result.OK) return;

ssize_t r;

unowned Archive.Entry entry;

int bob = 0;
string test = "";

for ( ;; ) {
r = archive.next_header (out entry);
if (r == Archive.Result.EOF) break;
if (r < Archive.Result.WARN) break;
entry.set_pathname (install_location + entry.pathname ());
if(bob++ == 0){
test = entry.pathname ();
}
r = ext.write_header (entry);
if (entry.size () > 0) {
r = copy_data (archive, ext);
Expand All @@ -37,9 +43,13 @@ namespace ProtonPlus.Manager {

archive.close ();

GLib.File file = GLib.File.new_for_path (install_location + archive_name);
GLib.File file = GLib.File.new_for_path (install_location + tool_name + ".tar.gz");
file.delete ();

GLib.File fileSource = GLib.File.new_for_path (test);
GLib.File fileDest = GLib.File.new_for_path (install_location + launcher_name + " | " + tool_name);
fileSource.move(fileDest, FileCopyFlags.NONE, null, null);

ProtonPlus.Stores.Threads store = ProtonPlus.Stores.Threads.instance ();
store.ProgressBarDone = true;
}
Expand Down
8 changes: 3 additions & 5 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,16 @@ protonplus_sources = [
'manager/file.vala',

'models/preference.vala',
'models/compatibilitytool.vala',
'models/tool.vala',
'models/location.vala',
'models/launcher.vala',

'widgets/protoncb.vala',
'widgets/protonrow.vala',
'models/release.vala',

'views/games.vala',
'views/tools.vala',
'views/notifications.vala',

'windows/home.vala',
'windows/home_custom_directory.vala',
'windows/home_info.vala',
'windows/preferences.vala',
'windows/selector.vala',
Expand Down
180 changes: 0 additions & 180 deletions src/models/compatibilitytool.vala

This file was deleted.

Loading

0 comments on commit 546d3f1

Please sign in to comment.