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

Jump to bottom

Objects.Video: remove unused properties, signals, functions #322

Merged
merged 4 commits into from
Jan 15, 2023
Merged

Objects.Video: remove unused properties, signals, functions #322

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8229d3e
Objects.Video: remove unused properties, signals, functions
danirabbit Dec 14, 2022
7d9849e
Merge branch 'master' into videoobject-cleanup
zeebok Jan 15, 2023
7c6f8af
Merge branch 'master' into videoobject-cleanup
danirabbit Jan 15, 2023
6ddeb12
Merge branch 'master' into videoobject-cleanup
zeebok Jan 15, 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
281 changes: 125 additions & 156 deletions src/Objects/Video.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*-
* Copyright (c) 2016-2016 elementary LLC.
* Copyright 2016-2022 elementary, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -18,200 +18,169 @@
*
*/

namespace Audience.Objects {
public class Video : Object {
Audience.Services.LibraryManager manager;

public signal void poster_changed (Video sender);
public signal void title_changed (Video sender);
public signal void thumbnail_changed ();
public signal void trashed ();

public File video_file { get; private set; }
public string directory { get; construct set; }
public string file { get; construct set; }

public string title { get; private set; }
public int year { get; private set; default = -1;}
public class Audience.Objects.Video : Object {
public signal void poster_changed (Video sender);
public signal void title_changed (Video sender);
public signal void trashed ();

public string directory { get; construct; }
public string file { get; construct; }
public string mime_type { get; construct; }

public File video_file { get; private set; }
public bool poster_initialized { get; private set; default = false; }
public Gdk.Pixbuf? poster { get; private set; default = null; }
public string container { get; private set; default = ""; }
public string hash_episode_poster { get; private set; }
public string hash_file_poster { get; private set; }
public string poster_cache_file { get; private set; }
public string title { get; private set; }

private Audience.Services.LibraryManager manager;
private string thumbnail_large_path;
private string thumbnail_normal_path;

public Video (string directory, string file, string mime_type) {
Object (directory: directory, file: file, mime_type: mime_type);
}

public Gdk.Pixbuf? poster { get; private set; default = null; }
public Gdk.Pixbuf? thumbnail { get; private set; default = null; }
public bool poster_initialized { get; private set; default = false; }
construct {
manager = Audience.Services.LibraryManager.get_instance ();
manager.thumbler.finished.connect (set_pixbufs);

public string mime_type { get; construct set; }
public string poster_cache_file { get; private set; }
title = Audience.get_title (file);

public string hash_file_poster { get; construct set; }
public string hash_episode_poster { get; construct set; }
public string thumbnail_large_path { get; construct set;}
public string thumbnail_normal_path { get; construct set;}
// exclude YEAR from Title
MatchInfo info;
if (manager.regex_year.match (this.title, 0, out info)) {
title = this.title.replace (info.fetch (0) + ")", "").strip ();
}

public string container { get; construct set; default = ""; }
video_file = File.new_for_path (Path.build_filename (directory, file));

public Video (string directory, string file, string mime_type) {
Object (directory: directory, file: file, mime_type: mime_type);
if (directory != Environment.get_user_special_dir (UserDirectory.VIDEOS)) {
container = Path.get_basename (directory);
}

construct {
manager = Audience.Services.LibraryManager.get_instance ();
manager.thumbler.finished.connect (dbus_finished);

title = Audience.get_title (file);
hash_file_poster = GLib.Checksum.compute_for_string (ChecksumType.MD5, video_file.get_uri (), video_file.get_uri ().length);
hash_episode_poster = GLib.Checksum.compute_for_string (ChecksumType.MD5, video_file.get_parent ().get_uri (), video_file.get_parent ().get_uri ().length);

extract_metadata ();
video_file = File.new_for_path (this.get_path ());
thumbnail_large_path = Path.build_filename (GLib.Environment.get_user_cache_dir (), "thumbnails", "large", hash_file_poster + ".png");
thumbnail_normal_path = Path.build_filename (GLib.Environment.get_user_cache_dir (), "thumbnails", "normal", hash_file_poster + ".png");
poster_cache_file = Path.build_filename (App.get_instance ().get_cache_directory (), hash_file_poster + ".jpg");

if (directory != Environment.get_user_special_dir (UserDirectory.VIDEOS)) {
container = Path.get_basename (directory);
}
notify["poster"].connect (() => {
poster_changed (this);
});
notify["title"].connect (() => {
title_changed (this);
});
}

hash_file_poster = GLib.Checksum.compute_for_string (ChecksumType.MD5, video_file.get_uri (), video_file.get_uri ().length);
hash_episode_poster = GLib.Checksum.compute_for_string (ChecksumType.MD5, video_file.get_parent ().get_uri (), video_file.get_parent ().get_uri ().length);

thumbnail_large_path = Path.build_filename (GLib.Environment.get_user_cache_dir (), "thumbnails", "large", hash_file_poster + ".png");
thumbnail_normal_path = Path.build_filename (GLib.Environment.get_user_cache_dir (), "thumbnails", "normal", hash_file_poster + ".png");
poster_cache_file = Path.build_filename (App.get_instance ().get_cache_directory (), hash_file_poster + ".jpg");

notify["poster"].connect (() => {
poster_changed (this);
});
notify["title"].connect (() => {
title_changed (this);
});
notify["thumbnail"].connect (() => {
thumbnail_changed ();
});
}
public async void initialize_poster () {
poster_initialized = true;
initialize_poster_thread.begin ((obj, res) => {
poster = initialize_poster_thread.end (res);
set_pixbufs ();
});
}

private void extract_metadata () {
// exclude YEAR from Title
MatchInfo info;
if (manager.regex_year.match (this.title, 0, out info)) {
year = int.parse (info.fetch (0).substring (1, 4));
title = this.title.replace (info.fetch (0) + ")", "").strip ();
}
}
private async Gdk.Pixbuf? initialize_poster_thread () {
SourceFunc callback = initialize_poster_thread.callback;
Gdk.Pixbuf? pixbuf = null;

public async void initialize_poster () {
poster_initialized = true;
initialize_poster_thread.begin ((obj, res) => {
poster = initialize_poster_thread.end (res);
set_pixbufs ();
});
}
ThreadFunc<void*> run = () => {
if (!FileUtils.test (thumbnail_large_path, FileTest.EXISTS) ||
!FileUtils.test (thumbnail_normal_path, FileTest.EXISTS)) {

private async Gdk.Pixbuf? initialize_poster_thread () {
SourceFunc callback = initialize_poster_thread.callback;
Gdk.Pixbuf? pixbuf = null;
// Call DBUS for create a new THUMBNAIL
Gee.ArrayList<string> uris = new Gee.ArrayList<string> ();
Gee.ArrayList<string> mimes = new Gee.ArrayList<string> ();

ThreadFunc<void*> run = () => {
if (!FileUtils.test (thumbnail_large_path, FileTest.EXISTS) ||
!FileUtils.test (thumbnail_normal_path, FileTest.EXISTS)) {
uris.add (video_file.get_uri ());
mimes.add (mime_type);

// Call DBUS for create a new THUMBNAIL
Gee.ArrayList<string> uris = new Gee.ArrayList<string> ();
Gee.ArrayList<string> mimes = new Gee.ArrayList<string> ();
manager.thumbler.instand (uris, mimes, "large");
manager.thumbler.instand (uris, mimes, "normal");
}

uris.add (video_file.get_uri ());
mimes.add (mime_type);
string? poster_path = poster_cache_file;
pixbuf = manager.get_poster_from_file (poster_path);

manager.thumbler.instand (uris, mimes, "large");
manager.thumbler.instand (uris, mimes, "normal");
}
// POSTER in Cache exists
if (pixbuf != null) {
Idle.add ((owned) callback);
return null;
}

string? poster_path = poster_cache_file;
poster_path = get_native_poster_path ();
if (poster_path != null) {
pixbuf = manager.get_poster_from_file (poster_path);
}

// POSTER in Cache exists
if (pixbuf != null) {
Idle.add ((owned) callback);
return null;
}

poster_path = get_native_poster_path ();
if (poster_path != null) {
pixbuf = manager.get_poster_from_file (poster_path);
}

// POSTER found
if (pixbuf != null) {
try {
pixbuf.save (poster_cache_file, "jpeg");
} catch (Error e) {
warning (e.message);
}
Idle.add ((owned) callback);
return null;
}

if (FileUtils.test (thumbnail_large_path, FileTest.EXISTS)) {
pixbuf = manager.get_poster_from_file (thumbnail_large_path);
Idle.add ((owned) callback);
return null;
// POSTER found
if (pixbuf != null) {
try {
pixbuf.save (poster_cache_file, "jpeg");
} catch (Error e) {
warning (e.message);
}

Idle.add ((owned) callback);
return null;
};
}

try {
new Thread<void*>.try (null, (owned)run);
} catch (Error e) {
warning (e.message);
if (FileUtils.test (thumbnail_large_path, FileTest.EXISTS)) {
pixbuf = manager.get_poster_from_file (thumbnail_large_path);
Idle.add ((owned) callback);
return null;
}

yield;
Idle.add ((owned) callback);
return null;
};

return pixbuf;
try {
new Thread<void*>.try (null, (owned)run);
} catch (Error e) {
warning (e.message);
}

private void dbus_finished (uint heandle) {
set_pixbufs ();
}
yield;

public void set_pixbufs () {
if (poster == null && FileUtils.test (thumbnail_large_path, FileTest.EXISTS)) {
poster = manager.get_poster_from_file (thumbnail_large_path);
}
if (thumbnail == null && FileUtils.test (thumbnail_normal_path, FileTest.EXISTS)) {
try {
thumbnail = new Gdk.Pixbuf.from_file (thumbnail_normal_path);
} catch (Error e) {
warning (e.message);
}
}
}
return pixbuf;
}

public string get_path () {
return Path.build_filename (directory, file);
private void set_pixbufs () {
if (poster == null && FileUtils.test (thumbnail_large_path, FileTest.EXISTS)) {
poster = manager.get_poster_from_file (thumbnail_large_path);
}
}

public string? get_native_poster_path () {
string poster_path = this.get_path () + ".jpg";
File file_poster = File.new_for_path (poster_path);
private string? get_native_poster_path () {
string poster_path = Path.build_filename (directory, file) + ".jpg";
File file_poster = File.new_for_path (poster_path);

if (file_poster.query_exists ())
return poster_path;
if (file_poster.query_exists ())
return poster_path;

poster_path = Path.build_filename (this.directory, Audience.get_title (file) + ".jpg");
file_poster = File.new_for_path (poster_path);
poster_path = Path.build_filename (this.directory, Audience.get_title (file) + ".jpg");
file_poster = File.new_for_path (poster_path);

if (file_poster.query_exists ())
return poster_path;

foreach (string s in Audience.settings.get_strv ("poster-names")) {
poster_path = Path.build_filename (this.directory, s);
file_poster = File.new_for_path (poster_path);
if (file_poster.query_exists ())
return poster_path;

foreach (string s in Audience.settings.get_strv ("poster-names")) {
poster_path = Path.build_filename (this.directory, s);
file_poster = File.new_for_path (poster_path);
if (file_poster.query_exists ())
return poster_path;
}

return null;
}

public void set_new_poster (Gdk.Pixbuf? new_poster) {
manager.clear_cache.begin (this.poster_cache_file);
poster = new_poster;
}
return null;
}

public void set_new_poster (Gdk.Pixbuf? new_poster) {
manager.clear_cache.begin (this.poster_cache_file);
poster = new_poster;
}
}