diff --git a/modules/torrents/client/controllers/uploads.client.controller.js b/modules/torrents/client/controllers/uploads.client.controller.js
index d0e334a5..2ead6bb2 100644
--- a/modules/torrents/client/controllers/uploads.client.controller.js
+++ b/modules/torrents/client/controllers/uploads.client.controller.js
@@ -6,10 +6,10 @@
.controller('TorrentsUploadController', TorrentsUploadController);
TorrentsUploadController.$inject = ['$scope', '$state', '$translate', '$timeout', 'Authentication', 'MeanTorrentConfig', 'Upload', 'Notification',
- 'TorrentsService', 'getStorageLangService', '$filter', 'DownloadService', 'DebugConsoleService'];
+ 'TorrentsService', 'getStorageLangService', '$filter', 'DownloadService', 'DebugConsoleService', 'NotifycationService'];
function TorrentsUploadController($scope, $state, $translate, $timeout, Authentication, MeanTorrentConfig, Upload, Notification,
- TorrentsService, getStorageLangService, $filter, DownloadService, mtDebug) {
+ TorrentsService, getStorageLangService, $filter, DownloadService, mtDebug, NotifycationService) {
var vm = this;
vm.announceConfig = MeanTorrentConfig.meanTorrentConfig.announce;
vm.tmdbConfig = MeanTorrentConfig.meanTorrentConfig.tmdbConfig;
@@ -22,6 +22,7 @@
vm.torrentInfo = null;
vm.tags = [];
vm.videoNfo = '';
+ vm.music = {};
// If user is not signed in then redirect back home
if (!Authentication.user) {
@@ -90,6 +91,79 @@
});
}
+ /**
+ * uploadMusicCover
+ * @param dataUrl
+ */
+ vm.uploadMusicCover = function (dataUrl) {
+ mtDebug.info(dataUrl);
+
+ if (dataUrl === null || dataUrl === undefined) {
+ vm.music.fileSelected = false;
+ Notification.info({
+ message: '
' + $translate.instant('TORRENTS_NO_FILE_SELECTED')
+ });
+ return;
+ }
+
+ Upload.upload({
+ url: '/api/torrents/uploadTorrentCover',
+ data: {
+ newTorrentCoverFile: dataUrl
+ }
+ }).then(function (response) {
+ vm.music.fileSelected = false;
+ vm.music.successfully = true;
+ mtDebug.info(response);
+ vm.music.coverFileName = response.data.filename;
+ Notification.success({
+ message: '
' + $translate.instant('MUSIC_COVER_UPLOAD_SUCCESSFULLY')
+ });
+ }, function (response) {
+ mtDebug.info(response);
+ if (response.status > 0) {
+ vm.music.fileSelected = false;
+ vm.music.successfully = false;
+ vm.music.coverFile = undefined;
+ Notification.error({
+ message: response.data,
+ title: '
' + $translate.instant('MUSIC_COVER_UPLOAD_FAILED')
+ });
+ }
+ }, function (evt) {
+ vm.music.progress = parseInt(100.0 * evt.loaded / evt.total, 10);
+ });
+ };
+
+ /**
+ * uploadTorrentImage
+ * @param editor
+ * @param ufile
+ * @param progressback
+ * @param callback
+ * @param errback
+ */
+ vm.uploadTorrentImage = function (editor, ufile, progressback, callback, errback) {
+ Upload.upload({
+ url: '/api/torrents/uploadTorrentImage',
+ data: {
+ newTorrentImageFile: ufile
+ }
+ }).then(function (res) {
+ if (callback) {
+ callback(res.data.filename);
+ }
+ }, function (res) {
+ if (errback && res.status > 0) {
+ errback(res);
+ }
+ }, function (evt) {
+ if (progressback) {
+ progressback(parseInt(100.0 * evt.loaded / evt.total, 10));
+ }
+ });
+ };
+
/**
* onTMDBIDKeyDown
* @param evt
@@ -347,6 +421,63 @@
}
};
+ /**
+ * createMusicTorrent
+ */
+ vm.createMusicTorrent = function () {
+ var l = vm.getTorrentSize();
+ var t = vm.getResourceTag();
+
+ var detail_info = {
+ title: vm.music.title,
+ subtitle: vm.music.subtitle,
+ cover: vm.music.coverFileName,
+ detail: vm.music.detail
+ };
+
+ mtDebug.info($scope.uImages);
+ var uimg = [];
+ angular.forEach($scope.uImages, function (f) {
+ mtDebug.info(f);
+ uimg.push({
+ filename: f.name
+ });
+ });
+
+ var torrent = new TorrentsService({
+ info_hash: vm.torrentInfo.info_hash,
+ torrent_filename: vm.torrentInfo.filename,
+ torrent_type: 'music',
+ torrent_tags: t,
+ torrent_nfo: vm.videoNfo,
+ torrent_announce: vm.torrentInfo.announce,
+ torrent_size: l,
+
+ resource_detail_info: detail_info,
+ _uImage: uimg
+ });
+
+
+ torrent.$save(function (response) {
+ successCallback(response);
+ }, function (errorResponse) {
+ errorCallback(errorResponse);
+ });
+
+ function successCallback(res) {
+ vm.downloadTorrent(res._id);
+ Notification.success({message: '
Torrent created successfully!'});
+
+ $state.reload('torrents.uploads');
+ document.body.scrollTop = document.documentElement.scrollTop = 0;
+ }
+
+ function errorCallback(res) {
+ vm.error_msg = res.data.message;
+ Notification.error({message: res.data.message, title: '
Torrent created error!'});
+ }
+ };
+
/**
* getTorrentSize
* @returns {number}
diff --git a/modules/torrents/client/services/torrent-download.client.service.js b/modules/torrents/client/services/torrent-download.client.service.js
index b49da845..cfdc5f30 100644
--- a/modules/torrents/client/services/torrent-download.client.service.js
+++ b/modules/torrents/client/services/torrent-download.client.service.js
@@ -24,9 +24,9 @@
var fileName = decodeURI(contentDisposition.substr(contentDisposition.indexOf('filename=') + 9));
FileSaver.saveAs(response.data, fileName);
- successcb(response.status);
+ if (successcb) successcb(response.status);
}, function errorCallback(response) {
- errorcb(response);
+ if (errorcb) errorcb(response);
});
}
}
diff --git a/modules/torrents/client/views/uploads-torrents.client.view.html b/modules/torrents/client/views/uploads-torrents.client.view.html
index 1d975e95..7d68fd05 100644
--- a/modules/torrents/client/views/uploads-torrents.client.view.html
+++ b/modules/torrents/client/views/uploads-torrents.client.view.html
@@ -46,15 +46,17 @@