Skip to content

Commit

Permalink
Prepend redacted packages with icon
Browse files Browse the repository at this point in the history
  • Loading branch information
cohaereo committed Jun 16, 2024
1 parent e194c6f commit a1a9ae8
Show file tree
Hide file tree
Showing 16 changed files with 33 additions and 24 deletions.
6 changes: 3 additions & 3 deletions src/gui/audio.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::gui::texture::{LoadedTexture, Texture};
use crate::packages::package_manager;
use crate::package_manager::package_manager;
use destiny_pkg::TagHash;
use eframe::egui::mutex::RwLock;
use eframe::egui::TextureId;
Expand Down Expand Up @@ -74,9 +74,9 @@ impl AudioPlayer {
impl AudioPlayer {
pub fn play(&self, hash: TagHash) -> AudioPlayerState {
if hash.is_none() {
return AudioPlayerState::Errored(format!("Tag {hash} is not linked to audio data"))
return AudioPlayerState::Errored(format!("Tag {hash} is not linked to audio data"));
}

let mut ap = self.playing.write();
// Already playing, don't restart playback
if Some(hash) == ap.as_ref().map(|p| p.tag) {
Expand Down
4 changes: 2 additions & 2 deletions src/gui/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ use std::io::{Cursor, Write};
use std::num::NonZeroU32;

use crate::gui::audio::{AudioPlayer, AudioPlayerState};
use crate::packages::get_hash64;
use crate::{packages::package_manager, tagtypes::TagType};
use crate::package_manager::get_hash64;
use crate::{package_manager::package_manager, tagtypes::TagType};

use super::texture::{Texture, TextureCache};

Expand Down
2 changes: 1 addition & 1 deletion src/gui/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use crate::gui::tag::TagHistory;
use crate::scanner::fnv1;
use crate::text::RawStringHashCache;
use crate::{
packages::package_manager,
package_manager::package_manager,
scanner::{load_tag_cache, scanner_progress, ScanStatus, TagCache},
text::{create_stringmap, StringCache},
};
Expand Down
2 changes: 1 addition & 1 deletion src/gui/named_tags.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use destiny_pkg::{package::UEntryHeader, PackageNamedTagEntry};
use eframe::egui::{self, RichText};

use crate::{packages::package_manager, tagtypes::TagType};
use crate::{package_manager::package_manager, tagtypes::TagType};

use super::{common::ResponseExt, tag::format_tag_entry, View, ViewAction};

Expand Down
12 changes: 9 additions & 3 deletions src/gui/packages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ use destiny_pkg::{manager::PackagePath, TagHash};
use eframe::egui::{self, RichText};

use crate::gui::common::open_audio_file_in_default_application;
use crate::packages::get_hash64;
use crate::package_manager::get_hash64;
use crate::util::format_file_size;
use crate::{packages::package_manager, tagtypes::TagType};
use crate::{package_manager::package_manager, tagtypes::TagType};

use super::{
common::{dump_wwise_info, ResponseExt},
Expand Down Expand Up @@ -74,11 +74,17 @@ impl View for PackagesView {
continue;
}

let redacted = if path.name.ends_with("redacted") {
"🗝 "
} else {
""
};

if ui
.selectable_value(
&mut self.selected_package,
*id,
format!("{id:04x}: {package_name}"),
format!("{id:04x}: {redacted}{package_name}"),
)
.changed()
{
Expand Down
2 changes: 1 addition & 1 deletion src/gui/raw_strings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use itertools::Itertools;
use rustc_hash::FxHashMap;

use crate::{
packages::package_manager,
package_manager::package_manager,
scanner::{fnv1, TagCache},
tagtypes::TagType,
};
Expand Down
2 changes: 1 addition & 1 deletion src/gui/strings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use itertools::Itertools;
use rustc_hash::FxHashMap;

use crate::{
packages::package_manager,
package_manager::package_manager,
scanner::TagCache,
tagtypes::TagType,
text::{decode_text, StringCache, StringCacheVec, StringContainer, StringData, StringPart},
Expand Down
4 changes: 2 additions & 2 deletions src/gui/tag.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ use rustc_hash::{FxHashMap, FxHashSet};
use std::fmt::Write;
use std::rc::Rc;

use crate::packages::get_hash64;
use crate::package_manager::get_hash64;
use crate::{gui::texture::Texture, scanner::read_raw_string_blob, text::RawStringHashCache};
use crate::{
packages::package_manager,
package_manager::package_manager,
references::REFERENCE_NAMES,
scanner::{ScanResult, TagCache},
tagtypes::TagType,
Expand Down
2 changes: 1 addition & 1 deletion src/gui/texture.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::gui::dxgi::DxgiFormat;
use crate::gui::texture::texture_capture::capture_texture;
use crate::packages::package_manager;
use crate::package_manager::package_manager;
use anyhow::Context;
use binrw::{BinRead, BinReaderExt};
use destiny_pkg::package::PackagePlatform;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/texturelist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use eframe::egui::{self, pos2, vec2, Color32, RichText, Stroke, Widget};
use std::fmt::{Display, Formatter};

use crate::gui::texture::{Texture, TextureDesc};
use crate::{packages::package_manager, tagtypes::TagType};
use crate::{package_manager::package_manager, tagtypes::TagType};

use super::{common::ResponseExt, texture::TextureCache, View, ViewAction};

Expand Down
11 changes: 7 additions & 4 deletions src/main.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mod gui;
mod packages;
mod package_manager;
mod panic_handler;
mod references;
mod scanner;
Expand All @@ -18,9 +18,9 @@ use env_logger::Env;
use game_detector::InstalledGame;
use log::info;

use crate::packages::initialize_package_manager;
use crate::package_manager::initialize_package_manager;
use crate::references::initialize_reference_names;
use crate::{gui::QuickTagApp, packages::package_manager};
use crate::{gui::QuickTagApp, package_manager::package_manager};

#[derive(clap::Parser, Debug)]
#[command(author, version, about, long_about = None, disable_version_flag(true))]
Expand Down Expand Up @@ -59,7 +59,10 @@ fn main() -> eframe::Result<()> {
panic!("Could not find Destiny 2 packages directory");
};

info!("Initializing package manager for version {:?} at '{}'", args.version, packages_path);
info!(
"Initializing package manager for version {:?} at '{}'",
args.version, packages_path
);
let pm = PackageManager::new(
packages_path,
args.version
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/references.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use eframe::epaint::mutex::RwLock;
use log::warn;
use rustc_hash::FxHashMap;

use crate::packages::{package_manager, package_manager_checked};
use crate::package_manager::{package_manager, package_manager_checked};

// TODO(cohae): User-defined references
lazy_static::lazy_static! {
Expand Down
2 changes: 1 addition & 1 deletion src/scanner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use rayon::prelude::{IntoParallelRefIterator, ParallelIterator};
use rustc_hash::FxHashMap;

use crate::{
packages::package_manager,
package_manager::package_manager,
text::create_stringmap,
util::{u32_from_endian, u64_from_endian},
};
Expand Down
2 changes: 1 addition & 1 deletion src/tagtypes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::fmt::Display;
use destiny_pkg::PackageVersion;
use eframe::epaint::Color32;

use crate::packages::package_manager;
use crate::package_manager::package_manager;

#[derive(PartialEq)]
pub enum TagType {
Expand Down
2 changes: 1 addition & 1 deletion src/text.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use destiny_pkg::{PackageVersion, TagHash};
use log::{error, warn};
use rustc_hash::{FxHashMap, FxHashSet};

use crate::packages::package_manager;
use crate::package_manager::package_manager;

pub type TablePointer32<T> = _TablePointer<i32, u32, T>;
pub type TablePointer64<T> = _TablePointer<i64, u64, T>;
Expand Down

0 comments on commit a1a9ae8

Please sign in to comment.