From 8b43df8ec3f92477f857280668a9f29f0b9d6229 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Sat, 14 Oct 2017 19:34:30 +0200 Subject: Handle file uploading in libdino & main, have http upload as provider --- libdino/src/plugin/interfaces.vala | 9 --- libdino/src/service/file_manager.vala | 109 +++++++++++++++++++++++++++------- 2 files changed, 89 insertions(+), 29 deletions(-) (limited to 'libdino') diff --git a/libdino/src/plugin/interfaces.vala b/libdino/src/plugin/interfaces.vala index 09877560..655ef13a 100644 --- a/libdino/src/plugin/interfaces.vala +++ b/libdino/src/plugin/interfaces.vala @@ -109,15 +109,6 @@ public interface MessageDisplayProvider : Object { public abstract MetaConversationItem? get_item(Entities.Message message, Entities.Conversation conversation); } -public interface FileProvider : Object { - public signal void file_incoming(FileTransfer file_transfer); -} - -public interface FileProcessor : Object { - public abstract bool can_process(FileTransfer file_transfer); - public abstract FileTransfer process(FileTransfer file_transfer); -} - public interface FileWidget : Object { public abstract Object get_widget(WidgetType type); } diff --git a/libdino/src/service/file_manager.vala b/libdino/src/service/file_manager.vala index b165039f..6517e9a5 100644 --- a/libdino/src/service/file_manager.vala +++ b/libdino/src/service/file_manager.vala @@ -10,11 +10,12 @@ public class FileManager : StreamInteractionModule, Object { public static ModuleIdentity IDENTITY = new ModuleIdentity("file"); public string id { get { return IDENTITY.id; } } + public signal void upload_available(Account account); public signal void received_file(FileTransfer file_transfer); private StreamInteractor stream_interactor; private Database db; - private Gee.List file_transfers = new ArrayList(); + private Gee.List file_senders = new ArrayList(); public static void start(StreamInteractor stream_interactor, Database db) { FileManager m = new FileManager(stream_interactor, db); @@ -31,24 +32,39 @@ public class FileManager : StreamInteractionModule, Object { DirUtils.create_with_parents(get_storage_dir(), 0700); } - public void add_provider(Plugins.FileProvider file_provider) { - file_provider.file_incoming.connect((file_transfer) => { - file_transfers.add(file_transfer); - string filename = Random.next_int().to_string("%x") + "_" + file_transfer.file_name; - file_transfer.file_name = filename; - File file = File.new_for_path(Path.build_filename(get_storage_dir(), filename)); - try { - OutputStream os = file.create(FileCreateFlags.REPLACE_DESTINATION); - os.splice(file_transfer.input_stream, 0); - os.close(); - file_transfer.state = FileTransfer.State.COMPLETE; - } catch (Error e) { - file_transfer.state = FileTransfer.State.FAILED; + public void send_file(string uri, Conversation conversation) { + File file = File.new_for_path(uri); + FileInfo file_info = file.query_info("*", FileQueryInfoFlags.NONE); + + FileTransfer file_transfer = new FileTransfer(); + file_transfer.account = conversation.account; + file_transfer.counterpart = conversation.counterpart; + file_transfer.ourpart = conversation.account.bare_jid; + file_transfer.direction = FileTransfer.DIRECTION_SENT; + file_transfer.time = new DateTime.now_utc(); + file_transfer.local_time = new DateTime.now_utc(); + file_transfer.encryption = Encryption.NONE; + file_transfer.file_name = file_info.get_display_name(); + file_transfer.input_stream = file.read(); + file_transfer.mime_type = file_info.get_content_type(); + file_transfer.size = (int)file_info.get_size(); + save_file(file_transfer); + + file_transfer.persist(db); + + foreach (FileSender file_sender in file_senders) { + if (file_sender.can_send(conversation, file_transfer)) { + file_sender.send_file(conversation, file_transfer); } - file_transfer.persist(db); - file_transfer.input_stream = file.read(); - received_file(file_transfer); - }); + } + received_file(file_transfer); + } + + public bool is_upload_available(Conversation conversation) { + foreach (FileSender file_sender in file_senders) { + if (file_sender.is_upload_available(conversation)) return true; + } + return false; } public Gee.List get_file_transfers(Account account, Jid counterpart, DateTime after, DateTime before) { @@ -62,13 +78,66 @@ public class FileManager : StreamInteractionModule, Object { Gee.List ret = new ArrayList(); foreach (Qlite.Row row in select) { FileTransfer file_transfer = new FileTransfer.from_row(db, row); - File file = File.new_for_path(Path.build_filename(get_storage_dir(), file_transfer.file_name)); - file_transfer.input_stream = file.read(); + File file = File.new_for_path(Path.build_filename(get_storage_dir(), file_transfer.path ?? file_transfer.file_name)); + try { + file_transfer.input_stream = file.read(); + } catch (IOError e) { } ret.insert(0, file_transfer); } return ret; } + public void add_provider(FileProvider file_provider) { + file_provider.file_incoming.connect((file_transfer) => { + save_file(file_transfer); + file_transfer.persist(db); + received_file(file_transfer); + }); + } + + public void add_sender(FileSender file_sender) { + file_senders.add(file_sender); + file_sender.upload_available.connect((account) => { + upload_available(account); + }); + } + + private void save_file(FileTransfer file_transfer) { + string filename = Random.next_int().to_string("%x") + "_" + file_transfer.file_name; + File file = File.new_for_path(Path.build_filename(get_storage_dir(), filename)); + try { + OutputStream os = file.create(FileCreateFlags.REPLACE_DESTINATION); + os.splice(file_transfer.input_stream, 0); + os.close(); + file_transfer.state = FileTransfer.State.COMPLETE; + } catch (Error e) { + file_transfer.state = FileTransfer.State.FAILED; + } + file_transfer.path = filename; + file_transfer.input_stream = file.read(); + } + +} + +public interface FileProvider : Object { + public signal void file_incoming(FileTransfer file_transfer); +} + +public interface FileSender : Object { + public signal void upload_available(Account account); + public abstract bool is_upload_available(Conversation conversation); + public abstract bool can_send(Conversation conversation, FileTransfer file_transfer); + public abstract void send_file(Conversation conversation, FileTransfer file_transfer); +} + +public interface IncommingFileProcessor : Object { + public abstract bool can_process(FileTransfer file_transfer); + public abstract FileTransfer process(FileTransfer file_transfer); +} + +public interface OutgoingFileProcessor : Object { + public abstract bool can_process(FileTransfer file_transfer); + public abstract FileTransfer process(FileTransfer file_transfer); } } -- cgit v1.2.3-54-g00ecf