' + }).grab( + new Element('a', { + 'text': 'Reset filter', + 'events': { + 'click': function(){ + self.filter = { + 'starts_with': null, + 'search': null + }; + self.navigation_search_input.set('value', ''); + self.reset(); + self.activateLetter(); + self.getMovies(true); + self.last_search_value = ''; + } + } + }) + ).inject(self.movie_list); + + } + + }, + + createMovie: function(movie, inject_at, nr){ + var self = this, + movies = Array.isArray(movie) ? movie : [movie], + movie_els = []; + inject_at = inject_at || 'bottom'; + + movies.each(function(movie, nr){ + + var m = new Movie(self, { + 'actions': self.options.actions, + 'view': self.current_view, + 'onSelect': self.calculateSelected.bind(self) + }, movie); + + var el = $(m); + + if(inject_at === 'bottom'){ + movie_els.push(el); + } + else { + el.inject(self.movie_list, inject_at); + } + + self.movies.include(m); + self.movies_added[movie._id] = true; + }); + + if(movie_els.length > 0){ + $(self.movie_list).adopt(movie_els); + } + + }, + + createNavigation: function(){ + var self = this; + var chars = '#ABCDEFGHIJKLMNOPQRSTUVWXYZ'; + + self.el.addClass('with_navigation'); + + self.navigation = new Element('div.alph_nav').adopt( + self.mass_edit_form = new Element('div.mass_edit_form').adopt( + new Element('span.select').adopt( + self.mass_edit_select = new Element('input[type=checkbox]', { + 'events': { + 'change': self.massEditToggleAll.bind(self) + } + }), + self.mass_edit_selected = new Element('span.count', {'text': 0}), + self.mass_edit_selected_label = new Element('span', {'text': 'selected'}) + ), + new Element('div.quality').adopt( + self.mass_edit_quality = new Element('select'), + new Element('a.button.orange', { + 'text': 'Change quality', + 'events': { + 'click': self.changeQualitySelected.bind(self) + } + }) + ), + new Element('div.delete').adopt( + new Element('span[text=or]'), + new Element('a.button.red', { + 'text': 'Delete', + 'events': { + 'click': self.deleteSelected.bind(self) + } + }) + ), + new Element('div.refresh').adopt( + new Element('span[text=or]'), + new Element('a.button.green', { + 'text': 'Refresh', + 'events': { + 'click': self.refreshSelected.bind(self) + } + }) + ) + ), + new Element('div.menus').adopt( + self.navigation_counter = new Element('span.counter[title=Total]'), + self.filter_menu = new BlockMenu(self, { + 'class': 'filter', + 'button_class': 'icon-filter' + }), + self.navigation_actions = new Element('div.actions', { + 'events': { + 'click': function(e, el){ + (e).preventDefault(); + + var new_view = self.current_view == 'list' ? 'thumb' : 'list'; + + var a = 'active'; + self.navigation_actions.getElements('.'+a).removeClass(a); + self.changeView(new_view); + + self.navigation_actions.getElement('[data-view='+new_view+']') + .addClass(a); + + } + } + }), + self.navigation_menu = new BlockMenu(self, { + 'class': 'extra', + 'button_class': 'icon-dots' + }) + ) + ); + + // Mass edit + Quality.getActiveProfiles().each(function(profile){ + new Element('option', { + 'value': profile.get('_id'), + 'text': profile.get('label') + }).inject(self.mass_edit_quality); + }); + + self.filter_menu.addLink( + self.navigation_search_input = new Element('input', { + 'title': 'Search through ' + self.options.identifier, + 'placeholder': 'Search through ' + self.options.identifier, + 'events': { + 'keyup': self.search.bind(self), + 'change': self.search.bind(self) + } + }) + ).addClass('search icon-search'); + + var available_chars; + self.filter_menu.addEvent('open', function(){ + self.navigation_search_input.focus(); + + // Get available chars and highlight + if(!available_chars && (self.navigation.isDisplayed() || self.navigation.isVisible())) + Api.request('media.available_chars', { + 'data': Object.merge({ + 'status': self.options.status + }, self.filter), + 'onSuccess': function(json){ + available_chars = json.chars; + + available_chars.each(function(c){ + self.letters[c.capitalize()].addClass('available'); + }); + + } + }); + }); + + self.filter_menu.addLink( + self.navigation_alpha = new Element('ul.numbers', { + 'events': { + 'click:relay(li.available)': function(e, el){ + self.activateLetter(el.get('data-letter')); + self.getMovies(true); + } + } + }) + ); + + // Actions + ['thumb', 'list'].each(function(view){ + var current = self.current_view == view; + new Element('a', { + 'class': 'icon-' + view + (current ? ' active ' : ''), + 'data-view': view + }).inject(self.navigation_actions, current ? 'top' : 'bottom'); + }); + + // All + self.letters.all = new Element('li.letter_all.available.active', { + 'text': 'ALL' + }).inject(self.navigation_alpha); + + // Chars + chars.split('').each(function(c){ + self.letters[c] = new Element('li', { + 'text': c, + 'class': 'letter_'+c, + 'data-letter': c + }).inject(self.navigation_alpha); + }); + + // Add menu or hide + if (self.options.menu.length > 0) + self.options.menu.each(function(menu_item){ + self.navigation_menu.addLink(menu_item); + }); + else + self.navigation_menu.hide(); + + }, + + calculateSelected: function(){ + var self = this; + + var selected = 0, + movies = self.movies.length; + self.movies.each(function(movie){ + selected += movie.isSelected() ? 1 : 0; + }); + + var indeterminate = selected > 0 && selected < movies, + checked = selected == movies && selected > 0; + + document.body[selected > 0 ? 'addClass' : 'removeClass']('mass_editing'); + + if(self.mass_edit_select){ + self.mass_edit_select.set('checked', checked); + self.mass_edit_select.indeterminate = indeterminate; + + self.mass_edit_selected.set('text', selected); + } + }, + + deleteSelected: function(){ + var self = this, + ids = self.getSelectedMovies(), + help_msg = self.identifier == 'wanted' ? 'If you do, you won\'t be able to watch them, as they won\'t get downloaded!' : 'Your files will be safe, this will only delete the references in CouchPotato'; + + var qObj = new Question('Are you sure you want to delete '+ids.length+' movie'+ (ids.length != 1 ? 's' : '') +'?', help_msg, [{ + 'text': 'Yes, delete '+(ids.length != 1 ? 'them' : 'it'), + 'class': 'delete', + 'events': { + 'click': function(e){ + (e).preventDefault(); + this.set('text', 'Deleting..'); + Api.request('media.delete', { + 'method': 'post', + 'data': { + 'id': ids.join(','), + 'delete_from': self.options.identifier + }, + 'onSuccess': function(){ + qObj.close(); + + var erase_movies = []; + self.movies.each(function(movie){ + if (movie.isSelected()){ + $(movie).destroy(); + erase_movies.include(movie); + } + }); + + erase_movies.each(function(movie){ + self.movies.erase(movie); + movie.destroy(); + self.setCounter(self.counter_count-1); + self.total_movies--; + }); + + self.calculateSelected(); + } + }); + + } + } + }, { + 'text': 'Cancel', + 'cancel': true + }]); + + }, + + changeQualitySelected: function(){ + var self = this; + var ids = self.getSelectedMovies(); + + Api.request('movie.edit', { + 'method': 'post', + 'data': { + 'id': ids.join(','), + 'profile_id': self.mass_edit_quality.get('value') + }, + 'onSuccess': self.search.bind(self) + }); + }, + + refreshSelected: function(){ + var self = this; + var ids = self.getSelectedMovies(); + + Api.request('media.refresh', { + 'method': 'post', + 'data': { + 'id': ids.join(',') + } + }); + }, + + getSelectedMovies: function(){ + var self = this; + + var ids = []; + self.movies.each(function(movie){ + if (movie.isSelected()) + ids.include(movie.get('_id')); + }); + + return ids; + }, + + massEditToggleAll: function(){ + var self = this; + + var select = self.mass_edit_select.get('checked'); + + self.movies.each(function(movie){ + movie.select(select); + }); + + self.calculateSelected(); + }, + + reset: function(){ + var self = this; + + self.movies = []; + if(self.mass_edit_select) + self.calculateSelected(); + if(self.navigation_alpha) + self.navigation_alpha.getElements('.active').removeClass('active'); + + self.offset = 0; + if(self.scrollspy){ + //self.load_more.show(); + self.scrollspy.start(); + } + }, + + activateLetter: function(letter){ + var self = this; + + self.reset(); + + self.letters[letter || 'all'].addClass('active'); + self.filter.starts_with = letter; + + }, + + changeView: function(new_view){ + var self = this; + + if(self.available_views.indexOf(new_view) == -1) + new_view = 'thumb'; + + self.el + .removeClass(self.current_view+'_list') + .addClass(new_view+'_list'); + + self.current_view = new_view; + Cookie.write(self.options.identifier+'_view', new_view, {duration: 1000}); + }, + + getSavedView: function(){ + var self = this; + return self.options.force_view ? self.options.view : Cookie.read(self.options.identifier+'_view'); + }, + + search: function(){ + var self = this; + + if(self.search_timer) clearRequestTimeout(self.search_timer); + self.search_timer = requestTimeout(function(){ + var search_value = self.navigation_search_input.get('value'); + if (search_value == self.last_search_value) return; + + self.reset(); + + self.activateLetter(); + self.filter.search = search_value; + + self.getMovies(true); + + self.last_search_value = search_value; + + }, 250); + + }, + + update: function(){ + var self = this; + + self.reset(); + self.getMovies(true); + }, + + getMovies: function(reset){ + var self = this; + + if(self.scrollspy){ + self.scrollspy.stop(); + self.load_more.set('text', 'loading...'); + } + + var loader_timeout; + if(self.movies.length === 0 && self.options.loader){ + + self.loader_first = new Element('div.mask.loading.with_message').grab( + new Element('div.message', {'text': self.options.title ? 'Loading \'' + self.options.title + '\'' : 'Loading...'}) + ).inject(self.el, 'top'); + createSpinner(self.loader_first); + + var lfc = self.loader_first; + loader_timeout = requestTimeout(function(){ + lfc.addClass('show'); + }, 10); + + self.el.setStyle('min-height', 220); + + } + + Api.request(self.options.api_call, { + 'data': Object.merge({ + 'type': self.options.type || 'movie', + 'status': self.options.status, + 'limit_offset': self.options.limit ? self.options.limit + ',' + self.offset : null + }, self.filter), + 'onSuccess': function(json){ + + if(reset) + self.movie_list.empty(); + + if(loader_timeout) clearRequestTimeout(loader_timeout); + if(self.loader_first){ + var lf = self.loader_first; + self.loader_first = null; + lf.removeClass('show'); + + requestTimeout(function(){ + lf.destroy(); + }, 1000); + self.el.setStyle('min-height', null); + } + + self.store(json.movies); + self.addMovies(json.movies, json.total || json.movies.length); + if(self.scrollspy) { + self.load_more.set('text', 'load more movies'); + self.scrollspy.start(); + } + + self.checkIfEmpty(); + self.fireEvent('loaded'); + } + }); + }, + + loadMore: function(){ + var self = this; + if(self.offset >= self.options.limit) + self.getMovies(); + }, + + store: function(movies){ + var self = this; + + self.offset += movies.length; + + }, + + checkIfEmpty: function(){ + var self = this; + + var is_empty = self.movies.length === 0 && (self.total_movies === 0 || self.total_movies === undefined); + + if(self.title) + self.title[is_empty ? 'hide' : 'show'](); + + if(self.description) + self.description.setStyle('display', [is_empty ? 'none' : '']); + + if(is_empty && self.options.on_empty_element){ + var ee = typeOf(self.options.on_empty_element) == 'function' ? self.options.on_empty_element() : self.options.on_empty_element; + ee.inject(self.loader_first || self.title || self.movie_list, 'after'); + + if(self.navigation) + self.navigation.hide(); + + self.empty_element = ee; + } + else if(self.empty_element){ + self.empty_element.destroy(); + + if(self.navigation) + self.navigation.show(); + } + + }, + + toElement: function(){ + return this.el; + } + +}); diff --git a/couchpotato/core/media/movie/_base/static/manage.js b/couchpotato/core/media/movie/_base/static/manage.js new file mode 100644 index 0000000000..9d379ad74b --- /dev/null +++ b/couchpotato/core/media/movie/_base/static/manage.js @@ -0,0 +1,148 @@ +var MoviesManage = new Class({ + + Extends: PageBase, + + order: 20, + name: 'manage', + title: 'Do stuff to your existing movies!', + + indexAction: function(){ + var self = this; + + if(!self.list){ + self.refresh_button = new Element('a', { + 'title': 'Rescan your library for new movies', + 'text': 'Full library refresh', + 'events':{ + 'click': self.refresh.bind(self, true) + } + }); + + self.refresh_quick = new Element('a', { + 'title': 'Just scan for recently changed', + 'text': 'Quick library scan', + 'events':{ + 'click': self.refresh.bind(self, false) + } + }); + + self.list = new MovieList({ + 'identifier': 'manage', + 'filter': { + 'status': 'done', + 'release_status': 'done', + 'status_or': 1 + }, + 'actions': [MA.IMDB, MA.Files, MA.Trailer, MA.Readd, MA.Delete], + 'menu': [self.refresh_button, self.refresh_quick], + 'on_empty_element': new Element('div.empty_manage').adopt( + new Element('div', { + 'text': 'Seems like you don\'t have anything in your library yet. Add your existing movie folders in ' + }).grab( + new Element('a', { + 'text': 'Settings > Manage', + 'href': App.createUrl('settings/manage') + }) + ), + new Element('div.after_manage', { + 'text': 'When you\'ve done that, hit this button Б├▓ ' + }).grab( + new Element('a.button.green', { + 'text': 'Hit me, but not too hard', + 'events':{ + 'click': self.refresh.bind(self, true) + } + }) + ) + ) + }); + $(self.list).inject(self.content); + + // Check if search is in progress + self.startProgressInterval(); + } + + }, + + refresh: function(full){ + var self = this; + + if(!self.update_in_progress){ + + Api.request('manage.update', { + 'data': { + 'full': +full + } + }); + + self.startProgressInterval(); + + } + + }, + + startProgressInterval: function(){ + var self = this; + + self.progress_interval = requestInterval(function(){ + + if(self.progress_request && self.progress_request.running) + return; + + self.update_in_progress = true; + self.progress_request = Api.request('manage.progress', { + 'onComplete': function(json){ + + if(!json || !json.progress){ + clearRequestInterval(self.progress_interval); + self.update_in_progress = false; + if(self.progress_container){ + self.progress_container.destroy(); + self.list.update(); + } + } + else { + // Capture progress so we can use it in our *each* closure + var progress = json.progress; + + // Don't add loader when page is loading still + if(!self.list.navigation) + return; + + if(!self.progress_container) + self.progress_container = new Element('div.progress') + .inject(self.list, 'top'); + + self.progress_container.empty(); + + var sorted_table = self.parseProgress(json.progress); + + sorted_table.each(function(folder){ + var folder_progress = progress[folder]; + new Element('div').adopt( + new Element('span.folder', {'text': folder + + (folder_progress.eta > 0 ? ', ' + new Date ().increment('second', folder_progress.eta).timeDiffInWords().replace('from now', 'to go') : '') + }), + new Element('span.percentage', {'text': folder_progress.total ? Math.round(((folder_progress.total-folder_progress.to_go)/folder_progress.total)*100) + '%' : '0%'}) + ).inject(self.progress_container); + }); + + } + } + }); + + }, 1000); + }, + + parseProgress: function (progress_object) { + var folder, temp_array = []; + + for (folder in progress_object) { + if (progress_object.hasOwnProperty(folder)) { + temp_array.push(folder); + } + } + return temp_array.stableSort(); + } + +}); diff --git a/couchpotato/core/media/movie/_base/static/movie.actions.js b/couchpotato/core/media/movie/_base/static/movie.actions.js new file mode 100644 index 0000000000..80c6484c29 --- /dev/null +++ b/couchpotato/core/media/movie/_base/static/movie.actions.js @@ -0,0 +1,985 @@ +var MovieAction = new Class({ + + Implements: [Options], + + class_name: 'action', + label: 'UNKNOWN', + icon: null, + button: null, + details: null, + detail_button: null, + + initialize: function(movie, options){ + var self = this; + self.setOptions(options); + + self.movie = movie; + + self.create(); + + if(self.button){ + var wrapper = new Element('div', { + 'class': self.class_name + }); + self.button.inject(wrapper); + + self.button = wrapper; + } + }, + + create: function(){}, + + getButton: function(){ + return this.button || null; + }, + + getDetails: function(){ + return this.details || null; + }, + + getDetailButton: function(){ + return this.detail_button || null; + }, + + getLabel: function(){ + return this.label; + }, + + disable: function(){ + if(this.el) + this.el.addClass('disable'); + }, + + enable: function(){ + if(this.el) + this.el.removeClass('disable'); + }, + + getTitle: function(){ + var self = this; + + try { + return self.movie.getTitle(true); + } + catch(e){ + try { + return self.movie.original_title ? self.movie.original_title : self.movie.titles[0]; + } + catch(e2){ + return 'Unknown'; + } + } + }, + + get: function(key){ + var self = this; + try { + return self.movie.get(key); + } + catch(e){ + return self.movie[key]; + } + }, + + createMask: function(){ + var self = this; + self.mask = new Element('div.mask', { + 'styles': { + 'z-index': '1' + } + }).inject(self.movie, 'top').fade('hide'); + }, + + toElement: function(){ + return this.el || null; + } + +}); + +var MA = {}; + +MA.IMDB = new Class({ + + Extends: MovieAction, + id: null, + + create: function(){ + var self = this; + + self.id = self.movie.getIdentifier ? self.movie.getIdentifier() : self.get('imdb'); + + self.button = self.createButton(); + self.detail_button = self.createButton(); + + if(!self.id) self.disable(); + }, + + createButton: function(){ + var self = this; + + return new Element('a.imdb', { + 'text': 'IMDB', + 'title': 'Go to the IMDB page of ' + self.getTitle(), + 'href': 'http://www.imdb.com/title/'+self.id+'/', + 'target': '_blank' + }); + }, + +}); + +MA.Release = new Class({ + + Extends: MovieAction, + label: 'Releases', + + create: function(){ + var self = this; + + App.on('movie.searcher.ended', function(notification){ + if(self.movie.data._id != notification.data._id) return; + + self.releases = null; + if(self.options_container){ + // Releases are currently displayed + if(self.options_container.isDisplayed()){ + self.options_container.destroy(); + self.getDetails(); + } + else { + self.options_container.destroy(); + self.options_container = null; + } + } + }); + + }, + + getDetails: function(refresh){ + var self = this; + if(!self.movie.data.releases || self.movie.data.releases.length === 0) return; + + if(!self.options_container || refresh){ + self.options_container = new Element('div.options').grab( + self.release_container = new Element('div.releases.table') + ); + + // Header + new Element('div.item.head').adopt( + new Element('span.name', {'text': 'Release name'}), + new Element('span.status', {'text': 'Status'}), + new Element('span.quality', {'text': 'Quality'}), + new Element('span.size', {'text': 'Size'}), + new Element('span.age', {'text': 'Age'}), + new Element('span.score', {'text': 'Score'}), + new Element('span.provider', {'text': 'Provider'}), + new Element('span.actions') + ).inject(self.release_container); + + if(self.movie.data.releases) + self.movie.data.releases.each(function(release){ + + var quality = Quality.getQuality(release.quality) || {}, + info = release.info || {}, + provider = self.get(release, 'provider') + (info.provider_extra ? self.get(release, 'provider_extra') : ''); + + var release_name = self.get(release, 'name'); + if(release.files && release.files.length > 0){ + try { + var movie_file = release.files.filter(function(file){ + var type = File.Type.get(file.type_id); + return type && type.identifier == 'movie'; + }).pick(); + release_name = movie_file.path.split(Api.getOption('path_sep')).getLast(); + } + catch(e){} + } + + var size = info.size ? Math.floor(self.get(release, 'size')) : 0; + size = size ? ((size < 1000) ? size + 'MB' : Math.round(size*10/1024)/10 + 'GB') : 'n/a'; + + // Create release + release.el = new Element('div', { + 'class': 'item '+release.status, + 'id': 'release_'+release._id + }).adopt( + new Element('span.name', {'text': release_name, 'title': release_name}), + new Element('span.status', {'text': release.status, 'class': 'status '+release.status}), + new Element('span.quality', {'text': quality.label + (release.is_3d ? ' 3D' : '') || 'n/a'}), + new Element('span.size', {'text': size}), + new Element('span.age', {'text': self.get(release, 'age')}), + new Element('span.score', {'text': self.get(release, 'score')}), + new Element('span.provider', { 'text': provider, 'title': provider }), + new Element('span.actions').adopt( + info.detail_url ? new Element('a.icon-info', { + 'href': info.detail_url, + 'target': '_blank' + }) : new Element('a'), + new Element('a.icon-download', { + 'events': { + 'click': function(e){ + (e).stopPropagation(); + if(!this.hasClass('completed')) + self.download(release); + } + } + }), + new Element('a', { + 'class': release.status == 'ignored' ? 'icon-redo' : 'icon-cancel', + 'events': { + 'click': function(e){ + (e).stopPropagation(); + self.ignore(release); + + this.toggleClass('icon-redo'); + this.toggleClass('icon-cancel'); + } + } + }) + ) + ).inject(self.release_container); + + if(release.status == 'ignored' || release.status == 'failed' || release.status == 'snatched'){ + if(!self.last_release || (self.last_release && self.last_release.status != 'snatched' && release.status == 'snatched')) + self.last_release = release; + } + else if(!self.next_release && release.status == 'available'){ + self.next_release = release; + } + + var update_handle = function(notification) { + if(notification.data._id != release._id) return; + + var q = self.movie.quality.getElement('.q_' + release.quality), + new_status = notification.data.status; + + release.el.set('class', 'item ' + new_status); + + var status_el = release.el.getElement('.status'); + status_el.set('class', 'status ' + new_status); + status_el.set('text', new_status); + + if(!q && (new_status == 'snatched' || new_status == 'seeding' || new_status == 'done')) + q = self.addQuality(release.quality_id); + + if(q && !q.hasClass(new_status)) { + q.removeClass(release.status).addClass(new_status); + q.set('title', q.get('title').replace(release.status, new_status)); + } + }; + + App.on('release.update_status', update_handle); + + }); + + if(self.last_release) + self.release_container.getElements('#release_'+self.last_release._id).addClass('last_release'); + + if(self.next_release) + self.release_container.getElements('#release_'+self.next_release._id).addClass('next_release'); + + if(self.next_release || (self.last_release && ['ignored', 'failed'].indexOf(self.last_release.status) === false)){ + + self.trynext_container = new Element('div.buttons.try_container').inject(self.release_container, 'top'); + + var nr = self.next_release, + lr = self.last_release; + + self.trynext_container.adopt( + new Element('span.or', { + 'text': 'If anything went wrong, download ' + }), + lr ? new Element('a.orange', { + 'text': 'the same release again', + 'events': { + 'click': function(){ + self.download(lr); + } + } + }) : null, + nr && lr ? new Element('span.or', { + 'text': ', ' + }) : null, + nr ? [new Element('a.green', { + 'text': lr ? 'another release' : 'the best release', + 'events': { + 'click': function(){ + self.download(nr); + } + } + }), + new Element('span.or', { + 'text': ' or pick one below' + })] : null + ); + } + + self.last_release = null; + self.next_release = null; + + } + + return self.options_container; + + }, + + get: function(release, type){ + return (release.info && release.info[type] !== undefined) ? release.info[type] : 'n/a'; + }, + + download: function(release){ + var self = this; + + var release_el = self.release_container.getElement('#release_'+release._id), + icon = release_el.getElement('.icon-download'); + + if(icon) + icon.addClass('icon spinner').removeClass('download'); + + Api.request('release.manual_download', { + 'data': { + 'id': release._id + }, + 'onComplete': function(json){ + if(icon) + icon.removeClass('icon spinner'); + + if(json.success){ + if(icon) + icon.addClass('completed'); + release_el.getElement('.status').set('text', 'snatched'); + } + else + if(icon) + icon.addClass('attention').set('title', 'Something went wrong when downloading, please check logs.'); + } + }); + }, + + ignore: function(release){ + + Api.request('release.ignore', { + 'data': { + 'id': release._id + } + }); + + } + +}); + +MA.Trailer = new Class({ + + Extends: MovieAction, + id: null, + label: 'Trailer', + + getDetails: function(){ + var self = this, + data_url = 'https://www.googleapis.com/youtube/v3/search?q="{title}" {year} trailer&maxResults=1&type=video&videoDefinition=high&videoEmbeddable=true&part=snippet&key=AIzaSyAT3li1KjfLidaL6Vt8T92MRU7n4VOrjYk'; + + if(!self.player_container){ + self.id = 'trailer-'+randomString(); + + self.container = new Element('div.trailer_container').adopt( + self.player_container = new Element('div.icon-play[id='+self.id+']', { + 'events': { + 'click': self.watch.bind(self) + } + }).adopt( + new Element('span[text="watch"]'), + new Element('span[text="trailer"]') + ), + self.background = new Element('div.background') + ); + + requestTimeout(function(){ + + var url = data_url.substitute({ + 'title': encodeURI(self.getTitle()), + 'year': self.get('year') + }); + + new Request.JSONP({ + 'url': url, + 'onComplete': function(json){ + if(json.items.length > 0){ + self.video_id = json.items[0].id.videoId; + self.background.setStyle('background-image', 'url('+json.items[0].snippet.thumbnails.high.url+')'); + self.background.addClass('visible'); + } + else { + self.container.getParent('.section').addClass('no_trailer'); + } + } + }).send(); + + }, 1000); + } + + return self.container; + + }, + + watch: function(){ + var self = this; + + new Element('iframe', { + 'src': 'https://www.youtube-nocookie.com/embed/'+self.video_id+'?rel=0&showinfo=0&autoplay=1&showsearch=0&iv_load_policy=3&vq=hd720' + }).inject(self.container); + } + + +}); + + +MA.Category = new Class({ + + Extends: MovieAction, + + create: function(){ + var self = this; + + var category = self.movie.get('category'); + + self.detail_button = new BlockMenu(self, { + 'class': 'category', + 'button_text': category ? category.label : 'No category', + 'button_class': 'icon-dropdown' + }); + + var categories = CategoryList.getAll(); + if(categories.length > 0){ + + $(self.detail_button).addEvents({ + 'click:relay(li a)': function(e, el){ + (e).stopPropagation(); + + // Update category + Api.request('movie.edit', { + 'data': { + 'id': self.movie.get('_id'), + 'category_id': el.get('data-id') + } + }); + + $(self.detail_button).getElements('.icon-ok').removeClass('icon-ok'); + el.addClass('icon-ok'); + + self.detail_button.button.set('text', el.get('text')); + + } + }); + + self.detail_button.addLink(new Element('a[text=No category]', { + 'class': !category ? 'icon-ok' : '', + 'data-id': '' + })); + categories.each(function(c){ + self.detail_button.addLink(new Element('a', { + 'text': c.get('label'), + 'class': category && category._id == c.get('_id') ? 'icon-ok' : '', + 'data-id': c.get('_id') + })); + }); + } + else { + $(self.detail_button).hide(); + } + + } + +}); + + +MA.Profile = new Class({ + + Extends: MovieAction, + + create: function(){ + var self = this; + + var profile = self.movie.profile; + + self.detail_button = new BlockMenu(self, { + 'class': 'profile', + 'button_text': profile ? profile.get('label') : 'No profile', + 'button_class': 'icon-dropdown' + }); + + var profiles = Quality.getActiveProfiles(); + if(profiles.length > 0){ + + $(self.detail_button).addEvents({ + 'click:relay(li a)': function(e, el){ + (e).stopPropagation(); + + // Update category + Api.request('movie.edit', { + 'data': { + 'id': self.movie.get('_id'), + 'profile_id': el.get('data-id') + } + }); + + $(self.detail_button).getElements('.icon-ok').removeClass('icon-ok'); + el.addClass('icon-ok'); + + self.detail_button.button.set('text', el.get('text')); + + } + }); + + profiles.each(function(pr){ + self.detail_button.addLink(new Element('a', { + 'text': pr.get('label'), + 'class': profile && profile.get('_id') == pr.get('_id') ? 'icon-ok' : '', + 'data-id': pr.get('_id') + })); + }); + } + else { + $(self.detail_button).hide(); + } + + } + +}); + +MA.Refresh = new Class({ + + Extends: MovieAction, + icon: 'refresh', + + create: function(){ + var self = this; + + self.button = self.createButton(); + self.detail_button = self.createButton(); + + }, + + createButton: function(){ + var self = this; + return new Element('a.refresh', { + 'text': 'Refresh', + 'title': 'Refresh the movie info and do a forced search', + 'events': { + 'click': self.doRefresh.bind(self) + } + }); + }, + + doRefresh: function(e){ + var self = this; + (e).stop(); + + Api.request('media.refresh', { + 'data': { + 'id': self.movie.get('_id') + } + }); + } + +}); + +var SuggestBase = new Class({ + + Extends: MovieAction, + + getIMDB: function(){ + return this.movie.data.info.imdb; + }, + + refresh: function(json){ + var self = this; + + if(json && json.movie){ + self.movie.list.addMovies([json.movie], 1); + + var last_added = self.movie.list.movies[self.movie.list.movies.length-1]; + $(last_added).inject(self.movie, 'before'); + } + + self.movie.destroy(); + } + +}); + +MA.Add = new Class({ + + Extends: SuggestBase, + label: 'Add', + icon: 'plus', + + create: function() { + var self = this; + + self.button = new Element('a.add', { + 'text': 'Add', + 'title': 'Re-add the movie and mark all previous snatched/downloaded as ignored', + 'events': { + 'click': function(){ + self.movie.openDetails(); + } + } + }); + + }, + + getDetails: function(){ + var self = this; + + var m = new BlockSearchMovieItem(self.movie.data.info, { + 'onAdded': self.movie.data.status == 'suggested' ? function(){ + + Api.request('suggestion.ignore', { + 'data': { + 'imdb': self.movie.data.info.imdb, + 'remove_only': true + }, + 'onComplete': self.refresh.bind(self) + }); + + } : function(){ + self.movie.destroy(); + } + }); + m.showOptions(); + + return m; + } + +}); + +MA.SuggestSeen = new Class({ + + Extends: SuggestBase, + icon: 'eye', + + create: function() { + var self = this; + + self.button = self.createButton(); + self.detail_button = self.createButton(); + }, + + createButton: function(){ + var self = this; + + return new Element('a.seen', { + 'text': 'Already seen', + 'title': 'Already seen it!', + 'events': { + 'click': self.markAsSeen.bind(self) + } + }); + + }, + + markAsSeen: function(e){ + var self = this; + (e).stopPropagation(); + + Api.request('suggestion.ignore', { + 'data': { + 'imdb': self.getIMDB(), + 'mark_seen': 1 + }, + 'onComplete': function(json){ + self.refresh(json); + if(self.movie.details){ + self.movie.details.close(); + } + } + }); + } + +}); + +MA.SuggestIgnore = new Class({ + + Extends: SuggestBase, + icon: 'error', + + create: function() { + var self = this; + + self.button = self.createButton(); + self.detail_button = self.createButton(); + }, + + createButton: function(){ + var self = this; + + return new Element('a.ignore', { + 'text': 'Ignore', + 'title': 'Don\'t suggest this movie anymore', + 'events': { + 'click': self.markAsIgnored.bind(self) + } + }); + + }, + + markAsIgnored: function(e){ + var self = this; + (e).stopPropagation(); + + Api.request('suggestion.ignore', { + 'data': { + 'imdb': self.getIMDB() + }, + 'onComplete': function(json){ + self.refresh(json); + if(self.movie.details){ + self.movie.details.close(); + } + } + }); + } + +}); + + +MA.ChartIgnore = new Class({ + + Extends: SuggestBase, + icon: 'error', + + create: function() { + var self = this; + + self.button = self.createButton(); + self.detail_button = self.createButton(); + }, + + createButton: function(){ + var self = this; + + return new Element('a.ignore', { + 'text': 'Hide', + 'title': 'Don\'t show this movie in charts', + 'events': { + 'click': self.markAsHidden.bind(self) + } + }); + + }, + + markAsHidden: function(e){ + var self = this; + (e).stopPropagation(); + + Api.request('charts.ignore', { + 'data': { + 'imdb': self.getIMDB() + }, + 'onComplete': function(json){ + if(self.movie.details){ + self.movie.details.close(); + } + self.movie.destroy(); + } + }); + } + +}); + +MA.Readd = new Class({ + + Extends: MovieAction, + + create: function(){ + var self = this, + movie_done = self.movie.data.status == 'done', + snatched; + + if(self.movie.data.releases && !movie_done) + snatched = self.movie.data.releases.filter(function(release){ + return release.status && (release.status == 'snatched' || release.status == 'seeding' || release.status == 'downloaded' || release.status == 'done'); + }).length; + + if(movie_done || snatched && snatched > 0) + self.el = new Element('a.readd', { + 'title': 'Re-add the movie and mark all previous snatched/downloaded as ignored', + 'events': { + 'click': self.doReadd.bind(self) + } + }); + + }, + + doReadd: function(e){ + var self = this; + (e).stopPropagation(); + + Api.request('movie.add', { + 'data': { + 'identifier': self.movie.getIdentifier(), + 'ignore_previous': 1 + } + }); + } + +}); + +MA.Delete = new Class({ + + Extends: MovieAction, + + Implements: [Chain], + + create: function(){ + var self = this; + + self.button = self.createButton(); + self.detail_button = self.createButton(); + + }, + + createButton: function(){ + var self = this; + return new Element('a.delete', { + 'text': 'Delete', + 'title': 'Remove the movie from this CP list', + 'events': { + 'click': self.showConfirm.bind(self) + } + }); + }, + + showConfirm: function(e){ + var self = this; + (e).stopPropagation(); + + self.question = new Question('Are you sure you want to delete ' + self.getTitle() + '?', '', [{ + 'text': 'Yes, delete '+self.getTitle(), + 'class': 'delete', + 'events': { + 'click': function(e){ + e.target.set('text', 'Deleting...'); + + self.del(); + } + } + }, { + 'text': 'Cancel', + 'cancel': true + }]); + + }, + + del: function(){ + var self = this; + + var movie = $(self.movie); + + Api.request('media.delete', { + 'data': { + 'id': self.movie.get('_id'), + 'delete_from': self.movie.list.options.identifier + }, + 'onComplete': function(){ + if(self.question) + self.question.close(); + + dynamics.animate(movie, { + opacity: 0, + scale: 0 + }, { + type: dynamics.bezier, + points: [{'x':0,'y':0,'cp':[{'x':0.876,'y':0}]},{'x':1,'y':1,'cp':[{'x':0.145,'y':1}]}], + duration: 400, + complete: function(){ + self.movie.destroy(); + } + }); + } + }); + + } + +}); + +MA.Files = new Class({ + + Extends: MovieAction, + label: 'Files', + + getDetails: function(){ + var self = this; + + if(!self.movie.data.releases || self.movie.data.releases.length === 0) + return; + + if(!self.files_container){ + self.files_container = new Element('div.files.table'); + + // Header + new Element('div.item.head').adopt( + new Element('span.name', {'text': 'File'}), + new Element('span.type', {'text': 'Type'}) + ).inject(self.files_container); + + if(self.movie.data.releases) + Array.each(self.movie.data.releases, function(release){ + var rel = new Element('div.release').inject(self.files_container); + + Object.each(release.files, function(files, type){ + Array.each(files, function(file){ + new Element('div.file.item').adopt( + new Element('span.name', {'text': file}), + new Element('span.type', {'text': type}) + ).inject(rel); + }); + }); + }); + + } + + return self.files_container; + } + +}); + + +MA.MarkAsDone = new Class({ + + Extends: MovieAction, + + create: function(){ + var self = this; + + self.button = self.createButton(); + self.detail_button = self.createButton(); + + }, + + createButton: function(){ + var self = this; + + return new Element('a.mark_as_done', { + 'text': 'Mark as done', + 'title': 'Remove from available list and move to managed movies', + 'events': { + 'click': self.markMovieDone.bind(self) + } + }); + }, + + markMovieDone: function(){ + var self = this; + + Api.request('media.delete', { + 'data': { + 'id': self.movie.get('_id'), + 'delete_from': 'wanted' + }, + 'onComplete': function(){ + self.movie.destroy(); + } + }); + + } + +}); diff --git a/couchpotato/core/media/movie/_base/static/movie.js b/couchpotato/core/media/movie/_base/static/movie.js new file mode 100644 index 0000000000..36f38eb5e4 --- /dev/null +++ b/couchpotato/core/media/movie/_base/static/movie.js @@ -0,0 +1,458 @@ +var Movie = new Class({ + + Extends: BlockBase, + Implements: [Options, Events], + + actions: null, + details: null, + + initialize: function(list, options, data){ + var self = this; + + self.actions = []; + self.data = data; + self.list = list; + + self.buttons = []; + + self.el = new Element('a.movie').grab( + self.inner = new Element('div.inner') + ); + self.el.store('klass', self); + + self.profile = Quality.getProfile(data.profile_id) || {}; + self.category = CategoryList.getCategory(data.category_id) || {}; + self.parent(self, options); + + self.addEvents(); + + //if(data.identifiers.imdb == 'tt3181822'){ + // self.el.fireEvent('mouseenter'); + // self.openDetails(); + //} + }, + + openDetails: function(){ + var self = this; + + if(!self.details){ + self.details = new MovieDetails(self, { + 'level': 3 + }); + + // Add action items + self.actions.each(function(action, nr){ + var details = action.getDetails(); + if(details){ + self.details.addSection(action.getLabel(), details); + } + else { + var button = action.getDetailButton(); + if(button){ + self.details.addButton(button); + } + } + }); + } + + App.getPageContainer().grab(self.details); + + requestTimeout(self.details.open.bind(self.details), 20); + }, + + addEvents: function(){ + var self = this; + + self.global_events = {}; + + // Do refresh with new data + self.global_events['movie.update'] = function(notification){ + if(self.data._id != notification.data._id) return; + + self.busy(false); + requestTimeout(function(){ + self.update(notification); + }, 2000); + }; + App.on('movie.update', self.global_events['movie.update']); + + // Add spinner on load / search + ['media.busy', 'movie.searcher.started'].each(function(listener){ + self.global_events[listener] = function(notification){ + if(notification.data && (self.data._id == notification.data._id || (typeOf(notification.data._id) == 'array' && notification.data._id.indexOf(self.data._id) > -1))) + self.busy(true); + }; + App.on(listener, self.global_events[listener]); + }); + + // Remove spinner + self.global_events['movie.searcher.ended'] = function(notification){ + if(notification.data && self.data._id == notification.data._id) + self.busy(false); + }; + App.on('movie.searcher.ended', self.global_events['movie.searcher.ended']); + + // Reload when releases have updated + self.global_events['release.update_status'] = function(notification){ + var data = notification.data; + if(data && self.data._id == data.media_id){ + + if(!self.data.releases) + self.data.releases = []; + + var updated = false; + self.data.releases.each(function(release){ + if(release._id == data._id){ + release.status = data.status; + updated = true; + } + }); + + if(updated) + self.updateReleases(); + } + }; + + App.on('release.update_status', self.global_events['release.update_status']); + + }, + + destroy: function(){ + var self = this; + + self.el.destroy(); + delete self.list.movies_added[self.get('id')]; + self.list.movies.erase(self); + + self.list.checkIfEmpty(); + + if(self.details) + self.details.close(); + + // Remove events + Object.each(self.global_events, function(handle, listener){ + App.off(listener, handle); + }); + }, + + busy: function(set_busy, timeout){ + var self = this; + + if(!set_busy){ + requestTimeout(function(){ + if(self.spinner){ + self.mask.fade('out'); + requestTimeout(function(){ + if(self.mask) + self.mask.destroy(); + if(self.spinner) + self.spinner.destroy(); + self.spinner = null; + self.mask = null; + }, timeout || 400); + } + }, timeout || 1000); + } + else if(!self.spinner) { + self.createMask(); + self.spinner = createSpinner(self.mask); + self.mask.fade('in'); + } + }, + + createMask: function(){ + var self = this; + self.mask = new Element('div.mask', { + 'styles': { + 'z-index': 4 + } + }).inject(self.el, 'top').fade('hide'); + }, + + update: function(notification){ + var self = this; + + self.actions = []; + self.data = notification.data; + self.inner.empty(); + + self.profile = Quality.getProfile(self.data.profile_id) || {}; + self.category = CategoryList.getCategory(self.data.category_id) || {}; + self.create(); + + self.select(self.select_checkbox.get('checked')); + + self.busy(false); + }, + + create: function(){ + var self = this; + + self.el.addClass('status_'+self.get('status')); + + var eta_date = self.getETA(); + + var rating, stars; + if(['suggested','chart'].indexOf(self.data.status) > -1 && self.data.info && self.data.info.rating && self.data.info.rating.imdb){ + rating = self.data.info.rating.imdb; + + stars = []; + + var half_rating = rating[0]/2; + for(var i = 1; i <= 5; i++){ + if(half_rating >= 1) + stars.push(new Element('span.icon-star')); + else if(half_rating > 0) + stars.push(new Element('span.icon-star-half')); + else + stars.push(new Element('span.icon-star-empty')); + + half_rating -= 1; + } + } + + var thumbnail = new Element('div.poster'); + + if(self.data.files && self.data.files.image_poster && self.data.files.image_poster.length > 0){ + thumbnail = new Element('div', { + 'class': 'type_image poster', + 'styles': { + 'background-image': 'url(' + Api.createUrl('file.cache') + self.data.files.image_poster[0].split(Api.getOption('path_sep')).pop() +')' + } + }); + } + else if(self.data.info && self.data.info.images && self.data.info.images.poster && self.data.info.images.poster.length > 0){ + thumbnail = new Element('div', { + 'class': 'type_image poster', + 'styles': { + 'background-image': 'url(' + self.data.info.images.poster[0] +')' + } + }); + } + + self.inner.adopt( + self.select_checkbox = new Element('input[type=checkbox]'), + new Element('div.poster_container').adopt( + thumbnail, + self.actions_el = new Element('div.actions') + ), + new Element('div.info').adopt( + new Element('div.title').adopt( + new Element('span', { + 'text': self.getTitle() || 'n/a' + }), + new Element('div.year', { + 'text': self.data.info.year || 'n/a' + }) + ), + eta_date ? new Element('div.eta', { + 'text': eta_date, + 'title': 'ETA' + }) : null, + self.quality = new Element('div.quality'), + rating ? new Element('div.rating[title='+rating[0]+']').adopt( + stars, + new Element('span.votes[text=('+rating.join(' / ')+')][title=Votes]') + ) : null + ) + ); + + if(!thumbnail) + self.el.addClass('no_thumbnail'); + + // Add profile + if(self.profile.data) + self.profile.getTypes().each(function(type){ + + var q = self.addQuality(type.get('quality'), type.get('3d')); + if((type.finish === true || type.get('finish')) && !q.hasClass('finish')){ + q.addClass('finish'); + q.set('title', q.get('title') + ' Will finish searching for this movie if this quality is found.'); + } + + }); + + // Add releases + self.updateReleases(); + + }, + + + onClick: function(e){ + var self = this; + + if(e.target.getParents('.actions').length === 0 && e.target != self.select_checkbox){ + (e).stopPropagation(); + self.addActions(); + self.openDetails(); + } + }, + + addActions: function(){ + var self = this; + + if(self.actions.length <= 0){ + self.options.actions.each(function(a){ + var action = new a(self), + button = action.getButton(); + if(button){ + self.actions_el.grab(button); + self.buttons.push(button); + } + + self.actions.push(action); + }); + } + }, + + onMouseenter: function(){ + var self = this; + + if(App.mobile_screen) return; + self.addActions(); + + if(self.list.current_view == 'thumb'){ + self.el.addClass('hover_start'); + requestTimeout(function(){ + self.el.removeClass('hover_start'); + }, 300); + + dynamics.css(self.inner, { + scale: 1 + }); + + dynamics.animate(self.inner, { + scale: 0.9 + }, { type: dynamics.bounce }); + + self.buttons.each(function(el, nr){ + + dynamics.css(el, { + opacity: 0, + translateY: 50 + }); + + dynamics.animate(el, { + opacity: 1, + translateY: 0 + }, { + type: dynamics.spring, + frequency: 200, + friction: 300, + duration: 800, + delay: 100 + (nr * 40) + }); + + }); + } + }, + + updateReleases: function(){ + var self = this; + if(!self.data.releases || self.data.releases.length === 0) return; + + self.data.releases.each(function(release){ + + var q = self.quality.getElement('.q_'+ release.quality+(release.is_3d ? '.is_3d' : ':not(.is_3d)')), + status = release.status; + + if(!q && (status == 'snatched' || status == 'seeding' || status == 'done')) + q = self.addQuality(release.quality, release.is_3d || false); + + if (q && !q.hasClass(status)){ + q.addClass(status); + q.set('title', (q.get('title') ? q.get('title') : '') + ' status: '+ status); + } + + }); + }, + + addQuality: function(quality, is_3d){ + var self = this; + + var q = Quality.getQuality(quality); + return new Element('span', { + 'text': q.label + (is_3d ? ' 3D' : ''), + 'class': 'q_'+q.identifier + (is_3d ? ' is_3d' : ''), + 'title': '' + }).inject(self.quality); + + }, + + getTitle: function(prefixed){ + var self = this; + + if(self.data.title) + return prefixed ? self.data.title : self.getUnprefixedTitle(self.data.title); + else if(self.data.info && self.data.info.titles && self.data.info.titles.length > 0) + return prefixed ? self.data.info.titles[0] : self.getUnprefixedTitle(self.data.info.titles[0]); + + return 'Unknown movie'; + }, + + getUnprefixedTitle: function(t){ + if(t.substr(0, 4).toLowerCase() == 'the ') + t = t.substr(4) + ', The'; + else if(t.substr(0, 3).toLowerCase() == 'an ') + t = t.substr(3) + ', An'; + else if(t.substr(0, 2).toLowerCase() == 'a ') + t = t.substr(2) + ', A'; + return t; + }, + + getIdentifier: function(){ + var self = this; + + try { + return self.get('identifiers').imdb; + } + catch (e){ } + + return self.get('imdb'); + }, + + getETA: function(format){ + var self = this, + d = new Date(), + now = Math.round(+d/1000), + eta = null, + eta_date = ''; + + if(self.data.info.release_date) + [self.data.info.release_date.dvd, self.data.info.release_date.theater].each(function(timestamp){ + if (timestamp > 0 && (eta === null || Math.abs(timestamp - now) < Math.abs(eta - now))) + eta = timestamp; + }); + + if(eta){ + eta_date = new Date(eta * 1000); + if(+eta_date/1000 < now){ + eta_date = null; + } + else { + eta_date = format ? eta_date.format(format) : (eta_date.format('%b') + (d.getFullYear() != eta_date.getFullYear() ? ' ' + eta_date.getFullYear() : '')); + } + } + + return (now+8035200 > eta) ? eta_date : ''; + }, + + get: function(attr){ + return this.data[attr] || this.data.info[attr]; + }, + + select: function(select){ + var self = this; + self.select_checkbox.set('checked', select); + self.el[self.select_checkbox.get('checked') ? 'addClass' : 'removeClass']('checked'); + }, + + isSelected: function(){ + return this.select_checkbox.get('checked'); + }, + + toElement: function(){ + return this.el; + } + +}); diff --git a/couchpotato/core/media/movie/_base/static/movie.scss b/couchpotato/core/media/movie/_base/static/movie.scss new file mode 100644 index 0000000000..108ca2bfdd --- /dev/null +++ b/couchpotato/core/media/movie/_base/static/movie.scss @@ -0,0 +1,1412 @@ +@import "_mixins"; + +$mass_edit_height: 44px; + +.page.movies { + bottom: auto; + z-index: 21; + height: $header_height; + + .scroll_content { + display: none; + } + + @include media-phablet { + height: $header_width_mobile; + } +} + +.page.movies_wanted, +.page.movies_manage { + top: $header_height; + padding: 0; + will-change: top; + transition: top 300ms $cubic; + + @include media-phablet { + top: $header_width_mobile; + } + + .mass_editing & { + top: $header_height + $mass_edit_height; + } + + .load_more { + text-align: center; + padding: $padding; + font-size: 2em; + display: block; + } + + .empty_manage { + padding: $padding; + + .after_manage { + margin-top: $padding; + } + } +} + +.movie { + + .ripple { + display: none; + } + + input[type=checkbox] { + display: none; + } + + .with_navigation & { + input[type=checkbox] { + display: inline-block; + position: absolute; + will-change: opacity; + transition: opacity 200ms; + opacity: 0; + z-index: 2; + cursor: pointer; + + @include media-phablet { + display: none; + } + + &:hover { + opacity: 1 !important; + } + } + + &:hover input[type=checkbox] { + opacity: .5; + } + + &.checked input[type=checkbox] { + opacity: 1; + } + } + + .quality { + font-weight: 400; + + span { + display: inline-block; + background: get-theme(off); + border: 1px solid transparent; + color: rgba(get-theme(text), .5); + border-radius: 1px; + padding: 1px 3px; + + @include theme-dark { + color: rgba(get-theme-dark(text), .5); + background: get-theme-dark(off); + } + + &.failed { background: #993619; color: #FFF; } + &.available { color: #009902; border-color: #009902; background: get-theme(background);} + &.snatched { background: #548399; color: #FFF } + &.downloaded, &.done { background: #009902; color: #FFF } + + @include theme-dark { + background: none; + &.available { border-color: transparent; background: none;} + &.snatched { background: #548399; } + &.downloaded, &.done { background: #009902; color: #FFF; } + } + } + } + + .rating { + .votes { + opacity: .7; + margin-left: 4px; + } + } + + &.status_suggested { + .quality { + display: none; + } + } + +} + +.movies { + position: relative; + + .no_movies { + display: block; + padding: $padding; + + @include media-tablet { + padding: $padding/2; + } + + a { + @include theme(color, primary); + } + } + + .message { + padding: $padding 0; + text-align: center; + + a { + @include theme(color, primary); + } + } + + &.movies > h2 { + padding: 0 $padding; + line-height: $header_height; + + @include media-phablet { + line-height: $header_width_mobile; + padding: 0 $padding/2; + } + } + + > .description { + position: absolute; + top: 0; + right: $padding; + width: auto; + line-height: $header_height; + opacity: .7; + + @include media-tablet { + display: none; + } + + a { + @include theme(color, primary); + display: inline; + + &:hover { + text-decoration: underline; + } + } + } + + > .loading { + @include theme(background, background); + + .message { + @include theme(color, text); + } + + .spinner { + @include theme(background-color, background); + } + } + + .movie .actions { + will-change: transform, opacity; + transform: rotateZ(360deg); + + @include media-phablet { + pointer-events: none; + } + } + + .progress { + + div { + width: 50%; + padding: $padding/4 $padding/2; + display: flex; + + @include media-tablet { + width: 100%; + } + + .folder { + flex: 1 auto; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + margin-right: $padding/2; + } + + .percentage { + font-weight: bold; + } + } + } +} + +.list_list { + font-weight: 300; + + .movie { + display: block; + border-bottom: 1px solid transparent; + @include theme(border-color, off); + + position: relative; + cursor: pointer; + + &:last-child { + border-bottom: none; + } + + &:hover { + background: get-theme(off); + + @include theme-dark { + background: get-theme-dark(off); + } + } + + input[type=checkbox] { + left: $padding; + top: 50%; + transform: translateY(-50%); + } + + .poster { + display: none; + } + + .info { + padding: $padding/2 $padding; + + display: flex; + flex-flow: row nowrap; + align-items: center; + + @include media-tablet { + display: block; + padding: $padding/2; + } + + .title { + flex: 1 auto; + + @include media-tablet { + display: flex; + flex-flow: row nowrap; + } + + span { + transition: margin 200ms $cubic; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + + @include media-tablet { + width: 100%; + } + + } + + .year { + display: inline-block; + margin: 0 10px; + opacity: .5; + } + } + + .eta { + font-size: .8em; + opacity: .5; + margin-right: 4px; + + @include media-phablet { + display: none; + } + } + + .quality { + clear: both; + overflow: hidden; + + span { + float: left; + font-size: .7em; + margin: 2px 0 0 2px; + + @include media-tablet { + margin: 2px 2px 0 0; + } + } + } + + .rating .vote { + display: inline-block; + min-width: 60px; + text-align: right; + } + } + + .actions { + position: absolute; + right: $padding/2; + top: 0; + bottom: 0; + display: none; + z-index: 10; + + .action { + display: inline-block; + } + + a { + height: 100%; + display: block; + @include theme(background, background); + @include theme(color, primary); + padding: $padding / 2; + width: auto; + float: right; + @include theme(text, text); + + &:before { + display: none; + } + + &:hover { + @include theme(background, off); + @include theme(color, text); + } + + .icon { + display: none; + } + } + } + + &:hover .actions { + display: block; + + @include media-tablet { + display: none; + } + } + } + + &.with_navigation .movie { + &:hover, &.checked { + .info .title span { + margin-left: $padding; + + @include media-tablet { + margin-left: 0; + } + } + } + } +} + +.thumb_list { + + $max-split: 20; + $split-jump: 225px; + + padding: 0 $padding/4; + + > div:last-child { + padding: 0 ($padding/2)+2px; + @include media-phablet { + padding: 0 $padding/6; + } + } + + .movie { + overflow: visible; + display: inline-block; + vertical-align: top; + margin-bottom: $padding; + position: relative; + cursor: pointer; + width: 150px; + border: 0 solid transparent; + border-width: 0 $padding/3; + + .inner { + will-change: transform; + transform: rotateZ(360deg); + } + + @while $max-split > 0 { + @media (min-width : $split-jump * ($max-split - 1)) and (max-width : $split-jump * $max-split) { + width: 100% / $max-split; + } + $max-split: $max-split - 1; + } + + @include media-tablet { + width: 33.333%; + border-width: 0 $padding/4; + } + + @include media-phablet { + width: 50%; + border-width: 0 $padding/5; + } + + input[type=checkbox] { + top: $padding/2; + left: $padding/2; + } + + .poster_container { + border-radius: $border_radius; + position: relative; + width: 100%; + padding-bottom: 150%; + overflow: hidden; + } + + .poster { + position: absolute; + background: center no-repeat; + @include theme(background-color, off); + background-size: cover; + overflow: hidden; + height: 100%; + width: 100%; + } + + .info { + clear: both; + font-size: .9em; + + .title { + display: flex; + padding: 3px 0; + font-weight: 400; + + span { + flex: 1 auto; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } + + .year { + display: inline-block; + margin-left: 5px; + opacity: .5; + } + } + + .eta { + opacity: .5; + float: right; + margin-left: 4px; + } + + .quality { + white-space: nowrap; + overflow: hidden; + font-size: .9em; + + span { + font-size: .8em; + margin-right: 2px; + } + } + } + + .actions { + background-image: linear-gradient(25deg, rgba(get-theme(primary),.3) 0%, rgba(get-theme(primary),1) 80%); + @include theme-dark { + background-image: linear-gradient(25deg, rgba(get-theme-dark(primary),.3) 0%, rgba(get-theme-dark(primary),1) 80%); + } + + will-change: opacity, visibility; + transition: all 400ms; + transition-property: opacity, visibility; + opacity: 0; + visibility: hidden; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + text-align: right; + + .action { + position: relative; + margin-right: $padding/2; + float: right; + clear: both; + + &:first-child { + margin-top: $padding/2; + } + + a { + transition: all 150ms $cubic; + will-change: color, background; + transition-property: color, background; + display: block; + width: auto; + padding: $padding / 3; + color: #FFF; + border-radius: $border_radius - 1px; + font-weight: 400; + + &:hover { + @include theme(background, background); + @include theme(color, primary); + + @include theme-dark { + color: #FFF; + } + } + } + } + } + + &:hover .actions { + opacity: 1; + visibility: visible; + + @include media-phablet { + display: none; + } + } + + &.hover_start .actions { + pointer-events: none; + } + + .mask { + bottom: 44px; + border-radius: $border_radius; + will-change: opacity; + transition: opacity 30ms; + } + } + +} + +.page.movie_details { + pointer-events: none; + $gab-width: $header_width/3; + + @include media-phablet { + left: 0; + } + + .overlay { + position: fixed; + top: 0; + bottom: 0; + right: 0; + left: $header_width; + background: rgba(0,0,0,.6); + border-radius: $border_radius 0 0 $border_radius; + opacity: 0; + will-change: opacity; + transform: rotateZ(360deg); + transition: opacity 300ms ease 400ms; + z-index: 1; + + .ripple { + background: #FFF; + } + + @include media-phablet { + left: 0; + border-radius: 0; + transition: none; + } + + .close { + display: inline-block; + text-align: center; + font-size: 60px; + line-height: $header_height; + color: #FFF; + width: 100%; + height: 100%; + opacity: 0; + will-change: opacity; + transition: opacity 300ms ease 200ms; + + &:before { + display: block; + width: $gab-width; + } + + @include media-phablet { + width: $header_width_mobile; + } + } + } + + .scroll_content { + position: fixed; + z-index: 2; + top: 0; + bottom: 0; + right: 0; + left: $header_width + $gab-width; + @include theme(background, background); + border-radius: $border_radius 0 0 $border_radius; + overflow-y: auto; + will-change: transform; + transform: translateX(100%) rotateZ(360deg); + transition: transform 450ms $cubic; + + @include media-phablet { + left: $header_width_mobile; + } + + > .head { + display: flex; + flex-flow: row wrap; + padding: 0 $padding 0 $padding/2; + position: relative; + z-index: 2; + will-change: transform, opacity; + transform: rotateZ(360deg); + + @include media-phablet { + padding: 0; + line-height: $header_width_mobile; + } + + h1 { + flex: 1 auto; + margin: 0; + font-size: 24px; + font-weight: 300; + max-width: 100%; + + @include media-phablet { + min-width: 100%; + line-height: $header_width_mobile; + + .more_menu { + width: 100%; + } + } + + .more_menu { + a { + @include theme(color, text); + } + + .icon-dropdown { + padding-right: $padding*1.5; + + @include media-phablet { + &:before { + right: $padding/2; + } + } + } + } + } + + .more_menu { + display: inline-block; + vertical-align: top; + max-width: 100%; + margin-bottom: 0; + + &.title .wrapper { + transform-origin: 0 0; + } + + > a { + float: left; + line-height: $header_height; + @include theme(color, primary); + + &:hover { + @include theme(color, text); + } + + @include media-phablet { + line-height: $header_width_mobile; + } + } + + .icon-dropdown { + position: relative; + padding: 0 $padding*1.25 0 $padding/2; + + &:before { + position: absolute; + right: $padding/2; + top: -2px; + opacity: .2; + } + + &:hover:before { + opacity: 1; + } + } + + .wrapper { + top: $header_height - 10px; + padding-top: 4px; + border-radius: $border_radius $border_radius 0 0; + font-size: 14px; + + @include media-phablet { + top: 25px; + } + + &:before { + top: 0; + left: auto; + right: 22px; + } + + ul { + border-radius: $border_radius $border_radius 0 0; + max-height: 215px; + overflow-y: auto; + } + + a { + padding-right: $padding * 1.5; + + &:before { + position: absolute; + right: $padding/2; + } + + &:hover, &.icon-ok { + @include theme(color, primary); + } + } + } + + &.title { + > a { + display: inline-block; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + width: 100%; + } + + .wrapper { + left: 0; + right: auto; + + @include media-phablet { + top: 30px; + max-width: 240px; + } + + &:before { + left: 22px; + right: auto; + } + } + } + + } + + .buttons { + display: flex; + flex-wrap: wrap; + + @include media-phablet { + margin: 0; + } + + > a { + display: inline-block; + padding: 0 10px; + @include theme(color, primary); + line-height: $header_height; + + @include media-phablet { + line-height: $header_width_mobile; + } + + &:hover { + @include theme(background, off); + @include theme(color, text); + } + } + + } + } + + .section { + padding: $padding; + border-top: 1px solid rgba(0,0,0,.1); + will-change: transform, opacity; + transform: rotateZ(360deg); + + @include theme-dark { + border-color: rgba(255,255,255,.1); + } + + @include media-phablet { + padding: $padding/2; + } + } + } + + &.show { + pointer-events: auto; + + .overlay { + opacity: 1; + transition-delay: 0s; + + .close { + opacity: 1; + transition-delay: 300ms; + } + } + + .scroll_content { + transition-delay: 50ms; + transform: translateX(0) rotateZ(360deg); + } + } + + .section_description { + .meta { + text-align: right; + font-style: italic; + font-size: .90em; + + span { + display: inline-block; + margin: $padding/2 $padding/2 0; + + &:last-child { + margin-right: 0; + } + } + } + } + + .section_add { + @include theme(background, off); + + .options > div { + display: flex; + align-items: center; + + select { + display: block; + width: 100%; + } + + .title { + min-width: 75px; + width: 2000px; + margin: 0 10px 0 0; + } + + .profile, .category { + width: 200px; + min-width: 50px; + margin: 0 10px 0 0; + } + + .add { + width: 200px; + + .button { + @include theme(background, background); + flex: 1 auto; + display: block; + text-align: center; + width: 100%; + margin: 0; + + &:hover { + @include theme(background, primary); + } + } + + } + + } + + .thumbnail, + .data { + display: none; + } + } + + .files { + span { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + text-align: center; + padding: $padding/3 0; + } + + .name { + text-align: left; + flex: 1 1 auto; + } + + .type { + min-width: 80px; + } + } + + .releases { + + .buttons { + margin-bottom: $padding/2; + + a { + display: inline; + @include theme(color, primary); + + &:hover { + text-decoration: underline; + } + } + } + + .item { + @include media-phablet { + display: block; + } + + &:not(.head):hover { + @include theme(background, off); + @include theme(text, text); + } + + span { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + text-align: center; + padding: $padding/3 0; + + &:before { + display: none; + font-weight: bold; + opacity: .8; + margin-right: 3px; + width: 100%; + font-size: .9em; + + @include media-phablet { + display: inline-block; + } + } + + @include media-phablet { + vertical-align: top; + white-space: normal; + display: inline-block; + width: 50%; + padding: 0; + min-width: 0; + max-width: none; + text-align: left; + margin-top: 3px; + } + } + + .name { + flex: 1 auto; + text-align: left; + + @include media-phablet { + width: 100%; + font-weight: bold; + } + } + + &.head { + + @include media-phablet { + display: none; + } + } + + &.ignored { + span:not(.actions) { + opacity: .3; + } + + .name { + text-decoration: line-through; + } + } + + .actions { + padding: 0; + + @include media-phablet { + width: 100%; + text-align: center; + } + + a { + display: inline-block; + vertical-align: top; + padding: $padding/3; + min-width: 26px; + @include theme(color, text); + + &:hover { + @include theme(color, primary); + } + + @include media-phablet { + text-align: center; + } + + &:after { + margin-left: 3px; + font-size: .9em; + } + + @include media-phablet { + &.icon-info:after { content: "more info"; } + &.icon-download:after { content: "download"; } + &.icon-cancel:after { content: "ignore"; } + } + } + } + } + + .status { min-width: 70px; max-width: 70px; &:before { content: "Status:"; } } + .quality { min-width: 60px; max-width: 60px; &:before { content: "Quality:"; } } + .size { min-width: 50px; max-width: 50px; &:before { content: "Size:"; } } + .age { min-width: 40px; max-width: 40px; &:before { content: "Age:"; } } + .score { min-width: 45px; max-width: 45px; &:before { content: "Score:"; } } + .provider { min-width: 110px; max-width: 110px; &:before { content: "Provider:"; } } + .actions { min-width: 80px; max-width: 80px; } + + } + + .section_trailer.section_trailer { + $max_height: 450px; + $max_width: $max_height * (16/9); + + padding: 0; + @include theme(background, menu); + max-height: $max_height; + overflow: hidden; + + @include media-phablet { + max-height: $max_height; + } + + &.no_trailer { + display: none; + } + + .trailer_container { + $play-size: 110px; + + max-height: $max_height; + position: relative; + overflow: hidden; + max-width: $max_width; + margin: 0 auto; + cursor: pointer; + + @include media-phablet { + margin-bottom: $padding/2; + } + + .background { + opacity: 0; + background: no-repeat center; + background-size: cover; + position: relative; + z-index: 1; + max-height: $max_height; + padding-bottom: 56.25%; + will-change: opacity; + transition: opacity 1000ms; + + &.visible { + opacity: .4; + } + } + + .icon-play { + opacity: 0.9; + position: absolute; + z-index: 2; + text-align: center; + width: 100%; + top: 50%; + transform: translateY(-50%); + will-change: opacity; + transition: all 300ms; + color: #FFF; + font-size: $play-size; + + @include media-desktop { + font-size: $play-size/2; + } + + @include media-phablet { + font-size: $play-size/3.5; + } + + span { + transition: all 300ms; + opacity: 0.9; + position: absolute; + font-size: 1em; + top: 50%; + left: 50%; + margin-left: $play-size/2; + transform: translateY(-54%); + will-change: opacity; + + @include media-desktop { + margin-left: $play-size/4; + } + + @include media-phablet { + margin-left: $play-size/7; + } + + &:first-child { + margin-left: -($play-size/2); + transform: translate(-100%, -54%); + + @include media-desktop { + margin-left: -($play-size/4); + } + + @include media-phablet { + margin-left: -($play-size/7); + } + } + } + } + + &:hover { + @include theme(color, primary); + + .icon-play { + opacity: 1; + + span { + opacity: 1; + } + } + } + + iframe { + position: absolute; + width: 100%; + height: 100%; + border: 0; + top: 0; + left: 0; + max-height: $max_height; + z-index: 10; + } + } + } + +} + + +.alph_nav { + position: relative; + + .mass_edit_form { + display: flex; + @include theme(background, background); + position: fixed; + top: $header_height; + right: 0; + left: $header_width; + flex-flow: row nowrap; + align-items: center; + will-change: max-height; + transition: max-height 300ms $cubic; + max-height: 0; + overflow: hidden; + + .mass_editing & { + max-height: $mass_edit_height; + } + + > * { + display: flex; + align-items: center; + } + + .select { + margin: 0 $padding/2 0 $padding; + + @include media-phablet { + margin: 0 $padding/4 0 $padding/2; + } + + input, .count { + margin-right: $padding/4; + } + } + + } + + .menus { + + .button { + padding: 0 $padding/2; + line-height: $header_height; + } + + .counter, .more_menu, .actions { + float: left; + + .wrapper { + transform-origin: 92% 0; + right: -7px; + } + + > a { + display: inline-block; + width: 30px; + line-height: $header_height; + text-align: center; + float: left; + + &:hover { + @include theme(background, off); + } + + @include media-tablet { + line-height: $header_width_mobile; + } + } + } + + .counter { + line-height: $header_height; + padding: 0 $padding/2; + + @include media-tablet { + display: none; + } + } + + .actions { + a { + display: inline-block; + } + + .active { + display: none; + } + + } + + .filter { + .wrapper { + width: 320px; + + @include media-phablet { + right: -70px; + transform-origin: 75% 0; + + &:before { + right: 83px !important; + } + } + } + + .button { + margin-top: -2px; + } + + .search { + position: relative; + + &:before { + position: absolute; + height: 100%; + line-height: 38px; + padding-left: $padding/2; + font-size: 16px; + opacity: .5; + } + + input { + width: 100%; + padding: $padding/2 $padding/2 $padding/2 $padding*1.5; + @include theme(background, background); + border: none; + border-bottom: 1px solid transparent; + @include theme(border-color, off); + + @include media-phablet { + font-size: 1.2em; + } + } + } + + .numbers { + padding: $padding/2; + + li { + float: left; + width: 10%; + height: 30px; + line-height: 30px; + text-align: center; + opacity: .2; + cursor: default; + border: 0; + + &.active { + @include theme(background, off); + } + + &.available { + opacity: 1; + cursor: pointer; + + &:hover { + @include theme(background, off); + } + } + } + } + } + + .more_menu { + + //&.show .button { + // color: rgba(0, 0, 0, 1); + //} + + .wrapper { + top: $header_height - 10px; + padding-top: 4px; + border-radius: $border_radius $border_radius 0 0; + min-width: 140px; + + @include media-phablet { + top: $header_width_mobile; + } + + &:before { + top: 0; + left: auto; + right: 22px; + } + + ul { + border-radius: $border_radius $border_radius 0 0; + } + } + } + } + +} diff --git a/couchpotato/core/media/movie/_base/static/page.js b/couchpotato/core/media/movie/_base/static/page.js new file mode 100644 index 0000000000..98b5083199 --- /dev/null +++ b/couchpotato/core/media/movie/_base/static/page.js @@ -0,0 +1,50 @@ +Page.Movies = new Class({ + + Extends: PageBase, + + name: 'movies', + icon: 'movie', + sub_pages: ['Wanted', 'Manage'], + default_page: 'Wanted', + current_page: null, + + initialize: function(parent, options){ + var self = this; + self.parent(parent, options); + + self.navigation = new BlockNavigation(); + $(self.navigation).inject(self.el); + + }, + + defaultAction: function(action, params){ + var self = this; + + if(self.current_page){ + self.current_page.hide(); + + if(self.current_page.list && self.current_page.list.navigation) + self.current_page.list.navigation.dispose(); + } + + var route = new Route(); + route.parse(action); + + var page_name = route.getPage() != 'index' ? route.getPage().capitalize() : self.default_page; + + var page = self.sub_pages.filter(function(page){ + return page.name == page_name; + }).pick()['class']; + + page.open(route.getAction() || 'index', params); + page.show(); + + if(page.list && page.list.navigation) + page.list.navigation.inject(self.navigation); + + self.current_page = page; + self.navigation.activate(page_name.toLowerCase()); + + } + +}); diff --git a/couchpotato/core/media/movie/_base/static/search.js b/couchpotato/core/media/movie/_base/static/search.js new file mode 100644 index 0000000000..734f4647a9 --- /dev/null +++ b/couchpotato/core/media/movie/_base/static/search.js @@ -0,0 +1,240 @@ +var BlockSearchMovieItem = new Class({ + + Implements: [Options, Events], + + initialize: function(info, options){ + var self = this; + self.setOptions(options); + + self.info = info; + self.alternative_titles = []; + + self.create(); + }, + + create: function(){ + var self = this, + info = self.info; + + var in_library; + if(info.in_library){ + in_library = []; + (info.in_library.releases || []).each(function(release){ + in_library.include(release.quality); + }); + } + + self.el = new Element('div.media_result', { + 'id': info.imdb, + 'events': { + 'click': self.showOptions.bind(self)//, + //'mouseenter': self.showOptions.bind(self), + //'mouseleave': self.closeOptions.bind(self) + } + }).adopt( + self.thumbnail = info.images && info.images.poster.length > 0 ? new Element('img.thumbnail', { + 'src': info.images.poster[0], + 'height': null, + 'width': null + }) : null, + self.options_el = new Element('div.options'), + self.data_container = new Element('div.data').grab( + self.info_container = new Element('div.info').grab( + new Element('h2', { + 'class': info.in_wanted && info.in_wanted.profile_id || in_library ? 'in_library_wanted' : '', + 'title': self.getTitle() + }).adopt( + self.title = new Element('span.title', { + 'text': self.getTitle() + }), + self.year = info.year ? new Element('span.year', { + 'text': info.year + }) : null, + info.in_wanted && info.in_wanted.profile_id ? new Element('span.in_wanted', { + 'text': 'Already in wanted list: ' + Quality.getProfile(info.in_wanted.profile_id).get('label') + }) : (in_library ? new Element('span.in_library', { + 'text': 'Already in library: ' + in_library.join(', ') + }) : null) + ) + ) + ) + ); + + if(info.titles) + info.titles.each(function(title){ + self.alternativeTitle({ + 'title': title + }); + }); + }, + + alternativeTitle: function(alternative){ + var self = this; + + self.alternative_titles.include(alternative); + }, + + getTitle: function(){ + var self = this; + try { + return self.info.original_title ? self.info.original_title : self.info.titles[0]; + } + catch(e){ + return 'Unknown'; + } + }, + + get: function(key){ + return this.info[key]; + }, + + showOptions: function(){ + var self = this; + + self.createOptions(); + + self.data_container.addClass('open'); + self.el.addEvent('outerClick', self.closeOptions.bind(self)); + + }, + + closeOptions: function(){ + var self = this; + + self.data_container.removeClass('open'); + self.el.removeEvents('outerClick'); + }, + + add: function(e){ + var self = this; + + if(e) + (e).preventDefault(); + + self.loadingMask(); + + Api.request('movie.add', { + 'data': { + 'identifier': self.info.imdb, + 'title': self.title_select.get('value'), + 'profile_id': self.profile_select.get('value'), + 'category_id': self.category_select.get('value') + }, + 'onComplete': function(json){ + self.options_el.empty(); + self.options_el.grab( + new Element('div.message', { + 'text': json.success ? 'Movie successfully added.' : 'Movie didn\'t add properly. Check logs' + }) + ); + self.mask.fade('out'); + + self.fireEvent('added'); + }, + 'onFailure': function(){ + self.options_el.empty(); + self.options_el.grab( + new Element('div.message', { + 'text': 'Something went wrong, check the logs for more info.' + }) + ); + self.mask.fade('out'); + } + }); + }, + + createOptions: function(){ + var self = this, + info = self.info; + + if(!self.options_el.hasClass('set')){ + + self.options_el.grab( + new Element('div').adopt( + new Element('div.title').grab( + self.title_select = new Element('select', { + 'name': 'title' + }) + ), + new Element('div.profile').grab( + self.profile_select = new Element('select', { + 'name': 'profile' + }) + ), + self.category_select_container = new Element('div.category').grab( + self.category_select = new Element('select', { + 'name': 'category' + }).grab( + new Element('option', {'value': -1, 'text': 'None'}) + ) + ), + new Element('div.add').grab( + self.add_button = new Element('a.button', { + 'text': 'Add', + 'events': { + 'click': self.add.bind(self) + } + }) + ) + ) + ); + + Array.each(self.alternative_titles, function(alt){ + new Element('option', { + 'text': alt.title + }).inject(self.title_select); + }); + + + // Fill categories + var categories = CategoryList.getAll(); + + if(categories.length === 0) + self.category_select_container.hide(); + else { + self.category_select_container.show(); + categories.each(function(category){ + new Element('option', { + 'value': category.data._id, + 'text': category.data.label + }).inject(self.category_select); + }); + } + + // Fill profiles + var profiles = Quality.getActiveProfiles(); + if(profiles.length == 1) + self.profile_select.hide(); + + profiles.each(function(profile){ + new Element('option', { + 'value': profile.get('_id'), + 'text': profile.get('label') + }).inject(self.profile_select); + }); + + self.options_el.addClass('set'); + + if(categories.length === 0 && self.title_select.getElements('option').length == 1 && profiles.length == 1 && + !(self.info.in_wanted && self.info.in_wanted.profile_id || in_library)) + self.add(); + + } + + }, + + loadingMask: function(){ + var self = this; + + self.mask = new Element('div.mask').inject(self.el).fade('hide'); + + createSpinner(self.mask); + self.mask.fade('in'); + + }, + + toElement: function(){ + return this.el; + } + +}); diff --git a/couchpotato/core/media/movie/_base/static/wanted.js b/couchpotato/core/media/movie/_base/static/wanted.js new file mode 100644 index 0000000000..fa1521b8b9 --- /dev/null +++ b/couchpotato/core/media/movie/_base/static/wanted.js @@ -0,0 +1,142 @@ +var MoviesWanted = new Class({ + + Extends: PageBase, + + order: 10, + name: 'wanted', + title: 'Gimme gimme gimme!', + folder_browser: null, + + indexAction: function(){ + var self = this; + + if(!self.list){ + + self.manual_search = new Element('a', { + 'title': 'Force a search for the full wanted list', + 'text': 'Search all wanted', + 'events':{ + 'click': self.doFullSearch.bind(self, true) + } + }); + + self.scan_folder = new Element('a', { + 'title': 'Scan a folder and rename all movies in it', + 'text': 'Manual folder scan', + 'events':{ + 'click': self.scanFolder.bind(self) + } + }); + + // Wanted movies + self.list = new MovieList({ + 'identifier': 'wanted', + 'status': 'active', + 'actions': [MA.IMDB, MA.Release, MA.Trailer, MA.Refresh, MA.Readd, MA.Delete, MA.Category, MA.Profile], + 'add_new': true, + 'menu': [self.manual_search, self.scan_folder], + 'on_empty_element': function(){ + return new Element('div.empty_wanted').adopt( + new Element('div.no_movies', { + 'text': 'Seems like you don\'t have any movies yet.. Maybe add some via search or the extension.' + }), + App.createUserscriptButtons() + ); + } + }); + $(self.list).inject(self.content); + + // Check if search is in progress + requestTimeout(self.startProgressInterval.bind(self), 4000); + } + + }, + + doFullSearch: function(){ + var self = this; + + if(!self.search_in_progress){ + + Api.request('movie.searcher.full_search'); + self.startProgressInterval(); + + } + + }, + + startProgressInterval: function(){ + var self = this; + + var start_text = self.manual_search.get('text'); + self.progress_interval = requestInterval(function(){ + if(self.search_progress && self.search_progress.running) return; + self.search_progress = Api.request('movie.searcher.progress', { + 'onComplete': function(json){ + self.search_in_progress = true; + if(!json.movie){ + clearRequestInterval(self.progress_interval); + self.search_in_progress = false; + self.manual_search.set('text', start_text); + } + else { + var progress = json.movie; + self.manual_search.set('text', 'Searching.. (' + Math.round(((progress.total-progress.to_go)/progress.total)*100) + '%)'); + } + } + }); + }, 1000); + + }, + + scanFolder: function(e) { + (e).stop(); + + var self = this; + var options = { + 'name': 'Scan_folder' + }; + + if(!self.folder_browser){ + self.folder_browser = new Option.Directory("Scan", "folder", "", options); + + self.folder_browser.save = function() { + var folder = self.folder_browser.getValue(); + Api.request('renamer.scan', { + 'data': { + 'base_folder': folder + } + }); + }; + + self.folder_browser.inject(self.content, 'top'); + self.folder_browser.fireEvent('injected'); + + // Hide the settings box + self.folder_browser.directory_inlay.hide(); + self.folder_browser.el.removeChild(self.folder_browser.el.firstChild); + + self.folder_browser.showBrowser(); + + // Make adjustments to the browser + self.folder_browser.browser.getElements('.clear.button').hide(); + self.folder_browser.save_button.text = "Select"; + self.folder_browser.browser.setStyles({ + 'z-index': 1000, + 'right': 20, + 'top': 0, + 'margin': 0 + }); + + self.folder_browser.pointer.setStyles({ + 'right': 20 + }); + + } + else{ + self.folder_browser.showBrowser(); + } + + self.list.navigation_menu.hide(); + } + +}); diff --git a/couchpotato/core/media/movie/charts/__init__.py b/couchpotato/core/media/movie/charts/__init__.py new file mode 100644 index 0000000000..0b89eaf448 --- /dev/null +++ b/couchpotato/core/media/movie/charts/__init__.py @@ -0,0 +1,20 @@ +from .main import Charts + + +def autoload(): + return Charts() + + +config = [{ + 'name': 'charts', + 'groups': [ + { + 'label': 'Charts', + 'description': 'Displays selected charts on the home page', + 'type': 'list', + 'name': 'charts_providers', + 'tab': 'display', + 'options': [], + }, + ], +}] diff --git a/couchpotato/core/media/movie/charts/main.py b/couchpotato/core/media/movie/charts/main.py new file mode 100644 index 0000000000..d42c29a033 --- /dev/null +++ b/couchpotato/core/media/movie/charts/main.py @@ -0,0 +1,84 @@ +from CodernityDB.database import RecordNotFound +from couchpotato import Env, get_db +from couchpotato.core.helpers.variable import getTitle, splitString + +from couchpotato.core.logger import CPLog +from couchpotato.api import addApiView +from couchpotato.core.event import fireEvent +from couchpotato.core.plugins.base import Plugin + + +log = CPLog(__name__) + + +class Charts(Plugin): + + def __init__(self): + addApiView('charts.view', self.automationView) + addApiView('charts.ignore', self.ignoreView) + + def automationView(self, force_update = False, **kwargs): + + db = get_db() + + charts = fireEvent('automation.get_chart_list', merge = True) + ignored = splitString(Env.prop('charts_ignore', default = '')) + + # Create a list the movie/list.js can use + for chart in charts: + medias = [] + for media in chart.get('list', []): + + identifier = media.get('imdb') + if identifier in ignored: + continue + + try: + try: + in_library = db.get('media', 'imdb-%s' % identifier) + if in_library: + continue + except RecordNotFound: + pass + except: + pass + + # Cache poster + posters = media.get('images', {}).get('poster', []) + poster = [x for x in posters if 'tmdb' in x] + posters = poster if len(poster) > 0 else posters + + cached_poster = fireEvent('file.download', url = posters[0], single = True) if len(posters) > 0 else False + files = {'image_poster': [cached_poster] } if cached_poster else {} + + medias.append({ + 'status': 'chart', + 'title': getTitle(media), + 'type': 'movie', + 'info': media, + 'files': files, + 'identifiers': { + 'imdb': identifier + } + }) + + chart['list'] = medias + + return { + 'success': True, + 'count': len(charts), + 'charts': charts, + 'ignored': ignored, + } + + def ignoreView(self, imdb = None, **kwargs): + + ignored = splitString(Env.prop('charts_ignore', default = '')) + + if imdb: + ignored.append(imdb) + Env.prop('charts_ignore', ','.join(set(ignored))) + + return { + 'result': True + } diff --git a/couchpotato/core/media/movie/charts/static/charts.js b/couchpotato/core/media/movie/charts/static/charts.js new file mode 100644 index 0000000000..51c4f5571e --- /dev/null +++ b/couchpotato/core/media/movie/charts/static/charts.js @@ -0,0 +1,93 @@ +var Charts = new Class({ + + Implements: [Options, Events], + + shown_once: false, + + initialize: function(options){ + var self = this; + self.setOptions(options); + + self.create(); + }, + + create: function(){ + var self = this; + + self.el = new Element('div.charts').grab( + self.el_refresh_container = new Element('div.refresh').grab( + self.el_refreshing_text = new Element('span.refreshing', { + 'text': 'Refreshing charts...' + }) + ) + ); + + self.show(); + + requestTimeout(function(){ + self.fireEvent('created'); + }, 0); + }, + + fill: function(json){ + + var self = this; + + self.el_refreshing_text.hide(); + + if(json && json.count > 0){ + json.charts.sort(function(a, b) { + return a.order - b.order; + }); + + Object.each(json.charts, function(chart){ + + var chart_list = new MovieList({ + 'navigation': false, + 'identifier': chart.name.toLowerCase().replace(/[^a-z0-9]+/g, '_'), + 'title': chart.name, + 'description': 'See source', + 'actions': [MA.Add, MA.ChartIgnore, MA.IMDB, MA.Trailer], + 'load_more': false, + 'view': 'thumb', + 'force_view': true, + 'api_call': null + }); + + // Load movies in manually + chart_list.store(chart.list); + chart_list.addMovies(chart.list, chart.list.length); + chart_list.checkIfEmpty(); + chart_list.fireEvent('loaded'); + + $(chart_list).inject(self.el); + + }); + + } + + self.fireEvent('loaded'); + + }, + + show: function(){ + var self = this; + + self.el.show(); + + if(!self.shown_once){ + requestTimeout(function(){ + self.api_request = Api.request('charts.view', { + 'onComplete': self.fill.bind(self) + }); + }, 100); + + self.shown_once = true; + } + }, + + toElement: function(){ + return this.el; + } + +}); diff --git a/couchpotato/core/media/movie/library.py b/couchpotato/core/media/movie/library.py new file mode 100644 index 0000000000..28cb1b46ed --- /dev/null +++ b/couchpotato/core/media/movie/library.py @@ -0,0 +1,32 @@ +from couchpotato.core.event import addEvent +from couchpotato.core.helpers.variable import getTitle +from couchpotato.core.logger import CPLog +from couchpotato.core.media._base.library.base import LibraryBase + + +log = CPLog(__name__) + +autoload = 'MovieLibraryPlugin' + + +class MovieLibraryPlugin(LibraryBase): + + def __init__(self): + addEvent('library.query', self.query) + + def query(self, media, first = True, include_year = True, **kwargs): + if media.get('type') != 'movie': + return + + default_title = getTitle(media) + titles = media['info'].get('titles', []) + titles.insert(0, default_title) + + # Add year identifier to titles + if include_year: + titles = [title + (' %s' % str(media['info']['year'])) for title in titles] + + if first: + return titles[0] if titles else None + + return titles diff --git a/libs/jinja2/testsuite/res/__init__.py b/couchpotato/core/media/movie/providers/__init__.py similarity index 100% rename from libs/jinja2/testsuite/res/__init__.py rename to couchpotato/core/media/movie/providers/__init__.py diff --git a/couchpotato/core/media/movie/providers/automation/__init__.py b/couchpotato/core/media/movie/providers/automation/__init__.py new file mode 100644 index 0000000000..93f6c10a40 --- /dev/null +++ b/couchpotato/core/media/movie/providers/automation/__init__.py @@ -0,0 +1,21 @@ +config = [{ + 'name': 'automation_providers', + 'groups': [ + { + 'label': 'Watchlists', + 'description': 'Check watchlists for new movies', + 'type': 'list', + 'name': 'watchlist_providers', + 'tab': 'automation', + 'options': [], + }, + { + 'label': 'Automated', + 'description': 'Uses minimal requirements', + 'type': 'list', + 'name': 'automation_providers', + 'tab': 'automation', + 'options': [], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/base.py b/couchpotato/core/media/movie/providers/automation/base.py new file mode 100644 index 0000000000..1a8d981f27 --- /dev/null +++ b/couchpotato/core/media/movie/providers/automation/base.py @@ -0,0 +1,111 @@ +import time + +from couchpotato.core.event import addEvent, fireEvent +from couchpotato.core.logger import CPLog +from couchpotato.core.media._base.providers.automation.base import AutomationBase +from couchpotato.environment import Env +from couchpotato.core.helpers.variable import splitString + + +log = CPLog(__name__) + + +class Automation(AutomationBase): + + enabled_option = 'automation_enabled' + chart_enabled_option = 'chart_display_enabled' + http_time_between_calls = 2 + + interval = 1800 + last_checked = 0 + + def __init__(self): + addEvent('automation.get_movies', self._getMovies) + addEvent('automation.get_chart_list', self._getChartList) + + def _getMovies(self): + + if self.isDisabled(): + return + + if not self.canCheck(): + log.debug('Just checked, skipping %s', self.getName()) + return [] + + self.last_checked = time.time() + + return self.getIMDBids() + + def _getChartList(self): + + if not (self.conf(self.chart_enabled_option) or self.conf(self.chart_enabled_option) is None): + return + + return self.getChartList() + + def search(self, name, year = None, imdb_only = False): + + prop_name = 'automation.cached.%s.%s' % (name, year) + cached_imdb = Env.prop(prop_name, default = False) + if cached_imdb and imdb_only: + return cached_imdb + + result = fireEvent('movie.search', q = '%s %s' % (name, year if year else ''), limit = 1, merge = True) + + if len(result) > 0: + if imdb_only and result[0].get('imdb'): + Env.prop(prop_name, result[0].get('imdb')) + + return result[0].get('imdb') if imdb_only else result[0] + else: + return None + + def isMinimalMovie(self, movie): + if not movie.get('rating'): + log.info('ignoring %s as no rating is available for.', (movie['original_title'])) + return False + + if movie['rating'] and movie['rating'].get('imdb'): + movie['votes'] = movie['rating']['imdb'][1] + movie['rating'] = movie['rating']['imdb'][0] + + for minimal_type in ['year', 'rating', 'votes']: + type_value = movie.get(minimal_type, 0) + type_min = self.getMinimal(minimal_type) + if type_value < type_min: + log.info('%s too low for %s, need %s has %s', (minimal_type, movie['original_title'], type_min, type_value)) + return False + + movie_genres = [genre.lower() for genre in movie['genres']] + required_genres = splitString(self.getMinimal('required_genres').lower()) + ignored_genres = splitString(self.getMinimal('ignored_genres').lower()) + + req_match = 0 + for req_set in required_genres: + req = splitString(req_set, '&') + req_match += len(list(set(movie_genres) & set(req))) == len(req) + + if self.getMinimal('required_genres') and req_match == 0: + log.info2('Required genre(s) missing for %s', movie['original_title']) + return False + + for ign_set in ignored_genres: + ign = splitString(ign_set, '&') + if len(list(set(movie_genres) & set(ign))) == len(ign): + log.info2('%s has blacklisted genre(s): %s', (movie['original_title'], ign)) + return False + + return True + + def getMinimal(self, min_type): + return Env.setting(min_type, 'automation') + + def getIMDBids(self): + return [] + + def getChartList(self): + # Example return: [ {'name': 'Display name of list', 'url': 'http://example.com/', 'order': 1, 'list': []} ] + return + + def canCheck(self): + return time.time() > self.last_checked + self.interval diff --git a/couchpotato/core/media/movie/providers/automation/bluray.py b/couchpotato/core/media/movie/providers/automation/bluray.py new file mode 100644 index 0000000000..1227c60c31 --- /dev/null +++ b/couchpotato/core/media/movie/providers/automation/bluray.py @@ -0,0 +1,192 @@ +import traceback + +from bs4 import BeautifulSoup +from couchpotato import fireEvent +from couchpotato.core.helpers.rss import RSS +from couchpotato.core.helpers.variable import tryInt +from couchpotato.core.logger import CPLog +from couchpotato.core.media.movie.providers.automation.base import Automation + + +log = CPLog(__name__) + +autoload = 'Bluray' + + +class Bluray(Automation, RSS): + + interval = 1800 + rss_url = 'http://www.blu-ray.com/rss/newreleasesfeed.xml' + backlog_url = 'http://www.blu-ray.com/movies/movies.php?show=newreleases&page=%s' + display_url = 'http://www.blu-ray.com/movies/movies.php?show=newreleases' + chart_order = 1 + + def getIMDBids(self): + + movies = [] + + if self.conf('backlog'): + + cookie = {'Cookie': 'listlayout_7=full'} + page = 0 + while True: + page += 1 + + url = self.backlog_url % page + data = self.getHTMLData(url, headers = cookie) + soup = BeautifulSoup(data) + + try: + # Stop if the release year is before the minimal year + brk = False + h3s = soup.body.find_all('h3') + for h3 in h3s: + if h3.parent.name != 'a': + + try: + page_year = tryInt(h3.get_text()[-4:]) + if page_year > 0 and page_year < self.getMinimal('year'): + brk = True + except: + log.error('Failed determining page year: %s', traceback.format_exc()) + brk = True + break + + if brk: + break + + for h3 in h3s: + try: + if h3.parent.name == 'a': + name = h3.get_text().lower().split('blu-ray')[0].strip() + + if not name.find('/') == -1: # make sure it is not a double movie release + continue + + if not h3.parent.parent.small: # ignore non-movie tables + continue + + year = h3.parent.parent.small.get_text().split('|')[1].strip() + + if tryInt(year) < self.getMinimal('year'): + continue + + imdb = self.search(name, year) + + if imdb: + if self.isMinimalMovie(imdb): + movies.append(imdb['imdb']) + except: + log.debug('Error parsing movie html: %s', traceback.format_exc()) + break + except: + log.debug('Error loading page %s: %s', (page, traceback.format_exc())) + break + + self.conf('backlog', value = False) + + rss_movies = self.getRSSData(self.rss_url) + + for movie in rss_movies: + name = self.getTextElement(movie, 'title').lower().split('blu-ray')[0].strip('(').rstrip() + year = self.getTextElement(movie, 'description').split('|')[1].strip('(').strip() + + if not name.find('/') == -1: # make sure it is not a double movie release + continue + + if tryInt(year) < self.getMinimal('year'): + continue + + imdb = self.search(name, year) + + if imdb: + if self.isMinimalMovie(imdb): + movies.append(imdb['imdb']) + + return movies + + def getChartList(self): + cache_key = 'bluray.charts' + movie_list = { + 'name': 'Blu-ray.com - New Releases', + 'url': self.display_url, + 'order': self.chart_order, + 'list': self.getCache(cache_key) or [] + } + + if not movie_list['list']: + movie_ids = [] + max_items = 10 + rss_movies = self.getRSSData(self.rss_url) + + for movie in rss_movies: + name = self.getTextElement(movie, 'title').lower().split('blu-ray')[0].strip('(').rstrip() + year = self.getTextElement(movie, 'description').split('|')[1].strip('(').strip() + + if not name.find('/') == -1: # make sure it is not a double movie release + continue + + movie = self.search(name, year) + + if movie: + + if movie.get('imdb') in movie_ids: + continue + + is_movie = fireEvent('movie.is_movie', identifier = movie.get('imdb'), single = True) + if not is_movie: + continue + + movie_ids.append(movie.get('imdb')) + movie_list['list'].append( movie ) + if len(movie_list['list']) >= max_items: + break + + if not movie_list['list']: + return + + self.setCache(cache_key, movie_list['list'], timeout = 259200) + + return [movie_list] + + +config = [{ + 'name': 'bluray', + 'groups': [ + { + 'tab': 'automation', + 'list': 'automation_providers', + 'name': 'bluray_automation', + 'label': 'Blu-ray.com', + 'description': 'Imports movies from blu-ray.com.', + 'options': [ + { + 'name': 'automation_enabled', + 'default': False, + 'type': 'enabler', + }, + { + 'name': 'backlog', + 'advanced': True, + 'description': ('Parses the history until the minimum movie year is reached. (Takes a while)', 'Will be disabled once it has completed'), + 'default': False, + 'type': 'bool', + }, + ], + }, + { + 'tab': 'display', + 'list': 'charts_providers', + 'name': 'bluray_charts_display', + 'label': 'Blu-ray.com', + 'description': 'Display new releases from Blu-ray.com', + 'options': [ + { + 'name': 'chart_display_enabled', + 'default': True, + 'type': 'enabler', + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/crowdai.py b/couchpotato/core/media/movie/providers/automation/crowdai.py new file mode 100644 index 0000000000..574310792f --- /dev/null +++ b/couchpotato/core/media/movie/providers/automation/crowdai.py @@ -0,0 +1,90 @@ +import re + +from couchpotato.core.helpers.rss import RSS +from couchpotato.core.helpers.variable import tryInt, splitString +from couchpotato.core.logger import CPLog +from couchpotato.core.media.movie.providers.automation.base import Automation + + +log = CPLog(__name__) + +autoload = 'CrowdAI' + + +class CrowdAI(Automation, RSS): + + interval = 1800 + + def getIMDBids(self): + + movies = [] + + urls = dict(zip(splitString(self.conf('automation_urls')), [tryInt(x) for x in splitString(self.conf('automation_urls_use'))])) + + for url in urls: + + if not urls[url]: + continue + + rss_movies = self.getRSSData(url) + + for movie in rss_movies: + + description = self.getTextElement(movie, 'description') + grabs = 0 + + for item in movie: + if item.attrib.get('name') == 'grabs': + grabs = item.attrib.get('value') + break + + if int(grabs) > tryInt(self.conf('number_grabs')): + title = re.match(r'.*Title: .a href.*/">(.*) \(\d{4}\).*', description).group(1) + log.info2('%s grabs for movie: %s, enqueue...', (grabs, title)) + year = re.match(r'.*Year: (\d{4}).*', description).group(1) + imdb = self.search(title, year) + + if imdb and self.isMinimalMovie(imdb): + movies.append(imdb['imdb']) + + return movies + + +config = [{ + 'name': 'crowdai', + 'groups': [ + { + 'tab': 'automation', + 'list': 'automation_providers', + 'name': 'crowdai_automation', + 'label': 'CrowdAI', + 'description': ('Imports from any newznab powered NZB providers RSS feed depending on the number of grabs per movie.', + 'Go to your newznab site and find the RSS section. Then copy the copy paste the link under "Movies > x264 feed" here.'), + 'options': [ + { + 'name': 'automation_enabled', + 'default': False, + 'type': 'enabler', + }, + { + 'name': 'automation_urls_use', + 'label': 'Use', + 'default': '1', + }, + { + 'name': 'automation_urls', + 'label': 'url', + 'type': 'combined', + 'combine': ['automation_urls_use', 'automation_urls'], + 'default': 'http://YOUR_PROVIDER/rss?t=THE_MOVIE_CATEGORY&i=YOUR_USER_ID&r=YOUR_API_KEY&res=2&rls=2&num=100', + }, + { + 'name': 'number_grabs', + 'default': '500', + 'label': 'Grab threshold', + 'description': 'Number of grabs required', + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/flixster.py b/couchpotato/core/media/movie/providers/automation/flixster.py new file mode 100644 index 0000000000..53a06d7623 --- /dev/null +++ b/couchpotato/core/media/movie/providers/automation/flixster.py @@ -0,0 +1,83 @@ +from couchpotato.core.helpers.variable import tryInt, splitString +from couchpotato.core.logger import CPLog +from couchpotato.core.media.movie.providers.automation.base import Automation + +log = CPLog(__name__) + +autoload = 'Flixster' + + +class Flixster(Automation): + + url = 'http://www.flixster.com/api/users/%s/movies/ratings?scoreTypes=wts' + + interval = 60 + + def getIMDBids(self): + + ids = splitString(self.conf('automation_ids')) + + if len(ids) == 0: + return [] + + movies = [] + + for movie in self.getWatchlist(): + imdb_id = self.search(movie.get('title'), movie.get('year'), imdb_only = True) + movies.append(imdb_id) + + return movies + + def getWatchlist(self): + + enablers = [tryInt(x) for x in splitString(self.conf('automation_ids_use'))] + ids = splitString(self.conf('automation_ids')) + + index = -1 + movies = [] + for user_id in ids: + + index += 1 + if not enablers[index]: + continue + + data = self.getJsonData(self.url % user_id, decode_from = 'iso-8859-1') + + for movie in data: + movies.append({ + 'title': movie['movie']['title'], + 'year': movie['movie']['year'] + }) + + return movies + + +config = [{ + 'name': 'flixster', + 'groups': [ + { + 'tab': 'automation', + 'list': 'watchlist_providers', + 'name': 'flixster_automation', + 'label': 'Flixster', + 'description': 'Import movies from any public Flixster watchlist', + 'options': [ + { + 'name': 'automation_enabled', + 'default': False, + 'type': 'enabler', + }, + { + 'name': 'automation_ids_use', + 'label': 'Use', + }, + { + 'name': 'automation_ids', + 'label': 'User ID', + 'type': 'combined', + 'combine': ['automation_ids_use', 'automation_ids'], + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/goodfilms.py b/couchpotato/core/media/movie/providers/automation/goodfilms.py new file mode 100644 index 0000000000..483cf02955 --- /dev/null +++ b/couchpotato/core/media/movie/providers/automation/goodfilms.py @@ -0,0 +1,84 @@ +from bs4 import BeautifulSoup +from couchpotato.core.logger import CPLog +from couchpotato.core.media.movie.providers.automation.base import Automation + +log = CPLog(__name__) + +autoload = 'Goodfilms' + + +class Goodfilms(Automation): + + url = 'https://goodfil.ms/%s/queue?page=%d&without_layout=1' + + interval = 1800 + + def getIMDBids(self): + + if not self.conf('automation_username'): + log.error('Please fill in your username') + return [] + + movies = [] + + for movie in self.getWatchlist(): + imdb_id = self.search(movie.get('title'), movie.get('year'), imdb_only = True) + movies.append(imdb_id) + + return movies + + def getWatchlist(self): + + movies = [] + page = 1 + + while True: + url = self.url % (self.conf('automation_username'), page) + data = self.getHTMLData(url) + soup = BeautifulSoup(data) + + this_watch_list = soup.find_all('div', attrs = { + 'class': 'movie', + 'data-film-title': True + }) + + if not this_watch_list: # No Movies + break + + for movie in this_watch_list: + movies.append({ + 'title': movie['data-film-title'], + 'year': movie['data-film-year'] + }) + + if not 'next page' in data.lower(): + break + + page += 1 + + return movies + + +config = [{ + 'name': 'goodfilms', + 'groups': [ + { + 'tab': 'automation', + 'list': 'watchlist_providers', + 'name': 'goodfilms_automation', + 'label': 'Goodfilms', + 'description': 'import movies from your Goodfilms queue', + 'options': [ + { + 'name': 'automation_enabled', + 'default': False, + 'type': 'enabler', + }, + { + 'name': 'automation_username', + 'label': 'Username', + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/hummingbird.py b/couchpotato/core/media/movie/providers/automation/hummingbird.py new file mode 100644 index 0000000000..188185877f --- /dev/null +++ b/couchpotato/core/media/movie/providers/automation/hummingbird.py @@ -0,0 +1,104 @@ +from couchpotato.core.logger import CPLog +from couchpotato.core.media.movie.providers.automation.base import Automation + + +log = CPLog(__name__) + +autoload = 'Hummingbird' + + +class Hummingbird(Automation): + + def getIMDBids(self): + movies = [] + for movie in self.getWatchlist(): + imdb = self.search(movie[0], movie[1]) + if imdb: + movies.append(imdb['imdb']) + return movies + + def getWatchlist(self): + if not self.conf('automation_username'): + log.error('You need to fill in a username') + return [] + + url = "http://hummingbird.me/api/v1/users/%s/library" % self.conf('automation_username') + data = self.getJsonData(url) + + chosen_filter = { + 'automation_list_current': 'currently-watching', + 'automation_list_plan': 'plan-to-watch', + 'automation_list_completed': 'completed', + 'automation_list_hold': 'on-hold', + 'automation_list_dropped': 'dropped', + } + + chosen_lists = [] + for x in chosen_filter: + if self.conf(x): + chosen_lists.append(chosen_filter[x]) + + entries = [] + for item in data: + if item['anime']['show_type'] != 'Movie' or item['status'] not in chosen_lists: + continue + title = item['anime']['title'] + year = item['anime']['started_airing'] + if year: + year = year[:4] + entries.append([title, year]) + return entries + +config = [{ + 'name': 'hummingbird', + 'groups': [ + { + 'tab': 'automation', + 'list': 'watchlist_providers', + 'name': 'hummingbird_automation', + 'label': 'Hummingbird', + 'description': 'Import movies from your Hummingbird.me lists', + 'options': [ + { + 'name': 'automation_enabled', + 'default': False, + 'type': 'enabler', + }, + { + 'name': 'automation_username', + 'label': 'Username', + }, + { + 'name': 'automation_list_current', + 'type': 'bool', + 'label': 'Currently Watching', + 'default': False, + }, + { + 'name': 'automation_list_plan', + 'type': 'bool', + 'label': 'Plan to Watch', + 'default': True, + }, + { + 'name': 'automation_list_completed', + 'type': 'bool', + 'label': 'Completed', + 'default': False, + }, + { + 'name': 'automation_list_hold', + 'type': 'bool', + 'label': 'On Hold', + 'default': False, + }, + { + 'name': 'automation_list_dropped', + 'type': 'bool', + 'label': 'Dropped', + 'default': False, + }, + ], + }, + ], +}] diff --git a/couchpotato/core/media/movie/providers/automation/imdb.py b/couchpotato/core/media/movie/providers/automation/imdb.py new file mode 100644 index 0000000000..ead888eba5 --- /dev/null +++ b/couchpotato/core/media/movie/providers/automation/imdb.py @@ -0,0 +1,338 @@ +import traceback +import re + +from bs4 import BeautifulSoup +from couchpotato import fireEvent +from couchpotato.core.helpers.encoding import ss +from couchpotato.core.helpers.rss import RSS +from couchpotato.core.helpers.variable import getImdb, splitString, tryInt +from couchpotato.core.logger import CPLog +from couchpotato.core.media._base.providers.base import MultiProvider +from couchpotato.core.media.movie.providers.automation.base import Automation + + +log = CPLog(__name__) + +autoload = 'IMDB' + + +class IMDB(MultiProvider): + + def getTypes(self): + return [IMDBWatchlist, IMDBAutomation, IMDBCharts] + + +class IMDBBase(Automation, RSS): + + interval = 1800 + + charts = { + 'theater': { + 'order': 1, + 'name': 'IMDB - Movies in Theaters', + 'url': 'http://www.imdb.com/movies-in-theaters/', + }, + 'boxoffice': { + 'order': 2, + 'name': 'IMDB - Box Office', + 'url': 'http://www.imdb.com/boxoffice/', + }, + 'rentals': { + 'order': 3, + 'name': 'IMDB - Top DVD rentals', + 'url': 'http://www.imdb.com/boxoffice/rentals', + 'type': 'json', + }, + 'top250': { + 'order': 4, + 'name': 'IMDB - Top 250 Movies', + 'url': 'http://www.imdb.com/chart/top', + }, + } + + def getInfo(self, imdb_id): + return fireEvent('movie.info', identifier = imdb_id, extended = False, merge = True) + + def getFromURL(self, url): + log.debug('Getting IMDBs from: %s', url) + html = self.getHTMLData(url) + + try: + split = splitString(html, split_on = "
")[1]
+ html = splitString(split, split_on = "
")[0]
+ except:
+ try:
+ split = splitString(html, split_on = "
")
+
+ if len(split) < 2:
+ log.error('Failed parsing IMDB page "%s", unexpected html.', url)
+ return []
+
+ html = BeautifulSoup(split[1])
+ for x in ['list compact', 'lister', 'list detail sub-list']:
+ html2 = html.find('div', attrs = {
+ 'class': x
+ })
+
+ if html2:
+ html = html2.contents
+ html = ''.join([str(x) for x in html])
+ break
+ except:
+ log.error('Failed parsing IMDB page "%s": %s', (url, traceback.format_exc()))
+
+ html = ss(html)
+ imdbs = getImdb(html, multiple = True) if html else []
+
+ return imdbs
+
+
+class IMDBWatchlist(IMDBBase):
+
+ enabled_option = 'automation_enabled'
+
+ def getIMDBids(self):
+
+ movies = []
+
+ watchlist_enablers = [tryInt(x) for x in splitString(self.conf('automation_urls_use'))]
+ watchlist_urls = splitString(self.conf('automation_urls'))
+
+ index = -1
+ for watchlist_url in watchlist_urls:
+
+ try:
+ # Get list ID
+ ids = re.findall('(?:list/|list_id=)([a-zA-Z0-9\-_]{11})', watchlist_url)
+ if len(ids) == 1:
+ watchlist_url = 'http://www.imdb.com/list/%s/?view=compact&sort=created:asc' % ids[0]
+ # Try find user id with watchlist
+ else:
+ userids = re.findall('(ur\d{7,9})', watchlist_url)
+ if len(userids) == 1:
+ watchlist_url = 'http://www.imdb.com/user/%s/watchlist?view=compact&sort=created:asc' % userids[0]
+ except:
+ log.error('Failed getting id from watchlist: %s', traceback.format_exc())
+
+ index += 1
+ if not watchlist_enablers[index]:
+ continue
+
+ start = 0
+ while True:
+ try:
+
+ w_url = '%s&start=%s' % (watchlist_url, start)
+ imdbs = self.getFromURL(w_url)
+
+ for imdb in imdbs:
+ if imdb not in movies:
+ movies.append(imdb)
+
+ if self.shuttingDown():
+ break
+
+ log.debug('Found %s movies on %s', (len(imdbs), w_url))
+
+ if len(imdbs) < 225:
+ break
+
+ start = len(movies)
+
+ except:
+ log.error('Failed loading IMDB watchlist: %s %s', (watchlist_url, traceback.format_exc()))
+ break
+
+ return movies
+
+
+class IMDBAutomation(IMDBBase):
+
+ enabled_option = 'automation_providers_enabled'
+
+ def getIMDBids(self):
+
+ movies = []
+
+ for name in self.charts:
+ chart = self.charts[name]
+ url = chart.get('url')
+
+ if self.conf('automation_charts_%s' % name):
+ imdb_ids = self.getFromURL(url)
+
+ try:
+ for imdb_id in imdb_ids:
+ info = self.getInfo(imdb_id)
+ if info and self.isMinimalMovie(info):
+ movies.append(imdb_id)
+
+ if self.shuttingDown():
+ break
+
+ except:
+ log.error('Failed loading IMDB chart results from %s: %s', (url, traceback.format_exc()))
+
+ return movies
+
+
+class IMDBCharts(IMDBBase):
+
+ def getChartList(self):
+ # Nearly identical to 'getIMDBids', but we don't care about minimalMovie and return all movie data (not just id)
+ movie_lists = []
+ max_items = 10
+
+ for name in self.charts:
+ chart = self.charts[name].copy()
+ cache_key = 'imdb.chart_display_%s' % name
+
+ if self.conf('chart_display_%s' % name):
+
+ cached = self.getCache(cache_key)
+ if cached:
+ chart['list'] = cached
+ movie_lists.append(chart)
+ continue
+
+ url = chart.get('url')
+
+ chart['list'] = []
+ imdb_ids = self.getFromURL(url)
+
+ try:
+ for imdb_id in imdb_ids[0:max_items]:
+
+ is_movie = fireEvent('movie.is_movie', identifier = imdb_id, single = True)
+ if not is_movie:
+ continue
+
+ info = self.getInfo(imdb_id)
+ chart['list'].append(info)
+
+ if self.shuttingDown():
+ break
+ except:
+ log.error('Failed loading IMDB chart results from %s: %s', (url, traceback.format_exc()))
+
+ self.setCache(cache_key, chart['list'], timeout = 259200)
+
+ if chart['list']:
+ movie_lists.append(chart)
+
+ return movie_lists
+
+
+config = [{
+ 'name': 'imdb',
+ 'groups': [
+ {
+ 'tab': 'automation',
+ 'list': 'watchlist_providers',
+ 'name': 'imdb_automation_watchlist',
+ 'label': 'IMDB',
+ 'description': 'From any public IMDB watchlists.',
+ 'options': [
+ {
+ 'name': 'automation_enabled',
+ 'default': False,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'automation_urls_use',
+ 'label': 'Use',
+ },
+ {
+ 'name': 'automation_urls',
+ 'label': 'url',
+ 'type': 'combined',
+ 'combine': ['automation_urls_use', 'automation_urls'],
+ },
+ ],
+ },
+ {
+ 'tab': 'automation',
+ 'list': 'automation_providers',
+ 'name': 'imdb_automation_charts',
+ 'label': 'IMDB',
+ 'description': 'Import movies from IMDB Charts',
+ 'options': [
+ {
+ 'name': 'automation_providers_enabled',
+ 'default': False,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'automation_charts_theater',
+ 'type': 'bool',
+ 'label': 'In Theaters',
+ 'description': 'New Movies In-Theaters chart',
+ 'default': True,
+ },
+ {
+ 'name': 'automation_charts_rentals',
+ 'type': 'bool',
+ 'label': 'DVD Rentals',
+ 'description': 'Top DVD rentals chart',
+ 'default': True,
+ },
+ {
+ 'name': 'automation_charts_top250',
+ 'type': 'bool',
+ 'label': 'TOP 250',
+ 'description': 'IMDB TOP 250 chart',
+ 'default': False,
+ },
+ {
+ 'name': 'automation_charts_boxoffice',
+ 'type': 'bool',
+ 'label': 'Box office TOP 10',
+ 'description': 'IMDB Box office TOP 10 chart',
+ 'default': True,
+ },
+ ],
+ },
+ {
+ 'tab': 'display',
+ 'list': 'charts_providers',
+ 'name': 'imdb_charts_display',
+ 'label': 'IMDB',
+ 'description': 'Display movies from IMDB Charts',
+ 'options': [
+ {
+ 'name': 'chart_display_enabled',
+ 'default': True,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'chart_display_theater',
+ 'type': 'bool',
+ 'label': 'In Theaters',
+ 'description': 'New Movies In-Theaters chart',
+ 'default': False,
+ },
+ {
+ 'name': 'chart_display_top250',
+ 'type': 'bool',
+ 'label': 'TOP 250',
+ 'description': 'IMDB TOP 250 chart',
+ 'default': False,
+ },
+ {
+ 'name': 'chart_display_rentals',
+ 'type': 'bool',
+ 'label': 'DVD Rentals',
+ 'description': 'Top DVD rentals chart',
+ 'default': True,
+ },
+ {
+ 'name': 'chart_display_boxoffice',
+ 'type': 'bool',
+ 'label': 'Box office TOP 10',
+ 'description': 'IMDB Box office TOP 10 chart',
+ 'default': True,
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/media/movie/providers/automation/itunes.py b/couchpotato/core/media/movie/providers/automation/itunes.py
new file mode 100644
index 0000000000..fcb20b1249
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/automation/itunes.py
@@ -0,0 +1,97 @@
+from xml.etree.ElementTree import QName
+import datetime
+import traceback
+import xml.etree.ElementTree as XMLTree
+
+from couchpotato.core.helpers.rss import RSS
+from couchpotato.core.helpers.variable import md5, splitString, tryInt
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media.movie.providers.automation.base import Automation
+
+
+log = CPLog(__name__)
+
+autoload = 'ITunes'
+
+
+class ITunes(Automation, RSS):
+
+ interval = 1800
+
+ def getIMDBids(self):
+
+ movies = []
+
+ enablers = [tryInt(x) for x in splitString(self.conf('automation_urls_use'))]
+ urls = splitString(self.conf('automation_urls'))
+
+ namespace = 'http://www.w3.org/2005/Atom'
+ namespace_im = 'http://itunes.apple.com/rss'
+
+ index = -1
+ for url in urls:
+
+ index += 1
+ if len(enablers) == 0 or len(enablers) < index or not enablers[index]:
+ continue
+
+ try:
+ cache_key = 'itunes.rss.%s' % md5(url)
+ rss_data = self.getCache(cache_key, url)
+
+ data = XMLTree.fromstring(rss_data)
+
+ if data is not None:
+ entry_tag = str(QName(namespace, 'entry'))
+ rss_movies = self.getElements(data, entry_tag)
+
+ for movie in rss_movies:
+ name_tag = str(QName(namespace_im, 'name'))
+ name = self.getTextElement(movie, name_tag)
+
+ releaseDate_tag = str(QName(namespace_im, 'releaseDate'))
+ releaseDateText = self.getTextElement(movie, releaseDate_tag)
+ year = datetime.datetime.strptime(releaseDateText, '%Y-%m-%dT00:00:00-07:00').strftime("%Y")
+
+ imdb = self.search(name, year)
+
+ if imdb and self.isMinimalMovie(imdb):
+ movies.append(imdb['imdb'])
+
+ except:
+ log.error('Failed loading iTunes rss feed: %s %s', (url, traceback.format_exc()))
+
+ return movies
+
+
+config = [{
+ 'name': 'itunes',
+ 'groups': [
+ {
+ 'tab': 'automation',
+ 'list': 'automation_providers',
+ 'name': 'itunes_automation',
+ 'label': 'iTunes',
+ 'description': 'From any iTunes Store feed. Url should be the RSS link.',
+ 'options': [
+ {
+ 'name': 'automation_enabled',
+ 'default': False,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'automation_urls_use',
+ 'label': 'Use',
+ 'default': ',',
+ },
+ {
+ 'name': 'automation_urls',
+ 'label': 'url',
+ 'type': 'combined',
+ 'combine': ['automation_urls_use', 'automation_urls'],
+ 'default': 'https://itunes.apple.com/rss/topmovies/limit=25/xml,',
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/media/movie/providers/automation/kinepolis.py b/couchpotato/core/media/movie/providers/automation/kinepolis.py
new file mode 100644
index 0000000000..a0f2596509
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/automation/kinepolis.py
@@ -0,0 +1,54 @@
+import datetime
+
+from couchpotato.core.helpers.rss import RSS
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media.movie.providers.automation.base import Automation
+
+
+log = CPLog(__name__)
+
+autoload = 'Kinepolis'
+
+
+class Kinepolis(Automation, RSS):
+
+ interval = 1800
+ rss_url = 'http://kinepolis.be/nl/top10-box-office/feed'
+
+ def getIMDBids(self):
+
+ movies = []
+
+ rss_movies = self.getRSSData(self.rss_url)
+
+ for movie in rss_movies:
+ name = self.getTextElement(movie, 'title')
+ year = datetime.datetime.now().strftime('%Y')
+
+ imdb = self.search(name, year)
+
+ if imdb and self.isMinimalMovie(imdb):
+ movies.append(imdb['imdb'])
+
+ return movies
+
+
+config = [{
+ 'name': 'kinepolis',
+ 'groups': [
+ {
+ 'tab': 'automation',
+ 'list': 'automation_providers',
+ 'name': 'kinepolis_automation',
+ 'label': 'Kinepolis',
+ 'description': 'Imports movies from the current top 10 of kinepolis.',
+ 'options': [
+ {
+ 'name': 'automation_enabled',
+ 'default': False,
+ 'type': 'enabler',
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/media/movie/providers/automation/letterboxd.py b/couchpotato/core/media/movie/providers/automation/letterboxd.py
new file mode 100644
index 0000000000..d43821c056
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/automation/letterboxd.py
@@ -0,0 +1,90 @@
+import re
+
+from bs4 import BeautifulSoup
+from couchpotato.core.helpers.variable import tryInt, splitString, removeEmpty
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media.movie.providers.automation.base import Automation
+
+
+log = CPLog(__name__)
+
+autoload = 'Letterboxd'
+
+
+class Letterboxd(Automation):
+
+ url = 'http://letterboxd.com/%s/watchlist/'
+ pattern = re.compile(r'(.*)\((\d*)\)')
+
+ interval = 1800
+
+ def getIMDBids(self):
+
+ urls = splitString(self.conf('automation_urls'))
+
+ if len(urls) == 0:
+ return []
+
+ movies = []
+
+ for movie in self.getWatchlist():
+ imdb_id = self.search(movie.get('title'), movie.get('year'), imdb_only = True)
+ movies.append(imdb_id)
+
+ return movies
+
+ def getWatchlist(self):
+
+ enablers = [tryInt(x) for x in splitString(self.conf('automation_urls_use'))]
+ urls = splitString(self.conf('automation_urls'))
+
+ index = -1
+ movies = []
+ for username in urls:
+
+ index += 1
+ if not enablers[index]:
+ continue
+
+ soup = BeautifulSoup(self.getHTMLData(self.url % username))
+
+ for movie in soup.find_all('li', attrs = {'class': 'poster-container'}):
+ img = movie.find('img', movie)
+ title = img.get('alt')
+
+ movies.append({
+ 'title': title
+ })
+
+ return movies
+
+
+config = [{
+ 'name': 'letterboxd',
+ 'groups': [
+ {
+ 'tab': 'automation',
+ 'list': 'watchlist_providers',
+ 'name': 'letterboxd_automation',
+ 'label': 'Letterboxd',
+ 'description': 'Import movies from any public Letterboxd watchlist',
+ 'options': [
+ {
+ 'name': 'automation_enabled',
+ 'default': False,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'automation_urls_use',
+ 'label': 'Use',
+ },
+ {
+ 'name': 'automation_urls',
+ 'label': 'Username',
+ 'type': 'combined',
+ 'combine': ['automation_urls_use', 'automation_urls'],
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/media/movie/providers/automation/moviemeter.py b/couchpotato/core/media/movie/providers/automation/moviemeter.py
new file mode 100644
index 0000000000..624ffb65c9
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/automation/moviemeter.py
@@ -0,0 +1,48 @@
+from couchpotato.core.helpers.rss import RSS
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media.movie.providers.automation.base import Automation
+
+log = CPLog(__name__)
+
+autoload = 'Moviemeter'
+
+
+class Moviemeter(Automation, RSS):
+
+ interval = 1800
+ rss_url = 'http://www.moviemeter.nl/rss/cinema'
+
+ def getIMDBids(self):
+
+ movies = []
+
+ rss_movies = self.getRSSData(self.rss_url)
+
+ for movie in rss_movies:
+ imdb = self.search(self.getTextElement(movie, 'title'))
+
+ if imdb and self.isMinimalMovie(imdb):
+ movies.append(imdb['imdb'])
+
+ return movies
+
+
+config = [{
+ 'name': 'moviemeter',
+ 'groups': [
+ {
+ 'tab': 'automation',
+ 'list': 'automation_providers',
+ 'name': 'moviemeter_automation',
+ 'label': 'Moviemeter',
+ 'description': 'Imports movies from the current top 10 of moviemeter.nl.',
+ 'options': [
+ {
+ 'name': 'automation_enabled',
+ 'default': False,
+ 'type': 'enabler',
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/media/movie/providers/automation/movies_io.py b/couchpotato/core/media/movie/providers/automation/movies_io.py
new file mode 100644
index 0000000000..3b0b54f277
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/automation/movies_io.py
@@ -0,0 +1,72 @@
+from couchpotato.core.event import fireEvent
+from couchpotato.core.helpers.rss import RSS
+from couchpotato.core.helpers.variable import tryInt, splitString
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media.movie.providers.automation.base import Automation
+
+log = CPLog(__name__)
+
+autoload = 'MoviesIO'
+
+
+class MoviesIO(Automation, RSS):
+
+ interval = 1800
+
+ def getIMDBids(self):
+
+ movies = []
+
+ enablers = [tryInt(x) for x in splitString(self.conf('automation_urls_use'))]
+
+ index = -1
+ for rss_url in splitString(self.conf('automation_urls')):
+
+ index += 1
+ if not enablers[index]:
+ continue
+
+ rss_movies = self.getRSSData(rss_url, headers = {'Referer': ''})
+
+ for movie in rss_movies:
+
+ nameyear = fireEvent('scanner.name_year', self.getTextElement(movie, 'title'), single = True)
+ imdb = self.search(nameyear.get('name'), nameyear.get('year'), imdb_only = True)
+
+ if not imdb:
+ continue
+
+ movies.append(imdb)
+
+ return movies
+
+
+config = [{
+ 'name': 'moviesio',
+ 'groups': [
+ {
+ 'tab': 'automation',
+ 'list': 'watchlist_providers',
+ 'name': 'moviesio',
+ 'label': 'Movies.IO',
+ 'description': 'Imports movies from Movies.io RSS watchlists',
+ 'options': [
+ {
+ 'name': 'automation_enabled',
+ 'default': False,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'automation_urls_use',
+ 'label': 'Use',
+ },
+ {
+ 'name': 'automation_urls',
+ 'label': 'url',
+ 'type': 'combined',
+ 'combine': ['automation_urls_use', 'automation_urls'],
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/media/movie/providers/automation/popularmovies.py b/couchpotato/core/media/movie/providers/automation/popularmovies.py
new file mode 100644
index 0000000000..9e403a0856
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/automation/popularmovies.py
@@ -0,0 +1,48 @@
+from couchpotato import fireEvent
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media.movie.providers.automation.base import Automation
+
+log = CPLog(__name__)
+
+autoload = 'PopularMovies'
+
+
+class PopularMovies(Automation):
+
+ interval = 1800
+ url = 'https://s3.amazonaws.com/popular-movies/movies.json'
+
+ def getIMDBids(self):
+
+ movies = []
+ retrieved_movies = self.getJsonData(self.url)
+
+ if retrieved_movies:
+ for movie in retrieved_movies:
+ imdb_id = movie.get('imdb_id')
+ info = fireEvent('movie.info', identifier = imdb_id, extended = False, merge = True)
+ if self.isMinimalMovie(info):
+ movies.append(imdb_id)
+
+ return movies
+
+
+config = [{
+ 'name': 'popularmovies',
+ 'groups': [
+ {
+ 'tab': 'automation',
+ 'list': 'automation_providers',
+ 'name': 'popularmovies_automation',
+ 'label': 'Popular Movies',
+ 'description': 'Imports the top titles of movies that have been in theaters. Script provided by Steven Lu',
+ 'options': [
+ {
+ 'name': 'automation_enabled',
+ 'default': False,
+ 'type': 'enabler',
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/media/movie/providers/automation/trakt/__init__.py b/couchpotato/core/media/movie/providers/automation/trakt/__init__.py
new file mode 100644
index 0000000000..b0e5cba8bd
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/automation/trakt/__init__.py
@@ -0,0 +1,38 @@
+from .main import Trakt
+
+
+def autoload():
+ return Trakt()
+
+
+config = [{
+ 'name': 'trakt',
+ 'groups': [
+ {
+ 'tab': 'automation',
+ 'list': 'watchlist_providers',
+ 'name': 'trakt_automation',
+ 'label': 'Trakt',
+ 'description': 'Import movies from your own watchlist',
+ 'options': [
+ {
+ 'name': 'automation_enabled',
+ 'default': False,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'automation_oauth_token',
+ 'label': 'Auth Token',
+ 'advanced': 1
+ },
+ {
+ 'name': 'automation_oauth_refresh',
+ 'label': 'Refresh Token',
+ 'description': ('Used to automatically refresh your oauth token every 3 months',
+ 'To get a refresh token, reconnect with trakt'),
+ 'advanced': 1
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/media/movie/providers/automation/trakt/main.py b/couchpotato/core/media/movie/providers/automation/trakt/main.py
new file mode 100644
index 0000000000..fcec75e938
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/automation/trakt/main.py
@@ -0,0 +1,114 @@
+import json
+import traceback
+import time
+
+from couchpotato import Env, fireEvent
+from couchpotato.api import addApiView
+from couchpotato.core.event import addEvent
+from couchpotato.core.helpers.variable import cleanHost
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.base import Provider
+from couchpotato.core.media.movie.providers.automation.base import Automation
+
+
+log = CPLog(__name__)
+
+
+class TraktBase(Provider):
+
+ client_id = '8a54ed7b5e1b56d874642770ad2e8b73e2d09d6e993c3a92b1e89690bb1c9014'
+ api_url = 'https://api-v2launch.trakt.tv/'
+
+ def call(self, method_url, post_data = None):
+ headers = {
+ 'Content-Type': 'application/json',
+ 'Authorization': 'Bearer %s' % self.conf('automation_oauth_token'),
+ 'trakt-api-version': 2,
+ 'trakt-api-key': self.client_id,
+ }
+
+ if post_data:
+ post_data = json.dumps(post_data)
+
+ data = self.getJsonData(self.api_url + method_url, data = post_data or {}, headers = headers)
+ return data if data else []
+
+
+class Trakt(Automation, TraktBase):
+
+ urls = {
+ 'watchlist': 'sync/watchlist/movies/',
+ 'oauth': 'https://api.couchpota.to/authorize/trakt/',
+ 'refresh_token': 'https://api.couchpota.to/authorize/trakt_refresh/',
+ }
+
+ def __init__(self):
+ super(Trakt, self).__init__()
+
+ addApiView('automation.trakt.auth_url', self.getAuthorizationUrl)
+ addApiView('automation.trakt.credentials', self.getCredentials)
+
+ fireEvent('schedule.interval', 'updater.check', self.refreshToken, hours = 24)
+ addEvent('app.load', self.refreshToken)
+
+ def refreshToken(self):
+
+ token = self.conf('automation_oauth_token')
+ refresh_token = self.conf('automation_oauth_refresh')
+ if token and refresh_token:
+
+ prop_name = 'last_trakt_refresh'
+ last_refresh = int(Env.prop(prop_name, default = 0))
+
+ if last_refresh < time.time()-4838400: # refresh every 8 weeks
+ log.debug('Refreshing trakt token')
+
+ url = self.urls['refresh_token'] + '?token=' + self.conf('automation_oauth_refresh')
+ data = fireEvent('cp.api_call', url, cache_timeout = 0, single = True)
+ if data and 'oauth' in data and 'refresh' in data:
+ log.debug('Oauth refresh: %s', data)
+ self.conf('automation_oauth_token', value = data.get('oauth'))
+ self.conf('automation_oauth_refresh', value = data.get('refresh'))
+ Env.prop(prop_name, value = int(time.time()))
+ else:
+ log.error('Failed refreshing Trakt token, please re-register in settings')
+
+ elif token and not refresh_token:
+ log.error('Refresh token is missing, please re-register Trakt for autorefresh of the token in the future')
+
+ def getIMDBids(self):
+ movies = []
+ for movie in self.getWatchlist():
+ movies.append(movie.get('movie').get('ids').get('imdb'))
+
+ return movies
+
+ def getWatchlist(self):
+ return self.call(self.urls['watchlist'])
+
+ def getAuthorizationUrl(self, host = None, **kwargs):
+ callback_url = cleanHost(host) + '%sautomation.trakt.credentials/' % (Env.get('api_base').lstrip('/'))
+ log.debug('callback_url is %s', callback_url)
+
+ target_url = self.urls['oauth'] + "?target=" + callback_url
+ log.debug('target_url is %s', target_url)
+
+ return {
+ 'success': True,
+ 'url': target_url,
+ }
+
+ def getCredentials(self, **kwargs):
+ try:
+ oauth_token = kwargs.get('oauth')
+ refresh_token = kwargs.get('refresh')
+
+ log.debug('oauth_token is: %s', oauth_token)
+ self.conf('automation_oauth_token', value = oauth_token)
+ self.conf('automation_oauth_refresh', value = refresh_token)
+
+ Env.prop('last_trakt_refresh', value = int(time.time()))
+ except:
+ log.error('Failed setting trakt token: %s', traceback.format_exc())
+
+ return 'redirect', Env.get('web_base') + 'settings/automation/'
diff --git a/couchpotato/core/media/movie/providers/automation/trakt/static/trakt.js b/couchpotato/core/media/movie/providers/automation/trakt/static/trakt.js
new file mode 100644
index 0000000000..4d757b7dc9
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/automation/trakt/static/trakt.js
@@ -0,0 +1,67 @@
+var TraktAutomation = new Class({
+
+ initialize: function(){
+ var self = this;
+
+ App.addEvent('loadSettings', self.addRegisterButton.bind(self));
+ },
+
+ addRegisterButton: function(){
+ var self = this,
+ setting_page = App.getPage('Settings');
+
+ setting_page.addEvent('create', function(){
+
+ var fieldset = setting_page.tabs.automation.groups.trakt_automation,
+ l = window.location;
+
+ var trakt_set = 0;
+ fieldset.getElements('input[type=text]').each(function(el){
+ trakt_set += +(el.get('value') !== '');
+ });
+
+ new Element('.ctrlHolder').adopt(
+
+ // Unregister button
+ (trakt_set > 0) ?
+ [
+ self.unregister = new Element('a.button.red', {
+ 'text': 'Unregister',
+ 'events': {
+ 'click': function(){
+ fieldset.getElements('input[name*=oauth_token]').set('value', '').fireEvent('change');
+
+ self.unregister.destroy();
+ self.unregister_or.destroy();
+ }
+ }
+ }),
+ self.unregister_or = new Element('span[text=or]')
+ ]
+ : null,
+
+ // Register button
+ new Element('a.button', {
+ 'text': trakt_set > 0 ? 'Register a different account' : 'Register your trakt.tv account',
+ 'events': {
+ 'click': function(){
+ Api.request('automation.trakt.auth_url', {
+ 'data': {
+ 'host': l.protocol + '//' + l.hostname + (l.port ? ':' + l.port : '')
+ },
+ 'onComplete': function(json){
+ window.location = json.url;
+ }
+ });
+ }
+ }
+ })
+
+ ).inject(fieldset);
+ });
+
+ }
+
+});
+
+new TraktAutomation();
diff --git a/couchpotato/core/media/movie/providers/base.py b/couchpotato/core/media/movie/providers/base.py
new file mode 100644
index 0000000000..4e80d5d318
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/base.py
@@ -0,0 +1,5 @@
+from couchpotato.core.media._base.providers.info.base import BaseInfoProvider
+
+
+class MovieProvider(BaseInfoProvider):
+ type = 'movie'
diff --git a/libs/migrate/versioning/templates/__init__.py b/couchpotato/core/media/movie/providers/info/__init__.py
similarity index 100%
rename from libs/migrate/versioning/templates/__init__.py
rename to couchpotato/core/media/movie/providers/info/__init__.py
diff --git a/couchpotato/core/media/movie/providers/info/_modifier.py b/couchpotato/core/media/movie/providers/info/_modifier.py
new file mode 100644
index 0000000000..f6a3089b75
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/info/_modifier.py
@@ -0,0 +1,135 @@
+import copy
+import traceback
+
+from CodernityDB.database import RecordNotFound
+from couchpotato import get_db
+from couchpotato.core.event import addEvent, fireEvent
+from couchpotato.core.helpers.variable import mergeDicts, randomString
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+
+
+log = CPLog(__name__)
+
+autoload = 'MovieResultModifier'
+
+
+class MovieResultModifier(Plugin):
+
+ default_info = {
+ 'tmdb_id': 0,
+ 'titles': [],
+ 'original_title': '',
+ 'year': 0,
+ 'images': {
+ 'poster': [],
+ 'backdrop': [],
+ 'poster_original': [],
+ 'backdrop_original': [],
+ 'actors': {},
+ 'landscape': [],
+ 'logo': [],
+ 'clear_art': [],
+ 'disc_art': [],
+ 'banner': [],
+ 'extra_thumbs': [],
+ 'extra_fanart': []
+ },
+ 'runtime': 0,
+ 'plot': '',
+ 'tagline': '',
+ 'imdb': '',
+ 'genres': [],
+ 'mpaa': None,
+ 'actors': [],
+ 'actor_roles': {}
+ }
+
+ def __init__(self):
+ addEvent('result.modify.info.search', self.returnByType)
+ addEvent('result.modify.movie.search', self.combineOnIMDB)
+ addEvent('result.modify.movie.info', self.checkLibrary)
+
+ def returnByType(self, results):
+
+ new_results = {}
+ for r in results:
+ type_name = r.get('type', 'movie') + 's'
+ if type_name not in new_results:
+ new_results[type_name] = []
+
+ new_results[type_name].append(r)
+
+ # Combine movies, needs a cleaner way..
+ if 'movies' in new_results:
+ new_results['movies'] = self.combineOnIMDB(new_results['movies'])
+
+ return new_results
+
+ def combineOnIMDB(self, results):
+
+ temp = {}
+ order = []
+
+ # Combine on imdb id
+ for item in results:
+ random_string = randomString()
+ imdb = item.get('imdb', random_string)
+ imdb = imdb if imdb else random_string
+
+ if not temp.get(imdb):
+ temp[imdb] = self.getLibraryTags(imdb)
+ order.append(imdb)
+
+ # Merge dicts
+ temp[imdb] = mergeDicts(temp[imdb], item)
+
+ # Make it a list again
+ temp_list = [temp[x] for x in order]
+
+ return temp_list
+
+ def getLibraryTags(self, imdb):
+
+ temp = {
+ 'in_wanted': False,
+ 'in_library': False,
+ }
+
+ # Add release info from current library
+ db = get_db()
+ try:
+
+ media = None
+ try:
+ media = db.get('media', 'imdb-%s' % imdb, with_doc = True)['doc']
+ except RecordNotFound:
+ pass
+
+ if media:
+
+ if media.get('status') == 'active':
+ temp['in_wanted'] = media
+
+ try: temp['in_wanted']['profile'] = db.get('id', media['profile_id'])
+ except: temp['in_wanted']['profile'] = {'label': ''}
+
+ for release in fireEvent('release.for_media', media['_id'], single = True):
+ if release.get('status') == 'done':
+ if not temp['in_library']:
+ temp['in_library'] = media
+ temp['in_library']['releases'] = []
+
+ temp['in_library']['releases'].append(release)
+ except:
+ log.error('Tried getting more info on searched movies: %s', traceback.format_exc())
+
+ return temp
+
+ def checkLibrary(self, result):
+
+ result = mergeDicts(copy.deepcopy(self.default_info), copy.deepcopy(result))
+
+ if result and result.get('imdb'):
+ return mergeDicts(result, self.getLibraryTags(result['imdb']))
+ return result
diff --git a/couchpotato/core/media/movie/providers/info/couchpotatoapi.py b/couchpotato/core/media/movie/providers/info/couchpotatoapi.py
new file mode 100644
index 0000000000..b789d88e10
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/info/couchpotatoapi.py
@@ -0,0 +1,128 @@
+import base64
+import time
+
+from couchpotato.core.event import addEvent, fireEvent
+from couchpotato.core.helpers.encoding import tryUrlencode, ss
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media.movie.providers.base import MovieProvider
+from couchpotato.environment import Env
+
+
+log = CPLog(__name__)
+
+autoload = 'CouchPotatoApi'
+
+
+class CouchPotatoApi(MovieProvider):
+
+ urls = {
+ 'validate': 'https://api.couchpota.to/validate/%s/',
+ 'search': 'https://api.couchpota.to/search/%s/',
+ 'info': 'https://api.couchpota.to/info/%s/',
+ 'is_movie': 'https://api.couchpota.to/ismovie/%s/',
+ 'eta': 'https://api.couchpota.to/eta/%s/',
+ 'suggest': 'https://api.couchpota.to/suggest/',
+ 'updater': 'https://api.couchpota.to/updater/?%s',
+ 'messages': 'https://api.couchpota.to/messages/?%s',
+ }
+ http_time_between_calls = 0
+ api_version = 1
+
+ def __init__(self):
+ addEvent('movie.info', self.getInfo, priority = 2)
+ addEvent('movie.info.release_date', self.getReleaseDate)
+
+ addEvent('info.search', self.search, priority = 1)
+ addEvent('movie.search', self.search, priority = 1)
+
+ addEvent('movie.suggest', self.getSuggestions)
+ addEvent('movie.is_movie', self.isMovie)
+
+ addEvent('release.validate', self.validate)
+
+ addEvent('cp.api_call', self.call)
+
+ addEvent('cp.source_url', self.getSourceUrl)
+ addEvent('cp.messages', self.getMessages)
+
+ def call(self, url, **kwargs):
+ return self.getJsonData(url, headers = self.getRequestHeaders(), **kwargs)
+
+ def getMessages(self, last_check = 0):
+
+ data = self.getJsonData(self.urls['messages'] % tryUrlencode({
+ 'last_check': last_check,
+ }), headers = self.getRequestHeaders(), cache_timeout = 10)
+
+ return data
+
+ def getSourceUrl(self, repo = None, repo_name = None, branch = None):
+ return self.getJsonData(self.urls['updater'] % tryUrlencode({
+ 'repo': repo,
+ 'name': repo_name,
+ 'branch': branch,
+ }), headers = self.getRequestHeaders())
+
+ def search(self, q, limit = 5):
+ return self.getJsonData(self.urls['search'] % tryUrlencode(q) + ('?limit=%s' % limit), headers = self.getRequestHeaders())
+
+ def validate(self, name = None):
+
+ if not name:
+ return
+
+ name_enc = base64.b64encode(ss(name))
+ return self.getJsonData(self.urls['validate'] % name_enc, headers = self.getRequestHeaders())
+
+ def isMovie(self, identifier = None, adding = False):
+
+ if not identifier:
+ return
+
+ url = self.urls['is_movie'] % identifier
+ url += '?adding=1' if adding else ''
+
+ data = self.getJsonData(url, headers = self.getRequestHeaders())
+ if data:
+ return data.get('is_movie', True)
+
+ return True
+
+ def getInfo(self, identifier = None, **kwargs):
+
+ if not identifier:
+ return
+
+ result = self.getJsonData(self.urls['info'] % identifier, headers = self.getRequestHeaders())
+ if result:
+ return dict((k, v) for k, v in result.items() if v)
+
+ return {}
+
+ def getReleaseDate(self, identifier = None):
+ if identifier is None: return {}
+
+ dates = self.getJsonData(self.urls['eta'] % identifier, headers = self.getRequestHeaders())
+ log.debug('Found ETA for %s: %s', (identifier, dates))
+
+ return dates
+
+ def getSuggestions(self, movies = None, ignore = None):
+ if not ignore: ignore = []
+ if not movies: movies = []
+
+ suggestions = self.getJsonData(self.urls['suggest'], data = {
+ 'movies': ','.join(movies),
+ 'ignore': ','.join(ignore),
+ }, headers = self.getRequestHeaders())
+ log.info('Found suggestions for %s movies, %s ignored', (len(movies), len(ignore)))
+
+ return suggestions
+
+ def getRequestHeaders(self):
+ return {
+ 'X-CP-Version': fireEvent('app.version', single = True),
+ 'X-CP-API': self.api_version,
+ 'X-CP-Time': time.time(),
+ 'X-CP-Identifier': '+%s' % Env.setting('api_key', 'core')[:10], # Use first 10 as identifier, so we don't need to use IP address in api stats
+ }
diff --git a/couchpotato/core/media/movie/providers/info/fanarttv.py b/couchpotato/core/media/movie/providers/info/fanarttv.py
new file mode 100644
index 0000000000..74cd942cd3
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/info/fanarttv.py
@@ -0,0 +1,133 @@
+import traceback
+
+from couchpotato import tryInt
+from couchpotato.core.event import addEvent
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media.movie.providers.base import MovieProvider
+from requests import HTTPError
+
+
+log = CPLog(__name__)
+
+autoload = 'FanartTV'
+
+
+class FanartTV(MovieProvider):
+
+ urls = {
+ 'api': 'http://webservice.fanart.tv/v3/movies/%s?api_key=b28b14e9be662e027cfbc7c3dd600405'
+ }
+
+ MAX_EXTRAFANART = 20
+ http_time_between_calls = 0
+
+ def __init__(self):
+ addEvent('movie.info', self.getArt, priority = 1)
+
+ def getArt(self, identifier = None, extended = True, **kwargs):
+
+ if not identifier or not extended:
+ return {}
+
+ images = {}
+
+ try:
+ url = self.urls['api'] % identifier
+ fanart_data = self.getJsonData(url, show_error = False)
+
+ if fanart_data:
+ log.debug('Found images for %s', fanart_data.get('name'))
+ images = self._parseMovie(fanart_data)
+ except HTTPError as e:
+ log.debug('Failed getting extra art for %s: %s',
+ (identifier, e))
+ except:
+ log.error('Failed getting extra art for %s: %s',
+ (identifier, traceback.format_exc()))
+ return {}
+
+ return {
+ 'images': images
+ }
+
+ def _parseMovie(self, movie):
+ images = {
+ 'landscape': self._getMultImages(movie.get('moviethumb', []), 1),
+ 'logo': [],
+ 'disc_art': self._getMultImages(self._trimDiscs(movie.get('moviedisc', [])), 1),
+ 'clear_art': self._getMultImages(movie.get('hdmovieart', []), 1),
+ 'banner': self._getMultImages(movie.get('moviebanner', []), 1),
+ 'extra_fanart': [],
+ }
+
+ if len(images['clear_art']) == 0:
+ images['clear_art'] = self._getMultImages(movie.get('movieart', []), 1)
+
+ images['logo'] = self._getMultImages(movie.get('hdmovielogo', []), 1)
+ if len(images['logo']) == 0:
+ images['logo'] = self._getMultImages(movie.get('movielogo', []), 1)
+
+ fanarts = self._getMultImages(movie.get('moviebackground', []), self.MAX_EXTRAFANART + 1)
+
+ if fanarts:
+ images['backdrop_original'] = [fanarts[0]]
+ images['extra_fanart'] = fanarts[1:]
+
+ return images
+
+ def _trimDiscs(self, disc_images):
+ """
+ Return a subset of discImages. Only bluray disc images will be returned.
+ """
+
+ trimmed = []
+ for disc in disc_images:
+ if disc.get('disc_type') == 'bluray':
+ trimmed.append(disc)
+
+ if len(trimmed) == 0:
+ return disc_images
+
+ return trimmed
+
+ def _getImage(self, images):
+ image_url = None
+ highscore = -1
+ for image in images:
+ if tryInt(image.get('likes')) > highscore:
+ highscore = tryInt(image.get('likes'))
+ image_url = image.get('url') or image.get('href')
+
+ return image_url
+
+ def _getMultImages(self, images, n):
+ """
+ Chooses the best n images and returns them as a list.
+ If n<0, all images will be returned.
+ """
+ image_urls = []
+ pool = []
+ for image in images:
+ if image.get('lang') == 'en':
+ pool.append(image)
+ orig_pool_size = len(pool)
+
+ while len(pool) > 0 and (n < 0 or orig_pool_size - len(pool) < n):
+ best = None
+ highscore = -1
+ for image in pool:
+ if tryInt(image.get('likes')) > highscore:
+ highscore = tryInt(image.get('likes'))
+ best = image
+ url = best.get('url') or best.get('href')
+ if url:
+ image_urls.append(url)
+ pool.remove(best)
+
+ return image_urls
+
+ def isDisabled(self):
+ if self.conf('api_key') == '':
+ log.error('No API key provided.')
+ return True
+ return False
diff --git a/couchpotato/core/media/movie/providers/info/omdbapi.py b/couchpotato/core/media/movie/providers/info/omdbapi.py
new file mode 100644
index 0000000000..16f30adcf7
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/info/omdbapi.py
@@ -0,0 +1,134 @@
+import json
+import re
+import traceback
+
+from couchpotato import Env
+from couchpotato.core.event import addEvent, fireEvent
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.helpers.variable import tryInt, tryFloat, splitString
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+
+log = CPLog(__name__)
+
+autoload = 'OMDBAPI'
+
+
+class OMDBAPI(MovieProvider):
+
+ urls = {
+ 'search': 'http://www.omdbapi.com/?type=movie&%s',
+ 'info': 'http://www.omdbapi.com/?type=movie&i=%s',
+ }
+
+ http_time_between_calls = 0
+
+ def __init__(self):
+ addEvent('info.search', self.search)
+ addEvent('movie.search', self.search)
+ addEvent('movie.info', self.getInfo)
+
+ def search(self, q, limit = 12):
+
+ name_year = fireEvent('scanner.name_year', q, single = True)
+
+ if not name_year or (name_year and not name_year.get('name')):
+ name_year = {
+ 'name': q
+ }
+
+ cache_key = 'omdbapi.cache.%s' % q
+ url = self.urls['search'] % tryUrlencode({'t': name_year.get('name'), 'y': name_year.get('year', '')})
+ cached = self.getCache(cache_key, url, timeout = 3, headers = {'User-Agent': Env.getIdentifier()})
+
+ if cached:
+ result = self.parseMovie(cached)
+ if result.get('titles') and len(result.get('titles')) > 0:
+ log.info('Found: %s', result['titles'][0] + ' (' + str(result.get('year')) + ')')
+ return [result]
+
+ return []
+
+ return []
+
+ def getInfo(self, identifier = None, **kwargs):
+
+ if not identifier:
+ return {}
+
+ cache_key = 'omdbapi.cache.%s' % identifier
+ cached = self.getCache(cache_key, self.urls['info'] % identifier, timeout = 3, headers = {'User-Agent': Env.getIdentifier()})
+
+ if cached:
+ result = self.parseMovie(cached)
+ if result.get('titles') and len(result.get('titles')) > 0:
+ log.info('Found: %s', result['titles'][0] + ' (' + str(result['year']) + ')')
+ return result
+
+ return {}
+
+ def parseMovie(self, movie):
+
+ movie_data = {}
+ try:
+
+ try:
+ if isinstance(movie, (str, unicode)):
+ movie = json.loads(movie)
+ except ValueError:
+ log.info('No proper json to decode')
+ return movie_data
+
+ if movie.get('Response') == 'Parse Error' or movie.get('Response') == 'False':
+ return movie_data
+
+ if movie.get('Type').lower() != 'movie':
+ return movie_data
+
+ tmp_movie = movie.copy()
+ for key in tmp_movie:
+ if tmp_movie.get(key).lower() == 'n/a':
+ del movie[key]
+
+ year = tryInt(movie.get('Year', ''))
+
+ movie_data = {
+ 'type': 'movie',
+ 'via_imdb': True,
+ 'titles': [movie.get('Title')] if movie.get('Title') else [],
+ 'original_title': movie.get('Title'),
+ 'images': {
+ 'poster': [movie.get('Poster', '')] if movie.get('Poster') and len(movie.get('Poster', '')) > 4 else [],
+ },
+ 'rating': {
+ 'imdb': (tryFloat(movie.get('imdbRating', 0)), tryInt(movie.get('imdbVotes', '').replace(',', ''))),
+ #'rotten': (tryFloat(movie.get('tomatoRating', 0)), tryInt(movie.get('tomatoReviews', '').replace(',', ''))),
+ },
+ 'imdb': str(movie.get('imdbID', '')),
+ 'mpaa': str(movie.get('Rated', '')),
+ 'runtime': self.runtimeToMinutes(movie.get('Runtime', '')),
+ 'released': movie.get('Released'),
+ 'year': year if isinstance(year, int) else None,
+ 'plot': movie.get('Plot'),
+ 'genres': splitString(movie.get('Genre', '')),
+ 'directors': splitString(movie.get('Director', '')),
+ 'writers': splitString(movie.get('Writer', '')),
+ 'actors': splitString(movie.get('Actors', '')),
+ }
+ movie_data = dict((k, v) for k, v in movie_data.items() if v)
+ except:
+ log.error('Failed parsing IMDB API json: %s', traceback.format_exc())
+
+ return movie_data
+
+ def runtimeToMinutes(self, runtime_str):
+ runtime = 0
+
+ regex = '(\d*.?\d+).(h|hr|hrs|mins|min)+'
+ matches = re.findall(regex, runtime_str)
+ for match in matches:
+ nr, size = match
+ runtime += tryInt(nr) * (60 if 'h' is str(size)[0] else 1)
+
+ return runtime
diff --git a/couchpotato/core/media/movie/providers/info/themoviedb.py b/couchpotato/core/media/movie/providers/info/themoviedb.py
new file mode 100644
index 0000000000..17110af8f1
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/info/themoviedb.py
@@ -0,0 +1,236 @@
+import traceback
+
+from couchpotato.core.event import addEvent, fireEvent
+from couchpotato.core.helpers.encoding import toUnicode, ss, tryUrlencode
+from couchpotato.core.helpers.variable import tryInt
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'TheMovieDb'
+
+
+class TheMovieDb(MovieProvider):
+
+ http_time_between_calls = .35
+
+ configuration = {
+ 'images': {
+ 'secure_base_url': 'https://image.tmdb.org/t/p/',
+ },
+ }
+
+ def __init__(self):
+ addEvent('info.search', self.search, priority = 3)
+ addEvent('movie.search', self.search, priority = 3)
+ addEvent('movie.info', self.getInfo, priority = 3)
+ addEvent('movie.info_by_tmdb', self.getInfo)
+ addEvent('app.load', self.config)
+
+ def config(self):
+ configuration = self.request('configuration')
+ if configuration:
+ self.configuration = configuration
+
+ def search(self, q, limit = 3):
+ """ Find movie by name """
+
+ if self.isDisabled():
+ return False
+
+ log.debug('Searching for movie: %s', q)
+
+ raw = None
+ try:
+ name_year = fireEvent('scanner.name_year', q, single = True)
+ raw = self.request('search/movie', {
+ 'query': name_year.get('name', q),
+ 'year': name_year.get('year'),
+ 'search_type': 'ngram' if limit > 1 else 'phrase'
+ }, return_key = 'results')
+ except:
+ log.error('Failed searching TMDB for "%s": %s', (q, traceback.format_exc()))
+
+ results = []
+ if raw:
+ try:
+ nr = 0
+
+ for movie in raw:
+ parsed_movie = self.parseMovie(movie, extended = False)
+ if parsed_movie:
+ results.append(parsed_movie)
+
+ nr += 1
+ if nr == limit:
+ break
+
+ log.info('Found: %s', [result['titles'][0] + ' (' + str(result.get('year', 0)) + ')' for result in results])
+
+ return results
+ except SyntaxError as e:
+ log.error('Failed to parse XML response: %s', e)
+ return False
+
+ return results
+
+ def getInfo(self, identifier = None, extended = True):
+
+ if not identifier:
+ return {}
+
+ result = self.parseMovie({
+ 'id': identifier
+ }, extended = extended)
+
+ return result or {}
+
+ def parseMovie(self, movie, extended = True):
+
+ # Do request, append other items
+ movie = self.request('movie/%s' % movie.get('id'), {
+ 'append_to_response': 'alternative_titles' + (',images,casts' if extended else '')
+ })
+ if not movie:
+ return
+
+ # Images
+ poster = self.getImage(movie, type = 'poster', size = 'w154')
+ poster_original = self.getImage(movie, type = 'poster', size = 'original')
+ backdrop_original = self.getImage(movie, type = 'backdrop', size = 'original')
+ extra_thumbs = self.getMultImages(movie, type = 'backdrops', size = 'original') if extended else []
+
+ images = {
+ 'poster': [poster] if poster else [],
+ #'backdrop': [backdrop] if backdrop else [],
+ 'poster_original': [poster_original] if poster_original else [],
+ 'backdrop_original': [backdrop_original] if backdrop_original else [],
+ 'actors': {},
+ 'extra_thumbs': extra_thumbs
+ }
+
+ # Genres
+ try:
+ genres = [genre.get('name') for genre in movie.get('genres', [])]
+ except:
+ genres = []
+
+ # 1900 is the same as None
+ year = str(movie.get('release_date') or '')[:4]
+ if not movie.get('release_date') or year == '1900' or year.lower() == 'none':
+ year = None
+
+ # Gather actors data
+ actors = {}
+ if extended:
+
+ # Full data
+ cast = movie.get('casts', {}).get('cast', [])
+
+ for cast_item in cast:
+ try:
+ actors[toUnicode(cast_item.get('name'))] = toUnicode(cast_item.get('character'))
+ images['actors'][toUnicode(cast_item.get('name'))] = self.getImage(cast_item, type = 'profile', size = 'original')
+ except:
+ log.debug('Error getting cast info for %s: %s', (cast_item, traceback.format_exc()))
+
+ movie_data = {
+ 'type': 'movie',
+ 'via_tmdb': True,
+ 'tmdb_id': movie.get('id'),
+ 'titles': [toUnicode(movie.get('title'))],
+ 'original_title': movie.get('original_title'),
+ 'images': images,
+ 'imdb': movie.get('imdb_id'),
+ 'runtime': movie.get('runtime'),
+ 'released': str(movie.get('release_date')),
+ 'year': tryInt(year, None),
+ 'plot': movie.get('overview'),
+ 'genres': genres,
+ 'collection': getattr(movie.get('belongs_to_collection'), 'name', None),
+ 'actor_roles': actors
+ }
+
+ movie_data = dict((k, v) for k, v in movie_data.items() if v)
+
+ # Add alternative names
+ if movie_data['original_title'] and movie_data['original_title'] not in movie_data['titles']:
+ movie_data['titles'].append(movie_data['original_title'])
+
+ # Add alternative titles
+ alternate_titles = movie.get('alternative_titles', {}).get('titles', [])
+
+ for alt in alternate_titles:
+ alt_name = alt.get('title')
+ if alt_name and alt_name not in movie_data['titles'] and alt_name.lower() != 'none' and alt_name is not None:
+ movie_data['titles'].append(alt_name)
+
+ return movie_data
+
+ def getImage(self, movie, type = 'poster', size = 'poster'):
+
+ image_url = ''
+ try:
+ path = movie.get('%s_path' % type)
+ if path:
+ image_url = '%s%s%s' % (self.configuration['images']['secure_base_url'], size, path)
+ except:
+ log.debug('Failed getting %s.%s for "%s"', (type, size, ss(str(movie))))
+
+ return image_url
+
+ def getMultImages(self, movie, type = 'backdrops', size = 'original'):
+
+ image_urls = []
+ try:
+ for image in movie.get('images', {}).get(type, [])[1:5]:
+ image_urls.append(self.getImage(image, 'file', size))
+ except:
+ log.debug('Failed getting %s.%s for "%s"', (type, size, ss(str(movie))))
+
+ return image_urls
+
+ def request(self, call = '', params = {}, return_key = None):
+
+ params = dict((k, v) for k, v in params.items() if v)
+ params = tryUrlencode(params)
+
+ try:
+ url = 'https://api.themoviedb.org/3/%s?api_key=%s%s' % (call, self.conf('api_key'), '&%s' % params if params else '')
+ data = self.getJsonData(url, show_error = False)
+ except:
+ log.debug('Movie not found: %s, %s', (call, params))
+ data = None
+
+ if data and return_key and return_key in data:
+ data = data.get(return_key)
+
+ return data
+
+ def isDisabled(self):
+ if self.conf('api_key') == '':
+ log.error('No API key provided.')
+ return True
+ return False
+
+
+config = [{
+ 'name': 'themoviedb',
+ 'groups': [
+ {
+ 'tab': 'providers',
+ 'name': 'tmdb',
+ 'label': 'TheMovieDB',
+ 'hidden': True,
+ 'description': 'Used for all calls to TheMovieDB.',
+ 'options': [
+ {
+ 'name': 'api_key',
+ 'default': '9b939aee0aaafc12a65bf448e4af9543',
+ 'label': 'Api Key',
+ },
+ ],
+ },
+ ],
+}]
diff --git a/libs/migrate/versioning/templates/repository/__init__.py b/couchpotato/core/media/movie/providers/metadata/__init__.py
similarity index 100%
rename from libs/migrate/versioning/templates/repository/__init__.py
rename to couchpotato/core/media/movie/providers/metadata/__init__.py
diff --git a/couchpotato/core/media/movie/providers/metadata/base.py b/couchpotato/core/media/movie/providers/metadata/base.py
new file mode 100755
index 0000000000..cc914af4bf
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/metadata/base.py
@@ -0,0 +1,187 @@
+import os
+import shutil
+import traceback
+
+from couchpotato.core.event import addEvent, fireEvent
+from couchpotato.core.helpers.encoding import sp
+from couchpotato.core.helpers.variable import getIdentifier, underscoreToCamel
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.metadata.base import MetaDataBase
+from couchpotato.environment import Env
+
+
+log = CPLog(__name__)
+
+
+class MovieMetaData(MetaDataBase):
+
+ enabled_option = 'meta_enabled'
+
+ def __init__(self):
+ addEvent('renamer.after', self.create)
+
+ def create(self, message = None, group = None):
+ if self.isDisabled(): return
+ if not group: group = {}
+
+ log.info('Creating %s metadata.', self.getName())
+
+ # Update library to get latest info
+ try:
+ group['media'] = fireEvent('movie.update', group['media'].get('_id'), identifier = getIdentifier(group['media']), extended = True, single = True)
+ except:
+ log.error('Failed to update movie, before creating metadata: %s', traceback.format_exc())
+
+ root_name = self.getRootName(group)
+ meta_name = os.path.basename(root_name)
+ root = os.path.dirname(root_name)
+
+ movie_info = group['media'].get('info')
+
+ for file_type in ['nfo']:
+ try:
+ self._createType(meta_name, root, movie_info, group, file_type, 0)
+ except:
+ log.error('Unable to create %s file: %s', ('nfo', traceback.format_exc()))
+
+ for file_type in ['thumbnail', 'fanart', 'banner', 'disc_art', 'logo', 'clear_art', 'landscape', 'extra_thumbs', 'extra_fanart']:
+ try:
+ if file_type == 'thumbnail':
+ num_images = len(movie_info['images']['poster_original'])
+ elif file_type == 'fanart':
+ num_images = len(movie_info['images']['backdrop_original'])
+ else:
+ num_images = len(movie_info['images'][file_type])
+
+ for i in range(num_images):
+ self._createType(meta_name, root, movie_info, group, file_type, i)
+ except:
+ log.error('Unable to create %s file: %s', (file_type, traceback.format_exc()))
+
+ def _createType(self, meta_name, root, movie_info, group, file_type, i): # Get file path
+ camelcase_method = underscoreToCamel(file_type.capitalize())
+ name = getattr(self, 'get' + camelcase_method + 'Name')(meta_name, root, i)
+
+ if name and (self.conf('meta_' + file_type) or self.conf('meta_' + file_type) is None):
+
+ # Get file content
+ content = getattr(self, 'get' + camelcase_method)(movie_info = movie_info, data = group, i = i)
+ if content:
+ log.debug('Creating %s file: %s', (file_type, name))
+ if os.path.isfile(content):
+ content = sp(content)
+ name = sp(name)
+
+ if not os.path.exists(os.path.dirname(name)):
+ os.makedirs(os.path.dirname(name))
+
+ shutil.copy2(content, name)
+ shutil.copyfile(content, name)
+
+ # Try and copy stats seperately
+ try: shutil.copystat(content, name)
+ except: pass
+ else:
+ self.createFile(name, content)
+ group['renamed_files'].append(name)
+
+ try:
+ os.chmod(sp(name), Env.getPermission('file'))
+ except:
+ log.debug('Failed setting permissions for %s: %s', (name, traceback.format_exc()))
+
+ def getRootName(self, data = None):
+ if not data: data = {}
+ return os.path.join(data['destination_dir'], data['filename'])
+
+ def getFanartName(self, name, root, i):
+ return
+
+ def getThumbnailName(self, name, root, i):
+ return
+
+ def getBannerName(self, name, root, i):
+ return
+
+ def getClearArtName(self, name, root, i):
+ return
+
+ def getLogoName(self, name, root, i):
+ return
+
+ def getDiscArtName(self, name, root, i):
+ return
+
+ def getLandscapeName(self, name, root, i):
+ return
+
+ def getExtraThumbsName(self, name, root, i):
+ return
+
+ def getExtraFanartName(self, name, root, i):
+ return
+
+ def getNfoName(self, name, root, i):
+ return
+
+ def getNfo(self, movie_info = None, data = None, i = 0):
+ if not data: data = {}
+ if not movie_info: movie_info = {}
+
+ def getThumbnail(self, movie_info = None, data = None, wanted_file_type = 'poster_original', i = 0):
+ if not data: data = {}
+ if not movie_info: movie_info = {}
+
+ # See if it is in current files
+ files = data['media'].get('files')
+ if files.get('image_' + wanted_file_type):
+ if os.path.isfile(files['image_' + wanted_file_type][i]):
+ return files['image_' + wanted_file_type][i]
+
+ # Download using existing info
+ try:
+ images = movie_info['images'][wanted_file_type]
+ file_path = fireEvent('file.download', url = images[i], single = True)
+ return file_path
+ except:
+ pass
+
+ def getFanart(self, movie_info = None, data = None, i = 0):
+ if not data: data = {}
+ if not movie_info: movie_info = {}
+ return self.getThumbnail(movie_info = movie_info, data = data, wanted_file_type = 'backdrop_original', i = i)
+
+ def getBanner(self, movie_info = None, data = None, i = 0):
+ if not data: data = {}
+ if not movie_info: movie_info = {}
+ return self.getThumbnail(movie_info = movie_info, data = data, wanted_file_type = 'banner', i = i)
+
+ def getClearArt(self, movie_info = None, data = None, i = 0):
+ if not data: data = {}
+ if not movie_info: movie_info = {}
+ return self.getThumbnail(movie_info = movie_info, data = data, wanted_file_type = 'clear_art', i = i)
+
+ def getLogo(self, movie_info = None, data = None, i = 0):
+ if not data: data = {}
+ if not movie_info: movie_info = {}
+ return self.getThumbnail(movie_info = movie_info, data = data, wanted_file_type = 'logo', i = i)
+
+ def getDiscArt(self, movie_info = None, data = None, i = 0):
+ if not data: data = {}
+ if not movie_info: movie_info = {}
+ return self.getThumbnail(movie_info = movie_info, data = data, wanted_file_type = 'disc_art', i = i)
+
+ def getLandscape(self, movie_info = None, data = None, i = 0):
+ if not data: data = {}
+ if not movie_info: movie_info = {}
+ return self.getThumbnail(movie_info = movie_info, data= data, wanted_file_type = 'landscape', i = i)
+
+ def getExtraThumbs(self, movie_info = None, data = None, i = 0):
+ if not data: data = {}
+ if not movie_info: movie_info = {}
+ return self.getThumbnail(movie_info = movie_info, data = data, wanted_file_type = 'extra_thumbs', i = i)
+
+ def getExtraFanart(self, movie_info = None, data = None, i = 0):
+ if not data: data = {}
+ if not movie_info: movie_info = {}
+ return self.getThumbnail(movie_info = movie_info, data = data, wanted_file_type = 'extra_fanart', i = i)
diff --git a/couchpotato/core/media/movie/providers/metadata/mediabrowser.py b/couchpotato/core/media/movie/providers/metadata/mediabrowser.py
new file mode 100644
index 0000000000..6e40e4c1f6
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/metadata/mediabrowser.py
@@ -0,0 +1,36 @@
+import os
+
+from couchpotato.core.media.movie.providers.metadata.base import MovieMetaData
+
+
+autoload = 'MediaBrowser'
+
+
+class MediaBrowser(MovieMetaData):
+
+ def getThumbnailName(self, name, root, i):
+ return os.path.join(root, 'folder.jpg')
+
+ def getFanartName(self, name, root, i):
+ return os.path.join(root, 'backdrop.jpg')
+
+
+config = [{
+ 'name': 'mediabrowser',
+ 'groups': [
+ {
+ 'tab': 'renamer',
+ 'subtab': 'metadata',
+ 'name': 'mediabrowser_metadata',
+ 'label': 'MediaBrowser',
+ 'description': 'Generate folder.jpg and backdrop.jpg',
+ 'options': [
+ {
+ 'name': 'meta_enabled',
+ 'default': False,
+ 'type': 'enabler',
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/media/movie/providers/metadata/ps3.py b/couchpotato/core/media/movie/providers/metadata/ps3.py
new file mode 100644
index 0000000000..05df0a5393
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/metadata/ps3.py
@@ -0,0 +1,33 @@
+import os
+
+from couchpotato.core.media.movie.providers.metadata.base import MovieMetaData
+
+
+autoload = 'SonyPS3'
+
+
+class SonyPS3(MovieMetaData):
+
+ def getThumbnailName(self, name, root, i):
+ return os.path.join(root, 'cover.jpg')
+
+
+config = [{
+ 'name': 'sonyps3',
+ 'groups': [
+ {
+ 'tab': 'renamer',
+ 'subtab': 'metadata',
+ 'name': 'sonyps3_metadata',
+ 'label': 'Sony PS3',
+ 'description': 'Generate cover.jpg',
+ 'options': [
+ {
+ 'name': 'meta_enabled',
+ 'default': False,
+ 'type': 'enabler',
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/media/movie/providers/metadata/wdtv.py b/couchpotato/core/media/movie/providers/metadata/wdtv.py
new file mode 100644
index 0000000000..a2062c7f1f
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/metadata/wdtv.py
@@ -0,0 +1,221 @@
+from xml.etree.ElementTree import Element, SubElement, tostring
+import os
+import re
+import traceback
+import xml.dom.minidom
+
+from couchpotato.core.media.movie.providers.metadata.base import MovieMetaData
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import getTitle
+from couchpotato.core.logger import CPLog
+
+autoload = 'WdtvLive'
+
+log = CPLog(__name__)
+
+
+class WdtvLive(MovieMetaData):
+
+ def getThumbnailName(self, name, root, i):
+ return self.createMetaName('%s.jpg', name, root)
+
+ def createMetaName(self, basename, name, root):
+ return os.path.join(root, basename.replace('%s', name))
+
+ def getNfoName(self, name, root, i):
+ return self.createMetaName('%s.xml', name, root)
+
+ def getNfo(self, movie_info=None, data=None, i=0):
+ if not data: data = {}
+ if not movie_info: movie_info = {}
+
+ nfoxml = Element('details')
+
+ # Title
+ try:
+ el = SubElement(nfoxml, 'title')
+ el.text = toUnicode(getTitle(data))
+ except:
+ pass
+
+ # IMDB id
+ try:
+ el = SubElement(nfoxml, 'id')
+ el.text = toUnicode(data['identifier'])
+ except:
+ pass
+
+ # Runtime
+ try:
+ runtime = SubElement(nfoxml, 'runtime')
+ runtime.text = '%s min' % movie_info.get('runtime')
+ except:
+ pass
+
+ # Other values
+ types = ['year', 'mpaa', 'originaltitle:original_title', 'outline', 'plot', 'tagline', 'premiered:released']
+ for type in types:
+
+ if ':' in type:
+ name, type = type.split(':')
+ else:
+ name = type
+
+ try:
+ if movie_info.get(type):
+ el = SubElement(nfoxml, name)
+ el.text = toUnicode(movie_info.get(type, ''))
+ except:
+ pass
+
+ # Rating
+ for rating_type in ['imdb', 'rotten', 'tmdb']:
+ try:
+ r, v = movie_info['rating'][rating_type]
+ rating = SubElement(nfoxml, 'rating')
+ rating.text = str(r)
+ votes = SubElement(nfoxml, 'votes')
+ votes.text = str(v)
+ break
+ except:
+ log.debug('Failed adding rating info from %s: %s', (rating_type, traceback.format_exc()))
+
+ # Genre
+ for genre in movie_info.get('genres', []):
+ genres = SubElement(nfoxml, 'genre')
+ genres.text = toUnicode(genre)
+
+ # Actors
+ for actor_name in movie_info.get('actor_roles', {}):
+ role_name = movie_info['actor_roles'][actor_name]
+
+ actor = SubElement(nfoxml, 'actor')
+ name = SubElement(actor, 'name')
+ name.text = toUnicode(actor_name)
+ if role_name:
+ role = SubElement(actor, 'role')
+ role.text = toUnicode(role_name)
+ if movie_info['images']['actors'].get(actor_name):
+ thumb = SubElement(actor, 'thumb')
+ thumb.text = toUnicode(movie_info['images']['actors'].get(actor_name))
+
+ # Directors
+ for director_name in movie_info.get('directors', []):
+ director = SubElement(nfoxml, 'director')
+ director.text = toUnicode(director_name)
+
+ # Writers
+ for writer in movie_info.get('writers', []):
+ writers = SubElement(nfoxml, 'credits')
+ writers.text = toUnicode(writer)
+
+ # Sets or collections
+ collection_name = movie_info.get('collection')
+ if collection_name:
+ collection = SubElement(nfoxml, 'set')
+ collection.text = toUnicode(collection_name)
+ sorttitle = SubElement(nfoxml, 'sorttitle')
+ sorttitle.text = '%s %s' % (toUnicode(collection_name), movie_info.get('year'))
+
+ # Images
+ for image_url in movie_info['images']['poster_original']:
+ image = SubElement(nfoxml, 'thumb')
+ image.text = toUnicode(image_url)
+
+ image_types = [
+ ('fanart', 'backdrop_original'),
+ ('banner', 'banner'),
+ ('discart', 'disc_art'),
+ ('logo', 'logo'),
+ ('clearart', 'clear_art'),
+ ('landscape', 'landscape'),
+ ('extrathumb', 'extra_thumbs'),
+ ('extrafanart', 'extra_fanart'),
+ ]
+
+ for image_type in image_types:
+ sub, type = image_type
+
+ sub_element = SubElement(nfoxml, sub)
+ for image_url in movie_info['images'][type]:
+ image = SubElement(sub_element, 'thumb')
+ image.text = toUnicode(image_url)
+
+ # Add trailer if found
+ trailer_found = False
+ if data.get('renamed_files'):
+ for filename in data.get('renamed_files'):
+ if 'trailer' in filename:
+ trailer = SubElement(nfoxml, 'trailer')
+ trailer.text = toUnicode(filename)
+ trailer_found = True
+ if not trailer_found and data['files'].get('trailer'):
+ trailer = SubElement(nfoxml, 'trailer')
+ trailer.text = toUnicode(data['files']['trailer'][0])
+
+ # Add file metadata
+ fileinfo = SubElement(nfoxml, 'fileinfo')
+ streamdetails = SubElement(fileinfo, 'streamdetails')
+
+ # Video data
+ if data['meta_data'].get('video'):
+ video = SubElement(streamdetails, 'video')
+ codec = SubElement(video, 'codec')
+ codec.text = toUnicode(data['meta_data']['video'])
+ aspect = SubElement(video, 'aspect')
+ aspect.text = str(data['meta_data']['aspect'])
+ width = SubElement(video, 'width')
+ width.text = str(data['meta_data']['resolution_width'])
+ height = SubElement(video, 'height')
+ height.text = str(data['meta_data']['resolution_height'])
+
+ # Audio data
+ if data['meta_data'].get('audio'):
+ audio = SubElement(streamdetails, 'audio')
+ codec = SubElement(audio, 'codec')
+ codec.text = toUnicode(data['meta_data'].get('audio'))
+ channels = SubElement(audio, 'channels')
+ channels.text = toUnicode(data['meta_data'].get('audio_channels'))
+
+ # Clean up the xml and return it
+ nfoxml = xml.dom.minidom.parseString(tostring(nfoxml))
+ xml_string = nfoxml.toprettyxml(indent = ' ')
+ text_re = re.compile('>\n\s+([^<>\s].*?)\n\s+\g<1>', str(i + 1)))
+
+ def getNfo(self, movie_info=None, data=None, i=0):
+ if not data: data = {}
+ if not movie_info: movie_info = {}
+
+ # return imdb url only
+ if self.conf('meta_url_only'):
+ return 'http://www.imdb.com/title/%s/' % toUnicode(data['identifier'])
+
+ nfoxml = Element('movie')
+
+ # Title
+ try:
+ el = SubElement(nfoxml, 'title')
+ el.text = toUnicode(getTitle(data))
+ except:
+ pass
+
+ # IMDB id
+ try:
+ el = SubElement(nfoxml, 'id')
+ el.text = toUnicode(data['identifier'])
+ except:
+ pass
+
+ # Runtime
+ try:
+ runtime = SubElement(nfoxml, 'runtime')
+ runtime.text = '%s min' % movie_info.get('runtime')
+ except:
+ pass
+
+ # Other values
+ types = ['year', 'mpaa', 'originaltitle:original_title', 'outline', 'plot', 'tagline', 'premiered:released']
+ for type in types:
+
+ if ':' in type:
+ name, type = type.split(':')
+ else:
+ name = type
+
+ try:
+ if movie_info.get(type):
+ el = SubElement(nfoxml, name)
+ el.text = toUnicode(movie_info.get(type, ''))
+ except:
+ pass
+
+ # Rating
+ for rating_type in ['imdb', 'rotten', 'tmdb']:
+ try:
+ r, v = movie_info['rating'][rating_type]
+ rating = SubElement(nfoxml, 'rating')
+ rating.text = str(r)
+ votes = SubElement(nfoxml, 'votes')
+ votes.text = str(v)
+ break
+ except:
+ log.debug('Failed adding rating info from %s: %s', (rating_type, traceback.format_exc()))
+
+ # Genre
+ for genre in movie_info.get('genres', []):
+ genres = SubElement(nfoxml, 'genre')
+ genres.text = toUnicode(genre)
+
+ # Actors
+ for actor_name in movie_info.get('actor_roles', {}):
+ role_name = movie_info['actor_roles'][actor_name]
+
+ actor = SubElement(nfoxml, 'actor')
+ name = SubElement(actor, 'name')
+ name.text = toUnicode(actor_name)
+ if role_name:
+ role = SubElement(actor, 'role')
+ role.text = toUnicode(role_name)
+ if movie_info['images']['actors'].get(actor_name):
+ thumb = SubElement(actor, 'thumb')
+ thumb.text = toUnicode(movie_info['images']['actors'].get(actor_name))
+
+ # Directors
+ for director_name in movie_info.get('directors', []):
+ director = SubElement(nfoxml, 'director')
+ director.text = toUnicode(director_name)
+
+ # Writers
+ for writer in movie_info.get('writers', []):
+ writers = SubElement(nfoxml, 'credits')
+ writers.text = toUnicode(writer)
+
+ # Sets or collections
+ collection_name = movie_info.get('collection')
+ if collection_name:
+ collection = SubElement(nfoxml, 'set')
+ collection.text = toUnicode(collection_name)
+ sorttitle = SubElement(nfoxml, 'sorttitle')
+ sorttitle.text = '%s %s' % (toUnicode(collection_name), movie_info.get('year'))
+
+ # Images
+ for image_url in movie_info['images']['poster_original']:
+ image = SubElement(nfoxml, 'thumb')
+ image.text = toUnicode(image_url)
+
+ image_types = [
+ ('fanart', 'backdrop_original'),
+ ('banner', 'banner'),
+ ('discart', 'disc_art'),
+ ('logo', 'logo'),
+ ('clearart', 'clear_art'),
+ ('landscape', 'landscape'),
+ ('extrathumb', 'extra_thumbs'),
+ ('extrafanart', 'extra_fanart'),
+ ]
+
+ for image_type in image_types:
+ sub, type = image_type
+
+ sub_element = SubElement(nfoxml, sub)
+ for image_url in movie_info['images'][type]:
+ image = SubElement(sub_element, 'thumb')
+ image.text = toUnicode(image_url)
+
+ # Add trailer if found
+ trailer_found = False
+ if data.get('renamed_files'):
+ for filename in data.get('renamed_files'):
+ if 'trailer' in filename:
+ trailer = SubElement(nfoxml, 'trailer')
+ trailer.text = toUnicode(filename)
+ trailer_found = True
+ if not trailer_found and data['files'].get('trailer'):
+ trailer = SubElement(nfoxml, 'trailer')
+ trailer.text = toUnicode(data['files']['trailer'][0])
+
+ # Add file metadata
+ fileinfo = SubElement(nfoxml, 'fileinfo')
+ streamdetails = SubElement(fileinfo, 'streamdetails')
+
+ # Video data
+ if data['meta_data'].get('video'):
+ video = SubElement(streamdetails, 'video')
+ codec = SubElement(video, 'codec')
+ codec.text = toUnicode(data['meta_data']['video'])
+ aspect = SubElement(video, 'aspect')
+ aspect.text = str(data['meta_data']['aspect'])
+ width = SubElement(video, 'width')
+ width.text = str(data['meta_data']['resolution_width'])
+ height = SubElement(video, 'height')
+ height.text = str(data['meta_data']['resolution_height'])
+
+ # Audio data
+ if data['meta_data'].get('audio'):
+ audio = SubElement(streamdetails, 'audio')
+ codec = SubElement(audio, 'codec')
+ codec.text = toUnicode(data['meta_data'].get('audio'))
+ channels = SubElement(audio, 'channels')
+ channels.text = toUnicode(data['meta_data'].get('audio_channels'))
+
+ # Clean up the xml and return it
+ nfoxml = xml.dom.minidom.parseString(tostring(nfoxml))
+ xml_string = nfoxml.toprettyxml(indent = ' ')
+ text_re = re.compile('>\n\s+([^<>\s].*?)\n\s+\g<1>%s is the rootname of the movie. For example "/path/to/movie cd1.mkv" will be "/path/to/movie"'
+ },
+ {
+ 'name': 'meta_url_only',
+ 'label': 'Only IMDB URL',
+ 'default': False,
+ 'advanced': True,
+ 'description': 'Create a nfo with only the IMDB url inside',
+ 'type': 'bool',
+ },
+ {
+ 'name': 'meta_fanart',
+ 'label': 'Fanart',
+ 'default': True,
+ 'type': 'bool',
+ },
+ {
+ 'name': 'meta_fanart_name',
+ 'label': 'Fanart filename',
+ 'default': '%s-fanart.jpg',
+ 'advanced': True,
+ },
+ {
+ 'name': 'meta_thumbnail',
+ 'label': 'Thumbnail',
+ 'default': True,
+ 'type': 'bool',
+ },
+ {
+ 'name': 'meta_thumbnail_name',
+ 'label': 'Thumbnail filename',
+ 'default': '%s.tbn',
+ 'advanced': True,
+ },
+ {
+ 'name': 'meta_banner',
+ 'label': 'Banner',
+ 'default': False,
+ 'type': 'bool'
+ },
+ {
+ 'name': 'meta_banner_name',
+ 'label': 'Banner filename',
+ 'default': 'banner.jpg',
+ 'advanced': True,
+ },
+ {
+ 'name': 'meta_clear_art',
+ 'label': 'ClearArt',
+ 'default': False,
+ 'type': 'bool'
+ },
+ {
+ 'name': 'meta_clear_art_name',
+ 'label': 'ClearArt filename',
+ 'default': 'clearart.png',
+ 'advanced': True,
+ },
+ {
+ 'name': 'meta_disc_art',
+ 'label': 'DiscArt',
+ 'default': False,
+ 'type': 'bool'
+ },
+ {
+ 'name': 'meta_disc_art_name',
+ 'label': 'DiscArt filename',
+ 'default': 'disc.png',
+ 'advanced': True,
+ },
+ {
+ 'name': 'meta_landscape',
+ 'label': 'Landscape',
+ 'default': False,
+ 'type': 'bool'
+ },
+ {
+ 'name': 'meta_landscape_name',
+ 'label': 'Landscape filename',
+ 'default': 'landscape.jpg',
+ 'advanced': True,
+ },
+ {
+ 'name': 'meta_logo',
+ 'label': 'ClearLogo',
+ 'default': False,
+ 'type': 'bool'
+ },
+ {
+ 'name': 'meta_logo_name',
+ 'label': 'ClearLogo filename',
+ 'default': 'logo.png',
+ 'advanced': True,
+ },
+ {
+ 'name': 'meta_extra_thumbs',
+ 'label': 'Extrathumbs',
+ 'default': False,
+ 'type': 'bool'
+ },
+ {
+ 'name': 'meta_extra_thumbs_name',
+ 'label': 'Extrathumbs filename',
+ 'description': '<i> is the image number, and must be included to have multiple images',
+ 'default': 'extrathumbs/thumb.jpg',
+ 'advanced': True
+ },
+ {
+ 'name': 'meta_extra_fanart',
+ 'label': 'Extrafanart',
+ 'default': False,
+ 'type': 'bool'
+ },
+ {
+ 'name': 'meta_extra_fanart_name',
+ 'label': 'Extrafanart filename',
+ 'default': 'extrafanart/extrafanart.jpg',
+ 'description': '<i> is the image number, and must be included to have multiple images',
+ 'advanced': True
+ }
+ ],
+ },
+ ],
+}]
diff --git a/libs/migrate/versioning/templates/repository/default/__init__.py b/couchpotato/core/media/movie/providers/nzb/__init__.py
similarity index 100%
rename from libs/migrate/versioning/templates/repository/default/__init__.py
rename to couchpotato/core/media/movie/providers/nzb/__init__.py
diff --git a/couchpotato/templates/_mobile.html b/couchpotato/core/media/movie/providers/nzb/base.py
similarity index 100%
rename from couchpotato/templates/_mobile.html
rename to couchpotato/core/media/movie/providers/nzb/base.py
diff --git a/couchpotato/core/media/movie/providers/nzb/binsearch.py b/couchpotato/core/media/movie/providers/nzb/binsearch.py
new file mode 100644
index 0000000000..d6f4852208
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/nzb/binsearch.py
@@ -0,0 +1,27 @@
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.helpers.variable import getIdentifier
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.nzb.binsearch import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+from couchpotato.environment import Env
+
+log = CPLog(__name__)
+
+autoload = 'BinSearch'
+
+
+class BinSearch(MovieProvider, Base):
+
+ def buildUrl(self, media, quality):
+ query = tryUrlencode({
+ 'q': getIdentifier(media),
+ 'm': 'n',
+ 'max': 400,
+ 'adv_age': Env.setting('retention', 'nzb'),
+ 'adv_sort': 'date',
+ 'adv_col': 'on',
+ 'adv_nfo': 'on',
+ 'minsize': quality.get('size_min'),
+ 'maxsize': quality.get('size_max'),
+ })
+ return query
diff --git a/couchpotato/core/media/movie/providers/nzb/newznab.py b/couchpotato/core/media/movie/providers/nzb/newznab.py
new file mode 100644
index 0000000000..fc94acbfe0
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/nzb/newznab.py
@@ -0,0 +1,26 @@
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.helpers.variable import getIdentifier
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.nzb.newznab import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'Newznab'
+
+
+class Newznab(MovieProvider, Base):
+
+ def buildUrl(self, media, host):
+
+ query = tryUrlencode({
+ 't': 'movie',
+ 'imdbid': getIdentifier(media).replace('tt', ''),
+ 'apikey': host['api_key'],
+ 'extended': 1
+ })
+
+ if len(host.get('custom_tag', '')) > 0:
+ query = '%s&%s' % (query, host.get('custom_tag'))
+
+ return query
diff --git a/couchpotato/core/media/movie/providers/nzb/nzbclub.py b/couchpotato/core/media/movie/providers/nzb/nzbclub.py
new file mode 100644
index 0000000000..2a43ba2f9f
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/nzb/nzbclub.py
@@ -0,0 +1,27 @@
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.event import fireEvent
+from couchpotato.core.media._base.providers.nzb.nzbclub import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'NZBClub'
+
+
+class NZBClub(MovieProvider, Base):
+
+ def buildUrl(self, media):
+
+ q = tryUrlencode({
+ 'q': '"%s"' % fireEvent('library.query', media, single = True),
+ })
+
+ query = tryUrlencode({
+ 'ig': 1,
+ 'rpp': 200,
+ 'st': 5,
+ 'sp': 1,
+ 'ns': 1,
+ })
+ return '%s&%s' % (q, query)
diff --git a/couchpotato/core/media/movie/providers/nzb/omgwtfnzbs.py b/couchpotato/core/media/movie/providers/nzb/omgwtfnzbs.py
new file mode 100644
index 0000000000..f4527f6d49
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/nzb/omgwtfnzbs.py
@@ -0,0 +1,11 @@
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.nzb.omgwtfnzbs import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'OMGWTFNZBs'
+
+
+class OMGWTFNZBs(MovieProvider, Base):
+ pass
diff --git a/libs/migrate/versioning/templates/repository/default/versions/__init__.py b/couchpotato/core/media/movie/providers/torrent/__init__.py
similarity index 100%
rename from libs/migrate/versioning/templates/repository/default/versions/__init__.py
rename to couchpotato/core/media/movie/providers/torrent/__init__.py
diff --git a/couchpotato/core/media/movie/providers/torrent/alpharatio.py b/couchpotato/core/media/movie/providers/torrent/alpharatio.py
new file mode 100644
index 0000000000..e7f39c1d0c
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/alpharatio.py
@@ -0,0 +1,32 @@
+from couchpotato.core.event import fireEvent
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.alpharatio import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'AlphaRatio'
+
+
+class AlphaRatio(MovieProvider, Base):
+
+ # AlphaRatio movie search categories
+ # 7: MoviesHD
+ # 9: MoviePackHD
+ # 6: MoviesSD
+ # 8: MovePackSD
+
+ cat_ids = [
+ ([7, 9], ['bd50']),
+ ([7, 9], ['720p', '1080p']),
+ ([6, 8], ['dvdr']),
+ ([6, 8], ['brrip', 'dvdrip']),
+ ]
+ cat_backup_id = 6
+
+ def buildUrl(self, media, quality):
+ query = (tryUrlencode(fireEvent('library.query', media, single = True)),
+ self.getSceneOnly(),
+ self.getCatId(quality)[0])
+ return query
diff --git a/couchpotato/core/media/movie/providers/torrent/awesomehd.py b/couchpotato/core/media/movie/providers/torrent/awesomehd.py
new file mode 100644
index 0000000000..b1c81f187e
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/awesomehd.py
@@ -0,0 +1,11 @@
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.awesomehd import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'AwesomeHD'
+
+
+class AwesomeHD(MovieProvider, Base):
+ pass
diff --git a/couchpotato/core/media/movie/providers/torrent/bithdtv.py b/couchpotato/core/media/movie/providers/torrent/bithdtv.py
new file mode 100644
index 0000000000..da6954c8db
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/bithdtv.py
@@ -0,0 +1,23 @@
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.event import fireEvent
+from couchpotato.core.media._base.providers.torrent.bithdtv import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'BiTHDTV'
+
+
+class BiTHDTV(MovieProvider, Base):
+ cat_ids = [
+ ([2], ['bd50']),
+ ]
+ cat_backup_id = 7 # Movies
+
+ def buildUrl(self, media, quality):
+ query = tryUrlencode({
+ 'search': fireEvent('library.query', media, single = True),
+ 'cat': self.getCatId(quality)[0]
+ })
+ return query
diff --git a/couchpotato/core/media/movie/providers/torrent/bitsoup.py b/couchpotato/core/media/movie/providers/torrent/bitsoup.py
new file mode 100644
index 0000000000..b0c8eded88
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/bitsoup.py
@@ -0,0 +1,25 @@
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.bitsoup import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'Bitsoup'
+
+
+class Bitsoup(MovieProvider, Base):
+ cat_ids = [
+ ([17], ['3d']),
+ ([80], ['720p', '1080p']),
+ ([20], ['dvdr']),
+ ([19], ['brrip', 'dvdrip']),
+ ]
+ cat_backup_id = 0
+
+ def buildUrl(self, title, media, quality):
+ query = tryUrlencode({
+ 'search': '"%s" %s' % (title, media['info']['year']),
+ 'cat': self.getCatId(quality)[0],
+ })
+ return query
diff --git a/couchpotato/core/media/movie/providers/torrent/hd4free.py b/couchpotato/core/media/movie/providers/torrent/hd4free.py
new file mode 100644
index 0000000000..37a28a5854
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/hd4free.py
@@ -0,0 +1,11 @@
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.hd4free import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'HD4Free'
+
+
+class HD4Free(MovieProvider, Base):
+ pass
diff --git a/couchpotato/core/media/movie/providers/torrent/hdaccess.py b/couchpotato/core/media/movie/providers/torrent/hdaccess.py
new file mode 100644
index 0000000000..fae2cf54fe
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/hdaccess.py
@@ -0,0 +1,11 @@
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.hdaccess import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'HDAccess'
+
+
+class HDAccess(MovieProvider, Base):
+ pass
diff --git a/couchpotato/core/media/movie/providers/torrent/hdbits.py b/couchpotato/core/media/movie/providers/torrent/hdbits.py
new file mode 100644
index 0000000000..016f1a126b
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/hdbits.py
@@ -0,0 +1,11 @@
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.hdbits import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'HDBits'
+
+
+class HDBits(MovieProvider, Base):
+ pass
diff --git a/couchpotato/core/media/movie/providers/torrent/ilovetorrents.py b/couchpotato/core/media/movie/providers/torrent/ilovetorrents.py
new file mode 100644
index 0000000000..cfd773ad20
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/ilovetorrents.py
@@ -0,0 +1,11 @@
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.ilovetorrents import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'ILoveTorrents'
+
+
+class ILoveTorrents(MovieProvider, Base):
+ pass
diff --git a/couchpotato/core/media/movie/providers/torrent/iptorrents.py b/couchpotato/core/media/movie/providers/torrent/iptorrents.py
new file mode 100644
index 0000000000..84a52f5653
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/iptorrents.py
@@ -0,0 +1,23 @@
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.iptorrents import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'IPTorrents'
+
+
+class IPTorrents(MovieProvider, Base):
+
+ cat_ids = [
+ ([87], ['3d']),
+ ([48], ['720p', '1080p', 'bd50']),
+ ([72], ['cam', 'ts', 'tc', 'r5', 'scr']),
+ ([7, 48, 20], ['dvdrip', 'brrip']),
+ ([6], ['dvdr']),
+ ]
+
+ def buildUrl(self, title, media, quality):
+ query = '"%s" %s' % (title.replace(':', ''), media['info']['year'])
+
+ return self._buildUrl(query, quality)
diff --git a/couchpotato/core/media/movie/providers/torrent/kickasstorrents.py b/couchpotato/core/media/movie/providers/torrent/kickasstorrents.py
new file mode 100644
index 0000000000..2b9b196990
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/kickasstorrents.py
@@ -0,0 +1,11 @@
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.kickasstorrents import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'KickAssTorrents'
+
+
+class KickAssTorrents(MovieProvider, Base):
+ pass
diff --git a/couchpotato/core/media/movie/providers/torrent/passthepopcorn.py b/couchpotato/core/media/movie/providers/torrent/passthepopcorn.py
new file mode 100644
index 0000000000..2b577ad9d6
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/passthepopcorn.py
@@ -0,0 +1,38 @@
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.passthepopcorn import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'PassThePopcorn'
+
+
+class PassThePopcorn(MovieProvider, Base):
+
+ quality_search_params = {
+ 'bd50': {'media': 'Blu-ray', 'format': 'BD50'},
+ '1080p': {'resolution': '1080p'},
+ '720p': {'resolution': '720p'},
+ 'brrip': {'resolution': 'anyhd'},
+ 'dvdr': {'resolution': 'anysd'},
+ 'dvdrip': {'media': 'DVD'},
+ 'scr': {'media': 'DVD-Screener'},
+ 'r5': {'media': 'R5'},
+ 'tc': {'media': 'TC'},
+ 'ts': {'media': 'TS'},
+ 'cam': {'media': 'CAM'}
+ }
+
+ post_search_filters = {
+ 'bd50': {'Codec': ['BD50']},
+ '1080p': {'Resolution': ['1080p']},
+ '720p': {'Resolution': ['720p']},
+ 'brrip': {'Quality': ['High Definition'], 'Container': ['!ISO']},
+ 'dvdr': {'Codec': ['DVD5', 'DVD9']},
+ 'dvdrip': {'Source': ['DVD'], 'Codec': ['!DVD5', '!DVD9']},
+ 'scr': {'Source': ['DVD-Screener']},
+ 'r5': {'Source': ['R5']},
+ 'tc': {'Source': ['TC']},
+ 'ts': {'Source': ['TS']},
+ 'cam': {'Source': ['CAM']}
+ }
diff --git a/couchpotato/core/media/movie/providers/torrent/rarbg.py b/couchpotato/core/media/movie/providers/torrent/rarbg.py
new file mode 100644
index 0000000000..849388e7ca
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/rarbg.py
@@ -0,0 +1,11 @@
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.rarbg import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'Rarbg'
+
+
+class Rarbg(MovieProvider, Base):
+ pass
diff --git a/couchpotato/core/media/movie/providers/torrent/sceneaccess.py b/couchpotato/core/media/movie/providers/torrent/sceneaccess.py
new file mode 100644
index 0000000000..579103af26
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/sceneaccess.py
@@ -0,0 +1,29 @@
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.sceneaccess import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'SceneAccess'
+
+
+class SceneAccess(MovieProvider, Base):
+
+ cat_ids = [
+ ([22], ['720p', '1080p']),
+ ([7], ['cam', 'ts', 'dvdrip', 'tc', 'r5', 'scr', 'brrip']),
+ ([8], ['dvdr']),
+ ]
+
+ def buildUrl(self, title, media, quality):
+ cat_id = self.getCatId(quality)[0]
+ url = self.urls['search'] % (cat_id, cat_id)
+
+ arguments = tryUrlencode({
+ 'search': '%s %s' % (title, media['info']['year']),
+ 'method': 2,
+ })
+ query = "%s&%s" % (url, arguments)
+
+ return query
diff --git a/couchpotato/core/media/movie/providers/torrent/scenetime.py b/couchpotato/core/media/movie/providers/torrent/scenetime.py
new file mode 100644
index 0000000000..58041ef4f9
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/scenetime.py
@@ -0,0 +1,11 @@
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.scenetime import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'SceneTime'
+
+
+class SceneTime(MovieProvider, Base):
+ pass
diff --git a/couchpotato/core/media/movie/providers/torrent/thepiratebay.py b/couchpotato/core/media/movie/providers/torrent/thepiratebay.py
new file mode 100644
index 0000000000..0dc8313d1c
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/thepiratebay.py
@@ -0,0 +1,27 @@
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.event import fireEvent
+from couchpotato.core.media._base.providers.torrent.thepiratebay import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'ThePirateBay'
+
+
+class ThePirateBay(MovieProvider, Base):
+
+ cat_ids = [
+ ([209], ['3d']),
+ ([207], ['720p', '1080p', 'bd50']),
+ ([201], ['cam', 'ts', 'dvdrip', 'tc', 'r5', 'scr']),
+ ([201, 207], ['brrip']),
+ ([202], ['dvdr'])
+ ]
+
+ def buildUrl(self, media, page, cats):
+ return (
+ tryUrlencode('"%s"' % fireEvent('library.query', media, single = True)),
+ page,
+ ','.join(str(x) for x in cats)
+ )
diff --git a/couchpotato/core/media/movie/providers/torrent/torrentbytes.py b/couchpotato/core/media/movie/providers/torrent/torrentbytes.py
new file mode 100644
index 0000000000..48fc68a413
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/torrentbytes.py
@@ -0,0 +1,11 @@
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.torrentbytes import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'TorrentBytes'
+
+
+class TorrentBytes(MovieProvider, Base):
+ pass
diff --git a/couchpotato/core/media/movie/providers/torrent/torrentday.py b/couchpotato/core/media/movie/providers/torrent/torrentday.py
new file mode 100644
index 0000000000..768d3043c5
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/torrentday.py
@@ -0,0 +1,17 @@
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.torrentday import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'TorrentDay'
+
+
+class TorrentDay(MovieProvider, Base):
+
+ cat_ids = [
+ ([11], ['720p', '1080p']),
+ ([1, 21, 25], ['cam', 'ts', 'dvdrip', 'tc', 'r5', 'scr', 'brrip']),
+ ([3], ['dvdr']),
+ ([5], ['bd50']),
+ ]
diff --git a/couchpotato/core/media/movie/providers/torrent/torrentleech.py b/couchpotato/core/media/movie/providers/torrent/torrentleech.py
new file mode 100644
index 0000000000..eea74f805f
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/torrentleech.py
@@ -0,0 +1,27 @@
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.torrentleech import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'TorrentLeech'
+
+
+class TorrentLeech(MovieProvider, Base):
+
+ cat_ids = [
+ ([13], ['720p', '1080p', 'bd50']),
+ ([8], ['cam']),
+ ([9], ['ts', 'tc']),
+ ([10], ['r5', 'scr']),
+ ([11], ['dvdrip']),
+ ([13, 14], ['brrip']),
+ ([12], ['dvdr']),
+ ]
+
+ def buildUrl(self, title, media, quality):
+ return (
+ tryUrlencode(title.replace(':', '')),
+ ','.join([str(x) for x in self.getCatId(quality)])
+ )
diff --git a/couchpotato/core/media/movie/providers/torrent/torrentpotato.py b/couchpotato/core/media/movie/providers/torrent/torrentpotato.py
new file mode 100644
index 0000000000..67573537d3
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/torrentpotato.py
@@ -0,0 +1,20 @@
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.helpers.variable import getIdentifier
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.torrentpotato import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'TorrentPotato'
+
+
+class TorrentPotato(MovieProvider, Base):
+
+ def buildUrl(self, media, host):
+ arguments = tryUrlencode({
+ 'user': host['name'],
+ 'passkey': host['pass_key'],
+ 'imdbid': getIdentifier(media),
+ })
+ return '%s?%s' % (host['host'], arguments)
diff --git a/couchpotato/core/media/movie/providers/torrent/torrentshack.py b/couchpotato/core/media/movie/providers/torrent/torrentshack.py
new file mode 100644
index 0000000000..f9127315cf
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/torrentshack.py
@@ -0,0 +1,36 @@
+from couchpotato.core.event import fireEvent
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.torrentshack import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'TorrentShack'
+
+
+class TorrentShack(MovieProvider, Base):
+
+ # TorrentShack movie search categories
+ # Movies/x264 - 300
+ # Movies/DVD-R - 350
+ # Movies/XviD - 400
+ # Full Blu-ray - 970
+ #
+ # REMUX - 320 (not included)
+ # Movies-HD Pack - 982 (not included)
+ # Movies-SD Pack - 983 (not included)
+
+ cat_ids = [
+ ([970, 320], ['bd50']),
+ ([300, 320], ['720p', '1080p']),
+ ([350], ['dvdr']),
+ ([400], ['brrip', 'dvdrip']),
+ ]
+ cat_backup_id = 400
+
+ def buildUrl(self, media, quality):
+ query = (tryUrlencode(fireEvent('library.query', media, single = True)),
+ self.getSceneOnly(),
+ self.getCatId(quality)[0])
+ return query
diff --git a/couchpotato/core/media/movie/providers/torrent/torrentz.py b/couchpotato/core/media/movie/providers/torrent/torrentz.py
new file mode 100644
index 0000000000..011ec4306c
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/torrentz.py
@@ -0,0 +1,14 @@
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.torrentz import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'Torrentz'
+
+
+class Torrentz(MovieProvider, Base):
+
+ def buildUrl(self, title, media, quality):
+ return tryUrlencode('"%s %s"' % (title, media['info']['year']))
\ No newline at end of file
diff --git a/couchpotato/core/media/movie/providers/torrent/yify.py b/couchpotato/core/media/movie/providers/torrent/yify.py
new file mode 100644
index 0000000000..d30132d626
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/torrent/yify.py
@@ -0,0 +1,11 @@
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.torrent.yify import Base
+from couchpotato.core.media.movie.providers.base import MovieProvider
+
+log = CPLog(__name__)
+
+autoload = 'Yify'
+
+
+class Yify(MovieProvider, Base):
+ pass
diff --git a/libs/migrate/versioning/templates/repository/pylons/__init__.py b/couchpotato/core/media/movie/providers/trailer/__init__.py
similarity index 100%
rename from libs/migrate/versioning/templates/repository/pylons/__init__.py
rename to couchpotato/core/media/movie/providers/trailer/__init__.py
diff --git a/couchpotato/core/media/movie/providers/trailer/base.py b/couchpotato/core/media/movie/providers/trailer/base.py
new file mode 100644
index 0000000000..9cd1dbe6d5
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/trailer/base.py
@@ -0,0 +1,16 @@
+from couchpotato.core.event import addEvent
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.base import Provider
+
+log = CPLog(__name__)
+
+
+class TrailerProvider(Provider):
+
+ type = 'trailer'
+
+ def __init__(self):
+ addEvent('trailer.search', self.search)
+
+ def search(self, *args, **kwargs):
+ pass
diff --git a/couchpotato/core/media/movie/providers/trailer/hdtrailers.py b/couchpotato/core/media/movie/providers/trailer/hdtrailers.py
new file mode 100644
index 0000000000..4cbb64d6cb
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/trailer/hdtrailers.py
@@ -0,0 +1,124 @@
+from string import digits, ascii_letters
+import re
+
+from bs4 import SoupStrainer, BeautifulSoup
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.helpers.variable import mergeDicts, getTitle, getIdentifier
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media.movie.providers.trailer.base import TrailerProvider
+from requests import HTTPError
+
+
+log = CPLog(__name__)
+
+autoload = 'HDTrailers'
+
+
+class HDTrailers(TrailerProvider):
+
+ urls = {
+ 'api': 'http://www.hd-trailers.net/movie/%s/',
+ 'backup': 'http://www.hd-trailers.net/blog/',
+ }
+ providers = ['apple.ico', 'yahoo.ico', 'moviefone.ico', 'myspace.ico', 'favicon.ico']
+ only_tables_tags = SoupStrainer('table')
+
+ def search(self, group):
+
+ movie_name = getTitle(group)
+
+ url = self.urls['api'] % self.movieUrlName(movie_name)
+ try:
+ data = self.getCache('hdtrailers.%s' % getIdentifier(group), url, show_error = False)
+ except HTTPError:
+ log.debug('No page found for: %s', movie_name)
+ data = None
+
+ result_data = {'480p': [], '720p': [], '1080p': []}
+
+ if not data:
+ return result_data
+
+ did_alternative = False
+ for provider in self.providers:
+ results = self.findByProvider(data, provider)
+
+ # Find alternative
+ if results.get('404') and not did_alternative:
+ results = self.findViaAlternative(group)
+ did_alternative = True
+
+ result_data = mergeDicts(result_data, results)
+
+ return result_data
+
+ def findViaAlternative(self, group):
+ results = {'480p': [], '720p': [], '1080p': []}
+
+ movie_name = getTitle(group)
+
+ url = "%s?%s" % (self.urls['backup'], tryUrlencode({'s':movie_name}))
+ try:
+ data = self.getCache('hdtrailers.alt.%s' % getIdentifier(group), url, show_error = False)
+ except HTTPError:
+ log.debug('No alternative page found for: %s', movie_name)
+ data = None
+
+ if not data:
+ return results
+
+ try:
+ html = BeautifulSoup(data, parse_only = self.only_tables_tags)
+ result_table = html.find_all('h2', text = re.compile(movie_name))
+
+ for h2 in result_table:
+ if 'trailer' in h2.lower():
+ parent = h2.parent.parent.parent
+ trailerLinks = parent.find_all('a', text = re.compile('480p|720p|1080p'))
+ try:
+ for trailer in trailerLinks:
+ results[trailer].insert(0, trailer.parent['href'])
+ except:
+ pass
+
+ except AttributeError:
+ log.debug('No trailers found in via alternative.')
+
+ return results
+
+ def findByProvider(self, data, provider):
+
+ results = {'480p':[], '720p':[], '1080p':[]}
+ try:
+ html = BeautifulSoup(data, parse_only = self.only_tables_tags)
+ result_table = html.find('table', attrs = {'class':'bottomTable'})
+
+ for tr in result_table.find_all('tr'):
+ trtext = str(tr).lower()
+ if 'clips' in trtext:
+ break
+
+ if 'trailer' in trtext and not 'clip' in trtext and provider in trtext and not '3d' in trtext:
+ if 'trailer' not in tr.find('span', 'standardTrailerName').text.lower():
+ continue
+ resolutions = tr.find_all('td', attrs = {'class':'bottomTableResolution'})
+ for res in resolutions:
+ if res.a and str(res.a.contents[0]) in results:
+ results[str(res.a.contents[0])].insert(0, res.a['href'])
+
+ except AttributeError:
+ log.debug('No trailers found in provider %s.', provider)
+ results['404'] = True
+
+ return results
+
+ def movieUrlName(self, string):
+ safe_chars = ascii_letters + digits + ' '
+ r = ''.join([char if char in safe_chars else ' ' for char in string])
+ name = re.sub('\s+' , '-', r).lower()
+
+ try:
+ int(name)
+ return '-' + name
+ except:
+ return name
diff --git a/libs/migrate/versioning/templates/repository/pylons/versions/__init__.py b/couchpotato/core/media/movie/providers/userscript/__init__.py
similarity index 100%
rename from libs/migrate/versioning/templates/repository/pylons/versions/__init__.py
rename to couchpotato/core/media/movie/providers/userscript/__init__.py
diff --git a/couchpotato/core/media/movie/providers/userscript/allocine.py b/couchpotato/core/media/movie/providers/userscript/allocine.py
new file mode 100644
index 0000000000..238a6b54dc
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/userscript/allocine.py
@@ -0,0 +1,36 @@
+import traceback
+
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+
+log = CPLog(__name__)
+
+autoload = 'AlloCine'
+
+
+class AlloCine(UserscriptBase):
+
+ includes = ['http://www.allocine.fr/film/*']
+
+ def getMovie(self, url):
+
+ if not 'fichefilm_gen_cfilm' in url:
+ return 'Url isn\'t from a movie'
+
+ try:
+ data = self.getUrl(url)
+ except:
+ return
+
+ try:
+ start = data.find('')
+ end = data.find(' ', start)
+ page_title = data[start + len(''):end].strip().split('-')
+
+ name = page_title[0].strip()
+ year = page_title[1].strip()[-4:]
+ return self.search(name, year)
+ except:
+ log.error('Failed parsing page for title and year: %s', traceback.format_exc())
+
diff --git a/couchpotato/core/media/movie/providers/userscript/appletrailers.py b/couchpotato/core/media/movie/providers/userscript/appletrailers.py
new file mode 100644
index 0000000000..c59722c7bd
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/userscript/appletrailers.py
@@ -0,0 +1,26 @@
+import re
+
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+
+autoload = 'AppleTrailers'
+
+
+class AppleTrailers(UserscriptBase):
+
+ includes = ['http://trailers.apple.com/trailers/*']
+
+ def getMovie(self, url):
+
+ try:
+ data = self.getUrl(url)
+ except:
+ return
+
+ name = re.search("trailerTitle.*=.*\'(?P<name>.*)\';", data)
+ name = name.group('name').decode('string_escape')
+
+ date = re.search("releaseDate.*=.*\'(?P<date>.*)\';", data)
+ year = date.group('date')[:4]
+
+ return self.search(name, year)
diff --git a/couchpotato/core/media/movie/providers/userscript/criticker.py b/couchpotato/core/media/movie/providers/userscript/criticker.py
new file mode 100644
index 0000000000..cc0bee844b
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/userscript/criticker.py
@@ -0,0 +1,8 @@
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+autoload = 'Criticker'
+
+
+class Criticker(UserscriptBase):
+
+ includes = ['http://www.criticker.com/film/*']
diff --git a/couchpotato/core/media/movie/providers/userscript/filmcentrum.py b/couchpotato/core/media/movie/providers/userscript/filmcentrum.py
new file mode 100644
index 0000000000..b2b15a9e23
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/userscript/filmcentrum.py
@@ -0,0 +1,8 @@
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+autoload = 'FilmCentrum'
+
+
+class FilmCentrum(UserscriptBase):
+
+ includes = ['*://filmcentrum.nl/films/*']
diff --git a/couchpotato/core/media/movie/providers/userscript/filmstarts.py b/couchpotato/core/media/movie/providers/userscript/filmstarts.py
new file mode 100644
index 0000000000..4e61f299f3
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/userscript/filmstarts.py
@@ -0,0 +1,30 @@
+from bs4 import BeautifulSoup
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+autoload = 'Filmstarts'
+
+
+class Filmstarts(UserscriptBase):
+
+ includes = ['*://www.filmstarts.de/kritiken/*']
+
+ def getMovie(self, url):
+ try:
+ data = self.getUrl(url)
+ except:
+ return
+
+ html = BeautifulSoup(data)
+ table = html.find("table", attrs={"class": "table table-standard thead-standard table-striped_2 fs11"})
+
+ if table.find(text='Originaltitel'):
+ # Get original film title from the table specified above
+ name = table.find("div", text="Originaltitel").parent.parent.parent.td.text
+ else:
+ # If none is available get the title from the meta data
+ name = html.find("meta", {"property":"og:title"})['content']
+
+ # Year of production is not available in the meta data, so get it from the table
+ year = table.find(text="Produktionsjahr").parent.parent.next_sibling.text
+
+ return self.search(name, year)
diff --git a/couchpotato/core/media/movie/providers/userscript/filmweb.py b/couchpotato/core/media/movie/providers/userscript/filmweb.py
new file mode 100644
index 0000000000..1f7b371e7d
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/userscript/filmweb.py
@@ -0,0 +1,30 @@
+from bs4 import BeautifulSoup
+from couchpotato import fireEvent
+
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+autoload = 'Filmweb'
+
+
+class Filmweb(UserscriptBase):
+
+ version = 3
+
+ includes = ['http://www.filmweb.pl/film/*']
+
+ def getMovie(self, url):
+
+ cookie = {'Cookie': 'welcomeScreen=welcome_screen'}
+
+ try:
+ data = self.urlopen(url, headers = cookie)
+ except:
+ return
+
+ html = BeautifulSoup(data)
+ name = html.find('meta', {'name': 'title'})['content'][:-9].strip()
+ name_year = fireEvent('scanner.name_year', name, single = True)
+ name = name_year.get('name')
+ year = name_year.get('year')
+
+ return self.search(name, year)
diff --git a/couchpotato/core/media/movie/providers/userscript/flickchart.py b/couchpotato/core/media/movie/providers/userscript/flickchart.py
new file mode 100644
index 0000000000..8b48ad7c14
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/userscript/flickchart.py
@@ -0,0 +1,36 @@
+import traceback
+
+from couchpotato.core.event import fireEvent
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+
+log = CPLog(__name__)
+
+autoload = 'Flickchart'
+
+
+class Flickchart(UserscriptBase):
+
+ version = 2
+
+ includes = ['http://www.flickchart.com/movie/*']
+
+ def getMovie(self, url):
+
+ try:
+ data = self.getUrl(url)
+ except:
+ return
+
+ try:
+ start = data.find('<title>')
+ end = data.find(' ', start)
+ page_title = data[start + len(''):end].strip().split('- Flick')
+
+ year_name = fireEvent('scanner.name_year', page_title[0], single = True)
+
+ return self.search(year_name.get('name'), year_name.get('year'))
+ except:
+ log.error('Failed parsing page for title and year: %s', traceback.format_exc())
+
diff --git a/couchpotato/core/media/movie/providers/userscript/imdb.py b/couchpotato/core/media/movie/providers/userscript/imdb.py
new file mode 100644
index 0000000000..dccc4832e0
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/userscript/imdb.py
@@ -0,0 +1,12 @@
+from couchpotato.core.helpers.variable import getImdb
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+autoload = 'IMDB'
+
+
+class IMDB(UserscriptBase):
+
+ includes = ['*://*.imdb.com/title/tt*', '*://imdb.com/title/tt*']
+
+ def getMovie(self, url):
+ return self.getInfo(getImdb(url))
diff --git a/couchpotato/core/media/movie/providers/userscript/letterboxd.py b/couchpotato/core/media/movie/providers/userscript/letterboxd.py
new file mode 100644
index 0000000000..43b5d309c7
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/userscript/letterboxd.py
@@ -0,0 +1,8 @@
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+autoload = 'Letterboxd'
+
+
+class Letterboxd(UserscriptBase):
+
+ includes = ['*://letterboxd.com/film/*']
diff --git a/couchpotato/core/media/movie/providers/userscript/moviemeter.py b/couchpotato/core/media/movie/providers/userscript/moviemeter.py
new file mode 100644
index 0000000000..ee8d931c4a
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/userscript/moviemeter.py
@@ -0,0 +1,22 @@
+from couchpotato.core.helpers.variable import getImdb
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+autoload = 'MovieMeter'
+
+
+class MovieMeter(UserscriptBase):
+
+ includes = ['http://*.moviemeter.nl/film/*', 'http://moviemeter.nl/film/*']
+
+ version = 2
+
+ def getMovie(self, url):
+
+ cookie = {'Cookie': 'cok=1'}
+
+ try:
+ data = self.urlopen(url, headers = cookie)
+ except:
+ return
+
+ return self.getInfo(getImdb(data))
diff --git a/couchpotato/core/media/movie/providers/userscript/moviesio.py b/couchpotato/core/media/movie/providers/userscript/moviesio.py
new file mode 100644
index 0000000000..0381d64ab1
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/userscript/moviesio.py
@@ -0,0 +1,8 @@
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+autoload = 'MoviesIO'
+
+
+class MoviesIO(UserscriptBase):
+
+ includes = ['*://movies.io/m/*']
diff --git a/couchpotato/core/media/movie/providers/userscript/reddit.py b/couchpotato/core/media/movie/providers/userscript/reddit.py
new file mode 100644
index 0000000000..8cb810797a
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/userscript/reddit.py
@@ -0,0 +1,20 @@
+from couchpotato import fireEvent
+from couchpotato.core.helpers.variable import splitString
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+autoload = 'Reddit'
+
+
+class Reddit(UserscriptBase):
+
+ includes = ['*://www.reddit.com/r/Ijustwatched/comments/*']
+
+ def getMovie(self, url):
+ name = splitString(splitString(url, '/ijw_')[-1], '/')[0]
+
+ if name.startswith('ijw_'):
+ name = name[4:]
+
+ year_name = fireEvent('scanner.name_year', name, single = True)
+
+ return self.search(year_name.get('name'), year_name.get('year'))
diff --git a/couchpotato/core/media/movie/providers/userscript/rottentomatoes.py b/couchpotato/core/media/movie/providers/userscript/rottentomatoes.py
new file mode 100644
index 0000000000..e6ff262c23
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/userscript/rottentomatoes.py
@@ -0,0 +1,40 @@
+import re
+import traceback
+
+from couchpotato import fireEvent
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+
+log = CPLog(__name__)
+
+autoload = 'RottenTomatoes'
+
+
+class RottenTomatoes(UserscriptBase):
+
+ includes = ['*://www.rottentomatoes.com/m/*']
+ excludes = ['*://www.rottentomatoes.com/m/*/*/']
+
+ version = 4
+
+ def getMovie(self, url):
+
+ try:
+ data = self.getUrl(url)
+ except:
+ return
+
+ try:
+ title = re.findall("<title>(.*) ", data)
+ title = title[0].split(' - Rotten')[0].replace(' ', ' ').decode('unicode_escape')
+ name_year = fireEvent('scanner.name_year', title, single = True)
+
+ name = name_year.get('name')
+ year = name_year.get('year')
+
+ if name and year:
+ return self.search(name, year)
+
+ except:
+ log.error('Failed parsing page for title and year: %s', traceback.format_exc())
diff --git a/couchpotato/core/media/movie/providers/userscript/tmdb.py b/couchpotato/core/media/movie/providers/userscript/tmdb.py
new file mode 100644
index 0000000000..fe7b139374
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/userscript/tmdb.py
@@ -0,0 +1,22 @@
+import re
+
+from couchpotato.core.event import fireEvent
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+
+autoload = 'TMDB'
+
+
+class TMDB(UserscriptBase):
+
+ version = 2
+
+ includes = ['*://www.themoviedb.org/movie/*']
+
+ def getMovie(self, url):
+ match = re.search('(?P\d+)', url)
+ movie = fireEvent('movie.info_by_tmdb', identifier = match.group('id'), extended = False, merge = True)
+
+ if movie['imdb']:
+ return self.getInfo(movie['imdb'])
+
diff --git a/couchpotato/core/media/movie/providers/userscript/trakt.py b/couchpotato/core/media/movie/providers/userscript/trakt.py
new file mode 100644
index 0000000000..1d7f0531e4
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/userscript/trakt.py
@@ -0,0 +1,11 @@
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+autoload = 'Trakt'
+
+
+class Trakt(UserscriptBase):
+
+ version = 2
+
+ includes = ['*://trakt.tv/movies/*', '*://*.trakt.tv/movies/*']
+ excludes = ['*://trakt.tv/movies/*/*', '*://*.trakt.tv/movies/*/*']
diff --git a/couchpotato/core/media/movie/providers/userscript/youteather.py b/couchpotato/core/media/movie/providers/userscript/youteather.py
new file mode 100644
index 0000000000..e7e63b464c
--- /dev/null
+++ b/couchpotato/core/media/movie/providers/userscript/youteather.py
@@ -0,0 +1,17 @@
+import re
+
+from couchpotato.core.media._base.providers.userscript.base import UserscriptBase
+
+
+autoload = 'YouTheater'
+
+
+class YouTheater(UserscriptBase):
+ id_re = re.compile("view\.php\?id=(\d+)")
+ includes = ['http://www.youtheater.com/view.php?id=*', 'http://youtheater.com/view.php?id=*',
+ 'http://www.sratim.co.il/view.php?id=*', 'http://sratim.co.il/view.php?id=*']
+
+ def getMovie(self, url):
+ id = self.id_re.findall(url)[0]
+ url = 'http://www.youtheater.com/view.php?id=%s' % id
+ return super(YouTheater, self).getMovie(url)
diff --git a/couchpotato/core/media/movie/searcher.py b/couchpotato/core/media/movie/searcher.py
new file mode 100755
index 0000000000..6d3ee83656
--- /dev/null
+++ b/couchpotato/core/media/movie/searcher.py
@@ -0,0 +1,478 @@
+from datetime import date
+import random
+import re
+import time
+import traceback
+
+from couchpotato import get_db
+from couchpotato.api import addApiView
+from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
+from couchpotato.core.helpers.encoding import simplifyString
+from couchpotato.core.helpers.variable import getTitle, possibleTitles, getImdb, getIdentifier, tryInt
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media._base.searcher.base import SearcherBase
+from couchpotato.core.media.movie import MovieTypeBase
+from couchpotato.environment import Env
+
+
+log = CPLog(__name__)
+
+autoload = 'MovieSearcher'
+
+
+class MovieSearcher(SearcherBase, MovieTypeBase):
+
+ in_progress = False
+
+ def __init__(self):
+ super(MovieSearcher, self).__init__()
+
+ addEvent('movie.searcher.all', self.searchAll)
+ addEvent('movie.searcher.all_view', self.searchAllView)
+ addEvent('movie.searcher.single', self.single)
+ addEvent('movie.searcher.try_next_release', self.tryNextRelease)
+ addEvent('movie.searcher.could_be_released', self.couldBeReleased)
+ addEvent('searcher.correct_release', self.correctRelease)
+ addEvent('searcher.get_search_title', self.getSearchTitle)
+
+ addApiView('movie.searcher.try_next', self.tryNextReleaseView, docs = {
+ 'desc': 'Marks the snatched results as ignored and try the next best release',
+ 'params': {
+ 'media_id': {'desc': 'The id of the media'},
+ },
+ })
+
+ addApiView('movie.searcher.full_search', self.searchAllView, docs = {
+ 'desc': 'Starts a full search for all wanted movies',
+ })
+
+ addApiView('movie.searcher.progress', self.getProgress, docs = {
+ 'desc': 'Get the progress of current full search',
+ 'return': {'type': 'object', 'example': """{
+ 'progress': False || object, total & to_go,
+}"""},
+ })
+
+ if self.conf('run_on_launch'):
+ addEvent('app.load', self.searchAll)
+
+ def searchAllView(self, **kwargs):
+
+ fireEventAsync('movie.searcher.all', manual = True)
+
+ return {
+ 'success': not self.in_progress
+ }
+
+ def searchAll(self, manual = False):
+
+ if self.in_progress:
+ log.info('Search already in progress')
+ fireEvent('notify.frontend', type = 'movie.searcher.already_started', data = True, message = 'Full search already in progress')
+ return
+
+ self.in_progress = True
+ fireEvent('notify.frontend', type = 'movie.searcher.started', data = True, message = 'Full search started')
+
+ medias = [x['_id'] for x in fireEvent('media.with_status', 'active', types = 'movie', with_doc = False, single = True)]
+ random.shuffle(medias)
+
+ total = len(medias)
+ self.in_progress = {
+ 'total': total,
+ 'to_go': total,
+ }
+
+ try:
+ search_protocols = fireEvent('searcher.protocols', single = True)
+
+ for media_id in medias:
+
+ media = fireEvent('media.get', media_id, single = True)
+ if not media: continue
+
+ try:
+ self.single(media, search_protocols, manual = manual)
+ except IndexError:
+ log.error('Forcing library update for %s, if you see this often, please report: %s', (getIdentifier(media), traceback.format_exc()))
+ fireEvent('movie.update', media_id)
+ except:
+ log.error('Search failed for %s: %s', (getIdentifier(media), traceback.format_exc()))
+
+ self.in_progress['to_go'] -= 1
+
+ # Break if CP wants to shut down
+ if self.shuttingDown():
+ break
+
+ except SearchSetupError:
+ pass
+
+ self.in_progress = False
+
+ def single(self, movie, search_protocols = None, manual = False, force_download = False):
+
+ # Find out search type
+ try:
+ if not search_protocols:
+ search_protocols = fireEvent('searcher.protocols', single = True)
+ except SearchSetupError:
+ return
+
+ if not movie['profile_id'] or (movie['status'] == 'done' and not manual):
+ log.debug('Movie doesn\'t have a profile or already done, assuming in manage tab.')
+ fireEvent('media.restatus', movie['_id'], single = True)
+ return
+
+ default_title = getTitle(movie)
+ if not default_title:
+ log.error('No proper info found for movie, removing it from library to stop it from causing more issues.')
+ fireEvent('media.delete', movie['_id'], single = True)
+ return
+
+ # Update media status and check if it is still not done (due to the stop searching after feature
+ if fireEvent('media.restatus', movie['_id'], single = True) == 'done':
+ log.debug('No better quality found, marking movie %s as done.', default_title)
+
+ pre_releases = fireEvent('quality.pre_releases', single = True)
+ release_dates = fireEvent('movie.update_release_dates', movie['_id'], merge = True)
+
+ found_releases = []
+ previous_releases = movie.get('releases', [])
+ too_early_to_search = []
+ outside_eta_results = 0
+ always_search = self.conf('always_search')
+ ignore_eta = manual
+ total_result_count = 0
+
+ fireEvent('notify.frontend', type = 'movie.searcher.started', data = {'_id': movie['_id']}, message = 'Searching for "%s"' % default_title)
+
+ # Ignore eta once every 7 days
+ if not always_search:
+ prop_name = 'last_ignored_eta.%s' % movie['_id']
+ last_ignored_eta = float(Env.prop(prop_name, default = 0))
+ if last_ignored_eta < time.time() - 604800:
+ ignore_eta = True
+ Env.prop(prop_name, value = time.time())
+
+ db = get_db()
+
+ profile = db.get('id', movie['profile_id'])
+ ret = False
+
+ for index, q_identifier in enumerate(profile.get('qualities', [])):
+ quality_custom = {
+ 'index': index,
+ 'quality': q_identifier,
+ 'finish': profile['finish'][index],
+ 'wait_for': tryInt(profile['wait_for'][index]),
+ '3d': profile['3d'][index] if profile.get('3d') else False,
+ 'minimum_score': profile.get('minimum_score', 1),
+ }
+
+ could_not_be_released = not self.couldBeReleased(q_identifier in pre_releases, release_dates, movie['info']['year'])
+ if not always_search and could_not_be_released:
+ too_early_to_search.append(q_identifier)
+
+ # Skip release, if ETA isn't ignored
+ if not ignore_eta:
+ continue
+
+ has_better_quality = 0
+
+ # See if better quality is available
+ for release in movie.get('releases', []):
+ if release['status'] not in ['available', 'ignored', 'failed']:
+ is_higher = fireEvent('quality.ishigher', \
+ {'identifier': q_identifier, 'is_3d': quality_custom.get('3d', 0)}, \
+ {'identifier': release['quality'], 'is_3d': release.get('is_3d', 0)}, \
+ profile, single = True)
+ if is_higher != 'higher':
+ has_better_quality += 1
+
+ # Don't search for quality lower then already available.
+ if has_better_quality > 0:
+ log.info('Better quality (%s) already available or snatched for %s', (q_identifier, default_title))
+ fireEvent('media.restatus', movie['_id'], single = True)
+ break
+
+ quality = fireEvent('quality.single', identifier = q_identifier, single = True)
+ log.info('Search for %s in %s%s', (default_title, quality['label'], ' ignoring ETA' if always_search or ignore_eta else ''))
+
+ # Extend quality with profile customs
+ quality['custom'] = quality_custom
+
+ results = fireEvent('searcher.search', search_protocols, movie, quality, single = True) or []
+
+ # Check if movie isn't deleted while searching
+ if not fireEvent('media.get', movie.get('_id'), single = True):
+ break
+
+ # Add them to this movie releases list
+ found_releases += fireEvent('release.create_from_search', results, movie, quality, single = True)
+ results_count = len(found_releases)
+ total_result_count += results_count
+ if results_count == 0:
+ log.debug('Nothing found for %s in %s', (default_title, quality['label']))
+
+ # Keep track of releases found outside ETA window
+ outside_eta_results += results_count if could_not_be_released else 0
+
+ # Don't trigger download, but notify user of available releases
+ if could_not_be_released and results_count > 0:
+ log.debug('Found %s releases for "%s", but ETA isn\'t correct yet.', (results_count, default_title))
+
+ # Try find a valid result and download it
+ if (force_download or not could_not_be_released or always_search) and fireEvent('release.try_download_result', results, movie, quality_custom, single = True):
+ ret = True
+
+ # Remove releases that aren't found anymore
+ temp_previous_releases = []
+ for release in previous_releases:
+ if release.get('status') == 'available' and release.get('identifier') not in found_releases:
+ fireEvent('release.delete', release.get('_id'), single = True)
+ else:
+ temp_previous_releases.append(release)
+ previous_releases = temp_previous_releases
+ del temp_previous_releases
+
+ # Break if CP wants to shut down
+ if self.shuttingDown() or ret:
+ break
+
+ if total_result_count > 0:
+ fireEvent('media.tag', movie['_id'], 'recent', update_edited = True, single = True)
+
+ if len(too_early_to_search) > 0:
+ log.info2('Too early to search for %s, %s', (too_early_to_search, default_title))
+
+ if outside_eta_results > 0:
+ message = 'Found %s releases for "%s" before ETA. Select and download via the dashboard.' % (outside_eta_results, default_title)
+ log.info(message)
+
+ if not manual:
+ fireEvent('media.available', message = message, data = {})
+
+ fireEvent('notify.frontend', type = 'movie.searcher.ended', data = {'_id': movie['_id']})
+
+ return ret
+
+ def correctRelease(self, nzb = None, media = None, quality = None, **kwargs):
+
+ if media.get('type') != 'movie': return
+
+ media_title = fireEvent('searcher.get_search_title', media, single = True)
+
+ imdb_results = kwargs.get('imdb_results', False)
+ retention = Env.setting('retention', section = 'nzb')
+
+ if nzb.get('seeders') is None and 0 < retention < nzb.get('age', 0):
+ log.info2('Wrong: Outside retention, age is %s, needs %s or lower: %s', (nzb['age'], retention, nzb['name']))
+ return False
+
+ # Check for required and ignored words
+ if not fireEvent('searcher.correct_words', nzb['name'], media, single = True):
+ return False
+
+ preferred_quality = quality if quality else fireEvent('quality.single', identifier = quality['identifier'], single = True)
+
+ # Contains lower quality string
+ contains_other = fireEvent('searcher.contains_other_quality', nzb, movie_year = media['info']['year'], preferred_quality = preferred_quality, single = True)
+ if contains_other and isinstance(contains_other, dict):
+ log.info2('Wrong: %s, looking for %s, found %s', (nzb['name'], quality['label'], [x for x in contains_other] if contains_other else 'no quality'))
+ return False
+
+ # Contains lower quality string
+ if not fireEvent('searcher.correct_3d', nzb, preferred_quality = preferred_quality, single = True):
+ log.info2('Wrong: %s, %slooking for %s in 3D', (nzb['name'], ('' if preferred_quality['custom'].get('3d') else 'NOT '), quality['label']))
+ return False
+
+ # File to small
+ if nzb['size'] and tryInt(preferred_quality['size_min']) > tryInt(nzb['size']):
+ log.info2('Wrong: "%s" is too small to be %s. %sMB instead of the minimal of %sMB.', (nzb['name'], preferred_quality['label'], nzb['size'], preferred_quality['size_min']))
+ return False
+
+ # File to large
+ if nzb['size'] and tryInt(preferred_quality['size_max']) < tryInt(nzb['size']):
+ log.info2('Wrong: "%s" is too large to be %s. %sMB instead of the maximum of %sMB.', (nzb['name'], preferred_quality['label'], nzb['size'], preferred_quality['size_max']))
+ return False
+
+ # Provider specific functions
+ get_more = nzb.get('get_more_info')
+ if get_more:
+ get_more(nzb)
+
+ extra_check = nzb.get('extra_check')
+ if extra_check and not extra_check(nzb):
+ return False
+
+
+ if imdb_results:
+ return True
+
+ # Check if nzb contains imdb link
+ if getImdb(nzb.get('description', '')) == getIdentifier(media):
+ return True
+
+ for raw_title in media['info']['titles']:
+ for movie_title in possibleTitles(raw_title):
+ movie_words = re.split('\W+', simplifyString(movie_title))
+
+ if fireEvent('searcher.correct_name', nzb['name'], movie_title, single = True):
+ # if no IMDB link, at least check year range 1
+ if len(movie_words) > 2 and fireEvent('searcher.correct_year', nzb['name'], media['info']['year'], 1, single = True):
+ return True
+
+ # if no IMDB link, at least check year
+ if len(movie_words) <= 2 and fireEvent('searcher.correct_year', nzb['name'], media['info']['year'], 0, single = True):
+ return True
+
+ log.info("Wrong: %s, undetermined naming. Looking for '%s (%s)'", (nzb['name'], media_title, media['info']['year']))
+ return False
+
+ def couldBeReleased(self, is_pre_release, dates, year = None):
+
+ now = int(time.time())
+ now_year = date.today().year
+ now_month = date.today().month
+
+ if (year is None or year < now_year - 1 or (year <= now_year - 1 and now_month > 4)) and (not dates or (dates.get('theater', 0) == 0 and dates.get('dvd', 0) == 0)):
+ return True
+ else:
+
+ # Don't allow movies with years to far in the future
+ add_year = 1 if now_month > 10 else 0 # Only allow +1 year if end of the year
+ if year is not None and year > (now_year + add_year):
+ return False
+
+ # For movies before 1972
+ if not dates or dates.get('theater', 0) < 0 or dates.get('dvd', 0) < 0:
+ return True
+
+ if is_pre_release:
+ # Prerelease 1 week before theaters
+ if dates.get('theater') - 604800 < now:
+ return True
+ else:
+ # 12 weeks after theater release
+ if dates.get('theater') > 0 and dates.get('theater') + 7257600 < now:
+ return True
+
+ if dates.get('dvd') > 0:
+
+ # 4 weeks before dvd release
+ if dates.get('dvd') - 2419200 < now:
+ return True
+
+ # Dvd should be released
+ if dates.get('dvd') < now:
+ return True
+
+
+ return False
+
+ def tryNextReleaseView(self, media_id = None, **kwargs):
+
+ trynext = self.tryNextRelease(media_id, manual = True, force_download = True)
+
+ return {
+ 'success': trynext
+ }
+
+ def tryNextRelease(self, media_id, manual = False, force_download = False):
+
+ try:
+
+ rels = fireEvent('release.for_media', media_id, single = True)
+
+ for rel in rels:
+ if rel.get('status') in ['snatched', 'done']:
+ fireEvent('release.update_status', rel.get('_id'), status = 'ignored')
+
+ media = fireEvent('media.get', media_id, single = True)
+ if media:
+ log.info('Trying next release for: %s', getTitle(media))
+ self.single(media, manual = manual, force_download = force_download)
+
+ return True
+
+ return False
+ except:
+ log.error('Failed searching for next release: %s', traceback.format_exc())
+ return False
+
+ def getSearchTitle(self, media):
+ if media['type'] == 'movie':
+ return getTitle(media)
+
+class SearchSetupError(Exception):
+ pass
+
+
+config = [{
+ 'name': 'moviesearcher',
+ 'order': 20,
+ 'groups': [
+ {
+ 'tab': 'searcher',
+ 'name': 'movie_searcher',
+ 'label': 'Movie search',
+ 'description': 'Search options for movies',
+ 'advanced': True,
+ 'options': [
+ {
+ 'name': 'always_search',
+ 'default': False,
+ 'migrate_from': 'searcher',
+ 'type': 'bool',
+ 'label': 'Always search',
+ 'description': 'Search for movies even before there is a ETA. Enabling this will probably get you a lot of fakes.',
+ },
+ {
+ 'name': 'run_on_launch',
+ 'migrate_from': 'searcher',
+ 'label': 'Run on launch',
+ 'advanced': True,
+ 'default': 0,
+ 'type': 'bool',
+ 'description': 'Force run the searcher after (re)start.',
+ },
+ {
+ 'name': 'search_on_add',
+ 'label': 'Search after add',
+ 'advanced': True,
+ 'default': 1,
+ 'type': 'bool',
+ 'description': 'Disable this to only search for movies on cron.',
+ },
+ {
+ 'name': 'cron_day',
+ 'migrate_from': 'searcher',
+ 'label': 'Day',
+ 'advanced': True,
+ 'default': '*',
+ 'type': 'string',
+ 'description': '*: Every day, */2: Every 2 days, 1: Every first of the month. See APScheduler for details.',
+ },
+ {
+ 'name': 'cron_hour',
+ 'migrate_from': 'searcher',
+ 'label': 'Hour',
+ 'advanced': True,
+ 'default': random.randint(0, 23),
+ 'type': 'string',
+ 'description': '*: Every hour, */8: Every 8 hours, 3: At 3, midnight.',
+ },
+ {
+ 'name': 'cron_minute',
+ 'migrate_from': 'searcher',
+ 'label': 'Minute',
+ 'advanced': True,
+ 'default': random.randint(0, 59),
+ 'type': 'string',
+ 'description': "Just keep it random, so the providers don't get DDOSed by every CP user on a 'full' hour."
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/media/movie/suggestion.py b/couchpotato/core/media/movie/suggestion.py
new file mode 100644
index 0000000000..04cda51d10
--- /dev/null
+++ b/couchpotato/core/media/movie/suggestion.py
@@ -0,0 +1,165 @@
+import time
+from couchpotato.api import addApiView
+from couchpotato.core.event import fireEvent, addEvent
+from couchpotato.core.helpers.variable import splitString, removeDuplicate, getIdentifier, getTitle
+from couchpotato.core.plugins.base import Plugin
+from couchpotato.environment import Env
+
+
+autoload = 'Suggestion'
+
+
+class Suggestion(Plugin):
+
+ def __init__(self):
+
+ addApiView('suggestion.view', self.suggestView)
+ addApiView('suggestion.ignore', self.ignoreView)
+
+ def test():
+ time.sleep(1)
+ self.suggestView()
+
+ addEvent('app.load', test)
+
+ def suggestView(self, limit = 6, **kwargs):
+ if self.isDisabled():
+ return {
+ 'success': True,
+ 'movies': []
+ }
+
+ movies = splitString(kwargs.get('movies', ''))
+ ignored = splitString(kwargs.get('ignored', ''))
+ seen = splitString(kwargs.get('seen', ''))
+
+ cached_suggestion = self.getCache('suggestion_cached')
+ if cached_suggestion:
+ suggestions = cached_suggestion
+ else:
+
+ if not movies or len(movies) == 0:
+ active_movies = fireEvent('media.with_status', ['active', 'done'], types = 'movie', single = True)
+ movies = [getIdentifier(x) for x in active_movies]
+
+ if not ignored or len(ignored) == 0:
+ ignored = splitString(Env.prop('suggest_ignore', default = ''))
+ if not seen or len(seen) == 0:
+ movies.extend(splitString(Env.prop('suggest_seen', default = '')))
+
+ suggestions = fireEvent('movie.suggest', movies = movies, ignore = ignored, single = True)
+ self.setCache('suggestion_cached', suggestions, timeout = 6048000) # Cache for 10 weeks
+
+ medias = []
+ for suggestion in suggestions[:int(limit)]:
+
+ # Cache poster
+ posters = suggestion.get('images', {}).get('poster', [])
+ poster = [x for x in posters if 'tmdb' in x]
+ posters = poster if len(poster) > 0 else posters
+
+ cached_poster = fireEvent('file.download', url = posters[0], single = True) if len(posters) > 0 else False
+ files = {'image_poster': [cached_poster] } if cached_poster else {}
+
+ medias.append({
+ 'status': 'suggested',
+ 'title': getTitle(suggestion),
+ 'type': 'movie',
+ 'info': suggestion,
+ 'files': files,
+ 'identifiers': {
+ 'imdb': suggestion.get('imdb')
+ }
+ })
+
+ return {
+ 'success': True,
+ 'movies': medias
+ }
+
+ def ignoreView(self, imdb = None, limit = 6, remove_only = False, mark_seen = False, **kwargs):
+
+ ignored = splitString(Env.prop('suggest_ignore', default = ''))
+ seen = splitString(Env.prop('suggest_seen', default = ''))
+
+ new_suggestions = []
+ if imdb:
+ if mark_seen:
+ seen.append(imdb)
+ Env.prop('suggest_seen', ','.join(set(seen)))
+ elif not remove_only:
+ ignored.append(imdb)
+ Env.prop('suggest_ignore', ','.join(set(ignored)))
+
+ new_suggestions = self.updateSuggestionCache(ignore_imdb = imdb, limit = limit, ignored = ignored, seen = seen)
+
+ if len(new_suggestions) <= limit:
+ return {
+ 'result': False
+ }
+
+ # Only return new (last) item
+ media = {
+ 'status': 'suggested',
+ 'title': getTitle(new_suggestions[limit]),
+ 'type': 'movie',
+ 'info': new_suggestions[limit],
+ 'identifiers': {
+ 'imdb': new_suggestions[limit].get('imdb')
+ }
+ }
+
+ return {
+ 'result': True,
+ 'movie': media
+ }
+
+ def updateSuggestionCache(self, ignore_imdb = None, limit = 6, ignored = None, seen = None):
+
+ # Combine with previous suggestion_cache
+ cached_suggestion = self.getCache('suggestion_cached') or []
+ new_suggestions = []
+ ignored = [] if not ignored else ignored
+ seen = [] if not seen else seen
+
+ if ignore_imdb:
+ suggested_imdbs = []
+ for cs in cached_suggestion:
+ if cs.get('imdb') != ignore_imdb and cs.get('imdb') not in suggested_imdbs:
+ suggested_imdbs.append(cs.get('imdb'))
+ new_suggestions.append(cs)
+
+ # Get new results and add them
+ if len(new_suggestions) - 1 < limit:
+ active_movies = fireEvent('media.with_status', ['active', 'done'], single = True)
+ movies = [getIdentifier(x) for x in active_movies]
+ movies.extend(seen)
+
+ ignored.extend([x.get('imdb') for x in cached_suggestion])
+ suggestions = fireEvent('movie.suggest', movies = movies, ignore = removeDuplicate(ignored), single = True)
+
+ if suggestions:
+ new_suggestions.extend(suggestions)
+
+ self.setCache('suggestion_cached', new_suggestions, timeout = 3024000)
+
+ return new_suggestions
+
+config = [{
+ 'name': 'suggestion',
+ 'groups': [
+ {
+ 'label': 'Suggestions',
+ 'description': 'Displays suggestions on the home page',
+ 'name': 'suggestions',
+ 'tab': 'display',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': True,
+ 'type': 'enabler',
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/migration/migrate.cfg b/couchpotato/core/migration/migrate.cfg
deleted file mode 100644
index f17e967a6e..0000000000
--- a/couchpotato/core/migration/migrate.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-[db_settings]
-repository_id = CouchPotato
-version_table = migrate_version
-required_dbs = ['sqlite']
diff --git a/couchpotato/core/migration/versions/__init__.py b/couchpotato/core/migration/versions/__init__.py
deleted file mode 100755
index 7e6e44bf0f..0000000000
--- a/couchpotato/core/migration/versions/__init__.py
+++ /dev/null
@@ -1,30 +0,0 @@
-"""
- Examples
-
- Adding a column:
-
- from migrate import *
- from migrate.changeset.schema import create_column
- from sqlalchemy import *
-
- meta = MetaData()
-
- def upgrade(migrate_engine):
- meta.bind = migrate_engine
-
- #print changeset.schema
- path_column = Column('path', String)
- resource = Table('resource', meta, path_column)
-
- create_column(path_column, resource)
-
-
-
- Adding Relation table: http://www.mail-archive.com/sqlelixir@googlegroups.com/msg02061.html
-
- person = Table('person', metadata, Column('id', Integer))
- person_column = Column('person_id', Integer, ForeignKey('person.id'), nullable=False)
- movie = Table('movie', metadata, person_column)
- person_constraint = ForeignKeyConstraint(['person_id'], ['person.id'], ondelete="restrict", table=movie)
-
-"""
diff --git a/couchpotato/core/notifications/__init__.py b/couchpotato/core/notifications/__init__.py
index 8ac24dfbeb..5958fe66d7 100644
--- a/couchpotato/core/notifications/__init__.py
+++ b/couchpotato/core/notifications/__init__.py
@@ -1,4 +1,4 @@
-config = {
+config = [{
'name': 'notification_providers',
'groups': [
{
@@ -10,4 +10,4 @@
'options': [],
},
],
-}
+}]
diff --git a/couchpotato/core/notifications/base.py b/couchpotato/core/notifications/base.py
index 7e98fa513c..725704e0d9 100644
--- a/couchpotato/core/notifications/base.py
+++ b/couchpotato/core/notifications/base.py
@@ -1,26 +1,29 @@
from couchpotato.api import addApiView
from couchpotato.core.event import addEvent
-from couchpotato.core.helpers.request import jsonified
from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
+from couchpotato.core.media._base.providers.base import Provider
from couchpotato.environment import Env
log = CPLog(__name__)
-class Notification(Plugin):
+class Notification(Provider):
+
+ type = 'notification'
default_title = Env.get('appname')
test_message = 'ZOMG Lazors Pewpewpew!'
listen_to = [
+ 'media.available',
'renamer.after', 'movie.snatched',
'updater.available', 'updater.updated',
+ 'core.message.important',
]
dont_listen_to = []
def __init__(self):
- addEvent('notify.%s' % self.getName().lower(), self.notify)
+ addEvent('notify.%s' % self.getName().lower(), self._notify)
addApiView(self.testNotifyName(), self.test)
@@ -30,29 +33,41 @@ def __init__(self):
addEvent(listener, self.createNotifyHandler(listener))
def createNotifyHandler(self, listener):
- def notify(message = None, group = {}, data = None):
+ def notify(message = None, group = None, data = None):
+ if not group: group = {}
+
if not self.conf('on_snatch', default = True) and listener == 'movie.snatched':
return
- return self.notify(message = message, data = data if data else group, listener = listener)
+ return self._notify(message = message, data = data if data else group, listener = listener)
return notify
- def notify(self, message = '', data = {}, listener = None):
- pass
+ def getNotificationImage(self, size = 'small'):
+ return 'https://raw.github.com/RuudBurger/CouchPotatoServer/master/couchpotato/static/images/notify.couch.%s.png' % size
+
+ def _notify(self, *args, **kwargs):
+ if self.isEnabled():
+ return self.notify(*args, **kwargs)
+ return False
+
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
- def test(self):
+ def test(self, **kwargs):
test_type = self.testNotifyName()
log.info('Sending test to %s', test_type)
- success = self.notify(
+ success = self._notify(
message = self.test_message,
data = {},
listener = 'test'
)
- return jsonified({'success': success})
+ return {
+ 'success': success
+ }
def testNotifyName(self):
return 'notify.%s.test' % self.getName().lower()
diff --git a/couchpotato/core/notifications/boxcar/__init__.py b/couchpotato/core/notifications/boxcar/__init__.py
deleted file mode 100644
index ab244c3248..0000000000
--- a/couchpotato/core/notifications/boxcar/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from .main import Boxcar
-
-def start():
- return Boxcar()
-
-config = [{
- 'name': 'boxcar',
- 'groups': [
- {
- 'tab': 'notifications',
- 'list': 'notification_providers',
- 'name': 'boxcar',
- 'options': [
- {
- 'name': 'enabled',
- 'default': 0,
- 'type': 'enabler',
- },
- {
- 'name': 'email',
- 'description': 'Your Boxcar registration emailaddress.'
- },
- {
- 'name': 'on_snatch',
- 'default': 0,
- 'type': 'bool',
- 'advanced': True,
- 'description': 'Also send message when movie is snatched.',
- },
- ],
- }
- ],
-}]
diff --git a/couchpotato/core/notifications/boxcar/main.py b/couchpotato/core/notifications/boxcar/main.py
deleted file mode 100644
index 3135614a9d..0000000000
--- a/couchpotato/core/notifications/boxcar/main.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.notifications.base import Notification
-import time
-
-log = CPLog(__name__)
-
-
-class Boxcar(Notification):
-
- url = 'https://boxcar.io/devices/providers/7MNNXY3UIzVBwvzkKwkC/notifications'
-
- def notify(self, message = '', data = {}, listener = None):
- if self.isDisabled(): return
-
- try:
- message = message.strip()
-
- params = {
- 'email': self.conf('email'),
- 'notification[from_screen_name]': self.default_title,
- 'notification[message]': toUnicode(message),
- 'notification[from_remote_service_id]': int(time.time()),
- }
-
- self.urlopen(self.url, params = params)
- except:
- log.error('Check your email and added services on boxcar.io')
- return False
-
- log.info('Boxcar notification successful.')
- return True
-
- def isEnabled(self):
- return super(Boxcar, self).isEnabled() and self.conf('email')
diff --git a/couchpotato/core/notifications/boxcar2.py b/couchpotato/core/notifications/boxcar2.py
new file mode 100644
index 0000000000..04ce4f38ad
--- /dev/null
+++ b/couchpotato/core/notifications/boxcar2.py
@@ -0,0 +1,71 @@
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+
+log = CPLog(__name__)
+
+autoload = 'Boxcar2'
+
+
+class Boxcar2(Notification):
+
+ url = 'https://new.boxcar.io/api/notifications'
+
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
+
+ try:
+ message = message.strip()
+
+ long_message = ''
+ if listener == 'test':
+ long_message = 'This is a test message'
+ elif data.get('identifier'):
+ long_message = 'More movie info on IMDB' % data['identifier']
+
+ data = {
+ 'user_credentials': self.conf('token'),
+ 'notification[title]': toUnicode('%s - %s' % (self.default_title, message)),
+ 'notification[long_message]': toUnicode(long_message),
+ }
+
+ self.urlopen(self.url, data = data)
+ except:
+ log.error('Make sure the token provided is for the correct device')
+ return False
+
+ log.info('Boxcar notification successful.')
+ return True
+
+ def isEnabled(self):
+ return super(Boxcar2, self).isEnabled() and self.conf('token')
+
+
+config = [{
+ 'name': 'boxcar2',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'boxcar2',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'token',
+ 'description': ('Your Boxcar access token.', 'Can be found in the app under settings')
+ },
+ {
+ 'name': 'on_snatch',
+ 'default': 0,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': 'Also send message when movie is snatched.',
+ },
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/notifications/core/__init__.py b/couchpotato/core/notifications/core/__init__.py
index 6e923dac54..9c4fb37347 100644
--- a/couchpotato/core/notifications/core/__init__.py
+++ b/couchpotato/core/notifications/core/__init__.py
@@ -1,6 +1,5 @@
from .main import CoreNotifier
-def start():
- return CoreNotifier()
-config = []
+def autoload():
+ return CoreNotifier()
diff --git a/couchpotato/core/notifications/core/index.py b/couchpotato/core/notifications/core/index.py
new file mode 100644
index 0000000000..c7985b5b05
--- /dev/null
+++ b/couchpotato/core/notifications/core/index.py
@@ -0,0 +1,37 @@
+from CodernityDB.tree_index import TreeBasedIndex
+
+
+class NotificationIndex(TreeBasedIndex):
+ _version = 1
+
+ custom_header = """from CodernityDB.tree_index import TreeBasedIndex
+import time"""
+
+ def __init__(self, *args, **kwargs):
+ kwargs['key_format'] = 'I'
+ super(NotificationIndex, self).__init__(*args, **kwargs)
+
+ def make_key(self, key):
+ return key
+
+ def make_key_value(self, data):
+ if data.get('_t') == 'notification':
+ return data.get('time'), None
+
+
+class NotificationUnreadIndex(TreeBasedIndex):
+ _version = 1
+
+ custom_header = """from CodernityDB.tree_index import TreeBasedIndex
+import time"""
+
+ def __init__(self, *args, **kwargs):
+ kwargs['key_format'] = 'I'
+ super(NotificationUnreadIndex, self).__init__(*args, **kwargs)
+
+ def make_key(self, key):
+ return key
+
+ def make_key_value(self, data):
+ if data.get('_t') == 'notification' and not data.get('read'):
+ return data.get('time'), None
diff --git a/couchpotato/core/notifications/core/main.py b/couchpotato/core/notifications/core/main.py
index bc8bd86066..4c39fb775e 100644
--- a/couchpotato/core/notifications/core/main.py
+++ b/couchpotato/core/notifications/core/main.py
@@ -1,29 +1,39 @@
-from couchpotato import get_session
+from operator import itemgetter
+import threading
+import time
+import traceback
+import uuid
+from CodernityDB.database import RecordDeleted
+
+from couchpotato import get_db
from couchpotato.api import addApiView, addNonBlockApiView
-from couchpotato.core.event import addEvent
+from couchpotato.core.event import addEvent, fireEvent
from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.request import jsonified, getParam
from couchpotato.core.helpers.variable import tryInt, splitString
from couchpotato.core.logger import CPLog
from couchpotato.core.notifications.base import Notification
-from couchpotato.core.settings.model import Notification as Notif
-from sqlalchemy.sql.expression import or_
-import threading
-import time
-import uuid
+from .index import NotificationIndex, NotificationUnreadIndex
+from couchpotato.environment import Env
+from tornado.ioloop import IOLoop
+
log = CPLog(__name__)
class CoreNotifier(Notification):
- m_lock = threading.Lock()
- messages = []
- listeners = []
+ _database = {
+ 'notification': NotificationIndex,
+ 'notification_unread': NotificationUnreadIndex
+ }
+
+ m_lock = None
listen_to = [
+ 'media.available',
'renamer.after', 'movie.snatched',
'updater.available', 'updater.updated',
+ 'core.message', 'core.message.important',
]
def __init__(self):
@@ -54,86 +64,118 @@ def __init__(self):
addNonBlockApiView('notification.listener', (self.addListener, self.removeListener))
addApiView('notification.listener', self.listener)
- addEvent('app.load', self.clean)
-
- def clean(self):
-
- db = get_session()
- db.query(Notif).filter(Notif.added <= (int(time.time()) - 2419200)).delete()
- db.commit()
-
-
- def markAsRead(self):
-
- ids = None
- if getParam('ids'):
- ids = splitString(getParam('ids'))
-
- db = get_session()
-
- if ids:
- q = db.query(Notif).filter(or_(*[Notif.id == tryInt(s) for s in ids]))
- else:
- q = db.query(Notif).filter_by(read = False)
+ fireEvent('schedule.interval', 'core.check_messages', self.checkMessages, hours = 12, single = True)
+ fireEvent('schedule.interval', 'core.clean_messages', self.cleanMessages, seconds = 15, single = True)
- q.update({Notif.read: True})
+ addEvent('app.load', self.clean)
- db.commit()
+ if not Env.get('dev'):
+ addEvent('app.load', self.checkMessages)
- return jsonified({
- 'success': True
- })
+ self.messages = []
+ self.listeners = []
+ self.m_lock = threading.Lock()
- def listView(self):
+ def clean(self):
+ try:
+ db = get_db()
+ for n in db.all('notification', with_doc = True):
+ if n['doc'].get('time', 0) <= (int(time.time()) - 2419200):
+ db.delete(n['doc'])
+ except:
+ log.error('Failed cleaning notification: %s', traceback.format_exc())
+
+ def markAsRead(self, ids = None, **kwargs):
+
+ ids = splitString(ids) if ids else None
+
+ try:
+ db = get_db()
+ for x in db.all('notification_unread', with_doc = True):
+ if not ids or x['_id'] in ids:
+ x['doc']['read'] = True
+ db.update(x['doc'])
+ return {
+ 'success': True
+ }
+ except:
+ log.error('Failed mark as read: %s', traceback.format_exc())
+
+ return {
+ 'success': False
+ }
- db = get_session()
- limit_offset = getParam('limit_offset', None)
+ def listView(self, limit_offset = None, **kwargs):
- q = db.query(Notif)
+ db = get_db()
if limit_offset:
splt = splitString(limit_offset)
- limit = splt[0]
- offset = 0 if len(splt) is 1 else splt[1]
- q = q.limit(limit).offset(offset)
+ limit = tryInt(splt[0])
+ offset = tryInt(0 if len(splt) is 1 else splt[1])
+ results = db.all('notification', limit = limit, offset = offset, with_doc = True)
else:
- q = q.limit(200)
+ results = db.all('notification', limit = 200, with_doc = True)
- results = q.all()
notifications = []
for n in results:
- ndict = n.to_dict()
- ndict['type'] = 'notification'
- notifications.append(ndict)
+ notifications.append(n['doc'])
- return jsonified({
+ return {
'success': True,
'empty': len(notifications) == 0,
'notifications': notifications
- })
+ }
+
+ def checkMessages(self):
+
+ prop_name = 'messages.last_check'
+ last_check = tryInt(Env.prop(prop_name, default = 0))
+
+ messages = fireEvent('cp.messages', last_check = last_check, single = True) or []
+
+ for message in messages:
+ if message.get('time') > last_check:
+ message['sticky'] = True # Always sticky core messages
+
+ message_type = 'core.message.important' if message.get('important') else 'core.message'
+ fireEvent(message_type, message = message.get('message'), data = message)
- def notify(self, message = '', data = {}, listener = None):
+ if last_check < message.get('time'):
+ last_check = message.get('time')
- db = get_session()
+ Env.prop(prop_name, value = last_check)
- data['notification_type'] = listener if listener else 'unknown'
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
- n = Notif(
- message = toUnicode(message),
- data = data
- )
- db.add(n)
- db.commit()
+ n = {
+ '_t': 'notification',
+ 'time': int(time.time()),
+ }
+
+ try:
+ db = get_db()
+
+ n['message'] = toUnicode(message)
- ndict = n.to_dict()
- ndict['type'] = 'notification'
- ndict['time'] = time.time()
+ if data.get('sticky'):
+ n['sticky'] = True
+ if data.get('important'):
+ n['important'] = True
- self.frontend(type = listener, data = data)
+ db.insert(n)
- return True
+ self.frontend(type = listener, data = n)
- def frontend(self, type = 'notification', data = {}, message = None):
+ return True
+ except:
+ log.error('Failed notify "%s": %s', (n, traceback.format_exc()))
+
+ def frontend(self, type = 'notification', data = None, message = None):
+ if not data: data = {}
+
+ log.debug('Notifying frontend')
self.m_lock.acquire()
notification = {
@@ -148,15 +190,17 @@ def frontend(self, type = 'notification', data = {}, message = None):
while len(self.listeners) > 0 and not self.shuttingDown():
try:
listener, last_id = self.listeners.pop()
- listener({
+ IOLoop.current().add_callback(listener, {
'success': True,
'result': [notification],
})
except:
- break
+ log.debug('Failed sending to listener: %s', traceback.format_exc())
+ self.listeners = []
self.m_lock.release()
- self.cleanMessages()
+
+ log.debug('Done notifying frontend')
def addListener(self, callback, last_id = None):
@@ -168,59 +212,77 @@ def addListener(self, callback, last_id = None):
'result': messages,
})
+ self.m_lock.acquire()
self.listeners.append((callback, last_id))
+ self.m_lock.release()
def removeListener(self, callback):
+ self.m_lock.acquire()
+ new_listeners = []
for list_tuple in self.listeners:
try:
listener, last_id = list_tuple
- if listener == callback:
- self.listeners.remove(list_tuple)
+ if listener != callback:
+ new_listeners.append(list_tuple)
except:
- pass
+ log.debug('Failed removing listener: %s', traceback.format_exc())
+
+ self.listeners = new_listeners
+ self.m_lock.release()
def cleanMessages(self):
+
+ if len(self.messages) == 0:
+ return
+
+ log.debug('Cleaning messages')
self.m_lock.acquire()
- for message in self.messages:
- if message['time'] < (time.time() - 15):
- self.messages.remove(message)
+ time_ago = (time.time() - 15)
+ self.messages[:] = [m for m in self.messages if (m['time'] > time_ago)]
self.m_lock.release()
+ log.debug('Done cleaning messages')
def getMessages(self, last_id):
+
+ log.debug('Getting messages with id: %s', last_id)
self.m_lock.acquire()
recent = []
- index = 0
- for i in xrange(len(self.messages)):
- index = len(self.messages) - i - 1
- if self.messages[index]["message_id"] == last_id: break
- recent = self.messages[index:]
+ try:
+ index = map(itemgetter('message_id'), self.messages).index(last_id)
+ recent = self.messages[index + 1:]
+ except:
+ pass
self.m_lock.release()
+ log.debug('Returning for %s %s messages', (last_id, len(recent)))
- return recent or []
+ return recent
- def listener(self):
+ def listener(self, init = False, **kwargs):
messages = []
- # Get unread
- if getParam('init'):
- db = get_session()
+ # Get last message
+ if init:
+ db = get_db()
+
+ notifications = db.all('notification')
- notifications = db.query(Notif) \
- .filter(or_(Notif.read == False, Notif.added > (time.time() - 259200))) \
- .all()
for n in notifications:
- ndict = n.to_dict()
- ndict['type'] = 'notification'
- messages.append(ndict)
- return jsonified({
+ try:
+ doc = db.get('id', n.get('_id'))
+ if doc.get('time') > (time.time() - 604800):
+ messages.append(doc)
+ except RecordDeleted:
+ pass
+
+ return {
'success': True,
'result': messages,
- })
+ }
diff --git a/couchpotato/core/notifications/core/static/notification.js b/couchpotato/core/notifications/core/static/notification.js
index 52062e93d1..718f2f3ec2 100644
--- a/couchpotato/core/notifications/core/static/notification.js
+++ b/couchpotato/core/notifications/core/static/notification.js
@@ -10,31 +10,30 @@ var NotificationBase = new Class({
// Listener
App.addEvent('unload', self.stopPoll.bind(self));
App.addEvent('reload', self.startInterval.bind(self, [true]));
- App.addEvent('notification', self.notify.bind(self));
- App.addEvent('message', self.showMessage.bind(self));
+ App.on('notification', self.notify.bind(self));
+ App.on('message', self.showMessage.bind(self));
// Add test buttons to settings page
- App.addEvent('load', self.addTestButtons.bind(self));
+ App.addEvent('loadSettings', self.addTestButtons.bind(self));
// Notification bar
- self.notifications = []
+ self.notifications = [];
App.addEvent('load', function(){
- App.block.notification = new Block.Menu(self, {
+ App.block.notification = new BlockMenu(self, {
+ 'button_class': 'icon-notifications',
'class': 'notification_menu',
'onOpen': self.markAsRead.bind(self)
- })
+ });
$(App.block.notification).inject(App.getBlock('search'), 'after');
self.badge = new Element('div.badge').inject(App.block.notification, 'top').hide();
- /* App.getBlock('notification').addLink(new Element('a.more', {
- 'href': App.createUrl('notifications'),
- 'text': 'Show older notifications'
- })); */
});
window.addEvent('load', function(){
- self.startInterval.delay(Browser.safari ? 100 : 0, self)
+ requestTimeout(function(){
+ self.startInterval($(window).getSize().x <= 480 ? 2000 : 100);
+ }, 0);
});
},
@@ -43,45 +42,55 @@ var NotificationBase = new Class({
var self = this;
var added = new Date();
- added.setTime(result.added*1000)
+ added.setTime(result.added*1000);
result.el = App.getBlock('notification').addLink(
new Element('span.'+(result.read ? 'read' : '' )).adopt(
- new Element('span.message', {'text': result.message}),
+ new Element('span.message', {'html': result.message}),
new Element('span.added', {'text': added.timeDiffInWords(), 'title': added})
- )
- , 'top');
+ ), 'top');
self.notifications.include(result);
- if(!result.read)
- self.setBadge(self.notifications.filter(function(n){ return !n.read}).length)
+ if((result.important !== undefined || result.sticky !== undefined) && !result.read){
+ var sticky = true;
+ App.trigger('message', [result.message, sticky, result]);
+ }
+ else if(!result.read){
+ self.setBadge(self.notifications.filter(function(n){ return !n.read; }).length);
+ }
},
setBadge: function(value){
var self = this;
- self.badge.set('text', value)
- self.badge[value ? 'show' : 'hide']()
+ self.badge.set('text', value);
+ self.badge[value ? 'show' : 'hide']();
},
- markAsRead: function(){
- var self = this;
+ markAsRead: function(force_ids){
+ var self = this,
+ ids = force_ids;
- var rn = self.notifications.filter(function(n){
- return !n.read
- })
+ if(!force_ids) {
+ var rn = self.notifications.filter(function(n){
+ return !n.read && n.important === undefined;
+ });
- var ids = []
- rn.each(function(n){
- ids.include(n.id)
- })
+ ids = [];
+ rn.each(function(n){
+ ids.include(n._id);
+ });
+ }
if(ids.length > 0)
Api.request('notification.markread', {
+ 'data': {
+ 'ids': ids.join(',')
+ },
'onSuccess': function(){
- self.setBadge('')
+ self.setBadge('');
}
- })
+ });
},
@@ -93,76 +102,107 @@ var NotificationBase = new Class({
return;
}
- Api.request('notification.listener', {
- 'data': {'init':true},
- 'onSuccess': self.processData.bind(self)
- }).send()
+ self.request = Api.request('notification.listener', {
+ 'data': {'init':true},
+ 'onSuccess': function(json){
+ self.processData(json, true);
+ }
+ }).send();
+
+ requestInterval(function(){
+
+ if(self.request && self.request.isRunning()){
+ self.request.cancel();
+ self.startPoll();
+ }
+
+ }, 120000);
},
startPoll: function(){
var self = this;
- if(self.stopped || (self.request && self.request.isRunning()))
+ if(self.stopped)
return;
+ if(self.request && self.request.isRunning())
+ self.request.cancel();
+
self.request = Api.request('nonblock/notification.listener', {
- 'onSuccess': self.processData.bind(self),
- 'data': {
- 'last_id': self.last_id
- },
- 'onFailure': function(){
- self.startPoll.delay(2000, self)
- }
- }).send()
+ 'onSuccess': function(json){
+ self.processData(json, false);
+ },
+ 'data': {
+ 'last_id': self.last_id
+ },
+ 'onFailure': function(){
+ requestTimeout(self.startPoll.bind(self), 2000);
+ }
+ }).send();
},
stopPoll: function(){
if(this.request)
- this.request.cancel()
+ this.request.cancel();
this.stopped = true;
},
- processData: function(json){
+ processData: function(json, init){
var self = this;
// Process data
- if(json){
+ if(json && json.result){
Array.each(json.result, function(result){
- App.fireEvent(result.type, result);
- if(result.message && result.read === undefined)
+ App.trigger(result._t || result.type, [result]);
+ if(result.message && result.read === undefined && !init)
self.showMessage(result.message);
- })
+ });
if(json.result.length > 0)
- self.last_id = json.result.getLast().message_id
+ self.last_id = json.result.getLast().message_id;
}
// Restart poll
- self.startPoll()
+ requestTimeout(self.startPoll.bind(self), 1500);
},
- showMessage: function(message){
+ showMessage: function(message, sticky, data){
var self = this;
if(!self.message_container)
self.message_container = new Element('div.messages').inject(document.body);
- var new_message = new Element('div.message', {
- 'text': message
- }).inject(self.message_container);
+ var new_message = new Element('div', {
+ 'class': 'message' + (sticky ? ' sticky' : ''),
+ 'html': ' 0:
- log.debug("Logging on to SMTP server using username \'%s\'%s", (smtp_user, " and a password" if len(smtp_pass) > 0 else ""))
- mailserver.login(smtp_user, smtp_pass)
-
- # Send the e-mail
- log.debug("Sending the email")
- mailserver.sendmail(from_address, to_address, message.as_string())
-
- # Close the SMTP connection
- mailserver.quit()
-
- log.info('Email notification sent')
-
- return True
- except:
- log.error('E-mail failed: %s', traceback.format_exc())
- return False
-
- return False
diff --git a/couchpotato/core/notifications/email_.py b/couchpotato/core/notifications/email_.py
new file mode 100644
index 0000000000..442f4398dc
--- /dev/null
+++ b/couchpotato/core/notifications/email_.py
@@ -0,0 +1,137 @@
+from email.mime.text import MIMEText
+from email.utils import formatdate, make_msgid
+import smtplib
+import traceback
+
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import splitString
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+from couchpotato.environment import Env
+
+
+log = CPLog(__name__)
+
+autoload = 'Email'
+
+
+class Email(Notification):
+
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
+
+ # Extract all the settings from settings
+ from_address = self.conf('from')
+ to_address = self.conf('to')
+ ssl = self.conf('ssl')
+ smtp_server = self.conf('smtp_server')
+ smtp_user = self.conf('smtp_user')
+ smtp_pass = self.conf('smtp_pass')
+ smtp_port = self.conf('smtp_port')
+ starttls = self.conf('starttls')
+
+ # Make the basic message
+ email = MIMEText(toUnicode(message), _charset = Env.get('encoding'))
+ email['Subject'] = '%s: %s' % (self.default_title, toUnicode(message))
+ email['From'] = from_address
+ email['To'] = to_address
+ email['Date'] = formatdate(localtime = 1)
+ email['Message-ID'] = make_msgid()
+
+ try:
+ # Open the SMTP connection, via SSL if requested
+ log.debug("Connecting to host %s on port %s" % (smtp_server, smtp_port))
+ log.debug("SMTP over SSL %s", ("enabled" if ssl == 1 else "disabled"))
+ mailserver = smtplib.SMTP_SSL(smtp_server, smtp_port) if ssl == 1 else smtplib.SMTP(smtp_server, smtp_port)
+
+ if starttls:
+ log.debug("Using StartTLS to initiate the connection with the SMTP server")
+ mailserver.starttls()
+
+ # Say hello to the server
+ mailserver.ehlo()
+
+ # Check too see if an login attempt should be attempted
+ if len(smtp_user) > 0:
+ log.debug("Logging on to SMTP server using username \'%s\'%s", (smtp_user, " and a password" if len(smtp_pass) > 0 else ""))
+ mailserver.login(smtp_user, smtp_pass)
+
+ # Send the e-mail
+ log.debug("Sending the email")
+ mailserver.sendmail(from_address, splitString(to_address), email.as_string())
+
+ # Close the SMTP connection
+ mailserver.quit()
+
+ log.info('Email notification sent')
+
+ return True
+ except:
+ log.error('E-mail failed: %s', traceback.format_exc())
+
+ return False
+
+
+config = [{
+ 'name': 'email',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'email',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'from',
+ 'label': 'Send e-mail from',
+ },
+ {
+ 'name': 'to',
+ 'label': 'Send e-mail to',
+ },
+ {
+ 'name': 'smtp_server',
+ 'label': 'SMTP server',
+ },
+ {
+ 'name': 'smtp_port',
+ 'label': 'SMTP server port',
+ 'default': '25',
+ 'type': 'int',
+ },
+ {
+ 'name': 'ssl',
+ 'label': 'Enable SSL',
+ 'default': 0,
+ 'type': 'bool',
+ },
+ {
+ 'name': 'starttls',
+ 'label': 'Enable StartTLS',
+ 'default': 0,
+ 'type': 'bool',
+ },
+ {
+ 'name': 'smtp_user',
+ 'label': 'SMTP user',
+ },
+ {
+ 'name': 'smtp_pass',
+ 'label': 'SMTP password',
+ 'type': 'password',
+ },
+ {
+ 'name': 'on_snatch',
+ 'default': 0,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': 'Also send message when movie is snatched.',
+ },
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/notifications/emby.py b/couchpotato/core/notifications/emby.py
new file mode 100644
index 0000000000..15bd64d754
--- /dev/null
+++ b/couchpotato/core/notifications/emby.py
@@ -0,0 +1,89 @@
+import json
+import urllib, urllib2
+
+from couchpotato.core.helpers.variable import cleanHost
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+
+
+log = CPLog(__name__)
+
+autoload = 'Emby'
+
+
+class Emby(Notification):
+
+ def notify(self, message = '', data = None, listener = None):
+ host = self.conf('host')
+ apikey = self.conf('apikey')
+
+ host = cleanHost(host)
+ url = '%semby/Library/Series/Updated' % (host)
+ values = {}
+ data = urllib.urlencode(values)
+
+ try:
+ req = urllib2.Request(url, data)
+ req.add_header('X-MediaBrowser-Token', apikey)
+
+ response = urllib2.urlopen(req)
+ result = response.read()
+ response.close()
+ return True
+
+ except (urllib2.URLError, IOError), e:
+ return False
+
+ def test(self, **kwargs):
+ host = self.conf('host')
+ apikey = self.conf('apikey')
+ message = self.test_message
+
+ host = cleanHost(host)
+ url = '%semby/Notifications/Admin' % (host)
+ values = {'Name': 'CouchPotato', 'Description': message, 'ImageUrl': 'https://raw.githubusercontent.com/RuudBurger/CouchPotatoServer/master/couchpotato/static/images/notify.couch.small.png'}
+ data = json.dumps(values)
+
+ try:
+ req = urllib2.Request(url, data)
+ req.add_header('X-MediaBrowser-Token', apikey)
+ req.add_header('Content-Type', 'application/json')
+
+ response = urllib2.urlopen(req)
+ result = response.read()
+ response.close()
+ return {
+ 'success': True
+ }
+
+ except (urllib2.URLError, IOError), e:
+ return False
+
+
+config = [{
+ 'name': 'emby',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'emby',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'host',
+ 'default': 'localhost:8096',
+ 'description': 'IP:Port, default localhost:8096'
+ },
+ {
+ 'name': 'apikey',
+ 'label': 'API Key',
+ 'default': '',
+ },
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/notifications/growl.py b/couchpotato/core/notifications/growl.py
new file mode 100644
index 0000000000..a0081a235a
--- /dev/null
+++ b/couchpotato/core/notifications/growl.py
@@ -0,0 +1,113 @@
+import traceback
+
+from couchpotato.core.event import fireEvent, addEvent
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+from couchpotato.environment import Env
+from gntp import notifier
+
+
+log = CPLog(__name__)
+
+autoload = 'Growl'
+
+
+class Growl(Notification):
+
+ registered = False
+
+ def __init__(self):
+ super(Growl, self).__init__()
+
+ self.growl = None
+
+ if self.isEnabled():
+ addEvent('app.load', self.register)
+
+ def register(self):
+ if self.registered: return
+ try:
+
+ hostname = self.conf('hostname')
+ password = self.conf('password')
+ port = self.conf('port')
+
+ self.growl = notifier.GrowlNotifier(
+ applicationName = Env.get('appname'),
+ notifications = ['Updates'],
+ defaultNotifications = ['Updates'],
+ applicationIcon = self.getNotificationImage('medium'),
+ hostname = hostname if hostname else 'localhost',
+ password = password if password else None,
+ port = port if port else 23053
+ )
+ self.growl.register()
+ self.registered = True
+ except Exception as e:
+ if 'timed out' in str(e):
+ self.registered = True
+ else:
+ log.error('Failed register of growl: %s', traceback.format_exc())
+
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
+
+ self.register()
+
+ try:
+ self.growl.notify(
+ noteType = 'Updates',
+ title = self.default_title,
+ description = message,
+ sticky = False,
+ priority = 1,
+ )
+
+ log.info('Growl notifications sent.')
+ return True
+ except:
+ log.error('Failed growl notification.')
+
+ return False
+
+
+config = [{
+ 'name': 'growl',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'growl',
+ 'description': 'Version 1.4+',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'on_snatch',
+ 'default': False,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': 'Also send message when movie is snatched.',
+ },
+ {
+ 'name': 'hostname',
+ 'description': 'Notify growl over network. Needs restart.',
+ 'advanced': True,
+ },
+ {
+ 'name': 'port',
+ 'type': 'int',
+ 'advanced': True,
+ },
+ {
+ 'name': 'password',
+ 'type': 'password',
+ 'advanced': True,
+ },
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/notifications/growl/__init__.py b/couchpotato/core/notifications/growl/__init__.py
deleted file mode 100644
index 8e462236b5..0000000000
--- a/couchpotato/core/notifications/growl/__init__.py
+++ /dev/null
@@ -1,45 +0,0 @@
-from .main import Growl
-
-def start():
- return Growl()
-
-config = [{
- 'name': 'growl',
- 'groups': [
- {
- 'tab': 'notifications',
- 'list': 'notification_providers',
- 'name': 'growl',
- 'description': 'Version 1.4+',
- 'options': [
- {
- 'name': 'enabled',
- 'default': 0,
- 'type': 'enabler',
- },
- {
- 'name': 'on_snatch',
- 'default': False,
- 'type': 'bool',
- 'advanced': True,
- 'description': 'Also send message when movie is snatched.',
- },
- {
- 'name': 'hostname',
- 'description': 'Notify growl over network. Needs restart.',
- 'advanced': True,
- },
- {
- 'name': 'port',
- 'type': 'int',
- 'advanced': True,
- },
- {
- 'name': 'password',
- 'type': 'password',
- 'advanced': True,
- },
- ],
- }
- ],
-}]
diff --git a/couchpotato/core/notifications/growl/main.py b/couchpotato/core/notifications/growl/main.py
deleted file mode 100644
index 7f1398d9a9..0000000000
--- a/couchpotato/core/notifications/growl/main.py
+++ /dev/null
@@ -1,66 +0,0 @@
-from couchpotato.core.event import fireEvent, addEvent
-from couchpotato.core.logger import CPLog
-from couchpotato.core.notifications.base import Notification
-from couchpotato.environment import Env
-from gntp import notifier
-import traceback
-
-log = CPLog(__name__)
-
-
-class Growl(Notification):
-
- registered = False
-
- def __init__(self):
- super(Growl, self).__init__()
-
- if self.isEnabled():
- addEvent('app.load', self.register)
-
- def register(self):
- if self.registered: return
- try:
-
- hostname = self.conf('hostname')
- password = self.conf('password')
- port = self.conf('port')
-
- self.growl = notifier.GrowlNotifier(
- applicationName = Env.get('appname'),
- notifications = ["Updates"],
- defaultNotifications = ["Updates"],
- applicationIcon = '%s/static/images/couch.png' % fireEvent('app.api_url', single = True),
- hostname = hostname if hostname else 'localhost',
- password = password if password else None,
- port = port if port else 23053
- )
- self.growl.register()
- self.registered = True
- except Exception, e:
- if 'timed out' in str(e):
- self.registered = True
- else:
- log.error('Failed register of growl: %s', traceback.format_exc())
-
- def notify(self, message = '', data = {}, listener = None):
- if self.isDisabled(): return
-
- self.register()
-
- try:
- self.growl.notify(
- noteType = "Updates",
- title = self.default_title,
- description = message,
- sticky = False,
- priority = 1,
- )
-
- log.info('Growl notifications sent.')
- return True
- except:
- log.error('Failed growl notification.')
-
- return False
-
diff --git a/couchpotato/core/notifications/nmj.py b/couchpotato/core/notifications/nmj.py
new file mode 100644
index 0000000000..665837f183
--- /dev/null
+++ b/couchpotato/core/notifications/nmj.py
@@ -0,0 +1,154 @@
+import re
+import telnetlib
+
+from couchpotato.api import addApiView
+from couchpotato.core.event import addEvent
+from couchpotato.core.helpers.encoding import tryUrlencode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+
+
+try:
+ import xml.etree.cElementTree as etree
+except ImportError:
+ import xml.etree.ElementTree as etree
+
+log = CPLog(__name__)
+
+autoload = 'NMJ'
+
+
+class NMJ(Notification):
+
+ # noinspection PyMissingConstructor
+ def __init__(self):
+ addApiView(self.testNotifyName(), self.test)
+ addApiView('notify.nmj.auto_config', self.autoConfig)
+
+ addEvent('renamer.after', self.addToLibrary)
+
+ def autoConfig(self, host = 'localhost', **kwargs):
+
+ mount = ''
+
+ try:
+ terminal = telnetlib.Telnet(host)
+ except Exception:
+ log.error('Warning: unable to get a telnet session to %s', host)
+ return self.failed()
+
+ log.debug('Connected to %s via telnet', host)
+ terminal.read_until('sh-3.00# ')
+ terminal.write('cat /tmp/source\n')
+ terminal.write('cat /tmp/netshare\n')
+ terminal.write('exit\n')
+ tnoutput = terminal.read_all()
+
+ match = re.search(r'(.+\.db)\r\n?(.+)(?=sh-3.00# cat /tmp/netshare)', tnoutput)
+
+ if match:
+ database = match.group(1)
+ device = match.group(2)
+ log.info('Found NMJ database %s on device %s', (database, device))
+ else:
+ log.error('Could not get current NMJ database on %s, NMJ is probably not running!', host)
+ return self.failed()
+
+ if device.startswith('NETWORK_SHARE/'):
+ match = re.search('.*(?=\r\n?%s)' % (re.escape(device[14:])), tnoutput)
+
+ if match:
+ mount = match.group().replace('127.0.0.1', host)
+ log.info('Found mounting url on the Popcorn Hour in configuration: %s', mount)
+ else:
+ log.error('Detected a network share on the Popcorn Hour, but could not get the mounting url')
+ return self.failed()
+
+ return {
+ 'success': True,
+ 'database': database,
+ 'mount': mount,
+ }
+
+ def addToLibrary(self, message = None, group = None):
+ if self.isDisabled(): return
+ if not group: group = {}
+
+ host = self.conf('host')
+ mount = self.conf('mount')
+ database = self.conf('database')
+
+ if mount:
+ log.debug('Try to mount network drive via url: %s', mount)
+ try:
+ self.urlopen(mount)
+ except:
+ return False
+
+ params = {
+ 'arg0': 'scanner_start',
+ 'arg1': database,
+ 'arg2': 'background',
+ 'arg3': '',
+ }
+ params = tryUrlencode(params)
+ update_url = 'http://%(host)s:8008/metadata_database?%(params)s' % {'host': host, 'params': params}
+
+ try:
+ response = self.urlopen(update_url)
+ except:
+ return False
+
+ try:
+ et = etree.fromstring(response)
+ result = et.findtext('returnValue')
+ except SyntaxError as e:
+ log.error('Unable to parse XML returned from the Popcorn Hour: %s', e)
+ return False
+
+ if int(result) > 0:
+ log.error('Popcorn Hour returned an errorcode: %s', result)
+ return False
+ else:
+ log.info('NMJ started background scan')
+ return True
+
+ def failed(self):
+ return {
+ 'success': False
+ }
+
+ def test(self, **kwargs):
+ return {
+ 'success': self.addToLibrary()
+ }
+
+
+config = [{
+ 'name': 'nmj',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'nmj',
+ 'label': 'NMJ',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'host',
+ 'default': 'localhost',
+ },
+ {
+ 'name': 'database',
+ },
+ {
+ 'name': 'mount',
+ },
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/notifications/nmj/__init__.py b/couchpotato/core/notifications/nmj/__init__.py
deleted file mode 100644
index 08a21a3ed7..0000000000
--- a/couchpotato/core/notifications/nmj/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from .main import NMJ
-
-def start():
- return NMJ()
-
-config = [{
- 'name': 'nmj',
- 'groups': [
- {
- 'tab': 'notifications',
- 'list': 'notification_providers',
- 'name': 'nmj',
- 'label': 'NMJ',
- 'options': [
- {
- 'name': 'enabled',
- 'default': 0,
- 'type': 'enabler',
- },
- {
- 'name': 'host',
- 'default': 'localhost',
- },
- {
- 'name': 'database',
- },
- {
- 'name': 'mount',
- },
- ],
- }
- ],
-}]
diff --git a/couchpotato/core/notifications/nmj/main.py b/couchpotato/core/notifications/nmj/main.py
deleted file mode 100644
index cdf531dc29..0000000000
--- a/couchpotato/core/notifications/nmj/main.py
+++ /dev/null
@@ -1,121 +0,0 @@
-from couchpotato.api import addApiView
-from couchpotato.core.event import addEvent
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.request import getParams, jsonified
-from couchpotato.core.logger import CPLog
-from couchpotato.core.notifications.base import Notification
-import re
-import telnetlib
-
-try:
- import xml.etree.cElementTree as etree
-except ImportError:
- import xml.etree.ElementTree as etree
-
-log = CPLog(__name__)
-
-
-class NMJ(Notification):
-
- def __init__(self):
- addEvent('renamer.after', self.addToLibrary)
- addApiView(self.testNotifyName(), self.test)
- addApiView('notify.nmj.auto_config', self.autoConfig)
-
- def autoConfig(self):
-
- params = getParams()
- host = params.get('host', 'localhost')
-
- database = ''
- mount = ''
-
- try:
- terminal = telnetlib.Telnet(host)
- except Exception:
- log.error('Warning: unable to get a telnet session to %s', (host))
- return self.failed()
-
- log.debug('Connected to %s via telnet', (host))
- terminal.read_until('sh-3.00# ')
- terminal.write('cat /tmp/source\n')
- terminal.write('cat /tmp/netshare\n')
- terminal.write('exit\n')
- tnoutput = terminal.read_all()
-
- match = re.search(r'(.+\.db)\r\n?(.+)(?=sh-3.00# cat /tmp/netshare)', tnoutput)
-
- if match:
- database = match.group(1)
- device = match.group(2)
- log.info('Found NMJ database %s on device %s', (database, device))
- else:
- log.error('Could not get current NMJ database on %s, NMJ is probably not running!', (host))
- return self.failed()
-
- if device.startswith('NETWORK_SHARE/'):
- match = re.search('.*(?=\r\n?%s)' % (re.escape(device[14:])), tnoutput)
-
- if match:
- mount = match.group().replace('127.0.0.1', host)
- log.info('Found mounting url on the Popcorn Hour in configuration: %s', (mount))
- else:
- log.error('Detected a network share on the Popcorn Hour, but could not get the mounting url')
- return self.failed()
-
- return jsonified({
- 'success': True,
- 'database': database,
- 'mount': mount,
- })
-
- def addToLibrary(self, message = None, group = {}):
- if self.isDisabled(): return
-
- host = self.conf('host')
- mount = self.conf('mount')
- database = self.conf('database')
-
- if mount:
- log.debug('Try to mount network drive via url: %s', (mount))
- try:
- data = self.urlopen(mount)
- except:
- return False
-
- params = {
- 'arg0': 'scanner_start',
- 'arg1': database,
- 'arg2': 'background',
- 'arg3': '',
- }
- params = tryUrlencode(params)
- UPDATE_URL = 'http://%(host)s:8008/metadata_database?%(params)s'
- updateUrl = UPDATE_URL % {'host': host, 'params': params}
-
- try:
- response = self.urlopen(updateUrl)
- except:
- return False
-
- try:
- et = etree.fromstring(response)
- result = et.findtext('returnValue')
- except SyntaxError, e:
- log.error('Unable to parse XML returned from the Popcorn Hour: %s', (e))
- return False
-
- if int(result) > 0:
- log.error('Popcorn Hour returned an errorcode: %s', (result))
- return False
- else:
- log.info('NMJ started background scan')
- return True
-
- def failed(self):
- return jsonified({'success': False})
-
- def test(self):
- return jsonified({'success': self.addToLibrary()})
-
-
diff --git a/couchpotato/core/notifications/notifo/__init__.py b/couchpotato/core/notifications/notifo/__init__.py
deleted file mode 100644
index 941246cc32..0000000000
--- a/couchpotato/core/notifications/notifo/__init__.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from .main import Notifo
-
-def start():
- return Notifo()
-
-config = [{
- 'name': 'notifo',
- 'groups': [
- {
- 'tab': 'notifications',
- 'list': 'notification_providers',
- 'name': 'notifo',
- 'description': 'Keep in mind that Notifo service will end soon.',
- 'options': [
- {
- 'name': 'enabled',
- 'default': 0,
- 'type': 'enabler',
- },
- {
- 'name': 'username',
- },
- {
- 'name': 'api_key',
- },
- {
- 'name': 'on_snatch',
- 'default': 0,
- 'type': 'bool',
- 'advanced': True,
- 'description': 'Also send message when movie is snatched.',
- },
- ],
- }
- ],
-}]
diff --git a/couchpotato/core/notifications/notifo/main.py b/couchpotato/core/notifications/notifo/main.py
deleted file mode 100644
index 64eee5eccc..0000000000
--- a/couchpotato/core/notifications/notifo/main.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.notifications.base import Notification
-from flask.helpers import json
-import base64
-import traceback
-
-log = CPLog(__name__)
-
-
-class Notifo(Notification):
-
- url = 'https://api.notifo.com/v1/send_notification'
-
- def notify(self, message = '', data = {}, listener = None):
- if self.isDisabled(): return
-
- try:
- params = {
- 'label': self.default_title,
- 'msg': toUnicode(message),
- }
-
- headers = {
- 'Authorization': "Basic %s" % base64.encodestring('%s:%s' % (self.conf('username'), self.conf('api_key')))[:-1]
- }
-
- handle = self.urlopen(self.url, params = params, headers = headers)
- result = json.loads(handle)
-
- if result['status'] != 'success' or result['response_message'] != 'OK':
- raise Exception
-
- except:
- log.error('Notification failed: %s', traceback.format_exc())
- return False
-
- log.info('Notifo notification successful.')
- return True
diff --git a/couchpotato/core/notifications/notifymyandroid.py b/couchpotato/core/notifications/notifymyandroid.py
new file mode 100644
index 0000000000..ed7a24c8db
--- /dev/null
+++ b/couchpotato/core/notifications/notifymyandroid.py
@@ -0,0 +1,78 @@
+from couchpotato.core.helpers.variable import splitString
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+import pynma
+import six
+
+log = CPLog(__name__)
+
+autoload = 'NotifyMyAndroid'
+
+
+class NotifyMyAndroid(Notification):
+
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
+
+ nma = pynma.PyNMA()
+ keys = splitString(self.conf('api_key'))
+ nma.addkey(keys)
+ nma.developerkey(self.conf('dev_key'))
+
+ response = nma.push(
+ application = self.default_title,
+ event = message.split(' ')[0],
+ description = message,
+ priority = self.conf('priority'),
+ batch_mode = len(keys) > 1
+ )
+
+ successful = 0
+ for key in keys:
+ if not response[str(key)]['code'] == six.u('200'):
+ log.error('Could not send notification to NotifyMyAndroid (%s). %s', (key, response[key]['message']))
+ else:
+ successful += 1
+
+ return successful == len(keys)
+
+
+config = [{
+ 'name': 'notifymyandroid',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'notifymyandroid',
+ 'label': 'Notify My Android',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'api_key',
+ 'description': 'Multiple keys seperated by a comma. Maximum of 5.'
+ },
+ {
+ 'name': 'dev_key',
+ 'advanced': True,
+ },
+ {
+ 'name': 'priority',
+ 'default': 0,
+ 'type': 'dropdown',
+ 'values': [('Very Low', -2), ('Moderate', -1), ('Normal', 0), ('High', 1), ('Emergency', 2)],
+ },
+ {
+ 'name': 'on_snatch',
+ 'default': 0,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': 'Also send message when movie is snatched.',
+ },
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/notifications/notifymyandroid/__init__.py b/couchpotato/core/notifications/notifymyandroid/__init__.py
deleted file mode 100644
index 9ee5d90a61..0000000000
--- a/couchpotato/core/notifications/notifymyandroid/__init__.py
+++ /dev/null
@@ -1,44 +0,0 @@
-from .main import NotifyMyAndroid
-
-def start():
- return NotifyMyAndroid()
-
-config = [{
- 'name': 'notifymyandroid',
- 'groups': [
- {
- 'tab': 'notifications',
- 'list': 'notification_providers',
- 'name': 'notifymyandroid',
- 'label': 'Notify My Android',
- 'options': [
- {
- 'name': 'enabled',
- 'default': 0,
- 'type': 'enabler',
- },
- {
- 'name': 'api_key',
- 'description': 'Multiple keys seperated by a comma. Maximum of 5.'
- },
- {
- 'name': 'dev_key',
- 'advanced': True,
- },
- {
- 'name': 'priority',
- 'default': 0,
- 'type': 'dropdown',
- 'values': [('Very Low', -2), ('Moderate', -1), ('Normal', 0), ('High', 1), ('Emergency', 2)],
- },
- {
- 'name': 'on_snatch',
- 'default': 0,
- 'type': 'bool',
- 'advanced': True,
- 'description': 'Also send message when movie is snatched.',
- },
- ],
- }
- ],
-}]
diff --git a/couchpotato/core/notifications/notifymyandroid/main.py b/couchpotato/core/notifications/notifymyandroid/main.py
deleted file mode 100644
index cc6ef6623a..0000000000
--- a/couchpotato/core/notifications/notifymyandroid/main.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from couchpotato.core.helpers.variable import splitString
-from couchpotato.core.logger import CPLog
-from couchpotato.core.notifications.base import Notification
-import pynma
-
-log = CPLog(__name__)
-
-
-class NotifyMyAndroid(Notification):
-
- def notify(self, message = '', data = {}, listener = None):
- if self.isDisabled(): return
-
- nma = pynma.PyNMA()
- keys = splitString(self.conf('api_key'))
- nma.addkey(keys)
- nma.developerkey(self.conf('dev_key'))
-
- # hacky fix for the event type
- # as it seems to be part of the message now
- self.event = message.split(' ')[0]
- response = nma.push(
- application = self.default_title,
- event = self.event,
- description = message,
- priority = self.conf('priority'),
- batch_mode = len(keys) > 1
- )
-
- successful = 0
- for key in keys:
- if not response[str(key)]['code'] == u'200':
- log.error('Could not send notification to NotifyMyAndroid (%s). %s', (key, response[key]['message']))
- else:
- successful += 1
-
- return successful == len(keys)
diff --git a/couchpotato/core/notifications/notifymywp/__init__.py b/couchpotato/core/notifications/notifymywp/__init__.py
deleted file mode 100644
index 6e0bd06d7f..0000000000
--- a/couchpotato/core/notifications/notifymywp/__init__.py
+++ /dev/null
@@ -1,44 +0,0 @@
-from .main import NotifyMyWP
-
-def start():
- return NotifyMyWP()
-
-config = [{
- 'name': 'notifymywp',
- 'groups': [
- {
- 'tab': 'notifications',
- 'list': 'notification_providers',
- 'name': 'notifymywp',
- 'label': 'Windows Phone',
- 'options': [
- {
- 'name': 'enabled',
- 'default': 0,
- 'type': 'enabler',
- },
- {
- 'name': 'api_key',
- 'description': 'Multiple keys seperated by a comma. Maximum of 5.'
- },
- {
- 'name': 'dev_key',
- 'advanced': True,
- },
- {
- 'name': 'priority',
- 'default': 0,
- 'type': 'dropdown',
- 'values': [('Very Low', -2), ('Moderate', -1), ('Normal', 0), ('High', 1), ('Emergency', 2)],
- },
- {
- 'name': 'on_snatch',
- 'default': 0,
- 'type': 'bool',
- 'advanced': True,
- 'description': 'Also send message when movie is snatched.',
- },
- ],
- }
- ],
-}]
diff --git a/couchpotato/core/notifications/notifymywp/main.py b/couchpotato/core/notifications/notifymywp/main.py
deleted file mode 100644
index 3258e85fe1..0000000000
--- a/couchpotato/core/notifications/notifymywp/main.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from couchpotato.core.helpers.variable import splitString
-from couchpotato.core.logger import CPLog
-from couchpotato.core.notifications.base import Notification
-from pynmwp import PyNMWP
-
-log = CPLog(__name__)
-
-
-class NotifyMyWP(Notification):
-
- def notify(self, message = '', data = {}, listener = None):
- if self.isDisabled(): return
-
- keys = splitString(self.conf('api_key'))
- p = PyNMWP(keys, self.conf('dev_key'))
-
- response = p.push(application = self.default_title, event = message, description = message, priority = self.conf('priority'), batch_mode = len(keys) > 1)
-
- for key in keys:
- if not response[key]['Code'] == u'200':
- log.error('Could not send notification to NotifyMyWindowsPhone (%s). %s', (key, response[key]['message']))
- return False
-
- return response
diff --git a/couchpotato/core/notifications/plex/__init__.py b/couchpotato/core/notifications/plex/__init__.py
old mode 100644
new mode 100755
index 8d89a40f1a..957369b76a
--- a/couchpotato/core/notifications/plex/__init__.py
+++ b/couchpotato/core/notifications/plex/__init__.py
@@ -1,6 +1,7 @@
from .main import Plex
-def start():
+
+def autoload():
return Plex()
config = [{
@@ -17,10 +18,42 @@ def start():
'type': 'enabler',
},
{
- 'name': 'host',
+ 'name': 'media_server',
+ 'label': 'Media Server',
'default': 'localhost',
- 'description': 'Default should be on localhost',
+ 'description': 'Hostname/IP, default localhost'
+ },
+ {
+ 'name': 'username',
+ 'label': 'Username',
+ 'default': '',
+ 'description': 'Required for myPlex'
+ },
+ {
+ 'name': 'password',
+ 'label': 'Password',
+ 'default': '',
+ 'type': 'password',
+ 'description': 'Required for myPlex'
+ },
+ {
+ 'name': 'auth_token',
+ 'label': 'Auth Token',
+ 'default': '',
+ 'advanced': True,
+ 'description': 'Required for myPlex'
+ },
+ {
+ 'name': 'clients',
+ 'default': '',
+ 'description': 'Comma separated list of client names\'s (computer names). Top right when you start Plex'
+ },
+ {
+ 'name': 'on_snatch',
+ 'default': 0,
+ 'type': 'bool',
'advanced': True,
+ 'description': 'Also send message when movie is snatched.',
},
],
}
diff --git a/couchpotato/core/notifications/plex/client.py b/couchpotato/core/notifications/plex/client.py
new file mode 100644
index 0000000000..84cf7af6a9
--- /dev/null
+++ b/couchpotato/core/notifications/plex/client.py
@@ -0,0 +1,87 @@
+import json
+
+from couchpotato import CPLog
+from couchpotato.core.event import addEvent
+from couchpotato.core.helpers.encoding import tryUrlencode
+import requests
+
+
+log = CPLog(__name__)
+
+
+class PlexClientProtocol(object):
+ def __init__(self, plex):
+ self.plex = plex
+
+ addEvent('notify.plex.notifyClient', self.notify)
+
+ def notify(self, client, message):
+ raise NotImplementedError()
+
+
+class PlexClientHTTP(PlexClientProtocol):
+ def request(self, command, client):
+ url = 'http://%s:%s/xbmcCmds/xbmcHttp/?%s' % (
+ client['address'],
+ client['port'],
+ tryUrlencode(command)
+ )
+
+ headers = {}
+
+ try:
+ self.plex.urlopen(url, headers = headers, timeout = 3, show_error = False)
+ except Exception as err:
+ log.error("Couldn't sent command to Plex: %s", err)
+ return False
+
+ return True
+
+ def notify(self, client, message):
+ if client.get('protocol') != 'xbmchttp':
+ return None
+
+ data = {
+ 'command': 'ExecBuiltIn',
+ 'parameter': 'Notification(CouchPotato, %s)' % message
+ }
+
+ return self.request(data, client)
+
+
+class PlexClientJSON(PlexClientProtocol):
+ def request(self, method, params, client):
+ log.debug('sendJSON("%s", %s, %s)', (method, params, client))
+ url = 'http://%s:%s/jsonrpc' % (
+ client['address'],
+ client['port']
+ )
+
+ headers = {
+ 'Content-Type': 'application/json'
+ }
+
+ request = {
+ 'id': 1,
+ 'jsonrpc': '2.0',
+ 'method': method,
+ 'params': params
+ }
+
+ try:
+ requests.post(url, headers = headers, timeout = 3, data = json.dumps(request))
+ except Exception as err:
+ log.error("Couldn't sent command to Plex: %s", err)
+ return False
+
+ return True
+
+ def notify(self, client, message):
+ if client.get('protocol') not in ['xbmcjson', 'plex']:
+ return None
+
+ params = {
+ 'title': 'CouchPotato',
+ 'message': message
+ }
+ return self.request('GUI.ShowNotification', params, client)
diff --git a/couchpotato/core/notifications/plex/main.py b/couchpotato/core/notifications/plex/main.py
old mode 100644
new mode 100755
index 9790ccfef4..a6853b2f83
--- a/couchpotato/core/notifications/plex/main.py
+++ b/couchpotato/core/notifications/plex/main.py
@@ -1,90 +1,78 @@
-from couchpotato.core.event import addEvent
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.request import jsonified
-from couchpotato.core.helpers.variable import cleanHost
+from couchpotato.core.event import addEvent, fireEvent
from couchpotato.core.logger import CPLog
from couchpotato.core.notifications.base import Notification
-from urllib2 import URLError
-from xml.dom import minidom
-import traceback
+from .client import PlexClientHTTP, PlexClientJSON
+from .server import PlexServer
log = CPLog(__name__)
class Plex(Notification):
+ http_time_between_calls = 0
+
def __init__(self):
super(Plex, self).__init__()
- addEvent('renamer.after', self.addToLibrary)
-
- def addToLibrary(self, message = None, group = {}):
- if self.isDisabled(): return
-
- log.info('Sending notification to Plex')
- hosts = [cleanHost(x.strip() + ':32400') for x in self.conf('host').split(",")]
- for host in hosts:
+ self.server = PlexServer(self)
- source_type = ['movie']
- base_url = '%slibrary/sections' % host
- refresh_url = '%s/%%s/refresh' % base_url
+ self.client_protocols = {
+ 'http': PlexClientHTTP(self),
+ 'json': PlexClientJSON(self)
+ }
- try:
- sections_xml = self.urlopen(base_url)
- xml_sections = minidom.parseString(sections_xml)
- sections = xml_sections.getElementsByTagName('Directory')
+ addEvent('renamer.after', self.addToLibrary)
- for s in sections:
- if s.getAttribute('type') in source_type:
- url = refresh_url % s.getAttribute('key')
- x = self.urlopen(url)
+ def addToLibrary(self, message = None, group = None):
+ if self.isDisabled(): return
+ if not group: group = {}
- except:
- log.error('Plex library update failed for %s, Media Server not running: %s', (host, traceback.format_exc(1)))
- return False
+ return self.server.refresh()
- return True
+ def getClientNames(self):
+ return [
+ x.strip().lower()
+ for x in self.conf('clients').split(',')
+ ]
- def notify(self, message = '', data = {}, listener = None):
- if self.isDisabled(): return
+ def notifyClients(self, message, client_names):
+ success = True
- hosts = [x.strip() + ':3000' for x in self.conf('host').split(",")]
- successful = 0
- for host in hosts:
- if self.send({'command': 'ExecBuiltIn', 'parameter': 'Notification(CouchPotato, %s)' % message}, host):
- successful += 1
+ for client_name in client_names:
- return successful == len(hosts)
+ client_success = False
+ client = self.server.clients.get(client_name)
- def send(self, command, host):
+ if client and client['found']:
+ client_success = fireEvent('notify.plex.notifyClient', client, message, single = True)
- url = 'http://%s/xbmcCmds/xbmcHttp/?%s' % (host, tryUrlencode(command))
+ if not client_success:
+ if self.server.staleClients() or not client:
+ log.info('Failed to send notification to client "%s". '
+ 'Client list is stale, updating the client list and retrying.', client_name)
+ self.server.updateClients(self.getClientNames())
+ else:
+ log.warning('Failed to send notification to client %s, skipping this time', client_name)
+ success = False
- headers = {}
+ return success
- try:
- self.urlopen(url, headers = headers, show_error = False)
- except URLError:
- log.error("Couldn't sent command to Plex, probably just running Media Server")
- return False
- except:
- log.error("Couldn't sent command to Plex: %s", traceback.format_exc())
- return False
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
+ return self.notifyClients(message, self.getClientNames())
- log.info('Plex notification to %s successful.', host)
- return True
-
- def test(self):
+ def test(self, **kwargs):
test_type = self.testNotifyName()
log.info('Sending test to %s', test_type)
- success = self.notify(
+ notify_success = self.notify(
message = self.test_message,
data = {},
listener = 'test'
)
- success2 = self.addToLibrary()
- return jsonified({'success': success or success2})
+ refresh_success = self.addToLibrary()
+
+ return {'success': notify_success or refresh_success}
diff --git a/couchpotato/core/notifications/plex/server.py b/couchpotato/core/notifications/plex/server.py
new file mode 100644
index 0000000000..4b8ea05f41
--- /dev/null
+++ b/couchpotato/core/notifications/plex/server.py
@@ -0,0 +1,150 @@
+from datetime import timedelta, datetime
+from urlparse import urlparse
+import traceback
+
+from couchpotato.core.helpers.variable import cleanHost
+from couchpotato import CPLog
+
+
+try:
+ import xml.etree.cElementTree as etree
+except ImportError:
+ import xml.etree.ElementTree as etree
+
+log = CPLog(__name__)
+
+
+class PlexServer(object):
+ def __init__(self, plex):
+ self.plex = plex
+
+ self.clients = {}
+ self.last_clients_update = None
+
+ def staleClients(self):
+ if not self.last_clients_update:
+ return True
+
+ return self.last_clients_update + timedelta(minutes=15) < datetime.now()
+
+ def request(self, path, data_type='xml'):
+ if not self.plex.conf('media_server'):
+ log.warning("Plex media server hostname is required")
+ return None
+
+ if path.startswith('/'):
+ path = path[1:]
+
+ #Maintain support for older Plex installations without myPlex
+ if not self.plex.conf('auth_token') and not self.plex.conf('username') and not self.plex.conf('password'):
+ data = self.plex.urlopen('%s/%s' % (
+ self.createHost(self.plex.conf('media_server'), port = 32400),
+ path
+ ))
+ else:
+ #Fetch X-Plex-Token if it doesn't exist but a username/password do
+ if not self.plex.conf('auth_token') and (self.plex.conf('username') and self.plex.conf('password')):
+ import urllib2, base64
+ log.info("Fetching a new X-Plex-Token from plex.tv")
+ username = self.plex.conf('username')
+ password = self.plex.conf('password')
+ req = urllib2.Request("https://plex.tv/users/sign_in.xml", data="")
+ authheader = "Basic %s" % base64.encodestring('%s:%s' % (username, password))[:-1]
+ req.add_header("Authorization", authheader)
+ req.add_header("X-Plex-Product", "Couchpotato Notifier")
+ req.add_header("X-Plex-Client-Identifier", "b3a6b24dcab2224bdb101fc6aa08ea5e2f3147d6")
+ req.add_header("X-Plex-Version", "1.0")
+
+ try:
+ response = urllib2.urlopen(req)
+ except urllib2.URLError, e:
+ log.info("Error fetching token from plex.tv")
+
+ try:
+ auth_tree = etree.parse(response)
+ token = auth_tree.findall(".//authentication-token")[0].text
+ self.plex.conf('auth_token', token)
+
+ except (ValueError, IndexError) as e:
+ log.info("Error parsing plex.tv response: " + ex(e))
+
+ #Add X-Plex-Token header for myPlex support workaround
+ data = self.plex.urlopen('%s/%s?X-Plex-Token=%s' % (
+ self.createHost(self.plex.conf('media_server'), port = 32400),
+ path,
+ self.plex.conf('auth_token')
+ ))
+
+ if data_type == 'xml':
+ return etree.fromstring(data)
+ else:
+ return data
+
+ def updateClients(self, client_names):
+ log.info('Searching for clients on Plex Media Server')
+
+ self.clients = {}
+
+ result = self.request('clients')
+ if not result:
+ return
+
+ found_clients = [
+ c for c in result.findall('Server')
+ if c.get('name') and c.get('name').lower() in client_names
+ ]
+
+ # Store client details in cache
+ for client in found_clients:
+ name = client.get('name').lower()
+
+ self.clients[name] = {
+ 'name': client.get('name'),
+ 'found': True,
+ 'address': client.get('address'),
+ 'port': client.get('port'),
+ 'protocol': client.get('protocol', 'xbmchttp')
+ }
+
+ client_names.remove(name)
+
+ # Store dummy info for missing clients
+ for client_name in client_names:
+ self.clients[client_name] = {
+ 'found': False
+ }
+
+ if len(client_names) > 0:
+ log.debug('Unable to find clients: %s', ', '.join(client_names))
+
+ self.last_clients_update = datetime.now()
+
+ def refresh(self, section_types=None):
+ if not section_types:
+ section_types = ['movie']
+
+ sections = self.request('library/sections')
+
+ try:
+ for section in sections.findall('Directory'):
+ if section.get('type') not in section_types:
+ continue
+
+ self.request('library/sections/%s/refresh' % section.get('key'), 'text')
+ except:
+ log.error('Plex library update failed for %s, Media Server not running: %s',
+ (self.plex.conf('media_server'), traceback.format_exc(1)))
+ return False
+
+ return True
+
+ def createHost(self, host, port = None):
+
+ h = cleanHost(host)
+ p = urlparse(h)
+ h = h.rstrip('/')
+
+ if port and not p.port:
+ h += ':%s' % port
+
+ return h
diff --git a/couchpotato/core/notifications/prowl.py b/couchpotato/core/notifications/prowl.py
new file mode 100644
index 0000000000..fdece326c6
--- /dev/null
+++ b/couchpotato/core/notifications/prowl.py
@@ -0,0 +1,75 @@
+import traceback
+
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+
+
+log = CPLog(__name__)
+
+autoload = 'Prowl'
+
+
+class Prowl(Notification):
+
+ urls = {
+ 'api': 'https://api.prowlapp.com/publicapi/add'
+ }
+
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
+
+ data = {
+ 'apikey': self.conf('api_key'),
+ 'application': self.default_title,
+ 'description': toUnicode(message),
+ 'priority': self.conf('priority'),
+ }
+ headers = {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ }
+
+ try:
+ self.urlopen(self.urls['api'], headers = headers, data = data, show_error = False)
+ log.info('Prowl notifications sent.')
+ return True
+ except:
+ log.error('Prowl failed: %s', traceback.format_exc())
+
+ return False
+
+
+config = [{
+ 'name': 'prowl',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'prowl',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'api_key',
+ 'label': 'Api key',
+ },
+ {
+ 'name': 'priority',
+ 'default': '0',
+ 'type': 'dropdown',
+ 'values': [('Very Low', -2), ('Moderate', -1), ('Normal', 0), ('High', 1), ('Emergency', 2)]
+ },
+ {
+ 'name': 'on_snatch',
+ 'default': 0,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': 'Also send message when movie is snatched.',
+ },
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/notifications/prowl/__init__.py b/couchpotato/core/notifications/prowl/__init__.py
deleted file mode 100644
index e056428907..0000000000
--- a/couchpotato/core/notifications/prowl/__init__.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from .main import Prowl
-
-def start():
- return Prowl()
-
-config = [{
- 'name': 'prowl',
- 'groups': [
- {
- 'tab': 'notifications',
- 'list': 'notification_providers',
- 'name': 'prowl',
- 'options': [
- {
- 'name': 'enabled',
- 'default': 0,
- 'type': 'enabler',
- },
- {
- 'name': 'api_key',
- 'label': 'Api key',
- },
- {
- 'name': 'priority',
- 'default': '0',
- 'type': 'dropdown',
- 'values': [('Very Low', -2), ('Moderate', -1), ('Normal', 0), ('High', 1), ('Emergency', 2)]
- },
- {
- 'name': 'on_snatch',
- 'default': 0,
- 'type': 'bool',
- 'advanced': True,
- 'description': 'Also send message when movie is snatched.',
- },
- ],
- }
- ],
-}]
diff --git a/couchpotato/core/notifications/prowl/main.py b/couchpotato/core/notifications/prowl/main.py
deleted file mode 100644
index 0990d0d1ea..0000000000
--- a/couchpotato/core/notifications/prowl/main.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.notifications.base import Notification
-import traceback
-
-log = CPLog(__name__)
-
-
-class Prowl(Notification):
-
- urls = {
- 'api': 'https://api.prowlapp.com/publicapi/add'
- }
-
- def notify(self, message = '', data = {}, listener = None):
- if self.isDisabled(): return
-
- data = {
- 'apikey': self.conf('api_key'),
- 'application': self.default_title,
- 'description': toUnicode(message),
- 'priority': self.conf('priority'),
- }
- headers = {
- 'Content-type': 'application/x-www-form-urlencoded'
- }
-
- try:
- self.urlopen(self.urls['api'], headers = headers, params = data, multipart = True, show_error = False)
- log.info('Prowl notifications sent.')
- return True
- except:
- log.error('Prowl failed: %s', traceback.format_exc())
-
- return False
diff --git a/couchpotato/core/notifications/pushalot.py b/couchpotato/core/notifications/pushalot.py
new file mode 100644
index 0000000000..fa781bc5f1
--- /dev/null
+++ b/couchpotato/core/notifications/pushalot.py
@@ -0,0 +1,87 @@
+import traceback
+
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+
+
+log = CPLog(__name__)
+
+autoload = 'Pushalot'
+
+
+class Pushalot(Notification):
+
+ urls = {
+ 'api': 'https://pushalot.com/api/sendmessage'
+ }
+
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
+
+ data = {
+ 'AuthorizationToken': self.conf('auth_token'),
+ 'Title': self.default_title,
+ 'Body': toUnicode(message),
+ 'IsImportant': self.conf('important'),
+ 'IsSilent': self.conf('silent'),
+ 'Image': toUnicode(self.getNotificationImage('medium') + '?1'),
+ 'Source': toUnicode(self.default_title)
+ }
+
+ headers = {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ }
+
+ try:
+ self.urlopen(self.urls['api'], headers = headers, data = data, show_error = False)
+ return True
+ except:
+ log.error('PushAlot failed: %s', traceback.format_exc())
+
+ return False
+
+
+config = [{
+ 'name': 'pushalot',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'pushalot',
+ 'description': 'for Windows Phone and Windows 8',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'auth_token',
+ 'label': 'Auth Token',
+ },
+ {
+ 'name': 'silent',
+ 'label': 'Silent',
+ 'default': 0,
+ 'type': 'bool',
+ 'description': 'Don\'t send Toast notifications. Only update Live Tile',
+ },
+ {
+ 'name': 'important',
+ 'label': 'High Priority',
+ 'default': 0,
+ 'type': 'bool',
+ 'description': 'Send message with High priority.',
+ },
+ {
+ 'name': 'on_snatch',
+ 'default': 0,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': 'Also send message when movie is snatched.',
+ },
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/notifications/pushalot/__init__.py b/couchpotato/core/notifications/pushalot/__init__.py
deleted file mode 100644
index a2a297a39c..0000000000
--- a/couchpotato/core/notifications/pushalot/__init__.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from .main import Pushalot
-
-def start():
- return Pushalot()
-
-config = [{
- 'name': 'pushalot',
- 'groups': [
- {
- 'tab': 'notifications',
- 'list': 'notification_providers',
- 'name': 'pushalot',
- 'description': 'for Windows Phone and Windows 8',
- 'options': [
- {
- 'name': 'enabled',
- 'default': 0,
- 'type': 'enabler',
- },
- {
- 'name': 'auth_token',
- 'label': 'Auth Token',
- },
- {
- 'name': 'silent',
- 'label': 'Silent',
- 'default': 0,
- 'type': 'bool',
- 'description': 'Don\'t send Toast notifications. Only update Live Tile',
- },
- {
- 'name': 'important',
- 'label': 'High Priority',
- 'default': 0,
- 'type': 'bool',
- 'description': 'Send message with High priority.',
- },
- {
- 'name': 'on_snatch',
- 'default': 0,
- 'type': 'bool',
- 'advanced': True,
- 'description': 'Also send message when movie is snatched.',
- },
- ],
- }
- ],
-}]
diff --git a/couchpotato/core/notifications/pushalot/main.py b/couchpotato/core/notifications/pushalot/main.py
deleted file mode 100644
index 3b11331127..0000000000
--- a/couchpotato/core/notifications/pushalot/main.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.notifications.base import Notification
-import traceback
-
-log = CPLog(__name__)
-
-class Pushalot(Notification):
-
- urls = {
- 'api': 'https://pushalot.com/api/sendmessage'
- }
-
- def notify(self, message = '', data = {}, listener = None):
- if self.isDisabled(): return
-
- data = {
- 'AuthorizationToken': self.conf('auth_token'),
- 'Title': self.default_title,
- 'Body': toUnicode(message),
- 'LinkTitle': toUnicode("CouchPotato"),
- 'link': toUnicode("https://couchpota.to/"),
- 'IsImportant': self.conf('important'),
- 'IsSilent': self.conf('silent'),
- }
-
- headers = {
- 'Content-type': 'application/x-www-form-urlencoded'
- }
-
- try:
- self.urlopen(self.urls['api'], headers = headers, params = data, multipart = True, show_error = False)
- return True
- except:
- log.error('PushAlot failed: %s', traceback.format_exc())
-
- return False
diff --git a/couchpotato/core/notifications/pushbullet.py b/couchpotato/core/notifications/pushbullet.py
new file mode 100644
index 0000000000..1b8ebe6e1a
--- /dev/null
+++ b/couchpotato/core/notifications/pushbullet.py
@@ -0,0 +1,112 @@
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import splitString
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+
+
+log = CPLog(__name__)
+
+autoload = 'Pushbullet'
+
+
+class Pushbullet(Notification):
+
+ url = 'https://api.pushbullet.com/v2/%s'
+
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
+
+ # Get all the device IDs linked to this user
+ devices = self.getDevices() or [None]
+ successful = 0
+ for device in devices:
+ response = self.request(
+ 'pushes',
+ device_iden = device,
+ type = 'note',
+ title = self.default_title,
+ body = toUnicode(message)
+ )
+
+ if response:
+ successful += 1
+ else:
+ log.error('Unable to push notification to Pushbullet device with ID %s' % device)
+
+ for channel in self.getChannels():
+ self.request(
+ 'pushes',
+ channel_tag = channel,
+ type = 'note',
+ title = self.default_title,
+ body = toUnicode(message)
+ )
+
+ return successful == len(devices)
+
+ def getDevices(self):
+ return splitString(self.conf('devices'))
+
+ def getChannels(self):
+ return splitString(self.conf('channels'))
+
+ def request(self, method, **kwargs):
+ try:
+ headers = {
+ 'Access-Token': self.conf('api_key')
+ }
+
+ if kwargs.get('device_iden') is None:
+ try: del kwargs['device_iden']
+ except: pass
+
+ return self.getJsonData(self.url % method, cache_timeout = -1, headers = headers, data = kwargs)
+
+ except Exception as ex:
+ log.error('Pushbullet request failed')
+ log.debug(ex)
+
+ return None
+
+
+config = [{
+ 'name': 'pushbullet',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'pushbullet',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'api_key',
+ 'label': 'Access Token',
+ 'description': 'Can be found on Account Settings',
+ },
+ {
+ 'name': 'devices',
+ 'default': '',
+ 'advanced': True,
+ 'description': 'IDs of devices to send notifications to, empty = all devices'
+ },
+ {
+ 'name': 'channels',
+ 'default': '',
+ 'advanced': True,
+ 'description': 'IDs of channels to send notifications to, empty = no channels'
+ },
+ {
+ 'name': 'on_snatch',
+ 'default': 0,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': 'Also send message when movie is snatched.',
+ },
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/notifications/pushover.py b/couchpotato/core/notifications/pushover.py
new file mode 100644
index 0000000000..ebce97c1ff
--- /dev/null
+++ b/couchpotato/core/notifications/pushover.py
@@ -0,0 +1,88 @@
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import getTitle, getIdentifier
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+
+
+log = CPLog(__name__)
+
+autoload = 'Pushover'
+
+
+class Pushover(Notification):
+
+ api_url = 'https://api.pushover.net'
+
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
+
+ api_data = {
+ 'user': self.conf('user_key'),
+ 'token': self.conf('api_token'),
+ 'message': toUnicode(message),
+ 'priority': self.conf('priority'),
+ 'sound': self.conf('sound'),
+ }
+
+ if data and getIdentifier(data):
+ api_data.update({
+ 'url': toUnicode('http://www.imdb.com/title/%s/' % getIdentifier(data)),
+ 'url_title': toUnicode('%s on IMDb' % getTitle(data)),
+ })
+
+ try:
+ data = self.urlopen('%s/%s' % (self.api_url, '1/messages.json'),
+ headers = {'Content-type': 'application/x-www-form-urlencoded'},
+ data = api_data)
+ log.info2('Pushover responded with: %s', data)
+ return True
+ except:
+ return False
+
+
+
+config = [{
+ 'name': 'pushover',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'pushover',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'user_key',
+ 'description': 'Register on pushover.net to get one.'
+ },
+ {
+ 'name': 'api_token',
+ 'description': 'Register on pushover.net to get one.',
+ 'advanced': True,
+ 'default': 'YkxHMYDZp285L265L3IwH3LmzkTaCy',
+ },
+ {
+ 'name': 'priority',
+ 'default': 0,
+ 'type': 'dropdown',
+ 'values': [('Lowest', -2), ('Low', -1), ('Normal', 0), ('High', 1)],
+ },
+ {
+ 'name': 'on_snatch',
+ 'default': 0,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': 'Also send message when movie is snatched.',
+ },
+ {
+ 'name': 'sound',
+ 'advanced': True,
+ 'description': 'Define custom sound for Pushover alert.'
+ },
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/notifications/pushover/__init__.py b/couchpotato/core/notifications/pushover/__init__.py
deleted file mode 100644
index 1ea1d5c014..0000000000
--- a/couchpotato/core/notifications/pushover/__init__.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from .main import Pushover
-
-def start():
- return Pushover()
-
-config = [{
- 'name': 'pushover',
- 'groups': [
- {
- 'tab': 'notifications',
- 'list': 'notification_providers',
- 'name': 'pushover',
- 'options': [
- {
- 'name': 'enabled',
- 'default': 0,
- 'type': 'enabler',
- },
- {
- 'name': 'user_key',
- 'description': 'Register on pushover.net to get one.'
- },
- {
- 'name': 'priority',
- 'default': 0,
- 'type': 'dropdown',
- 'values': [('Normal', 0), ('High', 1)],
- },
- {
- 'name': 'on_snatch',
- 'default': 0,
- 'type': 'bool',
- 'advanced': True,
- 'description': 'Also send message when movie is snatched.',
- },
- ],
- }
- ],
-}]
diff --git a/couchpotato/core/notifications/pushover/main.py b/couchpotato/core/notifications/pushover/main.py
deleted file mode 100644
index bcd3245ce4..0000000000
--- a/couchpotato/core/notifications/pushover/main.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.notifications.base import Notification
-from httplib import HTTPSConnection
-
-log = CPLog(__name__)
-
-
-class Pushover(Notification):
-
- app_token = 'YkxHMYDZp285L265L3IwH3LmzkTaCy'
-
- def notify(self, message = '', data = {}, listener = None):
- if self.isDisabled(): return
-
- http_handler = HTTPSConnection("api.pushover.net:443")
-
- data = {
- 'user': self.conf('user_key'),
- 'token': self.app_token,
- 'message': toUnicode(message),
- 'priority': self.conf('priority')
- }
-
- http_handler.request('POST',
- "/1/messages.json",
- headers = {'Content-type': 'application/x-www-form-urlencoded'},
- body = tryUrlencode(data)
- )
-
- response = http_handler.getresponse()
- request_status = response.status
-
- if request_status == 200:
- log.info('Pushover notifications sent.')
- return True
- elif request_status == 401:
- log.error('Pushover auth failed: %s', response.reason)
- return False
- else:
- log.error('Pushover notification failed.')
- return False
diff --git a/couchpotato/core/notifications/slack.py b/couchpotato/core/notifications/slack.py
new file mode 100644
index 0000000000..5da8456871
--- /dev/null
+++ b/couchpotato/core/notifications/slack.py
@@ -0,0 +1,126 @@
+import json
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+
+log = CPLog(__name__)
+autoload = 'Slack'
+
+
+class Slack(Notification):
+ url = 'https://slack.com/api/chat.postMessage'
+ required_confs = ('token', 'channels',)
+
+ def notify(self, message='', data=None, listener=None):
+ for key in self.required_confs:
+ if not self.conf(key):
+ log.warning('Slack notifications are enabled, but '
+ '"{0}" is not specified.'.format(key))
+ return False
+
+ data = data or {}
+ message = message.strip()
+
+ if self.conf('include_imdb') and 'identifier' in data:
+ template = ' http://www.imdb.com/title/{0[identifier]}/'
+ message += template.format(data)
+
+ payload = {
+ 'token': self.conf('token'),
+ 'text': message,
+ 'username': self.conf('bot_name'),
+ 'unfurl_links': self.conf('include_imdb'),
+ 'as_user': self.conf('as_user'),
+ 'icon_url': self.conf('icon_url'),
+ 'icon_emoji': self.conf('icon_emoji')
+ }
+
+ channels = self.conf('channels').split(',')
+ for channel in channels:
+ payload['channel'] = channel.strip()
+ response = self.urlopen(self.url, data=payload)
+ response = json.loads(response)
+ if not response['ok']:
+ log.warning('Notification sending to Slack has failed. Error '
+ 'code: %s.', response['error'])
+ return False
+ return True
+
+
+config = [{
+ 'name': 'slack',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'slack',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'token',
+ 'description': (
+ 'Your Slack authentication token.',
+ 'Can be created at https://api.slack.com/web'
+ )
+ },
+ {
+ 'name': 'channels',
+ 'description': (
+ 'Channel to send notifications to.',
+ 'Can be a public channel, private group or IM '
+ 'channel. Can be an encoded ID or a name '
+ '(staring with a hashtag, e.g. #general). '
+ 'Separate with commas in order to notify multiple '
+ 'channels. It is however recommended to send '
+ 'notifications to only one channel due to '
+ 'the Slack API rate limits.'
+ )
+ },
+ {
+ 'name': 'include_imdb',
+ 'default': True,
+ 'type': 'bool',
+ 'descrpition': 'Include a link to the movie page on IMDB.'
+ },
+ {
+ 'name': 'bot_name',
+ 'description': 'Name of bot.',
+ 'default': 'CouchPotato',
+ 'advanced': True,
+ },
+ {
+ 'name': 'as_user',
+ 'description': 'Send message as the authentication token '
+ ' user.',
+ 'default': False,
+ 'type': 'bool',
+ 'advanced': True
+ },
+ {
+ 'name': 'icon_url',
+ 'description': 'URL to an image to use as the icon for '
+ 'notifications.',
+ 'advanced': True,
+ },
+ {
+ 'name': 'icon_emoji',
+ 'description': (
+ 'Emoji to use as the icon for notifications.',
+ 'Overrides icon_url'
+ ),
+ 'advanced': True,
+ },
+ {
+ 'name': 'on_snatch',
+ 'default': 0,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': 'Also send message when movie is snatched.',
+ },
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/notifications/synoindex.py b/couchpotato/core/notifications/synoindex.py
new file mode 100644
index 0000000000..b14e1a0345
--- /dev/null
+++ b/couchpotato/core/notifications/synoindex.py
@@ -0,0 +1,63 @@
+import os
+import subprocess
+
+from couchpotato.api import addApiView
+from couchpotato.core.event import addEvent
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+
+
+log = CPLog(__name__)
+
+autoload = 'Synoindex'
+
+
+class Synoindex(Notification):
+
+ index_path = '/usr/syno/bin/synoindex'
+
+ def __init__(self):
+ addApiView(self.testNotifyName(), self.test)
+
+ addEvent('renamer.after', self.addToLibrary)
+
+ def addToLibrary(self, message = None, group = None):
+ if self.isDisabled(): return
+ if not group: group = {}
+
+ command = [self.index_path, '-A', group.get('destination_dir')]
+ log.info('Executing synoindex command: %s ', command)
+ try:
+ p = subprocess.Popen(command, stdout = subprocess.PIPE, stderr = subprocess.STDOUT)
+ out = p.communicate()
+ log.info('Result from synoindex: %s', str(out))
+ return True
+ except OSError as e:
+ log.error('Unable to run synoindex: %s', e)
+
+ return False
+
+ def test(self, **kwargs):
+ return {
+ 'success': os.path.isfile(self.index_path)
+ }
+
+
+config = [{
+ 'name': 'synoindex',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'synoindex',
+ 'description': 'Automaticly adds index to Synology Media Server.',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ }
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/notifications/synoindex/__init__.py b/couchpotato/core/notifications/synoindex/__init__.py
deleted file mode 100644
index eb3a793f80..0000000000
--- a/couchpotato/core/notifications/synoindex/__init__.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from .main import Synoindex
-
-def start():
- return Synoindex()
-
-config = [{
- 'name': 'synoindex',
- 'groups': [
- {
- 'tab': 'notifications',
- 'list': 'notification_providers',
- 'name': 'synoindex',
- 'description': 'Automaticly adds index to Synology Media Server.',
- 'options': [
- {
- 'name': 'enabled',
- 'default': 0,
- 'type': 'enabler',
- }
- ],
- }
- ],
-}]
diff --git a/couchpotato/core/notifications/synoindex/main.py b/couchpotato/core/notifications/synoindex/main.py
deleted file mode 100644
index 01bd2fc819..0000000000
--- a/couchpotato/core/notifications/synoindex/main.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from couchpotato.core.event import addEvent
-from couchpotato.core.helpers.request import jsonified
-from couchpotato.core.logger import CPLog
-from couchpotato.core.notifications.base import Notification
-import os
-import subprocess
-
-log = CPLog(__name__)
-
-
-class Synoindex(Notification):
-
- index_path = '/usr/syno/bin/synoindex'
-
- def __init__(self):
- super(Synoindex, self).__init__()
- addEvent('renamer.after', self.addToLibrary)
-
- def addToLibrary(self, message = None, group = {}):
- if self.isDisabled(): return
-
- command = [self.index_path, '-A', group.get('destination_dir')]
- log.info('Executing synoindex command: %s ', command)
- try:
- p = subprocess.Popen(command, stdout = subprocess.PIPE, stderr = subprocess.STDOUT)
- out = p.communicate()
- log.info('Result from synoindex: %s', str(out))
- return True
- except OSError, e:
- log.error('Unable to run synoindex: %s', e)
- return False
-
- return True
-
- def test(self):
- return jsonified({'success': os.path.isfile(self.index_path)})
diff --git a/couchpotato/core/notifications/telegrambot.py b/couchpotato/core/notifications/telegrambot.py
new file mode 100644
index 0000000000..a23f78a52e
--- /dev/null
+++ b/couchpotato/core/notifications/telegrambot.py
@@ -0,0 +1,71 @@
+from couchpotato.core.helpers.variable import splitString
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+import requests
+import six
+
+log = CPLog(__name__)
+
+autoload = 'TelegramBot'
+
+class TelegramBot(Notification):
+
+ TELEGRAM_API = "https://api.telegram.org/bot%s/%s"
+
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
+
+ # Get configuration data
+ token = self.conf('bot_token')
+ usr_id = self.conf('receiver_user_id')
+
+ # Cosntruct message
+ payload = {'chat_id': usr_id, 'text': message}
+
+ # Send message user Telegram's Bot API
+ response = requests.post(self.TELEGRAM_API % (token, "sendMessage"), data=payload)
+
+ # Error logging
+ sent_successfuly = True
+ if not response.status_code == 200:
+ log.error('Could not send notification to TelegramBot (token=%s). Response: [%s]', (token, response.text))
+ sent_successfuly = False
+
+ return sent_successfuly
+
+
+config = [{
+ 'name': 'telegrambot',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'telegrambot',
+ 'label': 'Telegram Bot',
+ 'description': 'Notification provider which utilizes the bot API of the famous Telegram IM.',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'bot_token',
+ 'description': 'Your bot token. Contact @BotFather on Telegram to get one.'
+ },
+ {
+ 'name': 'receiver_user_id',
+ 'label': 'Recieving User/Group ID',
+ 'description': 'Receiving user/group - notifications will be sent to this user or group. Contact @myidbot on Telegram to get an ID.'
+ },
+ {
+ 'name': 'on_snatch',
+ 'default': 0,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': 'Also send message when movie is snatched.',
+ },
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/notifications/toasty.py b/couchpotato/core/notifications/toasty.py
new file mode 100644
index 0000000000..919a9d1d6f
--- /dev/null
+++ b/couchpotato/core/notifications/toasty.py
@@ -0,0 +1,65 @@
+import traceback
+
+from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+
+
+log = CPLog(__name__)
+
+autoload = 'Toasty'
+
+
+class Toasty(Notification):
+
+ urls = {
+ 'api': 'http://api.supertoasty.com/notify/%s?%s'
+ }
+
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
+
+ data = {
+ 'title': self.default_title,
+ 'text': toUnicode(message),
+ 'sender': toUnicode("CouchPotato"),
+ 'image': 'https://raw.github.com/RuudBurger/CouchPotatoServer/master/couchpotato/static/images/homescreen.png',
+ }
+
+ try:
+ self.urlopen(self.urls['api'] % (self.conf('api_key'), tryUrlencode(data)), show_error = False)
+ return True
+ except:
+ log.error('Toasty failed: %s', traceback.format_exc())
+
+ return False
+
+
+config = [{
+ 'name': 'toasty',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'toasty',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'api_key',
+ 'label': 'Device ID',
+ },
+ {
+ 'name': 'on_snatch',
+ 'default': 0,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': 'Also send message when movie is snatched.',
+ },
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/notifications/toasty/__init__.py b/couchpotato/core/notifications/toasty/__init__.py
deleted file mode 100644
index 8e2dae76b6..0000000000
--- a/couchpotato/core/notifications/toasty/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from .main import Toasty
-
-def start():
- return Toasty()
-
-config = [{
- 'name': 'toasty',
- 'groups': [
- {
- 'tab': 'notifications',
- 'list': 'notification_providers',
- 'name': 'toasty',
- 'options': [
- {
- 'name': 'enabled',
- 'default': 0,
- 'type': 'enabler',
- },
- {
- 'name': 'api_key',
- 'label': 'Device ID',
- },
- {
- 'name': 'on_snatch',
- 'default': 0,
- 'type': 'bool',
- 'advanced': True,
- 'description': 'Also send message when movie is snatched.',
- },
- ],
- }
- ],
-}]
diff --git a/couchpotato/core/notifications/toasty/main.py b/couchpotato/core/notifications/toasty/main.py
deleted file mode 100644
index 638c75dd52..0000000000
--- a/couchpotato/core/notifications/toasty/main.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.notifications.base import Notification
-import traceback
-
-log = CPLog(__name__)
-
-class Toasty(Notification):
-
- urls = {
- 'api': 'http://api.supertoasty.com/notify/%s?%s'
- }
-
- def notify(self, message = '', data = {}, listener = None):
- if self.isDisabled(): return
-
- data = {
- 'title': self.default_title,
- 'text': toUnicode(message),
- 'sender': toUnicode("CouchPotato"),
- 'image': 'https://raw.github.com/RuudBurger/CouchPotatoServer/master/couchpotato/static/images/homescreen.png',
- }
-
- try:
- self.urlopen(self.urls['api'] % (self.conf('api_key'), tryUrlencode(data)), show_error = False)
- return True
- except:
- log.error('Toasty failed: %s', traceback.format_exc())
-
- return False
diff --git a/couchpotato/core/notifications/trakt.py b/couchpotato/core/notifications/trakt.py
new file mode 100644
index 0000000000..e3ae3d3929
--- /dev/null
+++ b/couchpotato/core/notifications/trakt.py
@@ -0,0 +1,67 @@
+from couchpotato.core.helpers.variable import getTitle, getIdentifier
+from couchpotato.core.logger import CPLog
+from couchpotato.core.media.movie.providers.automation.trakt.main import TraktBase
+from couchpotato.core.notifications.base import Notification
+
+log = CPLog(__name__)
+
+autoload = 'Trakt'
+
+
+class Trakt(Notification, TraktBase):
+
+ urls = {
+ 'library': 'sync/collection',
+ 'unwatchlist': 'sync/watchlist/remove',
+ 'test': 'sync/last_activities',
+ }
+
+ listen_to = ['renamer.after']
+ enabled_option = 'notification_enabled'
+
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
+
+ if listener == 'test':
+ result = self.call((self.urls['test']))
+
+ return result
+
+ else:
+
+ post_data = {
+ 'movies': [{'ids': {'imdb': getIdentifier(data)}}] if data else []
+ }
+
+ result = self.call((self.urls['library']), post_data)
+ if self.conf('remove_watchlist_enabled'):
+ result = result and self.call((self.urls['unwatchlist']), post_data)
+
+ return result
+
+
+config = [{
+ 'name': 'trakt',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'trakt',
+ 'label': 'Trakt',
+ 'description': 'add movies to your collection once downloaded. Connect your account in Automation Trakt settings',
+ 'options': [
+ {
+ 'name': 'notification_enabled',
+ 'default': False,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'remove_watchlist_enabled',
+ 'label': 'Remove from watchlist',
+ 'default': False,
+ 'type': 'bool',
+ },
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/notifications/twitter/__init__.py b/couchpotato/core/notifications/twitter/__init__.py
index 9db8dcb878..b6b42bb5d8 100644
--- a/couchpotato/core/notifications/twitter/__init__.py
+++ b/couchpotato/core/notifications/twitter/__init__.py
@@ -1,6 +1,7 @@
from .main import Twitter
-def start():
+
+def autoload():
return Twitter()
config = [{
diff --git a/couchpotato/core/notifications/twitter/main.py b/couchpotato/core/notifications/twitter/main.py
index bbb9262b76..0d02191e5d 100644
--- a/couchpotato/core/notifications/twitter/main.py
+++ b/couchpotato/core/notifications/twitter/main.py
@@ -1,14 +1,15 @@
+from urlparse import parse_qsl
+
from couchpotato.api import addApiView
from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.request import jsonified, getParam
from couchpotato.core.helpers.variable import cleanHost
from couchpotato.core.logger import CPLog
from couchpotato.core.notifications.base import Notification
-from flask.helpers import url_for
-from pytwitter import Api, parse_qsl
-from werkzeug.utils import redirect
+from couchpotato.environment import Env
+from pytwitter import Api
import oauth2
+
log = CPLog(__name__)
@@ -31,8 +32,8 @@ def __init__(self):
addApiView('notify.%s.auth_url' % self.getName().lower(), self.getAuthorizationUrl)
addApiView('notify.%s.credentials' % self.getName().lower(), self.getCredentials)
- def notify(self, message = '', data = {}, listener = None):
- if self.isDisabled(): return
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
api = Api(self.consumer_key, self.consumer_secret, self.conf('access_token_key'), self.conf('access_token_secret'))
@@ -53,7 +54,7 @@ def notify(self, message = '', data = {}, listener = None):
try:
if direct_message:
for user in direct_message_users.split():
- api.PostDirectMessage(user, '[%s] %s' % (self.default_title, message))
+ api.PostDirectMessage('[%s] %s' % (self.default_title, message), screen_name = user)
else:
update_message = '[%s] %s' % (self.default_title, message)
if len(update_message) > 140:
@@ -65,16 +66,15 @@ def notify(self, message = '', data = {}, listener = None):
api.PostUpdate(update_message[135:] + ' 2/2')
else:
api.PostUpdate(update_message)
- except Exception, e:
+ except Exception as e:
log.error('Error sending tweet: %s', e)
return False
return True
- def getAuthorizationUrl(self):
+ def getAuthorizationUrl(self, host = None, **kwargs):
- referer = getParam('host')
- callback_url = cleanHost(referer) + '%snotify.%s.credentials/' % (url_for('api.index').lstrip('/'), self.getName().lower())
+ callback_url = cleanHost(host) + '%snotify.%s.credentials/' % (Env.get('api_base').lstrip('/'), self.getName().lower())
oauth_consumer = oauth2.Consumer(self.consumer_key, self.consumer_secret)
oauth_client = oauth2.Client(oauth_consumer)
@@ -83,31 +83,29 @@ def getAuthorizationUrl(self):
if resp['status'] != '200':
log.error('Invalid response from Twitter requesting temp token: %s', resp['status'])
- return jsonified({
+ return {
'success': False,
- })
+ }
else:
self.request_token = dict(parse_qsl(content))
auth_url = self.urls['authorize'] + ("?oauth_token=%s" % self.request_token['oauth_token'])
log.info('Redirecting to "%s"', auth_url)
- return jsonified({
+ return {
'success': True,
'url': auth_url,
- })
-
- def getCredentials(self):
+ }
- key = getParam('oauth_verifier')
+ def getCredentials(self, oauth_verifier, **kwargs):
token = oauth2.Token(self.request_token['oauth_token'], self.request_token['oauth_token_secret'])
- token.set_verifier(key)
+ token.set_verifier(oauth_verifier)
oauth_consumer = oauth2.Consumer(key = self.consumer_key, secret = self.consumer_secret)
oauth_client = oauth2.Client(oauth_consumer, token)
- resp, content = oauth_client.request(self.urls['access'], method = 'POST', body = 'oauth_verifier=%s' % key)
+ resp, content = oauth_client.request(self.urls['access'], method = 'POST', body = 'oauth_verifier=%s' % oauth_verifier)
access_token = dict(parse_qsl(content))
if resp['status'] != '200':
@@ -122,4 +120,4 @@ def getCredentials(self):
self.request_token = None
- return redirect(url_for('web.index') + 'settings/notifications/')
+ return 'redirect', Env.get('web_base') + 'settings/notifications/'
diff --git a/couchpotato/core/notifications/twitter/static/twitter.js b/couchpotato/core/notifications/twitter/static/twitter.js
index 2c4e6e316b..97465b64bf 100644
--- a/couchpotato/core/notifications/twitter/static/twitter.js
+++ b/couchpotato/core/notifications/twitter/static/twitter.js
@@ -2,7 +2,7 @@ var TwitterNotification = new Class({
initialize: function(){
var self = this;
- App.addEvent('load', self.addRegisterButton.bind(self));
+ App.addEvent('loadSettings', self.addRegisterButton.bind(self));
},
addRegisterButton: function(){
@@ -16,7 +16,7 @@ var TwitterNotification = new Class({
var twitter_set = 0;
fieldset.getElements('input[type=text]').each(function(el){
- twitter_set += +(el.get('value') != '');
+ twitter_set += +(el.get('value') !== '');
});
@@ -57,9 +57,9 @@ var TwitterNotification = new Class({
}
})
).inject(fieldset.getElement('.test_button'), 'before');
- })
+ });
- },
+ }
});
diff --git a/couchpotato/core/notifications/webhook.py b/couchpotato/core/notifications/webhook.py
new file mode 100644
index 0000000000..8dc6329190
--- /dev/null
+++ b/couchpotato/core/notifications/webhook.py
@@ -0,0 +1,68 @@
+import traceback
+
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import getIdentifier
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+
+
+log = CPLog(__name__)
+
+autoload = 'Webhook'
+
+class Webhook(Notification):
+
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
+
+ post_data = {
+ 'message': toUnicode(message)
+ }
+
+ if getIdentifier(data):
+ post_data.update({
+ 'imdb_id': getIdentifier(data)
+ })
+
+ headers = {
+ 'Content-type': 'application/x-www-form-urlencoded'
+ }
+
+ try:
+ self.urlopen(self.conf('url'), headers = headers, data = post_data, show_error = False)
+ return True
+ except:
+ log.error('Webhook notification failed: %s', traceback.format_exc())
+
+ return False
+
+
+config = [{
+ 'name': 'webhook',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'webhook',
+ 'label': 'Webhook',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'url',
+ 'description': 'The URL to send notification data to when '
+ },
+ {
+ 'name': 'on_snatch',
+ 'default': 0,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': 'Also send message when movie is snatched.',
+ }
+ ]
+ }
+ ]
+}]
diff --git a/couchpotato/core/notifications/xbmc.py b/couchpotato/core/notifications/xbmc.py
new file mode 100644
index 0000000000..1fbfdb81de
--- /dev/null
+++ b/couchpotato/core/notifications/xbmc.py
@@ -0,0 +1,280 @@
+import base64
+import json
+import socket
+import traceback
+import urllib
+
+from couchpotato.core.helpers.variable import splitString, getTitle
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+from requests.exceptions import ConnectionError, Timeout
+from requests.packages.urllib3.exceptions import MaxRetryError
+
+
+log = CPLog(__name__)
+
+autoload = 'XBMC'
+
+
+class XBMC(Notification):
+
+ listen_to = ['renamer.after', 'movie.snatched']
+ use_json_notifications = {}
+ http_time_between_calls = 0
+
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
+
+ hosts = splitString(self.conf('host'))
+
+ successful = 0
+ max_successful = 0
+ for host in hosts:
+
+ if self.use_json_notifications.get(host) is None:
+ self.getXBMCJSONversion(host, message = message)
+
+ if self.use_json_notifications.get(host):
+ calls = [
+ ('GUI.ShowNotification', None, {'title': self.default_title, 'message': message, 'image': self.getNotificationImage('small')}),
+ ]
+
+ if data and data.get('destination_dir') and (not self.conf('only_first') or hosts.index(host) == 0):
+ param = {}
+ if not self.conf('force_full_scan') and (self.conf('remote_dir_scan') or socket.getfqdn('localhost') == socket.getfqdn(host.split(':')[0])):
+ param = {'directory': data['destination_dir']}
+
+ calls.append(('VideoLibrary.Scan', None, param))
+
+ max_successful += len(calls)
+ response = self.request(host, calls)
+ else:
+ response = self.notifyXBMCnoJSON(host, {'title': self.default_title, 'message': message})
+
+ if data and data.get('destination_dir') and (not self.conf('only_first') or hosts.index(host) == 0):
+ response += self.request(host, [('VideoLibrary.Scan', None, {})])
+ max_successful += 1
+
+ max_successful += 1
+
+ try:
+ for result in response:
+ if result.get('result') and result['result'] == 'OK':
+ successful += 1
+ elif result.get('error'):
+ log.error('XBMC error; %s: %s (%s)', (result['id'], result['error']['message'], result['error']['code']))
+
+ except:
+ log.error('Failed parsing results: %s', traceback.format_exc())
+
+ return successful == max_successful
+
+ def getXBMCJSONversion(self, host, message = ''):
+
+ success = False
+
+ # XBMC JSON-RPC version request
+ response = self.request(host, [
+ ('JSONRPC.Version', None, {})
+ ])
+ for result in response:
+ if result.get('result') and type(result['result']['version']).__name__ == 'int':
+ # only v2 and v4 return an int object
+ # v6 (as of XBMC v12(Frodo)) is required to send notifications
+ xbmc_rpc_version = str(result['result']['version'])
+
+ log.debug('Kodi JSON-RPC Version: %s ; Notifications by JSON-RPC only supported for v6 [as of XBMC v12(Frodo)]', xbmc_rpc_version)
+
+ # disable JSON use
+ self.use_json_notifications[host] = False
+
+ # send the text message
+ resp = self.notifyXBMCnoJSON(host, {'title': self.default_title, 'message': message})
+ for r in resp:
+ if r.get('result') and r['result'] == 'OK':
+ log.debug('Message delivered successfully!')
+ success = True
+ break
+ elif r.get('error'):
+ log.error('Kodi error; %s: %s (%s)', (r['id'], r['error']['message'], r['error']['code']))
+ break
+
+ elif result.get('result') and type(result['result']['version']).__name__ == 'dict':
+ # XBMC JSON-RPC v6 returns an array object containing
+ # major, minor and patch number
+ xbmc_rpc_version = str(result['result']['version']['major'])
+ xbmc_rpc_version += '.' + str(result['result']['version']['minor'])
+ xbmc_rpc_version += '.' + str(result['result']['version']['patch'])
+
+ log.debug('Kodie JSON-RPC Version: %s', xbmc_rpc_version)
+
+ # ok, XBMC version is supported
+ self.use_json_notifications[host] = True
+
+ # send the text message
+ resp = self.request(host, [('GUI.ShowNotification', None, {'title':self.default_title, 'message':message, 'image': self.getNotificationImage('small')})])
+ for r in resp:
+ if r.get('result') and r['result'] == 'OK':
+ log.debug('Message delivered successfully!')
+ success = True
+ break
+ elif r.get('error'):
+ log.error('Kodi error; %s: %s (%s)', (r['id'], r['error']['message'], r['error']['code']))
+ break
+
+ # error getting version info (we do have contact with XBMC though)
+ elif result.get('error'):
+ log.error('Kodi error; %s: %s (%s)', (result['id'], result['error']['message'], result['error']['code']))
+
+ log.debug('Use JSON notifications: %s ', self.use_json_notifications)
+
+ return success
+
+ def notifyXBMCnoJSON(self, host, data):
+
+ server = 'http://%s/xbmcCmds/' % host
+
+ # Notification(title, message [, timeout , image])
+ cmd = "xbmcHttp?command=ExecBuiltIn(Notification(%s,%s,'',%s))" % (urllib.quote(getTitle(data)), urllib.quote(data['message']), urllib.quote(self.getNotificationImage('medium')))
+ server += cmd
+
+ # I have no idea what to set to, just tried text/plain and seems to be working :)
+ headers = {
+ 'Content-Type': 'text/plain',
+ }
+
+ # authentication support
+ if self.conf('password'):
+ base64string = base64.encodestring('%s:%s' % (self.conf('username'), self.conf('password'))).replace('\n', '')
+ headers['Authorization'] = 'Basic %s' % base64string
+
+ try:
+ log.debug('Sending non-JSON-type request to %s: %s', (host, data))
+
+ # response wil either be 'OK':
+ #
+ # OK
+ #
+ #
+ # or 'Error':
+ #
+ # Error:
+ #
+ #
+ response = self.urlopen(server, headers = headers, timeout = 3, show_error = False)
+
+ if 'OK' in response:
+ log.debug('Returned from non-JSON-type request %s: %s', (host, response))
+ # manually fake expected response array
+ return [{'result': 'OK'}]
+ else:
+ log.error('Returned from non-JSON-type request %s: %s', (host, response))
+ # manually fake expected response array
+ return [{'result': 'Error'}]
+
+ except (MaxRetryError, Timeout, ConnectionError):
+ log.info2('Couldn\'t send request to Kodi, assuming it\'s turned off')
+ return [{'result': 'Error'}]
+ except:
+ log.error('Failed sending non-JSON-type request to Kodi: %s', traceback.format_exc())
+ return [{'result': 'Error'}]
+
+ def request(self, host, do_requests):
+ server = 'http://%s/jsonrpc' % host
+
+ data = []
+ for req in do_requests:
+ method, id, kwargs = req
+
+ data.append({
+ 'method': method,
+ 'params': kwargs,
+ 'jsonrpc': '2.0',
+ 'id': id if id else method,
+ })
+ data = json.dumps(data)
+
+ headers = {
+ 'Content-Type': 'application/json',
+ }
+
+ if self.conf('password'):
+ base64string = base64.encodestring('%s:%s' % (self.conf('username'), self.conf('password'))).replace('\n', '')
+ headers['Authorization'] = 'Basic %s' % base64string
+
+ try:
+ log.debug('Sending request to %s: %s', (host, data))
+ response = self.getJsonData(server, headers = headers, data = data, timeout = 3, show_error = False)
+ log.debug('Returned from request %s: %s', (host, response))
+
+ return response
+ except (MaxRetryError, Timeout, ConnectionError):
+ log.info2('Couldn\'t send request to Kodi, assuming it\'s turned off')
+ return []
+ except:
+ log.error('Failed sending request to Kodi: %s', traceback.format_exc())
+ return []
+
+
+config = [{
+ 'name': 'xbmc',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'xbmc',
+ 'label': 'Kodi',
+ 'description': 'v14 (Helix), v15 (Isengard)',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'host',
+ 'default': 'localhost:8080',
+ },
+ {
+ 'name': 'username',
+ 'default': 'xbmc',
+ },
+ {
+ 'name': 'password',
+ 'default': '',
+ 'type': 'password',
+ },
+ {
+ 'name': 'only_first',
+ 'default': 0,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': 'Only update the first host when movie snatched, useful for synced Kodi',
+ },
+ {
+ 'name': 'remote_dir_scan',
+ 'label': 'Remote Folder Scan',
+ 'default': 0,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': ('Only scan new movie folder at remote Kodi servers.', 'Useful if the Kodi path is different from the path CPS uses.'),
+ },
+ {
+ 'name': 'force_full_scan',
+ 'label': 'Always do a full scan',
+ 'default': 0,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': ('Do a full scan instead of only the new movie.', 'Useful if the Kodi path is different from the path CPS uses.'),
+ },
+ {
+ 'name': 'on_snatch',
+ 'default': False,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': 'Also send message when movie is snatched.',
+ },
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/notifications/xbmc/__init__.py b/couchpotato/core/notifications/xbmc/__init__.py
deleted file mode 100644
index 0753c82aa5..0000000000
--- a/couchpotato/core/notifications/xbmc/__init__.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from .main import XBMC
-
-def start():
- return XBMC()
-
-config = [{
- 'name': 'xbmc',
- 'groups': [
- {
- 'tab': 'notifications',
- 'list': 'notification_providers',
- 'name': 'xbmc',
- 'label': 'XBMC',
- 'description': 'v11 (Eden) and v12 (Frodo)',
- 'options': [
- {
- 'name': 'enabled',
- 'default': 0,
- 'type': 'enabler',
- },
- {
- 'name': 'host',
- 'default': 'localhost:8080',
- },
- {
- 'name': 'username',
- 'default': 'xbmc',
- },
- {
- 'name': 'password',
- 'default': '',
- 'type': 'password',
- },
- ],
- }
- ],
-}]
diff --git a/couchpotato/core/notifications/xbmc/main.py b/couchpotato/core/notifications/xbmc/main.py
deleted file mode 100755
index a1987bfa13..0000000000
--- a/couchpotato/core/notifications/xbmc/main.py
+++ /dev/null
@@ -1,189 +0,0 @@
-from couchpotato.core.helpers.variable import splitString
-from couchpotato.core.logger import CPLog
-from couchpotato.core.notifications.base import Notification
-from flask.helpers import json
-import base64
-import traceback
-import urllib
-
-log = CPLog(__name__)
-
-
-class XBMC(Notification):
-
- listen_to = ['renamer.after']
- use_json_notifications = {}
- couch_logo_url = 'https://raw.github.com/RuudBurger/CouchPotatoServer/master/couchpotato/static/images/xbmc-notify.png'
-
- def notify(self, message = '', data = {}, listener = None):
- if self.isDisabled(): return
-
- hosts = splitString(self.conf('host'))
-
- successful = 0
- for host in hosts:
-
- if self.use_json_notifications.get(host) is None:
- self.getXBMCJSONversion(host, message = message)
-
- if self.use_json_notifications.get(host):
- response = self.request(host, [
- ('GUI.ShowNotification', {'title': self.default_title, 'message': message, 'image': self.couch_logo_url}),
- ('VideoLibrary.Scan', {}),
- ])
- else:
- response = self.notifyXBMCnoJSON(host, {'title':self.default_title, 'message':message})
- response += self.request(host, [('VideoLibrary.Scan', {})])
-
- try:
- for result in response:
- if (result.get('result') and result['result'] == 'OK'):
- successful += 1
- elif (result.get('error')):
- log.error('XBMC error; %s: %s (%s)', (result['id'], result['error']['message'], result['error']['code']))
-
- except:
- log.error('Failed parsing results: %s', traceback.format_exc())
-
- return successful == len(hosts) * 2
-
- def getXBMCJSONversion(self, host, message = ''):
-
- success = False
-
- # XBMC JSON-RPC version request
- response = self.request(host, [
- ('JSONRPC.Version', {})
- ])
- for result in response:
- if (result.get('result') and type(result['result']['version']).__name__ == 'int'):
- # only v2 and v4 return an int object
- # v6 (as of XBMC v12(Frodo)) is required to send notifications
- xbmc_rpc_version = str(result['result']['version'])
-
- log.debug('XBMC JSON-RPC Version: %s ; Notifications by JSON-RPC only supported for v6 [as of XBMC v12(Frodo)]', xbmc_rpc_version)
-
- # disable JSON use
- self.use_json_notifications[host] = False
-
- # send the text message
- resp = self.notifyXBMCnoJSON(host, {'title':self.default_title, 'message':message})
- for result in resp:
- if (result.get('result') and result['result'] == 'OK'):
- log.debug('Message delivered successfully!')
- success = True
- break
- elif (result.get('error')):
- log.error('XBMC error; %s: %s (%s)', (result['id'], result['error']['message'], result['error']['code']))
- break
-
- elif (result.get('result') and type(result['result']['version']).__name__ == 'dict'):
- # XBMC JSON-RPC v6 returns an array object containing
- # major, minor and patch number
- xbmc_rpc_version = str(result['result']['version']['major'])
- xbmc_rpc_version += '.' + str(result['result']['version']['minor'])
- xbmc_rpc_version += '.' + str(result['result']['version']['patch'])
-
- log.debug('XBMC JSON-RPC Version: %s', xbmc_rpc_version)
-
- # ok, XBMC version is supported
- self.use_json_notifications[host] = True
-
- # send the text message
- resp = self.request(host, [('GUI.ShowNotification', {'title':self.default_title, 'message':message, 'image':self.couch_logo_url})])
- for result in resp:
- if (result.get('result') and result['result'] == 'OK'):
- log.debug('Message delivered successfully!')
- success = True
- break
- elif (result.get('error')):
- log.error('XBMC error; %s: %s (%s)', (result['id'], result['error']['message'], result['error']['code']))
- break
-
- # error getting version info (we do have contact with XBMC though)
- elif (result.get('error')):
- log.error('XBMC error; %s: %s (%s)', (result['id'], result['error']['message'], result['error']['code']))
-
- log.debug('Use JSON notifications: %s ', self.use_json_notifications)
-
- return success
-
- def notifyXBMCnoJSON(self, host, data):
-
- server = 'http://%s/xbmcCmds/' % host
-
- # Notification(title, message [, timeout , image])
- cmd = "xbmcHttp?command=ExecBuiltIn(Notification(%s,%s,'',%s))" % (urllib.quote(data['title']), urllib.quote(data['message']), urllib.quote(self.couch_logo_url))
- server += cmd
-
- # I have no idea what to set to, just tried text/plain and seems to be working :)
- headers = {
- 'Content-Type': 'text/plain',
- }
-
- # authentication support
- if self.conf('password'):
- base64string = base64.encodestring('%s:%s' % (self.conf('username'), self.conf('password'))).replace('\n', '')
- headers['Authorization'] = 'Basic %s' % base64string
-
- try:
- log.debug('Sending non-JSON-type request to %s: %s', (host, data))
-
- # response wil either be 'OK':
- #
- # OK
- #
- #
- # or 'Error':
- #
- # Error:
- #
- #
- response = self.urlopen(server, headers = headers)
-
- if 'OK' in response:
- log.debug('Returned from non-JSON-type request %s: %s', (host, response))
- # manually fake expected response array
- return [{'result': 'OK'}]
- else:
- log.error('Returned from non-JSON-type request %s: %s', (host, response))
- # manually fake expected response array
- return [{'result': 'Error'}]
-
- except:
- log.error('Failed sending non-JSON-type request to XBMC: %s', traceback.format_exc())
- return [{'result': 'Error'}]
-
- def request(self, host, requests):
- server = 'http://%s/jsonrpc' % host
-
- data = []
- for req in requests:
- method, kwargs = req
- data.append({
- 'method': method,
- 'params': kwargs,
- 'jsonrpc': '2.0',
- 'id': method,
- })
- data = json.dumps(data)
-
- headers = {
- 'Content-Type': 'application/json',
- }
-
- if self.conf('password'):
- base64string = base64.encodestring('%s:%s' % (self.conf('username'), self.conf('password'))).replace('\n', '')
- headers['Authorization'] = 'Basic %s' % base64string
-
- try:
- log.debug('Sending request to %s: %s', (host, data))
- rdata = self.urlopen(server, headers = headers, params = data, multipart = True)
- response = json.loads(rdata)
- log.debug('Returned from request %s: %s', (host, response))
-
- return response
- except:
- log.error('Failed sending request to XBMC: %s', traceback.format_exc())
- return []
-
diff --git a/couchpotato/core/notifications/xmpp_.py b/couchpotato/core/notifications/xmpp_.py
new file mode 100644
index 0000000000..f9916cd020
--- /dev/null
+++ b/couchpotato/core/notifications/xmpp_.py
@@ -0,0 +1,96 @@
+from time import sleep
+import traceback
+
+from couchpotato.core.logger import CPLog
+from couchpotato.core.notifications.base import Notification
+import xmpp
+
+
+log = CPLog(__name__)
+
+autoload = 'Xmpp'
+
+
+class Xmpp(Notification):
+
+ def notify(self, message = '', data = None, listener = None):
+ if not data: data = {}
+
+ try:
+ jid = xmpp.protocol.JID(self.conf('username'))
+ client = xmpp.Client(jid.getDomain(), debug = [])
+
+ # Connect
+ if not client.connect(server = (self.conf('hostname'), self.conf('port'))):
+ log.error('XMPP failed: Connection to server failed.')
+ return False
+
+ # Authenticate
+ if not client.auth(jid.getNode(), self.conf('password'), resource = jid.getResource()):
+ log.error('XMPP failed: Failed to authenticate.')
+ return False
+
+ # Send message
+ client.send(xmpp.protocol.Message(to = self.conf('to'), body = message, typ = 'chat'))
+
+ # Disconnect
+ # some older servers will not send the message if you disconnect immediately after sending
+ sleep(1)
+ client.disconnect()
+
+ log.info('XMPP notifications sent.')
+ return True
+
+ except:
+ log.error('XMPP failed: %s', traceback.format_exc())
+
+ return False
+
+
+config = [{
+ 'name': 'xmpp',
+ 'groups': [
+ {
+ 'tab': 'notifications',
+ 'list': 'notification_providers',
+ 'name': 'xmpp',
+ 'label': 'XMPP',
+ 'description`': 'for Jabber, Hangouts (Google Talk), AIM...',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': 0,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'username',
+ 'description': 'User sending the message. For Hangouts, e-mail of a single-step authentication Google account.',
+ },
+ {
+ 'name': 'password',
+ 'type': 'Password',
+ },
+ {
+ 'name': 'hostname',
+ 'default': 'talk.google.com',
+ },
+ {
+ 'name': 'to',
+ 'description': 'Username (or e-mail for Hangouts) of the person to send the messages to.',
+ },
+ {
+ 'name': 'port',
+ 'type': 'int',
+ 'default': 5222,
+ },
+ {
+ 'name': 'on_snatch',
+ 'default': 0,
+ 'type': 'bool',
+ 'advanced': True,
+ 'description': 'Also send message when movie is snatched.',
+ },
+ ],
+ }
+ ],
+}]
diff --git a/couchpotato/core/plugins/automation.py b/couchpotato/core/plugins/automation.py
new file mode 100644
index 0000000000..e98a00a619
--- /dev/null
+++ b/couchpotato/core/plugins/automation.py
@@ -0,0 +1,105 @@
+from couchpotato.core.event import addEvent, fireEvent
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+from couchpotato.environment import Env
+
+log = CPLog(__name__)
+
+autoload = 'Automation'
+
+
+class Automation(Plugin):
+
+ def __init__(self):
+
+ addEvent('app.load', self.setCrons)
+
+ if not Env.get('dev'):
+ addEvent('app.load', self.addMovies)
+
+ addEvent('setting.save.automation.hour.after', self.setCrons)
+
+ def setCrons(self):
+ fireEvent('schedule.interval', 'automation.add_movies', self.addMovies, hours = self.conf('hour', default = 12))
+
+ def addMovies(self):
+
+ movies = fireEvent('automation.get_movies', merge = True)
+ movie_ids = []
+
+ for imdb_id in movies:
+
+ if self.shuttingDown():
+ break
+
+ prop_name = 'automation.added.%s' % imdb_id
+ added = Env.prop(prop_name, default = False)
+ if not added:
+ added_movie = fireEvent('movie.add', params = {'identifier': imdb_id}, force_readd = False, search_after = False, update_after = True, single = True)
+ if added_movie:
+ movie_ids.append(added_movie['_id'])
+ Env.prop(prop_name, True)
+
+ for movie_id in movie_ids:
+
+ if self.shuttingDown():
+ break
+
+ movie_dict = fireEvent('media.get', movie_id, single = True)
+ if movie_dict:
+ fireEvent('movie.searcher.single', movie_dict)
+
+ return True
+
+
+config = [{
+ 'name': 'automation',
+ 'order': 101,
+ 'groups': [
+ {
+ 'tab': 'automation',
+ 'name': 'automation',
+ 'label': 'Minimal movie requirements',
+ 'options': [
+ {
+ 'name': 'year',
+ 'default': 2011,
+ 'type': 'int',
+ },
+ {
+ 'name': 'votes',
+ 'default': 1000,
+ 'type': 'int',
+ },
+ {
+ 'name': 'rating',
+ 'default': 7.0,
+ 'type': 'float',
+ },
+ {
+ 'name': 'hour',
+ 'advanced': True,
+ 'default': 12,
+ 'label': 'Check every',
+ 'type': 'int',
+ 'unit': 'hours',
+ 'description': 'hours',
+ },
+ {
+ 'name': 'required_genres',
+ 'label': 'Required Genres',
+ 'default': '',
+ 'placeholder': 'Example: Action, Crime & Drama',
+ 'description': ('Ignore movies that don\'t contain at least one set of genres.', 'Sets are separated by "," and each word within a set must be separated with "&"')
+ },
+ {
+ 'name': 'ignored_genres',
+ 'label': 'Ignored Genres',
+ 'default': '',
+ 'placeholder': 'Example: Horror, Comedy & Drama & Romance',
+ 'description': 'Ignore movies that contain at least one set of genres. Sets work the same as above.'
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/plugins/automation/__init__.py b/couchpotato/core/plugins/automation/__init__.py
deleted file mode 100644
index b7b1ab2869..0000000000
--- a/couchpotato/core/plugins/automation/__init__.py
+++ /dev/null
@@ -1,42 +0,0 @@
-from .main import Automation
-
-def start():
- return Automation()
-
-config = [{
- 'name': 'automation',
- 'order': 101,
- 'groups': [
- {
- 'tab': 'automation',
- 'name': 'automation',
- 'label': 'Minimal movie requirements',
- 'options': [
- {
- 'name': 'year',
- 'default': 2011,
- 'type': 'int',
- },
- {
- 'name': 'votes',
- 'default': 1000,
- 'type': 'int',
- },
- {
- 'name': 'rating',
- 'default': 7.0,
- 'type': 'float',
- },
- {
- 'name': 'hour',
- 'advanced': True,
- 'default': 12,
- 'label': 'Check every',
- 'type': 'int',
- 'unit': 'hours',
- 'description': 'hours',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/plugins/automation/main.py b/couchpotato/core/plugins/automation/main.py
deleted file mode 100644
index f4ede40dd4..0000000000
--- a/couchpotato/core/plugins/automation/main.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from couchpotato.core.event import addEvent, fireEvent
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.environment import Env
-
-log = CPLog(__name__)
-
-
-class Automation(Plugin):
-
- def __init__(self):
-
- fireEvent('schedule.interval', 'automation.add_movies', self.addMovies, hours = self.conf('hour', default = 12))
-
- if not Env.get('dev'):
- addEvent('app.load', self.addMovies)
-
- def addMovies(self):
-
- movies = fireEvent('automation.get_movies', merge = True)
- movie_ids = []
-
- for imdb_id in movies:
- prop_name = 'automation.added.%s' % imdb_id
- added = Env.prop(prop_name, default = False)
- if not added:
- added_movie = fireEvent('movie.add', params = {'identifier': imdb_id}, force_readd = False, search_after = False, update_library = True, single = True)
- if added_movie:
- movie_ids.append(added_movie['id'])
- Env.prop(prop_name, True)
-
- for movie_id in movie_ids:
- movie_dict = fireEvent('movie.get', movie_id, single = True)
- fireEvent('searcher.single', movie_dict)
diff --git a/couchpotato/core/plugins/base.py b/couchpotato/core/plugins/base.py
index 9330631de9..abfa5fd5e6 100644
--- a/couchpotato/core/plugins/base.py
+++ b/couchpotato/core/plugins/base.py
@@ -1,174 +1,245 @@
-from StringIO import StringIO
-from couchpotato import addView
-from couchpotato.core.event import fireEvent, addEvent
-from couchpotato.core.helpers.encoding import tryUrlencode, ss, toSafeString
-from couchpotato.core.helpers.variable import getExt, md5
-from couchpotato.core.logger import CPLog
-from couchpotato.environment import Env
-from flask.templating import render_template_string
-from multipartpost import MultipartPostHandler
+import threading
+from urllib import quote, getproxies
from urlparse import urlparse
-import cookielib
-import glob
-import gzip
-import math
import os.path
-import re
import time
import traceback
-import urllib2
+
+from couchpotato.core.event import fireEvent, addEvent
+from couchpotato.core.helpers.encoding import ss, toSafeString, \
+ toUnicode, sp
+from couchpotato.core.helpers.variable import md5, isLocalIP, scanForPassword, tryInt, getIdentifier, \
+ randomString
+from couchpotato.core.logger import CPLog
+from couchpotato.environment import Env
+import requests
+from requests.packages.urllib3 import Timeout
+from requests.packages.urllib3.exceptions import MaxRetryError
+from tornado import template
log = CPLog(__name__)
class Plugin(object):
+ _class_name = None
+ _database = None
+ plugin_path = None
+
enabled_option = 'enabled'
- auto_register_static = True
_needs_shutdown = False
+ _running = None
+ _locks = {}
+
+ user_agent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:40.0) Gecko/20100101 Firefox/40.0'
http_last_use = {}
+ http_last_use_queue = {}
http_time_between_calls = 0
http_failed_request = {}
http_failed_disabled = {}
+ def __new__(cls, *args, **kwargs):
+ new_plugin = super(Plugin, cls).__new__(cls)
+ new_plugin.registerPlugin()
+
+ return new_plugin
+
def registerPlugin(self):
addEvent('app.do_shutdown', self.doShutdown)
addEvent('plugin.running', self.isRunning)
+ self._running = []
- def conf(self, attr, value = None, default = None):
- return Env.setting(attr, self.getName().lower(), value = value, default = default)
-
- def getName(self):
- return self.__class__.__name__
+ # Setup database
+ if self._database:
+ addEvent('database.setup', self.databaseSetup)
- def renderTemplate(self, parent_file, template, **params):
+ def databaseSetup(self):
- template = open(os.path.join(os.path.dirname(parent_file), template), 'r').read()
- return render_template_string(template, **params)
+ for index_name in self._database:
+ klass = self._database[index_name]
- def registerStatic(self, plugin_file, add_to_head = True):
+ fireEvent('database.setup_index', index_name, klass)
- # Register plugin path
- self.plugin_path = os.path.dirname(plugin_file)
+ def conf(self, attr, value = None, default = None, section = None):
+ class_name = self.getName().lower().split(':')[0].lower()
+ return Env.setting(attr, section = section if section else class_name, value = value, default = default)
- # Get plugin_name from PluginName
- s1 = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', self.__class__.__name__)
- class_name = re.sub('([a-z0-9])([A-Z])', r'\1_\2', s1).lower()
+ def deleteConf(self, attr):
+ return Env._settings.delete(attr, section = self.getName().lower().split(':')[0].lower())
- path = 'api/%s/static/%s/' % (Env.setting('api_key'), class_name)
- addView(path + '', self.showStatic, static = True)
+ def getName(self):
+ return self._class_name or self.__class__.__name__
- if add_to_head:
- for f in glob.glob(os.path.join(self.plugin_path, 'static', '*')):
- ext = getExt(f)
- if ext in ['js', 'css']:
- fireEvent('register_%s' % ('script' if ext in 'js' else 'style'), path + os.path.basename(f), f)
+ def setName(self, name):
+ self._class_name = name
- def showStatic(self, filename):
- d = os.path.join(self.plugin_path, 'static')
+ def renderTemplate(self, parent_file, templ, **params):
- from flask.helpers import send_from_directory
- return send_from_directory(d, filename)
+ t = template.Template(open(os.path.join(os.path.dirname(parent_file), templ), 'r').read())
+ return t.generate(**params)
def createFile(self, path, content, binary = False):
- path = ss(path)
+ path = sp(path)
self.makeDir(os.path.dirname(path))
- try:
- f = open(path, 'w+' if not binary else 'w+b')
- f.write(content)
- f.close()
- os.chmod(path, Env.getPermission('file'))
- except Exception, e:
- log.error('Unable writing to file "%s": %s', (path, e))
+ if os.path.exists(path):
+ log.debug('%s already exists, overwriting file with new version', path)
+
+ write_type = 'w+' if not binary else 'w+b'
+
+ # Stream file using response object
+ if isinstance(content, requests.models.Response):
+
+ # Write file to temp
+ with open('%s.tmp' % path, write_type) as f:
+ for chunk in content.iter_content(chunk_size = 1048576):
+ if chunk: # filter out keep-alive new chunks
+ f.write(chunk)
+ f.flush()
+
+ # Rename to destination
+ os.rename('%s.tmp' % path, path)
+
+ else:
+ try:
+ f = open(path, write_type)
+ f.write(content)
+ f.close()
+ os.chmod(path, Env.getPermission('file'))
+ except:
+ log.error('Unable to write file "%s": %s', (path, traceback.format_exc()))
+ if os.path.isfile(path):
+ os.remove(path)
def makeDir(self, path):
- path = ss(path)
+ path = sp(path)
try:
if not os.path.isdir(path):
os.makedirs(path, Env.getPermission('folder'))
return True
- except Exception, e:
+ except Exception as e:
log.error('Unable to create folder "%s": %s', (path, e))
return False
+ def deleteEmptyFolder(self, folder, show_error = True, only_clean = None):
+ folder = sp(folder)
+
+ for item in os.listdir(folder):
+ full_folder = sp(os.path.join(folder, item))
+
+ if not only_clean or (item in only_clean and os.path.isdir(full_folder)):
+
+ for subfolder, dirs, files in os.walk(full_folder, topdown = False):
+
+ try:
+ os.rmdir(subfolder)
+ except:
+ if show_error:
+ log.info2('Couldn\'t remove directory %s: %s', (subfolder, traceback.format_exc()))
+
+ try:
+ os.rmdir(folder)
+ except:
+ if show_error:
+ log.error('Couldn\'t remove empty directory %s: %s', (folder, traceback.format_exc()))
+
# http request
- def urlopen(self, url, timeout = 30, params = None, headers = None, opener = None, multipart = False, show_error = True):
- url = ss(url)
+ def urlopen(self, url, timeout = 30, data = None, headers = None, files = None, show_error = True, stream = False):
+ url = quote(ss(url), safe = "%/:=&?~#+!$,;'@()*[]")
if not headers: headers = {}
- if not params: params = {}
+ if not data: data = {}
# Fill in some headers
- headers['Referer'] = headers.get('Referer', urlparse(url).hostname)
- headers['Host'] = headers.get('Host', urlparse(url).hostname)
- headers['User-Agent'] = headers.get('User-Agent', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0.2) Gecko/20100101 Firefox/10.0.2')
+ parsed_url = urlparse(url)
+ host = '%s%s' % (parsed_url.hostname, (':' + str(parsed_url.port) if parsed_url.port else ''))
+
+ headers['Referer'] = headers.get('Referer', '%s://%s' % (parsed_url.scheme, host))
+ headers['Host'] = headers.get('Host', None)
+ headers['User-Agent'] = headers.get('User-Agent', self.user_agent)
headers['Accept-encoding'] = headers.get('Accept-encoding', 'gzip')
+ headers['Connection'] = headers.get('Connection', 'keep-alive')
+ headers['Cache-Control'] = headers.get('Cache-Control', 'max-age=0')
+
+ use_proxy = Env.setting('use_proxy')
+ proxy_url = None
+
+ if use_proxy:
+ proxy_server = Env.setting('proxy_server')
+ proxy_username = Env.setting('proxy_username')
+ proxy_password = Env.setting('proxy_password')
+
+ if proxy_server:
+ loc = "{0}:{1}@{2}".format(proxy_username, proxy_password, proxy_server) if proxy_username else proxy_server
+ proxy_url = {
+ "http": "http://"+loc,
+ "https": "https://"+loc,
+ }
+ else:
+ proxy_url = getproxies()
- host = urlparse(url).hostname
+ r = Env.get('http_opener')
# Don't try for failed requests
if self.http_failed_disabled.get(host, 0) > 0:
if self.http_failed_disabled[host] > (time.time() - 900):
log.info2('Disabled calls to %s for 15 minutes because so many failed requests.', host)
if not show_error:
- raise
+ raise Exception('Disabled calls to %s for 15 minutes because so many failed requests' % host)
else:
return ''
else:
del self.http_failed_request[host]
del self.http_failed_disabled[host]
- self.wait(host)
+ self.wait(host, url)
+ status_code = None
try:
- if multipart:
- log.info('Opening multipart url: %s, params: %s', (url, [x for x in params.iterkeys()] if isinstance(params, dict) else 'with data'))
- request = urllib2.Request(url, params, headers)
-
- if opener:
- opener.add_handler(MultipartPostHandler())
- else:
- cookies = cookielib.CookieJar()
- opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookies), MultipartPostHandler)
-
- response = opener.open(request, timeout = timeout)
+ kwargs = {
+ 'headers': headers,
+ 'data': data if len(data) > 0 else None,
+ 'timeout': timeout,
+ 'files': files,
+ 'verify': False, #verify_ssl, Disable for now as to many wrongly implemented certificates..
+ 'stream': stream,
+ 'proxies': proxy_url,
+ }
+ method = 'post' if len(data) > 0 or files else 'get'
+
+ log.info('Opening url: %s %s, data: %s', (method, url, [x for x in data.keys()] if isinstance(data, dict) else 'with data'))
+ response = r.request(method, url, **kwargs)
+
+ status_code = response.status_code
+ if response.status_code == requests.codes.ok:
+ data = response if stream else response.content
else:
- log.info('Opening url: %s, params: %s', (url, [x for x in params.iterkeys()]))
- data = tryUrlencode(params) if len(params) > 0 else None
- request = urllib2.Request(url, data, headers)
-
- if opener:
- response = opener.open(request, timeout = timeout)
- else:
- response = urllib2.urlopen(request, timeout = timeout)
-
- # unzip if needed
- if response.info().get('Content-Encoding') == 'gzip':
- buf = StringIO(response.read())
- f = gzip.GzipFile(fileobj = buf)
- data = f.read()
- else:
- data = response.read()
+ response.raise_for_status()
self.http_failed_request[host] = 0
- except IOError:
+ except (IOError, MaxRetryError, Timeout):
if show_error:
- log.error('Failed opening url in %s: %s %s', (self.getName(), url, traceback.format_exc(1)))
+ log.error('Failed opening url in %s: %s %s', (self.getName(), url, traceback.format_exc(0)))
# Save failed requests by hosts
try:
+
+ # To many requests
+ if status_code in [429]:
+ self.http_failed_request[host] = 1
+ self.http_failed_disabled[host] = time.time()
+
if not self.http_failed_request.get(host):
self.http_failed_request[host] = 1
else:
self.http_failed_request[host] += 1
# Disable temporarily
- if self.http_failed_request[host] > 5:
+ if self.http_failed_request[host] > 5 and not isLocalIP(host):
self.http_failed_disabled[host] = time.time()
except:
@@ -180,16 +251,34 @@ def urlopen(self, url, timeout = 30, params = None, headers = None, opener = Non
return data
- def wait(self, host = ''):
- now = time.time()
+ def wait(self, host = '', url = ''):
+ if self.http_time_between_calls == 0:
+ return
- last_use = self.http_last_use.get(host, 0)
+ try:
+ if host not in self.http_last_use_queue:
+ self.http_last_use_queue[host] = []
- wait = math.ceil(last_use - now + self.http_time_between_calls)
+ self.http_last_use_queue[host].append(url)
+
+ while True and not self.shuttingDown():
+ wait = (self.http_last_use.get(host, 0) - time.time()) + self.http_time_between_calls
+
+ if self.http_last_use_queue[host][0] != url:
+ time.sleep(.1)
+ continue
+
+ if wait > 0:
+ log.debug('Waiting for %s, %d seconds', (self.getName(), max(1, wait)))
+ time.sleep(min(wait, 30))
+ else:
+ self.http_last_use_queue[host] = self.http_last_use_queue[host][1:]
+ self.http_last_use[host] = time.time()
+ break
+ except:
+ log.error('Failed handling waiting call: %s', traceback.format_exc())
+ time.sleep(self.http_time_between_calls)
- if wait > 0:
- log.debug('Waiting for %s, %d seconds', (self.getName(), wait))
- time.sleep(last_use - now + self.http_time_between_calls)
def beforeCall(self, handler):
self.isRunning('%s.%s' % (self.getName(), handler.__name__))
@@ -197,7 +286,7 @@ def beforeCall(self, handler):
def afterCall(self, handler):
self.isRunning('%s.%s' % (self.getName(), handler.__name__), False)
- def doShutdown(self):
+ def doShutdown(self, *args, **kwargs):
self.shuttingDown(True)
return True
@@ -209,9 +298,6 @@ def shuttingDown(self, value = None):
def isRunning(self, value = None, boolean = True):
- if not hasattr(self, '_running'):
- self._running = []
-
if value is None:
return self._running
@@ -223,55 +309,134 @@ def isRunning(self, value = None, boolean = True):
except:
log.error("Something went wrong when finishing the plugin function. Could not find the 'is_running' key")
-
def getCache(self, cache_key, url = None, **kwargs):
- cache_key = md5(ss(cache_key))
- cache = Env.get('cache').get(cache_key)
- if cache:
- if not Env.get('dev'): log.debug('Getting cache %s', cache_key)
- return cache
+
+ use_cache = not len(kwargs.get('data', {})) > 0 and not kwargs.get('files')
+
+ if use_cache:
+ cache_key_md5 = md5(cache_key)
+ cache = Env.get('cache').get(cache_key_md5)
+ if cache:
+ if not Env.get('dev'): log.debug('Getting cache %s', cache_key)
+ return cache
if url:
try:
cache_timeout = 300
- if kwargs.get('cache_timeout'):
+ if 'cache_timeout' in kwargs:
cache_timeout = kwargs.get('cache_timeout')
del kwargs['cache_timeout']
data = self.urlopen(url, **kwargs)
- if data:
+ if data and cache_timeout > 0 and use_cache:
self.setCache(cache_key, data, timeout = cache_timeout)
return data
except:
if not kwargs.get('show_error', True):
raise
+ log.debug('Failed getting cache: %s', (traceback.format_exc(0)))
return ''
def setCache(self, cache_key, value, timeout = 300):
+ cache_key_md5 = md5(cache_key)
log.debug('Setting cache %s', cache_key)
- Env.get('cache').set(cache_key, value, timeout)
+ Env.get('cache').set(cache_key_md5, value, timeout)
return value
- def createNzbName(self, data, movie):
- tag = self.cpTag(movie)
- return '%s%s' % (toSafeString(data.get('name')[:127 - len(tag)]), tag)
+ def createNzbName(self, data, media, unique_tag = False):
+ release_name = data.get('name')
+ tag = self.cpTag(media, unique_tag = unique_tag)
+
+ # Check if password is filename
+ name_password = scanForPassword(data.get('name'))
+ if name_password:
+ release_name, password = name_password
+ tag += '{{%s}}' % password
+ elif data.get('password'):
+ tag += '{{%s}}' % data.get('password')
- def createFileName(self, data, filedata, movie):
- name = os.path.join(self.createNzbName(data, movie))
- if data.get('type') == 'nzb' and 'DOCTYPE nzb' not in filedata and '' not in filedata:
+ max_length = 127 - len(tag) # Some filesystems don't support 128+ long filenames
+ return '%s%s' % (toSafeString(toUnicode(release_name)[:max_length]), tag)
+
+ def createFileName(self, data, filedata, media, unique_tag = False):
+ name = self.createNzbName(data, media, unique_tag = unique_tag)
+ if data.get('protocol') == 'nzb' and 'DOCTYPE nzb' not in filedata and '' not in filedata:
return '%s.%s' % (name, 'rar')
- return '%s.%s' % (name, data.get('type'))
+ return '%s.%s' % (name, data.get('protocol'))
+
+ def cpTag(self, media, unique_tag = False):
- def cpTag(self, movie):
- if Env.setting('enabled', 'renamer'):
- return '.cp(' + movie['library'].get('identifier') + ')' if movie['library'].get('identifier') else ''
+ tag = ''
+ if Env.setting('enabled', 'renamer') or unique_tag:
+ identifier = getIdentifier(media) or ''
+ unique_tag = ', ' + randomString() if unique_tag else ''
- return ''
+ tag = '.cp('
+ tag += identifier
+ tag += ', ' if unique_tag and identifier else ''
+ tag += randomString() if unique_tag else ''
+ tag += ')'
+
+ return tag if len(tag) > 7 else ''
+
+ def checkFilesChanged(self, files, unchanged_for = 60):
+ now = time.time()
+ file_too_new = False
+
+ file_time = []
+ for cur_file in files:
+
+ # File got removed while checking
+ if not os.path.isfile(cur_file):
+ file_too_new = now
+ break
+
+ # File has changed in last 60 seconds
+ file_time = self.getFileTimes(cur_file)
+ for t in file_time:
+ if t > now - unchanged_for:
+ file_too_new = tryInt(time.time() - t)
+ break
+
+ if file_too_new:
+ break
+
+ if file_too_new:
+ try:
+ time_string = time.ctime(file_time[0])
+ except:
+ try:
+ time_string = time.ctime(file_time[1])
+ except:
+ time_string = 'unknown'
+
+ return file_too_new, time_string
+
+ return False, None
+
+ def getFileTimes(self, file_path):
+ return [os.path.getmtime(file_path), os.path.getctime(file_path) if os.name != 'posix' else 0]
def isDisabled(self):
return not self.isEnabled()
def isEnabled(self):
- return self.conf(self.enabled_option) or self.conf(self.enabled_option) == None
+ return self.conf(self.enabled_option) or self.conf(self.enabled_option) is None
+
+ def acquireLock(self, key):
+
+ lock = self._locks.get(key)
+ if not lock:
+ self._locks[key] = threading.RLock()
+
+ log.debug('Acquiring lock: %s', key)
+ self._locks.get(key).acquire()
+
+ def releaseLock(self, key):
+
+ lock = self._locks.get(key)
+ if lock:
+ log.debug('Releasing lock: %s', key)
+ self._locks.get(key).release()
diff --git a/couchpotato/core/plugins/browser.py b/couchpotato/core/plugins/browser.py
new file mode 100644
index 0000000000..660070a2e5
--- /dev/null
+++ b/couchpotato/core/plugins/browser.py
@@ -0,0 +1,125 @@
+import ctypes
+import os
+import string
+import traceback
+import time
+
+from couchpotato import CPLog
+from couchpotato.api import addApiView
+from couchpotato.core.event import addEvent
+from couchpotato.core.helpers.encoding import sp, ss, toUnicode
+from couchpotato.core.helpers.variable import getUserDir
+from couchpotato.core.plugins.base import Plugin
+
+
+log = CPLog(__name__)
+
+
+if os.name == 'nt':
+ import imp
+ try:
+ imp.find_module('win32file')
+ except:
+ # todo:: subclass ImportError for missing dependencies, vs. broken plugins?
+ raise ImportError("Missing the win32file module, which is a part of the prerequisite \
+ pywin32 package. You can get it from http://sourceforge.net/projects/pywin32/files/pywin32/")
+ else:
+ # noinspection PyUnresolvedReferences
+ import win32file
+
+autoload = 'FileBrowser'
+
+
+class FileBrowser(Plugin):
+
+ def __init__(self):
+ addApiView('directory.list', self.view, docs = {
+ 'desc': 'Return the directory list of a given directory',
+ 'params': {
+ 'path': {'desc': 'The directory to scan'},
+ 'show_hidden': {'desc': 'Also show hidden files'}
+ },
+ 'return': {'type': 'object', 'example': """{
+ 'is_root': bool, //is top most folder
+ 'parent': string, //parent folder of requested path
+ 'home': string, //user home folder
+ 'empty': bool, //directory is empty
+ 'dirs': array, //directory names
+}"""}
+ })
+
+ def getDirectories(self, path = '/', show_hidden = True):
+
+ # Return driveletters or root if path is empty
+ if path == '/' or not path or path == '\\':
+ if os.name == 'nt':
+ return self.getDriveLetters()
+ path = '/'
+
+ dirs = []
+ path = sp(path)
+ for f in os.listdir(path):
+ p = sp(os.path.join(path, f))
+ if os.path.isdir(p) and ((self.is_hidden(p) and bool(int(show_hidden))) or not self.is_hidden(p)):
+ dirs.append(toUnicode('%s%s' % (p, os.path.sep)))
+
+ return sorted(dirs)
+
+ def getFiles(self):
+ pass
+
+ def getDriveLetters(self):
+
+ driveletters = []
+ for drive in string.ascii_uppercase:
+ if win32file.GetDriveType(drive + ':') in [win32file.DRIVE_FIXED, win32file.DRIVE_REMOTE, win32file.DRIVE_RAMDISK, win32file.DRIVE_REMOVABLE]:
+ driveletters.append(drive + ':\\')
+
+ return driveletters
+
+ def view(self, path = '/', show_hidden = True, **kwargs):
+
+ home = getUserDir()
+
+ if not path:
+ path = home
+
+ try:
+ dirs = self.getDirectories(path = path, show_hidden = show_hidden)
+ except:
+ log.error('Failed getting directory "%s" : %s', (path, traceback.format_exc()))
+ dirs = []
+
+ parent = os.path.dirname(path.rstrip(os.path.sep))
+ if parent == path.rstrip(os.path.sep):
+ parent = '/'
+ elif parent != '/' and parent[-2:] != ':\\':
+ parent += os.path.sep
+
+ return {
+ 'is_root': path == '/',
+ 'empty': len(dirs) == 0,
+ 'parent': parent,
+ 'home': home + os.path.sep,
+ 'platform': os.name,
+ 'dirs': dirs,
+ }
+
+
+ def is_hidden(self, filepath):
+ name = ss(os.path.basename(os.path.abspath(filepath)))
+ return name.startswith('.') or self.has_hidden_attribute(filepath)
+
+ def has_hidden_attribute(self, filepath):
+
+ result = False
+ try:
+ attrs = ctypes.windll.kernel32.GetFileAttributesW(sp(filepath)) #@UndefinedVariable
+ assert attrs != -1
+ result = bool(attrs & 2)
+ except (AttributeError, AssertionError):
+ pass
+ except:
+ log.error('Failed getting hidden attribute: %s', traceback.format_exc())
+
+ return result
diff --git a/couchpotato/core/plugins/browser/__init__.py b/couchpotato/core/plugins/browser/__init__.py
deleted file mode 100644
index 976fcd102c..0000000000
--- a/couchpotato/core/plugins/browser/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import FileBrowser
-
-def start():
- return FileBrowser()
-
-config = []
diff --git a/couchpotato/core/plugins/browser/main.py b/couchpotato/core/plugins/browser/main.py
deleted file mode 100644
index 3eee85bb91..0000000000
--- a/couchpotato/core/plugins/browser/main.py
+++ /dev/null
@@ -1,106 +0,0 @@
-from couchpotato.api import addApiView
-from couchpotato.core.helpers.request import getParam, jsonified
-from couchpotato.core.helpers.variable import getUserDir
-from couchpotato.core.plugins.base import Plugin
-import ctypes
-import os
-import string
-
-if os.name == 'nt':
- import imp
- try:
- imp.find_module('win32file')
- except:
- # todo:: subclass ImportError for missing dependencies, vs. broken plugins?
- raise ImportError("Missing the win32file module, which is a part of the prerequisite \
- pywin32 package. You can get it from http://sourceforge.net/projects/pywin32/files/pywin32/");
- else:
- import win32file #@UnresolvedImport
-
-class FileBrowser(Plugin):
-
- def __init__(self):
- addApiView('directory.list', self.view, docs = {
- 'desc': 'Return the directory list of a given directory',
- 'params': {
- 'path': {'desc': 'The directory to scan'},
- 'show_hidden': {'desc': 'Also show hidden files'}
- },
- 'return': {'type': 'object', 'example': """{
- 'is_root': bool, //is top most folder
- 'parent': string, //parent folder of requested path
- 'home': string, //user home folder
- 'empty': bool, //directory is empty
- 'dirs': array, //directory names
-}"""}
- })
-
- def getDirectories(self, path = '/', show_hidden = True):
-
- # Return driveletters or root if path is empty
- if path == '/' or not path or path == '\\':
- if os.name == 'nt':
- return self.getDriveLetters()
- path = '/'
-
- dirs = []
- for f in os.listdir(path):
- p = os.path.join(path, f)
- if os.path.isdir(p) and ((self.is_hidden(p) and bool(int(show_hidden))) or not self.is_hidden(p)):
- dirs.append(p + os.path.sep)
-
- return sorted(dirs)
-
- def getFiles(self):
- pass
-
- def getDriveLetters(self):
-
- driveletters = []
- for drive in string.ascii_uppercase:
- if win32file.GetDriveType(drive + ":") in [win32file.DRIVE_FIXED, win32file.DRIVE_REMOTE, win32file.DRIVE_RAMDISK, win32file.DRIVE_REMOVABLE]:
- driveletters.append(drive + ":\\")
-
- return driveletters
-
- def view(self):
-
- path = getParam('path', '/')
- home = getUserDir()
-
- if not path:
- path = home
-
- try:
- dirs = self.getDirectories(path = path, show_hidden = getParam('show_hidden', True))
- except:
- dirs = []
-
- parent = os.path.dirname(path.rstrip(os.path.sep))
- if parent == path.rstrip(os.path.sep):
- parent = '/'
- elif parent != '/' and parent[-2:] != ':\\':
- parent += os.path.sep
-
- return jsonified({
- 'is_root': path == '/',
- 'empty': len(dirs) == 0,
- 'parent': parent,
- 'home': home + os.path.sep,
- 'platform': os.name,
- 'dirs': dirs,
- })
-
-
- def is_hidden(self, filepath):
- name = os.path.basename(os.path.abspath(filepath))
- return name.startswith('.') or self.has_hidden_attribute(filepath)
-
- def has_hidden_attribute(self, filepath):
- try:
- attrs = ctypes.windll.kernel32.GetFileAttributesW(unicode(filepath)) #@UndefinedVariable
- assert attrs != -1
- result = bool(attrs & 2)
- except (AttributeError, AssertionError):
- result = False
- return result
diff --git a/couchpotato/core/plugins/category/__init__.py b/couchpotato/core/plugins/category/__init__.py
new file mode 100644
index 0000000000..d147092f3d
--- /dev/null
+++ b/couchpotato/core/plugins/category/__init__.py
@@ -0,0 +1,5 @@
+from .main import CategoryPlugin
+
+
+def autoload():
+ return CategoryPlugin()
diff --git a/couchpotato/core/plugins/category/index.py b/couchpotato/core/plugins/category/index.py
new file mode 100644
index 0000000000..6445de3ca8
--- /dev/null
+++ b/couchpotato/core/plugins/category/index.py
@@ -0,0 +1,31 @@
+from CodernityDB.tree_index import TreeBasedIndex
+
+
+class CategoryIndex(TreeBasedIndex):
+ _version = 1
+
+ def __init__(self, *args, **kwargs):
+ kwargs['key_format'] = 'i'
+ super(CategoryIndex, self).__init__(*args, **kwargs)
+
+ def make_key(self, key):
+ return key
+
+ def make_key_value(self, data):
+ if data.get('_t') == 'category':
+ return data.get('order', -99), None
+
+
+class CategoryMediaIndex(TreeBasedIndex):
+ _version = 1
+
+ def __init__(self, *args, **kwargs):
+ kwargs['key_format'] = '32s'
+ super(CategoryMediaIndex, self).__init__(*args, **kwargs)
+
+ def make_key(self, key):
+ return str(key)
+
+ def make_key_value(self, data):
+ if data.get('_t') == 'media' and data.get('category_id'):
+ return str(data.get('category_id')), None
diff --git a/couchpotato/core/plugins/category/main.py b/couchpotato/core/plugins/category/main.py
new file mode 100644
index 0000000000..4abc94c03c
--- /dev/null
+++ b/couchpotato/core/plugins/category/main.py
@@ -0,0 +1,150 @@
+import traceback
+
+from couchpotato import get_db
+from couchpotato.api import addApiView
+from couchpotato.core.event import addEvent
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+from .index import CategoryIndex, CategoryMediaIndex
+
+
+log = CPLog(__name__)
+
+
+class CategoryPlugin(Plugin):
+
+ _database = {
+ 'category': CategoryIndex,
+ 'category_media': CategoryMediaIndex,
+ }
+
+ def __init__(self):
+ addApiView('category.save', self.save)
+ addApiView('category.save_order', self.saveOrder)
+ addApiView('category.delete', self.delete)
+ addApiView('category.list', self.allView, docs = {
+ 'desc': 'List all available categories',
+ 'return': {'type': 'object', 'example': """{
+ 'success': True,
+ 'categories': array, categories
+}"""}
+ })
+
+ addEvent('category.all', self.all)
+
+ def allView(self, **kwargs):
+
+ return {
+ 'success': True,
+ 'categories': self.all()
+ }
+
+ def all(self):
+
+ db = get_db()
+ categories = db.all('category', with_doc = True)
+
+ return [x['doc'] for x in categories]
+
+ def save(self, **kwargs):
+
+ try:
+ db = get_db()
+
+ category = {
+ '_t': 'category',
+ 'order': kwargs.get('order', 999),
+ 'label': toUnicode(kwargs.get('label', '')),
+ 'ignored': toUnicode(kwargs.get('ignored', '')),
+ 'preferred': toUnicode(kwargs.get('preferred', '')),
+ 'required': toUnicode(kwargs.get('required', '')),
+ 'destination': toUnicode(kwargs.get('destination', '')),
+ }
+
+ try:
+ c = db.get('id', kwargs.get('id'))
+ category['order'] = c.get('order', category['order'])
+ c.update(category)
+
+ db.update(c)
+ except:
+ c = db.insert(category)
+ c.update(category)
+
+ return {
+ 'success': True,
+ 'category': c
+ }
+ except:
+ log.error('Failed: %s', traceback.format_exc())
+
+ return {
+ 'success': False,
+ 'category': None
+ }
+
+ def saveOrder(self, **kwargs):
+
+ try:
+ db = get_db()
+
+ order = 0
+ for category_id in kwargs.get('ids', []):
+ c = db.get('id', category_id)
+ c['order'] = order
+ db.update(c)
+
+ order += 1
+
+ return {
+ 'success': True
+ }
+ except:
+ log.error('Failed: %s', traceback.format_exc())
+
+ return {
+ 'success': False
+ }
+
+ def delete(self, id = None, **kwargs):
+
+ try:
+ db = get_db()
+
+ success = False
+ message = ''
+ try:
+ c = db.get('id', id)
+ db.delete(c)
+
+ # Force defaults on all empty category movies
+ self.removeFromMovie(id)
+
+ success = True
+ except:
+ message = log.error('Failed deleting category: %s', traceback.format_exc())
+
+ return {
+ 'success': success,
+ 'message': message
+ }
+ except:
+ log.error('Failed: %s', traceback.format_exc())
+
+ return {
+ 'success': False
+ }
+
+ def removeFromMovie(self, category_id):
+
+ try:
+ db = get_db()
+ movies = [x['doc'] for x in db.get_many('category_media', category_id, with_doc = True)]
+
+ if len(movies) > 0:
+ for movie in movies:
+ movie['category_id'] = None
+ db.update(movie)
+ except:
+ log.error('Failed: %s', traceback.format_exc())
diff --git a/couchpotato/core/plugins/category/static/category.js b/couchpotato/core/plugins/category/static/category.js
new file mode 100644
index 0000000000..916110224c
--- /dev/null
+++ b/couchpotato/core/plugins/category/static/category.js
@@ -0,0 +1,328 @@
+var CategoryListBase = new Class({
+
+ initialize: function(){
+ var self = this;
+
+ App.addEvent('loadSettings', self.addSettings.bind(self));
+ },
+
+ setup: function(categories){
+ var self = this;
+
+ self.categories = [];
+ Array.each(categories, self.createCategory.bind(self));
+
+ },
+
+ addSettings: function(){
+ var self = this;
+
+ self.settings = App.getPage('Settings');
+ self.settings.addEvent('create', function(){
+ var tab = self.settings.createSubTab('category', {
+ 'label': 'Categories',
+ 'name': 'category',
+ 'subtab_label': 'Category & filtering'
+ }, self.settings.tabs.searcher ,'searcher');
+
+ self.tab = tab.tab;
+ self.content = tab.content;
+
+ self.createList();
+ self.createOrdering();
+
+ });
+
+ // Add categories in renamer
+ self.settings.addEvent('create', function(){
+ var renamer_group = self.settings.tabs.renamer.groups.renamer;
+
+ self.categories.each(function(category){
+
+ var input = new Option.Directory('section_name', 'option.name', category.get('destination'), {
+ 'name': category.get('label')
+ });
+ input.inject(renamer_group.getElement('.renamer_to'));
+ input.fireEvent('injected');
+
+ input.save = function(){
+ category.data.destination = input.getValue();
+ category.save();
+ };
+
+ });
+
+ });
+
+ },
+
+ createList: function(){
+ var self = this;
+
+ var count = self.categories.length;
+
+ self.settings.createGroup({
+ 'label': 'Categories',
+ 'description': 'Create categories, each one extending global filters. (Needs refresh \'' +(App.isMac() ? 'CMD+R' : 'F5')+ '\' after editing)'
+ }).inject(self.content).adopt(
+ self.category_container = new Element('div.container'),
+ new Element('a.add_new_category', {
+ 'text': count > 0 ? 'Create another category' : 'Click here to create a category.',
+ 'events': {
+ 'click': function(){
+ var category = self.createCategory();
+ $(category).inject(self.category_container);
+ }
+ }
+ })
+ );
+
+ // Add categories, that aren't part of the core (for editing)
+ Array.each(self.categories, function(category){
+ $(category).inject(self.category_container);
+ });
+
+ },
+
+ getCategory: function(id){
+ return this.categories.filter(function(category){
+ return category.data._id == id;
+ }).pick();
+ },
+
+ getAll: function(){
+ return this.categories;
+ },
+
+ createCategory: function(data){
+ var self = this;
+
+ data = data || {'id': randomString()};
+ var category = new Category(data);
+ self.categories.include(category);
+
+ return category;
+ },
+
+ createOrdering: function(){
+ var self = this;
+
+ var category_list;
+ self.settings.createGroup({
+ 'label': 'Category ordering'
+ }).adopt(
+ new Element('.ctrlHolder#category_ordering').adopt(
+ new Element('label[text=Order]'),
+ category_list = new Element('ul'),
+ new Element('p.formHint', {
+ 'html': 'Change the order the categories are in the dropdown list.'
+ })
+ )
+ ).inject(self.content);
+
+ Array.each(self.categories, function(category){
+ new Element('li', {'data-id': category.data._id}).adopt(
+ new Element('span.category_label', {
+ 'text': category.data.label
+ }),
+ new Element('span.handle.icon-handle')
+ ).inject(category_list);
+
+ });
+
+ // Sortable
+ self.category_sortable = new Sortables(category_list, {
+ 'revert': true,
+ 'handle': '',
+ 'opacity': 0.5,
+ 'onComplete': self.saveOrdering.bind(self)
+ });
+
+ },
+
+ saveOrdering: function(){
+ var self = this;
+
+ var ids = [];
+
+ self.category_sortable.list.getElements('li').each(function(el){
+ ids.include(el.get('data-id'));
+ });
+
+ Api.request('category.save_order', {
+ 'data': {
+ 'ids': ids
+ }
+ });
+
+ }
+
+});
+
+window.CategoryList = new CategoryListBase();
+
+var Category = new Class({
+
+ data: {},
+
+ initialize: function(data){
+ var self = this;
+
+ self.data = data;
+
+ self.create();
+
+ self.el.addEvents({
+ 'change:relay(select)': self.save.bind(self, 0),
+ 'keyup:relay(input[type=text])': self.save.bind(self, [300])
+ });
+
+ },
+
+ create: function(){
+ var self = this;
+
+ var data = self.data;
+
+ self.el = new Element('div.category').adopt(
+ self.delete_button = new Element('span.delete.icon-delete', {
+ 'events': {
+ 'click': self.del.bind(self)
+ }
+ }),
+ new Element('.category_label.ctrlHolder').adopt(
+ new Element('label', {'text':'Name'}),
+ new Element('input', {
+ 'type':'text',
+ 'value': data.label,
+ 'placeholder': 'Example: Kids, Horror or His'
+ }),
+ new Element('p.formHint', {'text': 'See global filters for explanation.'})
+ ),
+ new Element('.category_preferred.ctrlHolder').adopt(
+ new Element('label', {'text':'Preferred'}),
+ new Element('input', {
+ 'type':'text',
+ 'value': data.preferred,
+ 'placeholder': 'Blu-ray, DTS'
+ })
+ ),
+ new Element('.category_required.ctrlHolder').adopt(
+ new Element('label', {'text':'Required'}),
+ new Element('input', {
+ 'type':'text',
+ 'value': data.required,
+ 'placeholder': 'Example: DTS, AC3 & English'
+ })
+ ),
+ new Element('.category_ignored.ctrlHolder').adopt(
+ new Element('label', {'text':'Ignored'}),
+ new Element('input', {
+ 'type':'text',
+ 'value': data.ignored,
+ 'placeholder': 'Example: dubbed, swesub, french'
+ })
+ )
+ );
+
+ self.makeSortable();
+
+ },
+
+ save: function(delay){
+ var self = this;
+
+ if(self.save_timer) clearRequestTimeout(self.save_timer);
+ self.save_timer = requestTimeout(function(){
+
+ Api.request('category.save', {
+ 'data': self.getData(),
+ 'useSpinner': true,
+ 'spinnerOptions': {
+ 'target': self.el
+ },
+ 'onComplete': function(json){
+ if(json.success){
+ self.data = json.category;
+ }
+ }
+ });
+
+ }, delay || 0);
+
+ },
+
+ getData: function(){
+ var self = this;
+
+ return {
+ 'id' : self.data._id,
+ 'label' : self.el.getElement('.category_label input').get('value'),
+ 'required' : self.el.getElement('.category_required input').get('value'),
+ 'preferred' : self.el.getElement('.category_preferred input').get('value'),
+ 'ignored' : self.el.getElement('.category_ignored input').get('value'),
+ 'destination': self.data.destination
+ };
+ },
+
+ del: function(){
+ var self = this;
+
+ if(self.data.label === undefined){
+ self.el.destroy();
+ return;
+ }
+
+ var label = self.el.getElement('.category_label input').get('value');
+ var qObj = new Question('Are you sure you want to delete "'+label+'"?', '', [{
+ 'text': 'Delete "'+label+'"',
+ 'class': 'delete',
+ 'events': {
+ 'click': function(e){
+ (e).preventDefault();
+ Api.request('category.delete', {
+ 'data': {
+ 'id': self.data._id
+ },
+ 'useSpinner': true,
+ 'spinnerOptions': {
+ 'target': self.el
+ },
+ 'onComplete': function(json){
+ if(json.success) {
+ qObj.close();
+ self.el.destroy();
+ } else {
+ alert(json.message);
+ }
+ }
+ });
+ }
+ }
+ }, {
+ 'text': 'Cancel',
+ 'cancel': true
+ }]);
+
+ },
+
+ makeSortable: function(){
+ var self = this;
+
+ self.sortable = new Sortables(self.category_container, {
+ 'revert': true,
+ 'handle': '.handle',
+ 'opacity': 0.5,
+ 'onComplete': self.save.bind(self, 300)
+ });
+ },
+
+ get: function(attr){
+ return this.data[attr];
+ },
+
+ toElement: function(){
+ return this.el;
+ }
+
+});
diff --git a/couchpotato/core/plugins/category/static/category.scss b/couchpotato/core/plugins/category/static/category.scss
new file mode 100644
index 0000000000..f1568f07a4
--- /dev/null
+++ b/couchpotato/core/plugins/category/static/category.scss
@@ -0,0 +1,78 @@
+@import "_mixins";
+
+.add_new_category {
+ padding: 20px;
+ display: block;
+ text-align: center;
+ font-size: 20px;
+}
+
+.category {
+ margin-bottom: 20px;
+ position: relative;
+
+ > .delete {
+ position: absolute;
+ padding: $padding/3 $padding;
+ right: 0;
+ cursor: pointer;
+ opacity: 0.6;
+ color: #fd5353;
+ font-size: 1.5em;
+ z-index: 2;
+
+ &:hover {
+ opacity: 1;
+ }
+ }
+
+ .ctrlHolder:hover {
+ background: none;
+ }
+
+ .formHint {
+ opacity: 0.1;
+ }
+
+ &:hover .formHint {
+ opacity: 1;
+ }
+}
+
+#category_ordering {
+
+ ul {
+ float: left;
+ margin: 0;
+ width: 275px;
+ padding: 0;
+ }
+
+ li {
+ cursor: grab;
+ border-bottom: 1px solid transparent;
+ @include theme(border-color, off);
+ padding: 5px;
+ list-style: none;
+
+ &:last-child { border: 0; }
+
+ .check {
+ margin: 2px 10px 0 0;
+ vertical-align: top;
+ }
+
+ > span {
+ display: inline-block;
+ height: 20px;
+ vertical-align: top;
+ line-height: 20px;
+ }
+
+ .handle {
+ width: 20px;
+ float: right;
+ }
+ }
+
+}
diff --git a/couchpotato/core/plugins/profile/static/handle.png b/couchpotato/core/plugins/category/static/handle.png
similarity index 100%
rename from couchpotato/core/plugins/profile/static/handle.png
rename to couchpotato/core/plugins/category/static/handle.png
diff --git a/couchpotato/core/plugins/custom.py b/couchpotato/core/plugins/custom.py
new file mode 100644
index 0000000000..20b4c3f7a7
--- /dev/null
+++ b/couchpotato/core/plugins/custom.py
@@ -0,0 +1,25 @@
+import os
+
+from couchpotato.core.event import addEvent
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+from couchpotato.environment import Env
+
+
+log = CPLog(__name__)
+
+autoload = 'Custom'
+
+
+class Custom(Plugin):
+
+ def __init__(self):
+ addEvent('app.load', self.createStructure)
+
+ def createStructure(self):
+
+ custom_dir = os.path.join(Env.get('data_dir'), 'custom_plugins')
+
+ if not os.path.isdir(custom_dir):
+ self.makeDir(custom_dir)
+ self.createFile(os.path.join(custom_dir, '__init__.py'), '# Don\'t remove this file')
diff --git a/couchpotato/core/plugins/dashboard.py b/couchpotato/core/plugins/dashboard.py
new file mode 100644
index 0000000000..16dc4188e4
--- /dev/null
+++ b/couchpotato/core/plugins/dashboard.py
@@ -0,0 +1,116 @@
+import random as rndm
+import time
+from CodernityDB.database import RecordDeleted, RecordNotFound
+
+from couchpotato import get_db
+from couchpotato.api import addApiView
+from couchpotato.core.event import fireEvent
+from couchpotato.core.helpers.variable import splitString, tryInt
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+
+
+log = CPLog(__name__)
+
+autoload = 'Dashboard'
+
+
+class Dashboard(Plugin):
+
+ def __init__(self):
+ addApiView('dashboard.soon', self.getSoonView)
+
+ def getSoonView(self, limit_offset = None, random = False, late = False, **kwargs):
+
+ db = get_db()
+ now = time.time()
+
+ # Get profiles first, determine pre or post theater
+ profiles = fireEvent('profile.all', single = True)
+ pre_releases = fireEvent('quality.pre_releases', single = True)
+
+ # See what the profile contain and cache it
+ profile_pre = {}
+ for profile in profiles:
+ contains = {}
+ for q_identifier in profile.get('qualities', []):
+ contains['theater' if q_identifier in pre_releases else 'dvd'] = True
+
+ profile_pre[profile.get('_id')] = contains
+
+ # Add limit
+ limit = 12
+ if limit_offset:
+ splt = splitString(limit_offset) if isinstance(limit_offset, (str, unicode)) else limit_offset
+ limit = tryInt(splt[0])
+
+ # Get all active medias
+ active_ids = [x['_id'] for x in fireEvent('media.with_status', 'active', with_doc = False, single = True)]
+
+ medias = []
+
+ if len(active_ids) > 0:
+
+ # Order by title or randomize
+ if not random:
+ orders_ids = db.all('media_title')
+ active_ids = [x['_id'] for x in orders_ids if x['_id'] in active_ids]
+ else:
+ rndm.shuffle(active_ids)
+
+ for media_id in active_ids:
+ try:
+ media = db.get('id', media_id)
+ except RecordDeleted:
+ log.debug('Record already deleted: %s', media_id)
+ continue
+
+ except RecordNotFound:
+ log.debug('Record not found: %s', media_id)
+ continue
+
+ pp = profile_pre.get(media.get('profile_id'))
+ if not pp: continue
+
+ eta = media['info'].get('release_date', {}) or {}
+ coming_soon = False
+
+ # Theater quality
+ if pp.get('theater') and fireEvent('movie.searcher.could_be_released', True, eta, media['info']['year'], single = True):
+ coming_soon = 'theater'
+ elif pp.get('dvd') and fireEvent('movie.searcher.could_be_released', False, eta, media['info']['year'], single = True):
+ coming_soon = 'dvd'
+
+ if coming_soon:
+
+ # Don't list older movies
+ eta_date = eta.get(coming_soon)
+ eta_3month_passed = eta_date < (now - 7862400) # Release was more than 3 months ago
+
+ if (not late and not eta_3month_passed) or \
+ (late and eta_3month_passed):
+
+ add = True
+
+ # Check if it doesn't have any releases
+ if late:
+ media['releases'] = fireEvent('release.for_media', media['_id'], single = True)
+
+ for release in media.get('releases', []):
+ if release.get('status') in ['snatched', 'available', 'seeding', 'downloaded']:
+ add = False
+ break
+
+ if add:
+ medias.append(media)
+
+ if len(medias) >= limit:
+ break
+
+ return {
+ 'success': True,
+ 'empty': len(medias) == 0,
+ 'movies': medias,
+ }
+
+ getLateView = getSoonView
diff --git a/couchpotato/core/plugins/dashboard/__init__.py b/couchpotato/core/plugins/dashboard/__init__.py
deleted file mode 100644
index 81279291c0..0000000000
--- a/couchpotato/core/plugins/dashboard/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import Dashboard
-
-def start():
- return Dashboard()
-
-config = []
diff --git a/couchpotato/core/plugins/dashboard/main.py b/couchpotato/core/plugins/dashboard/main.py
deleted file mode 100644
index d5f9ef0be8..0000000000
--- a/couchpotato/core/plugins/dashboard/main.py
+++ /dev/null
@@ -1,120 +0,0 @@
-from couchpotato import get_session
-from couchpotato.api import addApiView
-from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.request import jsonified, getParams
-from couchpotato.core.helpers.variable import splitString, tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.core.settings.model import Movie
-from sqlalchemy.sql.expression import or_
-import random
-
-log = CPLog(__name__)
-
-
-class Dashboard(Plugin):
-
- def __init__(self):
-
- addApiView('dashboard.suggestions', self.suggestView)
- addApiView('dashboard.soon', self.getSoonView)
-
- def newSuggestions(self):
-
- movies = fireEvent('movie.list', status = ['active', 'done'], limit_offset = (20, 0), single = True)
- movie_identifiers = [m['library']['identifier'] for m in movies[1]]
-
- ignored_movies = fireEvent('movie.list', status = ['ignored', 'deleted'], limit_offset = (100, 0), single = True)
- ignored_identifiers = [m['library']['identifier'] for m in ignored_movies[1]]
-
- suggestions = fireEvent('movie.suggest', movies = movie_identifiers, ignore = ignored_identifiers, single = True)
- suggest_status = fireEvent('status.get', 'suggest', single = True)
-
- for suggestion in suggestions:
- fireEvent('movie.add', params = {'identifier': suggestion}, force_readd = False, search_after = False, status_id = suggest_status.get('id'))
-
- def suggestView(self):
-
- db = get_session()
-
- movies = db.query(Movie).limit(20).all()
- identifiers = [m.library.identifier for m in movies]
-
- suggestions = fireEvent('movie.suggest', movies = identifiers, single = True)
- print suggestions
-
- return jsonified({
- 'result': True,
- 'suggestions': suggestions
- })
-
- def getSoonView(self):
-
- params = getParams()
- db = get_session()
-
- # Get profiles first, determine pre or post theater
- profiles = fireEvent('profile.all', single = True)
- qualities = fireEvent('quality.all', single = True)
- pre_releases = fireEvent('quality.pre_releases', single = True)
-
- id_pre = {}
- for quality in qualities:
- id_pre[quality.get('id')] = quality.get('identifier') in pre_releases
-
- # See what the profile contain and cache it
- profile_pre = {}
- for profile in profiles:
- contains = {}
- for profile_type in profile.get('types', []):
- contains['theater' if id_pre.get(profile_type.get('quality_id')) else 'dvd'] = True
-
- profile_pre[profile.get('id')] = contains
-
- # Get all active movies
- q = db.query(Movie) \
- .join(Movie.profile, Movie.library) \
- .filter(or_(*[Movie.status.has(identifier = s) for s in ['active']])) \
- .group_by(Movie.id)
-
- # Add limit
- limit_offset = params.get('limit_offset')
- limit = 12
- if limit_offset:
- splt = splitString(limit_offset) if isinstance(limit_offset, (str, unicode)) else limit_offset
- limit = tryInt(splt[0])
-
- all_movies = q.all()
-
- if params.get('random', False):
- random.shuffle(all_movies)
-
- movies = []
- for movie in all_movies:
- pp = profile_pre.get(movie.profile.id)
- eta = movie.library.info.get('release_date', {})
- coming_soon = False
-
- # Theater quality
- if pp.get('theater') and fireEvent('searcher.could_be_released', True, eta, single = True):
- coming_soon = True
- if pp.get('dvd') and fireEvent('searcher.could_be_released', False, eta, single = True):
- coming_soon = True
-
- if coming_soon:
- temp = movie.to_dict({
- 'profile': {'types': {}},
- 'releases': {'files':{}, 'info': {}},
- 'library': {'titles': {}, 'files':{}},
- 'files': {},
- })
- movies.append(temp)
-
- if len(movies) >= limit:
- break
-
- return jsonified({
- 'success': True,
- 'empty': len(movies) == 0,
- 'movies': movies,
- })
diff --git a/couchpotato/core/plugins/file.py b/couchpotato/core/plugins/file.py
new file mode 100644
index 0000000000..56c5230ddc
--- /dev/null
+++ b/couchpotato/core/plugins/file.py
@@ -0,0 +1,115 @@
+import os.path
+import traceback
+
+from couchpotato import get_db
+from couchpotato.api import addApiView
+from couchpotato.core.event import addEvent, fireEvent
+from couchpotato.core.helpers.encoding import toUnicode, ss, sp
+from couchpotato.core.helpers.variable import md5, getExt, isSubFolder
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+from couchpotato.environment import Env
+from tornado.web import StaticFileHandler
+
+
+log = CPLog(__name__)
+
+autoload = 'FileManager'
+
+
+class FileManager(Plugin):
+
+ def __init__(self):
+ addEvent('file.download', self.download)
+
+ addApiView('file.cache/(.*)', self.showCacheFile, static = True, docs = {
+ 'desc': 'Return a file from the cp_data/cache directory',
+ 'params': {
+ 'filename': {'desc': 'path/filename of the wanted file'}
+ },
+ 'return': {'type': 'file'}
+ })
+
+ fireEvent('schedule.interval', 'file.cleanup', self.cleanup, hours = 24)
+
+ addEvent('app.test', self.doSubfolderTest)
+
+ def cleanup(self):
+
+ # Wait a bit after starting before cleanup
+ log.debug('Cleaning up unused files')
+
+ try:
+ db = get_db()
+ cache_dir = Env.get('cache_dir')
+ medias = db.all('media', with_doc = True)
+
+ files = []
+ for media in medias:
+ file_dict = media['doc'].get('files', {})
+ for x in file_dict.keys():
+ files.extend(file_dict[x])
+
+ for f in os.listdir(cache_dir):
+ if os.path.splitext(f)[1] in ['.png', '.jpg', '.jpeg']:
+ file_path = os.path.join(cache_dir, f)
+ if toUnicode(file_path) not in files:
+ os.remove(file_path)
+ except:
+ log.error('Failed removing unused file: %s', traceback.format_exc())
+
+ def showCacheFile(self, route, **kwargs):
+ Env.get('app').add_handlers(".*$", [('%s%s' % (Env.get('api_base'), route), StaticFileHandler, {'path': toUnicode(Env.get('cache_dir'))})])
+
+ def download(self, url = '', dest = None, overwrite = False, urlopen_kwargs = None):
+ if not urlopen_kwargs: urlopen_kwargs = {}
+
+ # Return response object to stream download
+ urlopen_kwargs['stream'] = True
+
+ if not dest: # to Cache
+ dest = os.path.join(Env.get('cache_dir'), ss('%s.%s' % (md5(url), getExt(url))))
+
+ dest = sp(dest)
+
+ if not overwrite and os.path.isfile(dest):
+ return dest
+
+ try:
+ filedata = self.urlopen(url, **urlopen_kwargs)
+ except:
+ log.error('Failed downloading file %s: %s', (url, traceback.format_exc()))
+ return False
+
+ self.createFile(dest, filedata, binary = True)
+ return dest
+
+ def doSubfolderTest(self):
+
+ tests = {
+ ('/test/subfolder', '/test/sub'): False,
+ ('/test/sub/folder', '/test/sub'): True,
+ ('/test/sub/folder', '/test/sub2'): False,
+ ('/sub/fold', '/test/sub/fold'): False,
+ ('/sub/fold', '/test/sub/folder'): False,
+ ('/opt/couchpotato', '/var/opt/couchpotato'): False,
+ ('/var/opt', '/var/opt/couchpotato'): False,
+ ('/CapItaLs/Are/OK', '/CapItaLs/Are/OK'): True,
+ ('/CapItaLs/Are/OK', '/CapItaLs/Are/OK2'): False,
+ ('/capitals/are/not/OK', '/capitals/are/NOT'): False,
+ ('\\\\Mounted\\Volume\\Test', '\\\\Mounted\\Volume'): True,
+ ('C:\\\\test\\path', 'C:\\\\test2'): False
+ }
+
+ failed = 0
+ for x in tests:
+ if isSubFolder(x[0], x[1]) is not tests[x]:
+ log.error('Failed subfolder test %s %s', x)
+ failed += 1
+
+ if failed > 0:
+ log.error('Subfolder test failed %s tests', failed)
+ else:
+ log.info('Subfolder test succeeded')
+
+ return failed == 0
diff --git a/couchpotato/core/plugins/file/__init__.py b/couchpotato/core/plugins/file/__init__.py
deleted file mode 100644
index 54d9cbe542..0000000000
--- a/couchpotato/core/plugins/file/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import FileManager
-
-def start():
- return FileManager()
-
-config = []
diff --git a/couchpotato/core/plugins/file/main.py b/couchpotato/core/plugins/file/main.py
deleted file mode 100644
index 0dc0178340..0000000000
--- a/couchpotato/core/plugins/file/main.py
+++ /dev/null
@@ -1,161 +0,0 @@
-from couchpotato import get_session
-from couchpotato.api import addApiView
-from couchpotato.core.event import addEvent
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.request import jsonified
-from couchpotato.core.helpers.variable import md5, getExt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.core.plugins.scanner.main import Scanner
-from couchpotato.core.settings.model import FileType, File
-from couchpotato.environment import Env
-import os.path
-import time
-import traceback
-
-log = CPLog(__name__)
-
-
-class FileManager(Plugin):
-
- def __init__(self):
- addEvent('file.add', self.add)
- addEvent('file.download', self.download)
- addEvent('file.types', self.getTypes)
-
- addApiView('file.cache/', self.showCacheFile, static = True, docs = {
- 'desc': 'Return a file from the cp_data/cache directory',
- 'params': {
- 'filename': {'desc': 'path/filename of the wanted file'}
- },
- 'return': {'type': 'file'}
- })
-
- addApiView('file.types', self.getTypesView, docs = {
- 'desc': 'Return a list of all the file types and their ids.',
- 'return': {'type': 'object', 'example': """{
- 'types': [
- {
- "identifier": "poster_original",
- "type": "image",
- "id": 1,
- "name": "Poster_original"
- },
- {
- "identifier": "poster",
- "type": "image",
- "id": 2,
- "name": "Poster"
- },
- etc
- ]
-}"""}
- })
-
- addEvent('app.load', self.cleanup)
- addEvent('app.load', self.init)
-
- def init(self):
-
- for type_tuple in Scanner.file_types.values():
- self.getType(type_tuple)
-
- def cleanup(self):
-
- # Wait a bit after starting before cleanup
- time.sleep(3)
- log.debug('Cleaning up unused files')
-
- python_cache = Env.get('cache')._path
- try:
- db = get_session()
- for root, dirs, walk_files in os.walk(Env.get('cache_dir')):
- for filename in walk_files:
- if root == python_cache or 'minified' in filename: continue
- file_path = os.path.join(root, filename)
- f = db.query(File).filter(File.path == toUnicode(file_path)).first()
- if not f:
- os.remove(file_path)
- except:
- log.error('Failed removing unused file: %s', traceback.format_exc())
-
- def showCacheFile(self, filename = ''):
-
- cache_dir = Env.get('cache_dir')
- filename = os.path.basename(filename)
-
- from flask.helpers import send_from_directory
- return send_from_directory(cache_dir, filename)
-
- def download(self, url = '', dest = None, overwrite = False, urlopen_kwargs = {}):
-
- if not dest: # to Cache
- dest = os.path.join(Env.get('cache_dir'), '%s.%s' % (md5(url), getExt(url)))
-
- if not overwrite and os.path.isfile(dest):
- return dest
-
- try:
- filedata = self.urlopen(url, **urlopen_kwargs)
- except:
- log.error('Failed downloading file %s: %s', (url, traceback.format_exc()))
- return False
-
- self.createFile(dest, filedata, binary = True)
- return dest
-
- def add(self, path = '', part = 1, type_tuple = (), available = 1, properties = {}):
- type_id = self.getType(type_tuple).get('id')
- db = get_session()
-
- f = db.query(File).filter(File.path == toUnicode(path)).first()
- if not f:
- f = File()
- db.add(f)
-
- f.path = toUnicode(path)
- f.part = part
- f.available = available
- f.type_id = type_id
-
- db.commit()
-
- file_dict = f.to_dict()
-
- return file_dict
-
- def getType(self, type_tuple):
-
- db = get_session()
- type_type, type_identifier = type_tuple
-
- ft = db.query(FileType).filter_by(identifier = type_identifier).first()
- if not ft:
- ft = FileType(
- type = toUnicode(type_type),
- identifier = type_identifier,
- name = toUnicode(type_identifier[0].capitalize() + type_identifier[1:])
- )
- db.add(ft)
- db.commit()
-
- type_dict = ft.to_dict()
- return type_dict
-
- def getTypes(self):
-
- db = get_session()
-
- results = db.query(FileType).all()
-
- types = []
- for type_object in results:
- types.append(type_object.to_dict())
-
- return types
-
- def getTypesView(self):
-
- return jsonified({
- 'types': self.getTypes()
- })
diff --git a/couchpotato/core/plugins/file/static/file.js b/couchpotato/core/plugins/file/static/file.js
deleted file mode 100644
index 7b893e88e6..0000000000
--- a/couchpotato/core/plugins/file/static/file.js
+++ /dev/null
@@ -1,83 +0,0 @@
-var File = new Class({
-
- initialize: function(file){
- var self = this;
-
- if(!file){
- self.empty = true;
- self.el = new Element('div');
- return
- }
-
- self.data = file;
- self.type = File.Type.get(file.type_id);
-
- self['create'+(self.type.type).capitalize()]()
-
- },
-
- createImage: function(){
- var self = this;
-
- var file_name = self.data.path.replace(/^.*[\\\/]/, '');
-
- self.el = new Element('div', {
- 'class': 'type_image ' + self.type.identifier
- }).adopt(
- new Element('img', {
- 'src': Api.createUrl('file.cache') + file_name
- })
- )
- },
-
- toElement: function(){
- return this.el;
- }
-
-});
-
-var FileSelect = new Class({
-
- multiple: function(type, files, single){
-
- var results = files.filter(function(file){
- return file.type_id == File.Type.get(type).id;
- });
-
- if(single)
- return new File(results.pop());
-
- return results;
-
- },
-
- single: function(type, files){
- return this.multiple(type, files, true);
- }
-
-});
-window.File.Select = new FileSelect();
-
-var FileTypeBase = new Class({
-
- setup: function(types){
- var self = this;
-
- self.typesById = {};
- self.typesByKey = {};
- Object.each(types, function(type){
- self.typesByKey[type.identifier] = type;
- self.typesById[type.id] = type;
- });
-
- },
-
- get: function(identifier){
- if(typeOf(identifier) == 'number')
- return this.typesById[identifier]
- else
- return this.typesByKey[identifier]
- }
-
-});
-window.File.Type = new FileTypeBase();
diff --git a/couchpotato/core/plugins/library/__init__.py b/couchpotato/core/plugins/library/__init__.py
deleted file mode 100644
index f597032999..0000000000
--- a/couchpotato/core/plugins/library/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import LibraryPlugin
-
-def start():
- return LibraryPlugin()
-
-config = []
diff --git a/couchpotato/core/plugins/library/main.py b/couchpotato/core/plugins/library/main.py
deleted file mode 100644
index aa1611dddc..0000000000
--- a/couchpotato/core/plugins/library/main.py
+++ /dev/null
@@ -1,166 +0,0 @@
-from couchpotato import get_session
-from couchpotato.core.event import addEvent, fireEventAsync, fireEvent
-from couchpotato.core.helpers.encoding import toUnicode, simplifyString
-from couchpotato.core.helpers.variable import mergeDicts
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.core.settings.model import Library, LibraryTitle, File
-from string import ascii_letters
-import time
-import traceback
-
-log = CPLog(__name__)
-
-class LibraryPlugin(Plugin):
-
- default_dict = {'titles': {}, 'files':{}}
-
- def __init__(self):
- addEvent('library.add', self.add)
- addEvent('library.update', self.update)
- addEvent('library.update_release_date', self.updateReleaseDate)
-
-
- def add(self, attrs = {}, update_after = True):
-
- db = get_session()
-
- l = db.query(Library).filter_by(identifier = attrs.get('identifier')).first()
- if not l:
- status = fireEvent('status.get', 'needs_update', single = True)
- l = Library(
- year = attrs.get('year'),
- identifier = attrs.get('identifier'),
- plot = toUnicode(attrs.get('plot')),
- tagline = toUnicode(attrs.get('tagline')),
- status_id = status.get('id')
- )
-
- title = LibraryTitle(
- title = toUnicode(attrs.get('title')),
- simple_title = self.simplifyTitle(attrs.get('title'))
- )
-
- l.titles.append(title)
-
- db.add(l)
- db.commit()
-
- # Update library info
- if update_after is not False:
- handle = fireEventAsync if update_after is 'async' else fireEvent
- handle('library.update', identifier = l.identifier, default_title = toUnicode(attrs.get('title', '')))
-
- library_dict = l.to_dict(self.default_dict)
-
- return library_dict
-
- def update(self, identifier, default_title = '', force = False):
-
- db = get_session()
- library = db.query(Library).filter_by(identifier = identifier).first()
- done_status = fireEvent('status.get', 'done', single = True)
-
- if library:
- library_dict = library.to_dict(self.default_dict)
-
- do_update = True
-
- if library.status_id == done_status.get('id') and not force:
- do_update = False
- else:
- info = fireEvent('movie.info', merge = True, identifier = identifier)
-
- # Don't need those here
- try: del info['in_wanted']
- except: pass
- try: del info['in_library']
- except: pass
-
- if not info or len(info) == 0:
- log.error('Could not update, no movie info to work with: %s', identifier)
- return False
-
- # Main info
- if do_update:
- library.plot = toUnicode(info.get('plot', ''))
- library.tagline = toUnicode(info.get('tagline', ''))
- library.year = info.get('year', 0)
- library.status_id = done_status.get('id')
- library.info = info
- db.commit()
-
- # Titles
- [db.delete(title) for title in library.titles]
- db.commit()
-
- titles = info.get('titles', [])
- log.debug('Adding titles: %s', titles)
- for title in titles:
- if not title:
- continue
- title = toUnicode(title)
- t = LibraryTitle(
- title = title,
- simple_title = self.simplifyTitle(title),
- default = title.lower() == toUnicode(default_title.lower()) or (toUnicode(default_title) == u'' and toUnicode(titles[0]) == title)
- )
- library.titles.append(t)
-
- db.commit()
-
- # Files
- images = info.get('images', [])
- for image_type in ['poster']:
- for image in images.get(image_type, []):
- if not isinstance(image, (str, unicode)):
- continue
-
- file_path = fireEvent('file.download', url = image, single = True)
- if file_path:
- file_obj = fireEvent('file.add', path = file_path, type_tuple = ('image', image_type), single = True)
- try:
- file_obj = db.query(File).filter_by(id = file_obj.get('id')).one()
- library.files.append(file_obj)
- db.commit()
-
- break
- except:
- log.debug('Failed to attach to library: %s', traceback.format_exc())
-
- library_dict = library.to_dict(self.default_dict)
-
- return library_dict
-
- def updateReleaseDate(self, identifier):
-
- db = get_session()
- library = db.query(Library).filter_by(identifier = identifier).first()
-
- if not library.info:
- library_dict = self.update(identifier, force = True)
- dates = library_dict.get('info', {}).get('release_date')
- else:
- dates = library.info.get('release_date')
-
- if dates and dates.get('expires', 0) < time.time() or not dates:
- dates = fireEvent('movie.release_date', identifier = identifier, merge = True)
- library.info = mergeDicts(library.info, {'release_date': dates })
- db.commit()
-
- return dates
-
-
- def simplifyTitle(self, title):
-
- title = toUnicode(title)
-
- nr_prefix = '' if title[0] in ascii_letters else '#'
- title = simplifyString(title)
-
- for prefix in ['the ']:
- if prefix == title[:len(prefix)]:
- title = title[len(prefix):]
- break
-
- return nr_prefix + title
diff --git a/couchpotato/core/plugins/log/__init__.py b/couchpotato/core/plugins/log/__init__.py
index 33dcf338a3..3760b5675f 100644
--- a/couchpotato/core/plugins/log/__init__.py
+++ b/couchpotato/core/plugins/log/__init__.py
@@ -1,6 +1,5 @@
from .main import Logging
-def start():
- return Logging()
-config = []
+def autoload():
+ return Logging()
diff --git a/couchpotato/core/plugins/log/main.py b/couchpotato/core/plugins/log/main.py
index e6ff1133c0..4bf7cf3e55 100644
--- a/couchpotato/core/plugins/log/main.py
+++ b/couchpotato/core/plugins/log/main.py
@@ -1,12 +1,14 @@
+import os
+import re
+import traceback
+
from couchpotato.api import addApiView
from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.request import jsonified, getParam, getParams
-from couchpotato.core.helpers.variable import tryInt
+from couchpotato.core.helpers.variable import tryInt, splitString
from couchpotato.core.logger import CPLog
from couchpotato.core.plugins.base import Plugin
from couchpotato.environment import Env
-import os
-import traceback
+
log = CPLog(__name__)
@@ -21,7 +23,11 @@ def __init__(self):
},
'return': {'type': 'object', 'example': """{
'success': True,
- 'log': string, //Log file
+ 'log': [{
+ 'time': '03-12 09:12:59',
+ 'type': 'INFO',
+ 'message': 'Log message'
+ }, ..], //Log file
'total': int, //Total log files available
}"""}
})
@@ -33,7 +39,11 @@ def __init__(self):
},
'return': {'type': 'object', 'example': """{
'success': True,
- 'log': string, //Log file
+ 'log': [{
+ 'time': '03-12 09:12:59',
+ 'type': 'INFO',
+ 'message': 'Log message'
+ }, ..]
}"""}
})
addApiView('logging.clear', self.clear, docs = {
@@ -43,13 +53,13 @@ def __init__(self):
'desc': 'Log errors',
'params': {
'type': {'desc': 'Type of logging, default "error"'},
- '**kwargs': {'type':'object', 'desc': 'All other params will be printed in the log string.'},
+ '**kwargs': {'type': 'object', 'desc': 'All other params will be printed in the log string.'},
}
})
- def get(self):
+ def get(self, nr = 0, **kwargs):
- nr = int(getParam('nr', 0))
+ nr = tryInt(nr)
current_path = None
total = 1
@@ -66,21 +76,22 @@ def get(self):
if x is nr:
current_path = path
- log = ''
+ log_content = ''
if current_path:
f = open(current_path, 'r')
- log = f.read()
+ log_content = f.read()
+ logs = self.toList(log_content)
- return jsonified({
+ return {
'success': True,
- 'log': toUnicode(log),
+ 'log': logs,
'total': total,
- })
+ }
- def partial(self):
+ def partial(self, type = 'all', lines = 30, offset = 0, **kwargs):
- log_type = getParam('type', 'all')
- total_lines = tryInt(getParam('lines', 30))
+ total_lines = tryInt(lines)
+ offset = tryInt(offset)
log_lines = []
@@ -92,37 +103,66 @@ def partial(self):
if not os.path.isfile(path):
break
- reversed_lines = []
f = open(path, 'r')
- reversed_lines = toUnicode(f.read()).split('[0m\n')
- reversed_lines.reverse()
+ log_content = toUnicode(f.read())
+ raw_lines = self.toList(log_content)
+ raw_lines.reverse()
brk = False
- for line in reversed_lines:
+ for line in raw_lines:
- if log_type == 'all' or '%s ' % log_type.upper() in line:
+ if type == 'all' or line.get('type') == type.upper():
log_lines.append(line)
- if len(log_lines) >= total_lines:
+ if len(log_lines) >= (total_lines + offset):
brk = True
break
if brk:
break
+ log_lines = log_lines[offset:]
log_lines.reverse()
- return jsonified({
+
+ return {
'success': True,
- 'log': '[0m\n'.join(log_lines),
- })
+ 'log': log_lines,
+ }
+
+ def toList(self, log_content = ''):
- def clear(self):
+ logs_raw = re.split(r'\[0m\n', toUnicode(log_content))
+
+ logs = []
+ re_split = r'\x1b'
+ for log_line in logs_raw:
+ split = re.split(re_split, log_line)
+ if split and len(split) == 3:
+ try:
+ date, time, log_type = splitString(split[0], ' ')
+ timestamp = '%s %s' % (date, time)
+ except:
+ timestamp = 'UNKNOWN'
+ log_type = 'UNKNOWN'
+
+ message = ''.join(split[1]) if len(split) > 1 else split[0]
+ message = re.sub('\[\d+m\[', '[', message)
+
+ logs.append({
+ 'time': timestamp,
+ 'type': log_type,
+ 'message': message
+ })
+
+ return logs
+
+ def clear(self, **kwargs):
for x in range(0, 50):
path = '%s%s' % (Env.get('log_path'), '.%s' % x if x > 0 else '')
if not os.path.isfile(path):
- break
+ continue
try:
@@ -135,24 +175,21 @@ def clear(self):
except:
log.error('Couldn\'t delete file "%s": %s', (path, traceback.format_exc()))
- return jsonified({
+ return {
'success': True
- })
-
- def log(self):
+ }
- params = getParams()
+ def log(self, type = 'error', **kwargs):
try:
- log_message = 'API log: %s' % params
+ log_message = 'API log: %s' % kwargs
try:
- getattr(log, params.get('type', 'error'))(log_message)
+ getattr(log, type)(log_message)
except:
log.error(log_message)
except:
- log.error('Couldn\'t log via API: %s', params)
+ log.error('Couldn\'t log via API: %s', kwargs)
-
- return jsonified({
+ return {
'success': True
- })
+ }
diff --git a/couchpotato/core/plugins/log/static/log.css b/couchpotato/core/plugins/log/static/log.css
deleted file mode 100644
index 222b8efa03..0000000000
--- a/couchpotato/core/plugins/log/static/log.css
+++ /dev/null
@@ -1,66 +0,0 @@
-.page.log .nav {
- display: block;
- text-align: center;
- padding: 20px 0;
- margin: 0;
- font-size: 20px;
- position: fixed;
- width: 960px;
- bottom: 0;
- background: #4E5969;
-}
-
- .page.log .nav li {
- display: inline;
- padding: 5px 10px;
- margin: 0;
- cursor: pointer;
- }
-
- .page.log .nav li:hover:not(.active) {
- background: rgba(255, 255, 255, 0.1);
- }
-
- .page.log .nav li.active {
- font-weight: bold;
- cursor: default;
- font-size: 30px;
- }
-
-.page.log .loading {
- text-align: center;
- font-size: 20px;
- padding: 50px;
-}
-
-.page.log .container {
- padding: 30px 0 60px;
- overflow: hidden;
-}
-
-.page.log .container span {
- float: left;
- width: 86%;
- line-height: 150%;
- padding: 3px 0;
- border-top: 1px solid rgba(255, 255, 255, 0.2);
- font-size: 11px;
- font-family: Lucida Console, Monaco, Nimbus Mono L;
-}
-
- .page.log .container .error {
- color: #FFA4A4;
- white-space: pre-wrap;
- }
- .page.log .container .debug { color: lightgrey; }
-
- .page.log .container .time {
- clear: both;
- width: 14%;
- color: lightgrey;
- padding: 3px 0;
- font-size: 10px;
- }
-
- .page.log .container .time:last-child { display: none; }
-
diff --git a/couchpotato/core/plugins/log/static/log.js b/couchpotato/core/plugins/log/static/log.js
index 0e276b5838..39e5f6ead6 100644
--- a/couchpotato/core/plugins/log/static/log.js
+++ b/couchpotato/core/plugins/log/static/log.js
@@ -2,94 +2,304 @@ Page.Log = new Class({
Extends: PageBase,
+ order: 60,
name: 'log',
title: 'Show recent logs.',
has_tab: false,
- initialize: function(options){
- var self = this;
- self.parent(options)
-
+ navigation: null,
+ log_items: [],
+ report_text: '### Steps to reproduce:\n'+
+ '1. ..\n'+
+ '2. ..\n'+
+ '\n'+
+ '### Information:\n'+
+ 'Movie(s) I have this with: ...\n'+
+ 'Quality of the movie being searched: ...\n'+
+ 'Providers I use: ...\n'+
+ 'Version of CouchPotato: {version}\n'+
+ 'Running on: ...\n'+
+ '\n'+
+ '### Logs:\n'+
+ '```\n{issue}```',
- App.getBlock('more').addLink(new Element('a', {
- 'href': App.createUrl(self.name),
- 'text': self.name.capitalize(),
- 'title': self.title
- }))
-
- },
-
- indexAction: function(){
+ indexAction: function () {
var self = this;
self.getLogs(0);
},
- getLogs: function(nr){
+ getLogs: function (nr) {
var self = this;
- if(self.log) self.log.destroy();
+ if (self.log) self.log.destroy();
+
self.log = new Element('div.container.loading', {
- 'text': 'loading...'
- }).inject(self.el);
+ 'text': 'loading...',
+ 'events': {
+ 'mouseup:relay(.time)': function(e){
+ requestTimeout(function(){
+ self.showSelectionButton(e);
+ }, 100);
+ }
+ }
+ }).inject(self.content);
- Api.request('logging.get', {
+ if(self.navigation){
+ var nav = self.navigation.getElement('.nav');
+ nav.getElements('.active').removeClass('active');
+
+ self.navigation.getElements('li')[nr+1].addClass('active');
+ }
+
+ if(self.request && self.request.running) self.request.cancel();
+ self.request = Api.request('logging.get', {
'data': {
'nr': nr
},
- 'onComplete': function(json){
- self.log.set('html', self.addColors(json.log));
+ 'onComplete': function (json) {
+ self.log.set('text', '');
+ self.log_items = self.createLogElements(json.log);
+ self.log.adopt(self.log_items);
self.log.removeClass('loading');
+ self.scrollToBottom();
- new Fx.Scroll(window, {'duration': 0}).toBottom();
+ if(!self.navigation){
+ self.navigation = new Element('div.navigation').adopt(
+ new Element('h2[text=Logs]'),
+ new Element('div.hint', {
+ 'text': 'Select multiple lines & report an issue'
+ })
+ );
- var nav = new Element('ul.nav').inject(self.log, 'top');
- for (var i = 0; i <= json.total; i++) {
- new Element('li', {
- 'text': i+1,
- 'class': nr == i ? 'active': '',
+ var nav = new Element('ul.nav', {
'events': {
- 'click': function(e){
- self.getLogs(e.target.get('text')-1);
+ 'click:relay(li.select)': function (e, el) {
+ self.getLogs(parseInt(el.get('text')) - 1);
}
}
- }).inject(nav);
- };
+ }).inject(self.navigation);
- new Element('li', {
- 'text': 'clear',
- 'events': {
- 'click': function(){
- Api.request('logging.clear', {
- 'onComplete': function(){
- self.getLogs(0);
+ // Type selection
+ new Element('li.filter').grab(
+ new Element('select', {
+ 'events': {
+ 'change': function () {
+ var type_filter = this.getSelected()[0].get('value');
+ self.content.set('data-filter', type_filter);
+ self.scrollToBottom();
}
- });
+ }
+ }).adopt(
+ new Element('option', {'value': 'ALL', 'text': 'Show all logs'}),
+ new Element('option', {'value': 'INFO', 'text': 'Show only INFO'}),
+ new Element('option', {'value': 'DEBUG', 'text': 'Show only DEBUG'}),
+ new Element('option', {'value': 'ERROR', 'text': 'Show only ERROR'})
+ )
+ ).inject(nav);
- }
+ // Selections
+ for (var i = 0; i <= json.total; i++) {
+ new Element('li', {
+ 'text': i + 1,
+ 'class': 'select ' + (nr == i ? 'active' : '')
+ }).inject(nav);
}
- }).inject(nav)
+
+ // Clear button
+ new Element('li.clear', {
+ 'text': 'clear',
+ 'events': {
+ 'click': function () {
+ Api.request('logging.clear', {
+ 'onComplete': function () {
+ self.getLogs(0);
+ }
+ });
+
+ }
+ }
+ }).inject(nav);
+
+ // Add to page
+ self.navigation.inject(self.content, 'top');
+ }
}
});
},
- addColors: function(text){
- var self = this;
+ createLogElements: function (logs) {
+
+ var elements = [];
+
+ logs.each(function (log) {
+ elements.include(new Element('div', {
+ 'class': 'time ' + log.type.toLowerCase()
+ }).adopt(
+ new Element('span', {
+ 'text': log.time
+ }),
+ new Element('span.type', {
+ 'text': log.type
+ }),
+ new Element('span.message', {
+ 'text': log.message
+ })
+ ));
+ });
+
+ return elements;
+ },
+
+ scrollToBottom: function () {
+ new Fx.Scroll(this.content, {'duration': 0}).toBottom();
+ },
+
+ showSelectionButton: function(e){
+ var self = this,
+ selection = self.getSelected(),
+ start_node = selection.anchorNode,
+ parent_start = start_node.parentNode.getParent('.time'),
+ end_node = selection.focusNode.parentNode.getParent('.time'),
+ text = '';
+
+ var remove_button = function(){
+ self.log.getElements('.highlight').removeClass('highlight');
+ if(self.do_report)
+ self.do_report.destroy();
+ document.body.removeEvent('click', remove_button);
+ };
+ remove_button();
+
+ if(parent_start)
+ start_node = parent_start;
+
+ var index = {
+ 'start': self.log_items.indexOf(start_node),
+ 'end': self.log_items.indexOf(end_node)
+ };
+
+ if(index.start > index.end){
+ index = {
+ 'start': index.end,
+ 'end': index.start
+ };
+ }
+
+ var nodes = self.log_items.slice(index.start, index.end + 1);
+
+ nodes.each(function(node, nr){
+ node.addClass('highlight');
+ node.getElements('span').each(function(span){
+ text += self.spaceFill(span.get('text') + ' ', 6);
+ });
+ text += '\n';
+ });
+
+ self.do_report = new Element('a.do_report.button', {
+ 'text': 'Report issue',
+ 'styles': {
+ 'top': e.page.y,
+ 'left': e.page.x
+ },
+ 'events': {
+ 'click': function(e){
+ (e).stop();
+
+ self.showReport(text);
+ }
+ }
+ }).inject(document.body);
+
+ requestTimeout(function(){
+ document.body.addEvent('click', remove_button);
+ }, 0);
+
+ },
+
+ showReport: function(text){
+ var self = this,
+ version = Updater.getInfo(),
+ body = self.report_text
+ .replace('{issue}', text)
+ .replace('{version}', version ? version.version.repr : '...'),
+ textarea;
+
+ var overlay = new Element('div.mask.report_popup', {
+ 'method': 'post',
+ 'events': {
+ 'click': function(e){
+ overlay.destroy();
+ }
+ }
+ }).grab(
+ new Element('div.bug', {
+ 'events': {
+ 'click': function(e){
+ (e).stopPropagation();
+ }
+ }
+ }).adopt(
+ new Element('h1', {
+ 'text': 'Report a bug'
+ }),
+ new Element('span').adopt(
+ new Element('span', {
+ 'text': 'Read '
+ }),
+ new Element('a.button', {
+ 'target': '_blank',
+ 'text': 'the contributing guide',
+ 'href': 'https://github.com/RuudBurger/CouchPotatoServer/blob/develop/contributing.md'
+ }),
+ new Element('span', {
+ 'html': ' before posting, then copy the text below and FILL IN the dots.'
+ })
+ ),
+ textarea = new Element('textarea', {
+ 'text': body
+ }),
+ new Element('a.button', {
+ 'target': '_blank',
+ 'text': 'Create a new issue on GitHub with the text above',
+ 'href': 'https://github.com/RuudBurger/CouchPotatoServer/issues/new',
+ 'events': {
+ 'click': function(e){
+ (e).stop();
+
+ var body = textarea.get('value'),
+ bdy = '?body=' + (body.length < 2000 ? encodeURIComponent(body) : 'Paste the text here'),
+ win = window.open(e.target.get('href') + bdy, '_blank');
+ win.focus();
+ }
+ }
+ })
+ )
+ );
+
+ overlay.inject(document.body);
+ },
+
+ getSelected: function(){
+ if (window.getSelection)
+ return window.getSelection();
+ else if (document.getSelection)
+ return document.getSelection();
+ else {
+ var selection = document.selection && document.selection.createRange();
+ if (selection.text)
+ return selection.text;
+ }
+ return false;
+
+ },
- text = text
- .replace(/&/g, '&')
- .replace(//g, '>')
- .replace(/"/g, '"')
- .replace(/\u001b\[31m/gi, '')
- .replace(/\u001b\[36m/gi, '')
- .replace(/\u001b\[33m/gi, '')
- .replace(/\u001b\[0m\n/gi, '')
- .replace(/\u001b\[0m/gi, '')
-
- return '' + text + '';
+ spaceFill: function( number, width ){
+ if ( number.toString().length >= width )
+ return number;
+ return ( new Array( width ).join( ' ' ) + number.toString() ).substr( -width );
}
-})
\ No newline at end of file
+});
diff --git a/couchpotato/core/plugins/log/static/log.scss b/couchpotato/core/plugins/log/static/log.scss
new file mode 100644
index 0000000000..e3667802bb
--- /dev/null
+++ b/couchpotato/core/plugins/log/static/log.scss
@@ -0,0 +1,189 @@
+@import "_mixins";
+
+.page.log {
+
+ .nav {
+ text-align: right;
+ padding: 0;
+ margin: 0;
+
+ li {
+ display: inline-block;
+ padding: 5px 10px;
+ margin: 0;
+
+ @include media-tablet {
+ &.filter, &:nth-child(7),&:nth-child(8),&:nth-child(9),&:nth-child(10),&:nth-child(11),&:nth-child(12) {
+ display: none;
+ }
+
+ &:last-child {
+ display: inline-block;
+ }
+ }
+
+ &.select, &.clear {
+ cursor: pointer;
+ }
+
+ &:hover:not(.active):not(.filter) {
+ background: rgba(255,255,255,.1);
+ }
+
+ &.active {
+ font-weight: bold;
+ cursor: default;
+ background: rgba(255,255,255,.1);
+ }
+ }
+ }
+
+ .hint {
+ font-style: italic;
+ opacity: .5;
+ margin-top: 3px;
+
+ @include media-tablet {
+ display: none;
+ }
+ }
+
+ .container {
+ padding: $padding;
+ overflow: hidden;
+ line-height: 150%;
+
+ @include media-phablet {
+ padding: $padding $padding/2;
+ }
+
+ &.loading {
+ text-align: center;
+ font-size: 20px;
+ padding: 100px 50px;
+ }
+
+ select {
+ vertical-align: top;
+ }
+
+ .time {
+ clear: both;
+ font-size: .75em;
+ border-top: 1px solid rgba(255,255,255,.1);
+ overflow: hidden;
+ padding: 0 3px;
+ font-family: Lucida Console, Monaco, Nimbus Mono L, monospace, serif;
+ display: flex;
+
+ @include media-phablet {
+ flex-flow: row wrap;
+ }
+
+ &.highlight {
+ @include theme(background, off);
+ }
+
+ span {
+ padding: 5px 0 3px;
+ display: inline-block;
+ vertical-align: middle;
+ width: 95px;
+ }
+
+ .message {
+ white-space: pre-wrap;
+ flex: 1 auto;
+
+ @include media-phablet {
+ flex: 1 auto;
+ margin-top: -$padding/4;
+ padding: 0;
+ display: block;
+ width: 100%;
+ }
+ }
+
+ ::selection {
+ @include theme(background-color, background);
+ @include theme(color, text);
+ }
+ }
+
+ .type.type {
+ margin-left: $padding/3;
+ width: 40px;
+ }
+
+
+ .error { color: #FFA4A4; }
+ .debug span { opacity: .6; }
+ }
+
+
+
+ [data-filter=INFO] .error,
+ [data-filter=INFO] .debug,
+ [data-filter=ERROR] .debug,
+ [data-filter=ERROR] .info,
+ [data-filter=DEBUG] .info,
+ [data-filter=DEBUG] .error {
+ display: none;
+ }
+}
+
+.report_popup.report_popup {
+ position: fixed;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ top: 0;
+ z-index: 99999;
+ font-size: 14px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ opacity: 1;
+ color: #FFF;
+ pointer-events: auto;
+
+ .button {
+ margin: 10px 0;
+ padding: 10px;
+ color: #FFF;
+ @include theme(background, primary);
+ }
+
+ .bug {
+ width: 80%;
+ height: 80%;
+ max-height: 800px;
+ max-width: 800px;
+
+ display: flex;
+ flex-flow: column nowrap;
+
+ > span {
+ margin: $padding/2 0 $padding 0;
+ }
+
+ textarea {
+ display: block;
+ width: 100%;
+ background: #FFF;
+ padding: 20px;
+ overflow: auto;
+ color: #666;
+ height: 70%;
+ font-size: 12px;
+ }
+ }
+}
+
+.do_report.do_report {
+ z-index: 10000;
+ position: absolute;
+ padding: 10px;
+ @include theme(background, primary);
+ color: #FFF !important;
+}
diff --git a/couchpotato/core/plugins/manage.py b/couchpotato/core/plugins/manage.py
new file mode 100755
index 0000000000..b0e1239c54
--- /dev/null
+++ b/couchpotato/core/plugins/manage.py
@@ -0,0 +1,323 @@
+import os
+import time
+import traceback
+
+from couchpotato import get_db
+from couchpotato.api import addApiView
+from couchpotato.core.event import fireEvent, addEvent, fireEventAsync
+from couchpotato.core.helpers.encoding import sp
+from couchpotato.core.helpers.variable import splitString, getTitle, tryInt, getIdentifier, getFreeSpace
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+from couchpotato.environment import Env
+
+
+log = CPLog(__name__)
+
+autoload = 'Manage'
+
+
+class Manage(Plugin):
+
+ in_progress = False
+
+ def __init__(self):
+
+ fireEvent('scheduler.interval', identifier = 'manage.update_library', handle = self.updateLibrary, hours = 2)
+
+ addEvent('manage.update', self.updateLibrary)
+ addEvent('manage.diskspace', self.getDiskSpace)
+
+ # Add files after renaming
+ def after_rename(message = None, group = None):
+ if not group: group = {}
+ return self.scanFilesToLibrary(folder = group['destination_dir'], files = group['renamed_files'], release_download = group['release_download'])
+ addEvent('renamer.after', after_rename, priority = 110)
+
+ addApiView('manage.update', self.updateLibraryView, docs = {
+ 'desc': 'Update the library by scanning for new movies',
+ 'params': {
+ 'full': {'desc': 'Do a full update or just recently changed/added movies.'},
+ }
+ })
+
+ addApiView('manage.progress', self.getProgress, docs = {
+ 'desc': 'Get the progress of current manage update',
+ 'return': {'type': 'object', 'example': """{
+ 'progress': False || object, total & to_go,
+}"""},
+ })
+
+ if not Env.get('dev') and self.conf('startup_scan'):
+ addEvent('app.load', self.updateLibraryQuick)
+
+ addEvent('app.load', self.setCrons)
+
+ # Enable / disable interval
+ addEvent('setting.save.manage.library_refresh_interval.after', self.setCrons)
+
+ def setCrons(self):
+
+ fireEvent('schedule.remove', 'manage.update_library')
+ refresh = tryInt(self.conf('library_refresh_interval'))
+ if refresh > 0:
+ fireEvent('schedule.interval', 'manage.update_library', self.updateLibrary, hours = refresh, single = True)
+
+ return True
+
+ def getProgress(self, **kwargs):
+ return {
+ 'progress': self.in_progress
+ }
+
+ def updateLibraryView(self, full = 1, **kwargs):
+
+ fireEventAsync('manage.update', full = True if full == '1' else False)
+
+ return {
+ 'progress': self.in_progress,
+ 'success': True
+ }
+
+ def updateLibraryQuick(self):
+ return self.updateLibrary(full = False)
+
+ def updateLibrary(self, full = True):
+ last_update_key = 'manage.last_update%s' % ('_full' if full else '')
+ last_update = float(Env.prop(last_update_key, default = 0))
+
+ if self.in_progress:
+ log.info('Already updating library: %s', self.in_progress)
+ return
+ elif self.isDisabled() or (last_update > time.time() - 20):
+ return
+
+ self.in_progress = {}
+ fireEvent('notify.frontend', type = 'manage.updating', data = True)
+
+ try:
+
+ directories = self.directories()
+ directories.sort()
+ added_identifiers = []
+
+ # Add some progress
+ for directory in directories:
+ self.in_progress[os.path.normpath(directory)] = {
+ 'started': False,
+ 'eta': -1,
+ 'total': None,
+ 'to_go': None,
+ }
+
+ for directory in directories:
+ folder = os.path.normpath(directory)
+ self.in_progress[os.path.normpath(directory)]['started'] = tryInt(time.time())
+
+ if not os.path.isdir(folder):
+ if len(directory) > 0:
+ log.error('Directory doesn\'t exist: %s', folder)
+ continue
+
+ log.info('Updating manage library: %s', folder)
+ fireEvent('notify.frontend', type = 'manage.update', data = True, message = 'Scanning for movies in "%s"' % folder)
+
+ onFound = self.createAddToLibrary(folder, added_identifiers)
+ fireEvent('scanner.scan', folder = folder, simple = True, newer_than = last_update if not full else 0, check_file_date = False, on_found = onFound, single = True)
+
+ # Break if CP wants to shut down
+ if self.shuttingDown():
+ break
+
+ # If cleanup option is enabled, remove offline files from database
+ if self.conf('cleanup') and full and not self.shuttingDown():
+
+ # Get movies with done status
+ total_movies, done_movies = fireEvent('media.list', types = 'movie', status = 'done', release_status = 'done', status_or = True, single = True)
+
+ deleted_releases = []
+ for done_movie in done_movies:
+ if getIdentifier(done_movie) not in added_identifiers:
+ fireEvent('media.delete', media_id = done_movie['_id'], delete_from = 'all')
+ else:
+
+ releases = done_movie.get('releases', [])
+
+ for release in releases:
+ if release.get('files'):
+ brk = False
+ for file_type in release.get('files', {}):
+ for release_file in release['files'][file_type]:
+ # Remove release not available anymore
+ if not os.path.isfile(sp(release_file)):
+ fireEvent('release.clean', release['_id'])
+ brk = True
+ break
+ if brk:
+ break
+
+ # Check if there are duplicate releases (different quality) use the last one, delete the rest
+ if len(releases) > 1:
+ used_files = {}
+ for release in releases:
+ for file_type in release.get('files', {}):
+ for release_file in release['files'][file_type]:
+ already_used = used_files.get(release_file)
+
+ if already_used:
+ release_id = release['_id'] if already_used.get('last_edit', 0) > release.get('last_edit', 0) else already_used['_id']
+ if release_id not in deleted_releases:
+ fireEvent('release.delete', release_id, single = True)
+ deleted_releases.append(release_id)
+ break
+ else:
+ used_files[release_file] = release
+ del used_files
+
+ # Break if CP wants to shut down
+ if self.shuttingDown():
+ break
+
+ if not self.shuttingDown():
+ db = get_db()
+ db.reindex()
+
+ Env.prop(last_update_key, time.time())
+ except:
+ log.error('Failed updating library: %s', (traceback.format_exc()))
+
+ while self.in_progress and len(self.in_progress) > 0 and not self.shuttingDown():
+
+ delete_me = {}
+
+ # noinspection PyTypeChecker
+ for folder in self.in_progress:
+ if self.in_progress[folder]['to_go'] <= 0:
+ delete_me[folder] = True
+
+ for delete in delete_me:
+ del self.in_progress[delete]
+
+ time.sleep(1)
+
+ fireEvent('notify.frontend', type = 'manage.updating', data = False)
+ self.in_progress = False
+
+ # noinspection PyDefaultArgument
+ def createAddToLibrary(self, folder, added_identifiers = []):
+
+ def addToLibrary(group, total_found, to_go):
+ if self.in_progress[folder]['total'] is None:
+ self.in_progress[folder].update({
+ 'total': total_found,
+ 'to_go': total_found,
+ })
+
+ self.updateProgress(folder, to_go)
+
+ if group['media'] and group['identifier']:
+ added_identifiers.append(group['identifier'])
+
+ # Add it to release and update the info
+ fireEvent('release.add', group = group, update_info = False)
+ fireEvent('movie.update', identifier = group['identifier'], on_complete = self.createAfterUpdate(folder, group['identifier']))
+
+ return addToLibrary
+
+ def createAfterUpdate(self, folder, identifier):
+
+ # Notify frontend
+ def afterUpdate():
+ if not self.in_progress or self.shuttingDown():
+ return
+
+ total = self.in_progress[folder]['total']
+ movie_dict = fireEvent('media.get', identifier, single = True)
+
+ if movie_dict:
+ fireEvent('notify.frontend', type = 'movie.added', data = movie_dict, message = None if total > 5 else 'Added "%s" to manage.' % getTitle(movie_dict))
+
+ return afterUpdate
+
+ def updateProgress(self, folder, to_go):
+
+ pr = self.in_progress[folder]
+ if to_go < pr['to_go']:
+ pr['to_go'] = to_go
+
+ avg = (time.time() - pr['started']) / (pr['total'] - pr['to_go'])
+ pr['eta'] = tryInt(avg * pr['to_go'])
+
+
+ def directories(self):
+ try:
+ if self.conf('library', default = '').strip():
+ return splitString(self.conf('library', default = ''), '::')
+ except:
+ pass
+
+ return []
+
+ def scanFilesToLibrary(self, folder = None, files = None, release_download = None):
+
+ folder = os.path.normpath(folder)
+
+ groups = fireEvent('scanner.scan', folder = folder, files = files, single = True)
+
+ if groups:
+ for group in groups.values():
+ if group.get('media'):
+ if release_download and release_download.get('release_id'):
+ fireEvent('release.add', group = group, update_id = release_download.get('release_id'))
+ else:
+ fireEvent('release.add', group = group)
+
+ def getDiskSpace(self):
+ return getFreeSpace(self.directories())
+
+
+config = [{
+ 'name': 'manage',
+ 'groups': [
+ {
+ 'tab': 'manage',
+ 'label': 'Movie Library Manager',
+ 'description': 'Add your existing movie folders.',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'default': False,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'library',
+ 'type': 'directories',
+ 'description': 'Folder where the movies should be moved to.',
+ },
+ {
+ 'label': 'Cleanup After',
+ 'name': 'cleanup',
+ 'type': 'bool',
+ 'description': 'Remove movie from db if it can\'t be found after re-scan.',
+ 'default': True,
+ },
+ {
+ 'label': 'Scan at startup',
+ 'name': 'startup_scan',
+ 'type': 'bool',
+ 'default': True,
+ 'advanced': True,
+ 'description': 'Do a quick scan on startup. On slow systems better disable this.',
+ },
+ {
+ 'label': 'Full library refresh',
+ 'name': 'library_refresh_interval',
+ 'type': 'int',
+ 'default': 0,
+ 'advanced': True,
+ 'description': 'Do a full scan every X hours. (0 is disabled)',
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/plugins/manage/__init__.py b/couchpotato/core/plugins/manage/__init__.py
deleted file mode 100644
index 30f6ea686d..0000000000
--- a/couchpotato/core/plugins/manage/__init__.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from .main import Manage
-
-def start():
- return Manage()
-
-config = [{
- 'name': 'manage',
- 'groups': [
- {
- 'tab': 'manage',
- 'label': 'movie library manager',
- 'description': 'Add your existing movie folders.',
- 'options': [
- {
- 'name': 'enabled',
- 'default': False,
- 'type': 'enabler',
- },
- {
- 'name': 'library',
- 'type': 'directories',
- 'description': 'Folder where the movies should be moved to.',
- },
- {
- 'label': 'Cleanup After',
- 'name': 'cleanup',
- 'type': 'bool',
- 'description': 'Remove movie from db if it can\'t be found after re-scan.',
- 'default': True,
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/plugins/manage/main.py b/couchpotato/core/plugins/manage/main.py
deleted file mode 100644
index 51094899d4..0000000000
--- a/couchpotato/core/plugins/manage/main.py
+++ /dev/null
@@ -1,248 +0,0 @@
-from couchpotato.api import addApiView
-from couchpotato.core.event import fireEvent, addEvent, fireEventAsync
-from couchpotato.core.helpers.encoding import ss
-from couchpotato.core.helpers.request import jsonified, getParam
-from couchpotato.core.helpers.variable import splitString, getTitle
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.environment import Env
-import ctypes
-import os
-import sys
-import time
-import traceback
-
-
-log = CPLog(__name__)
-
-class Manage(Plugin):
-
- in_progress = False
-
- def __init__(self):
-
- fireEvent('scheduler.interval', identifier = 'manage.update_library', handle = self.updateLibrary, hours = 2)
-
- addEvent('manage.update', self.updateLibrary)
- addEvent('manage.diskspace', self.getDiskSpace)
-
- # Add files after renaming
- def after_rename(message = None, group = {}):
- return self.scanFilesToLibrary(folder = group['destination_dir'], files = group['renamed_files'])
- addEvent('renamer.after', after_rename, priority = 110)
-
- addApiView('manage.update', self.updateLibraryView, docs = {
- 'desc': 'Update the library by scanning for new movies',
- 'params': {
- 'full': {'desc': 'Do a full update or just recently changed/added movies.'},
- }
- })
-
- addApiView('manage.progress', self.getProgress, docs = {
- 'desc': 'Get the progress of current manage update',
- 'return': {'type': 'object', 'example': """{
- 'progress': False || object, total & to_go,
-}"""},
- })
-
- if not Env.get('dev'):
- def updateLibrary():
- self.updateLibrary(full = False)
- addEvent('app.load', updateLibrary)
-
- def getProgress(self):
- return jsonified({
- 'progress': self.in_progress
- })
-
- def updateLibraryView(self):
-
- full = getParam('full', default = 1)
- fireEventAsync('manage.update', full = True if full == '1' else False)
-
- return jsonified({
- 'success': True
- })
-
-
- def updateLibrary(self, full = True):
- last_update = float(Env.prop('manage.last_update', default = 0))
-
- if self.in_progress:
- log.info('Already updating library: %s', self.in_progress)
- return
- elif self.isDisabled() or (last_update > time.time() - 20):
- return
-
- self.in_progress = {}
- fireEvent('notify.frontend', type = 'manage.updating', data = True)
-
- try:
-
- directories = self.directories()
- added_identifiers = []
-
- # Add some progress
- self.in_progress = {}
- for directory in directories:
- self.in_progress[os.path.normpath(directory)] = {
- 'total': None,
- 'to_go': None,
- }
-
- for directory in directories:
- folder = os.path.normpath(directory)
-
- if not os.path.isdir(folder):
- if len(directory) > 0:
- log.error('Directory doesn\'t exist: %s', folder)
- continue
-
- log.info('Updating manage library: %s', folder)
- fireEvent('notify.frontend', type = 'manage.update', data = True, message = 'Scanning for movies in "%s"' % folder)
-
- onFound = self.createAddToLibrary(folder, added_identifiers)
- fireEvent('scanner.scan', folder = folder, simple = True, newer_than = last_update if not full else 0, on_found = onFound, single = True)
-
- # Break if CP wants to shut down
- if self.shuttingDown():
- break
-
- # If cleanup option is enabled, remove offline files from database
- if self.conf('cleanup') and full and not self.shuttingDown():
-
- # Get movies with done status
- total_movies, done_movies = fireEvent('movie.list', status = 'done', single = True)
-
- for done_movie in done_movies:
- if done_movie['library']['identifier'] not in added_identifiers:
- fireEvent('movie.delete', movie_id = done_movie['id'], delete_from = 'all')
- else:
-
- for release in done_movie.get('releases', []):
- if len(release.get('files', [])) == 0:
- fireEvent('release.delete', release['id'])
- else:
- for release_file in release.get('files', []):
- # Remove release not available anymore
- if not os.path.isfile(ss(release_file['path'])):
- fireEvent('release.clean', release['id'])
- break
-
- # Check if there are duplicate releases (different quality) use the last one, delete the rest
- if len(done_movie.get('releases', [])) > 1:
- used_files = {}
- for release in done_movie.get('releases', []):
-
- for release_file in release.get('files', []):
- already_used = used_files.get(release_file['path'])
-
- if already_used:
- if already_used < release['id']:
- fireEvent('release.delete', release['id'], single = True) # delete this one
- else:
- fireEvent('release.delete', already_used, single = True) # delete previous one
- break
- else:
- used_files[release_file['path']] = release.get('id')
- del used_files
-
- Env.prop('manage.last_update', time.time())
- except:
- log.error('Failed updating library: %s', (traceback.format_exc()))
-
- while True and not self.shuttingDown():
-
- delete_me = {}
-
- for folder in self.in_progress:
- if self.in_progress[folder]['to_go'] <= 0:
- delete_me[folder] = True
-
- for delete in delete_me:
- del self.in_progress[delete]
-
- if len(self.in_progress) == 0:
- break
-
- time.sleep(1)
-
- fireEvent('notify.frontend', type = 'manage.updating', data = False)
- self.in_progress = False
-
- def createAddToLibrary(self, folder, added_identifiers = []):
- def addToLibrary(group, total_found, to_go):
- if self.in_progress[folder]['total'] is None:
- self.in_progress[folder] = {
- 'total': total_found,
- 'to_go': total_found,
- }
-
- if group['library'] and group['library'].get('identifier'):
- identifier = group['library'].get('identifier')
- added_identifiers.append(identifier)
-
- # Add it to release and update the info
- fireEvent('release.add', group = group)
- fireEventAsync('library.update', identifier = identifier, on_complete = self.createAfterUpdate(folder, identifier))
-
- return addToLibrary
-
- def createAfterUpdate(self, folder, identifier):
-
- # Notify frontend
- def afterUpdate():
- self.in_progress[folder]['to_go'] = self.in_progress[folder]['to_go'] - 1
- total = self.in_progress[folder]['total']
- movie_dict = fireEvent('movie.get', identifier, single = True)
-
- fireEvent('notify.frontend', type = 'movie.added', data = movie_dict, message = None if total > 5 else 'Added "%s" to manage.' % getTitle(movie_dict['library']))
-
- return afterUpdate
-
- def directories(self):
- try:
- if self.conf('library', default = '').strip():
- return splitString(self.conf('library', default = ''), '::')
- except:
- pass
-
- return []
-
- def scanFilesToLibrary(self, folder = None, files = None):
-
- folder = os.path.normpath(folder)
-
- groups = fireEvent('scanner.scan', folder = folder, files = files, single = True)
-
- for group in groups.itervalues():
- if group['library'] and group['library'].get('identifier'):
- fireEvent('release.add', group = group)
-
- def getDiskSpace(self):
-
- free_space = {}
- for folder in self.directories():
-
- size = None
- if os.path.isdir(folder):
- if os.name == 'nt':
- _, total, free = ctypes.c_ulonglong(), ctypes.c_ulonglong(), \
- ctypes.c_ulonglong()
- if sys.version_info >= (3,) or isinstance(folder, unicode):
- fun = ctypes.windll.kernel32.GetDiskFreeSpaceExW #@UndefinedVariable
- else:
- fun = ctypes.windll.kernel32.GetDiskFreeSpaceExA #@UndefinedVariable
- ret = fun(folder, ctypes.byref(_), ctypes.byref(total), ctypes.byref(free))
- if ret == 0:
- raise ctypes.WinError()
- used = total.value - free.value
- return [total.value, used, free.value]
- else:
- s = os.statvfs(folder)
- size = [s.f_blocks * s.f_frsize / (1024 * 1024), (s.f_bavail * s.f_frsize) / (1024 * 1024)]
-
- free_space[folder] = size
-
- return free_space
-
diff --git a/couchpotato/core/plugins/movie/__init__.py b/couchpotato/core/plugins/movie/__init__.py
deleted file mode 100644
index 4df29ad88a..0000000000
--- a/couchpotato/core/plugins/movie/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import MoviePlugin
-
-def start():
- return MoviePlugin()
-
-config = []
diff --git a/couchpotato/core/plugins/movie/main.py b/couchpotato/core/plugins/movie/main.py
deleted file mode 100644
index c708ec4e04..0000000000
--- a/couchpotato/core/plugins/movie/main.py
+++ /dev/null
@@ -1,587 +0,0 @@
-from couchpotato import get_session
-from couchpotato.api import addApiView
-from couchpotato.core.event import fireEvent, fireEventAsync, addEvent
-from couchpotato.core.helpers.encoding import toUnicode, simplifyString
-from couchpotato.core.helpers.request import getParams, jsonified, getParam
-from couchpotato.core.helpers.variable import getImdb, splitString
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.core.settings.model import Library, LibraryTitle, Movie, \
- Release
-from couchpotato.environment import Env
-from sqlalchemy.orm import joinedload_all
-from sqlalchemy.sql.expression import or_, asc, not_, desc
-from string import ascii_lowercase
-
-log = CPLog(__name__)
-
-
-class MoviePlugin(Plugin):
-
- default_dict = {
- 'profile': {'types': {'quality': {}}},
- 'releases': {'status': {}, 'quality': {}, 'files':{}, 'info': {}},
- 'library': {'titles': {}, 'files':{}},
- 'files': {},
- 'status': {}
- }
-
- def __init__(self):
- addApiView('movie.search', self.search, docs = {
- 'desc': 'Search the movie providers for a movie',
- 'params': {
- 'q': {'desc': 'The (partial) movie name you want to search for'},
- },
- 'return': {'type': 'object', 'example': """{
- 'success': True,
- 'empty': bool, any movies returned or not,
- 'movies': array, movies found,
-}"""}
- })
- addApiView('movie.list', self.listView, docs = {
- 'desc': 'List movies in wanted list',
- 'params': {
- 'status': {'type': 'array or csv', 'desc': 'Filter movie by status. Example:"active,done"'},
- 'release_status': {'type': 'array or csv', 'desc': 'Filter movie by status of its releases. Example:"snatched,available"'},
- 'limit_offset': {'desc': 'Limit and offset the movie list. Examples: "50" or "50,30"'},
- 'starts_with': {'desc': 'Starts with these characters. Example: "a" returns all movies starting with the letter "a"'},
- 'search': {'desc': 'Search movie title'},
- },
- 'return': {'type': 'object', 'example': """{
- 'success': True,
- 'empty': bool, any movies returned or not,
- 'movies': array, movies found,
-}"""}
- })
- addApiView('movie.get', self.getView, docs = {
- 'desc': 'Get a movie by id',
- 'params': {
- 'id': {'desc': 'The id of the movie'},
- }
- })
- addApiView('movie.refresh', self.refresh, docs = {
- 'desc': 'Refresh a movie by id',
- 'params': {
- 'id': {'desc': 'Movie ID(s) you want to refresh.', 'type': 'int (comma separated)'},
- }
- })
- addApiView('movie.available_chars', self.charView)
- addApiView('movie.add', self.addView, docs = {
- 'desc': 'Add new movie to the wanted list',
- 'params': {
- 'identifier': {'desc': 'IMDB id of the movie your want to add.'},
- 'profile_id': {'desc': 'ID of quality profile you want the add the movie in. If empty will use the default profile.'},
- 'title': {'desc': 'Movie title to use for searches. Has to be one of the titles returned by movie.search.'},
- }
- })
- addApiView('movie.edit', self.edit, docs = {
- 'desc': 'Add new movie to the wanted list',
- 'params': {
- 'id': {'desc': 'Movie ID(s) you want to edit.', 'type': 'int (comma separated)'},
- 'profile_id': {'desc': 'ID of quality profile you want the edit the movie to.'},
- 'default_title': {'desc': 'Movie title to use for searches. Has to be one of the titles returned by movie.search.'},
- }
- })
- addApiView('movie.delete', self.deleteView, docs = {
- 'desc': 'Delete a movie from the wanted list',
- 'params': {
- 'id': {'desc': 'Movie ID(s) you want to delete.', 'type': 'int (comma separated)'},
- 'delete_from': {'desc': 'Delete movie from this page', 'type': 'string: all (default), wanted, manage'},
- }
- })
-
- addEvent('movie.add', self.add)
- addEvent('movie.delete', self.delete)
- addEvent('movie.get', self.get)
- addEvent('movie.list', self.list)
- addEvent('movie.restatus', self.restatus)
-
- addEvent('app.load', self.cleanReleases)
-
- def cleanReleases(self):
-
- prop_name = 'cleaned_releases'
- already_cleaned = Env.prop(prop_name, default = False)
- if already_cleaned:
- return True
-
- log.info('Removing releases from library movies')
-
- db = get_session()
-
- movies = db.query(Movie).all()
-
- done_status = fireEvent('status.get', 'done', single = True)
- available_status = fireEvent('status.get', 'available', single = True)
- snatched_status = fireEvent('status.get', 'snatched', single = True)
-
- for movie in movies:
- if movie.status_id == done_status.get('id'):
- for rel in movie.releases:
- if rel.status_id in [available_status.get('id'), snatched_status.get('id')]:
- fireEvent('release.delete', id = rel.id, single = True)
-
- Env.prop(prop_name, True)
-
- def getView(self):
-
- movie_id = getParam('id')
- movie = self.get(movie_id) if movie_id else None
-
- return jsonified({
- 'success': movie is not None,
- 'movie': movie,
- })
-
- def get(self, movie_id):
-
- db = get_session()
-
- imdb_id = getImdb(str(movie_id))
-
- if(imdb_id):
- m = db.query(Movie).filter(Movie.library.has(identifier = imdb_id)).first()
- else:
- m = db.query(Movie).filter_by(id = movie_id).first()
-
- results = None
- if m:
- results = m.to_dict(self.default_dict)
-
- return results
-
- def list(self, status = None, release_status = None, limit_offset = None, starts_with = None, search = None, order = None):
-
- db = get_session()
-
- # Make a list from string
- if status and not isinstance(status, (list, tuple)):
- status = [status]
- if release_status and not isinstance(release_status, (list, tuple)):
- release_status = [release_status]
-
- q = db.query(Movie) \
- .outerjoin(Movie.releases, Movie.library, Library.titles) \
- .filter(LibraryTitle.default == True) \
- .group_by(Movie.id)
-
- # Filter on movie status
- if status and len(status) > 0:
- q = q.filter(or_(*[Movie.status.has(identifier = s) for s in status]))
-
- # Filter on release status
- if release_status and len(release_status) > 0:
- q = q.filter(or_(*[Release.status.has(identifier = s) for s in release_status]))
-
- total_count = q.count()
-
- filter_or = []
- if starts_with:
- starts_with = toUnicode(starts_with.lower())
- if starts_with in ascii_lowercase:
- filter_or.append(LibraryTitle.simple_title.startswith(starts_with))
- else:
- ignore = []
- for letter in ascii_lowercase:
- ignore.append(LibraryTitle.simple_title.startswith(toUnicode(letter)))
- filter_or.append(not_(or_(*ignore)))
-
- if search:
- filter_or.append(LibraryTitle.simple_title.like('%%' + search + '%%'))
-
- if filter_or:
- q = q.filter(or_(*filter_or))
-
- if order == 'release_order':
- q = q.order_by(desc(Release.last_edit))
- else:
- q = q.order_by(asc(LibraryTitle.simple_title))
-
- q = q.subquery()
- q2 = db.query(Movie).join((q, q.c.id == Movie.id)) \
- .options(joinedload_all('releases')) \
- .options(joinedload_all('profile.types')) \
- .options(joinedload_all('library.titles')) \
- .options(joinedload_all('library.files')) \
- .options(joinedload_all('status')) \
- .options(joinedload_all('files'))
-
- if limit_offset:
- splt = splitString(limit_offset) if isinstance(limit_offset, (str, unicode)) else limit_offset
- limit = splt[0]
- offset = 0 if len(splt) is 1 else splt[1]
- q2 = q2.limit(limit).offset(offset)
-
- results = q2.all()
- movies = []
- for movie in results:
- temp = movie.to_dict({
- 'profile': {'types': {}},
- 'releases': {'files':{}, 'info': {}},
- 'library': {'titles': {}, 'files':{}},
- 'files': {},
- })
- movies.append(temp)
-
- #db.close()
- return (total_count, movies)
-
- def availableChars(self, status = None, release_status = None):
-
- chars = ''
-
- db = get_session()
-
- # Make a list from string
- if not isinstance(status, (list, tuple)):
- status = [status]
- if release_status and not isinstance(release_status, (list, tuple)):
- release_status = [release_status]
-
- q = db.query(Movie) \
- .outerjoin(Movie.releases, Movie.library, Library.titles, Movie.status) \
- .options(joinedload_all('library.titles'))
-
- # Filter on movie status
- if status and len(status) > 0:
- q = q.filter(or_(*[Movie.status.has(identifier = s) for s in status]))
-
- # Filter on release status
- if release_status and len(release_status) > 0:
- q = q.filter(or_(*[Release.status.has(identifier = s) for s in release_status]))
-
- results = q.all()
-
- for movie in results:
- char = movie.library.titles[0].simple_title[0]
- char = char if char in ascii_lowercase else '#'
- if char not in chars:
- chars += str(char)
-
- #db.close()
- return ''.join(sorted(chars, key = str.lower))
-
- def listView(self):
-
- params = getParams()
- status = splitString(params.get('status', None))
- release_status = splitString(params.get('release_status', None))
- limit_offset = params.get('limit_offset', None)
- starts_with = params.get('starts_with', None)
- search = params.get('search', None)
- order = params.get('order', None)
-
- total_movies, movies = self.list(
- status = status,
- release_status = release_status,
- limit_offset = limit_offset,
- starts_with = starts_with,
- search = search,
- order = order
- )
-
- return jsonified({
- 'success': True,
- 'empty': len(movies) == 0,
- 'total': total_movies,
- 'movies': movies,
- })
-
- def charView(self):
-
- params = getParams()
- status = splitString(params.get('status', None))
- release_status = splitString(params.get('release_status', None))
- chars = self.availableChars(status, release_status)
-
- return jsonified({
- 'success': True,
- 'empty': len(chars) == 0,
- 'chars': chars,
- })
-
- def refresh(self):
-
- db = get_session()
-
- for id in splitString(getParam('id')):
- movie = db.query(Movie).filter_by(id = id).first()
-
- if movie:
-
- # Get current selected title
- default_title = ''
- for title in movie.library.titles:
- if title.default: default_title = title.title
-
- fireEvent('notify.frontend', type = 'movie.busy.%s' % id, data = True, message = 'Updating "%s"' % default_title)
- fireEventAsync('library.update', identifier = movie.library.identifier, default_title = default_title, force = True, on_complete = self.createOnComplete(id))
-
-
- #db.close()
- return jsonified({
- 'success': True,
- })
-
- def search(self):
-
- q = getParam('q')
- cache_key = u'%s/%s' % (__name__, simplifyString(q))
- movies = Env.get('cache').get(cache_key)
-
- if not movies:
-
- if getImdb(q):
- movies = [fireEvent('movie.info', identifier = q, merge = True)]
- else:
- movies = fireEvent('movie.search', q = q, merge = True)
- Env.get('cache').set(cache_key, movies)
-
- return jsonified({
- 'success': True,
- 'empty': len(movies) == 0 if movies else 0,
- 'movies': movies,
- })
-
- def add(self, params = {}, force_readd = True, search_after = True, update_library = False, status_id = None):
-
- if not params.get('identifier'):
- msg = 'Can\'t add movie without imdb identifier.'
- log.error(msg)
- fireEvent('notify.frontend', type = 'movie.is_tvshow', message = msg)
- return False
- else:
- try:
- is_movie = fireEvent('movie.is_movie', identifier = params.get('identifier'), single = True)
- if not is_movie:
- msg = 'Can\'t add movie, seems to be a TV show.'
- log.error(msg)
- fireEvent('notify.frontend', type = 'movie.is_tvshow', message = msg)
- return False
- except:
- pass
-
-
- library = fireEvent('library.add', single = True, attrs = params, update_after = update_library)
-
- # Status
- status_active = fireEvent('status.add', 'active', single = True)
- status_snatched = fireEvent('status.add', 'snatched', single = True)
-
- default_profile = fireEvent('profile.default', single = True)
-
- db = get_session()
- m = db.query(Movie).filter_by(library_id = library.get('id')).first()
- added = True
- do_search = False
- if not m:
- m = Movie(
- library_id = library.get('id'),
- profile_id = params.get('profile_id', default_profile.get('id')),
- status_id = status_id if status_id else status_active.get('id'),
- )
- db.add(m)
- db.commit()
-
- onComplete = None
- if search_after:
- onComplete = self.createOnComplete(m.id)
-
- fireEventAsync('library.update', params.get('identifier'), default_title = params.get('title', ''), on_complete = onComplete)
- search_after = False
- elif force_readd:
- # Clean snatched history
- for release in m.releases:
- if release.status_id == status_snatched.get('id'):
- release.delete()
-
- m.profile_id = params.get('profile_id', default_profile.get('id'))
- else:
- log.debug('Movie already exists, not updating: %s', params)
- added = False
-
- if force_readd:
- m.status_id = status_id if status_id else status_active.get('id')
- do_search = True
-
- db.commit()
-
- # Remove releases
- available_status = fireEvent('status.get', 'available', single = True)
- for rel in m.releases:
- if rel.status_id is available_status.get('id'):
- db.delete(rel)
- db.commit()
-
- movie_dict = m.to_dict(self.default_dict)
-
- if do_search and search_after:
- onComplete = self.createOnComplete(m.id)
- onComplete()
-
- if added:
- fireEvent('notify.frontend', type = 'movie.added', data = movie_dict, message = 'Successfully added "%s" to your wanted list.' % params.get('title', ''))
-
- #db.close()
- return movie_dict
-
-
- def addView(self):
-
- params = getParams()
-
- movie_dict = self.add(params)
-
- return jsonified({
- 'success': True,
- 'added': True if movie_dict else False,
- 'movie': movie_dict,
- })
-
- def edit(self):
-
- params = getParams()
- db = get_session()
-
- available_status = fireEvent('status.get', 'available', single = True)
-
- ids = splitString(params.get('id'))
- for movie_id in ids:
-
- m = db.query(Movie).filter_by(id = movie_id).first()
- if not m:
- continue
-
- m.profile_id = params.get('profile_id')
-
- # Remove releases
- for rel in m.releases:
- if rel.status_id is available_status.get('id'):
- db.delete(rel)
- db.commit()
-
- # Default title
- if params.get('default_title'):
- for title in m.library.titles:
- title.default = toUnicode(params.get('default_title', '')).lower() == toUnicode(title.title).lower()
-
- db.commit()
-
- fireEvent('movie.restatus', m.id)
-
- movie_dict = m.to_dict(self.default_dict)
- fireEventAsync('searcher.single', movie_dict, on_complete = self.createNotifyFront(movie_id))
-
- #db.close()
- return jsonified({
- 'success': True,
- })
-
- def deleteView(self):
-
- params = getParams()
-
- ids = splitString(params.get('id'))
- for movie_id in ids:
- self.delete(movie_id, delete_from = params.get('delete_from', 'all'))
-
- return jsonified({
- 'success': True,
- })
-
- def delete(self, movie_id, delete_from = None):
-
- db = get_session()
-
- movie = db.query(Movie).filter_by(id = movie_id).first()
- if movie:
- deleted = False
- if delete_from == 'all':
- db.delete(movie)
- db.commit()
- deleted = True
- else:
- done_status = fireEvent('status.get', 'done', single = True)
-
- total_releases = len(movie.releases)
- total_deleted = 0
- new_movie_status = None
- for release in movie.releases:
- if delete_from in ['wanted', 'snatched']:
- if release.status_id != done_status.get('id'):
- db.delete(release)
- total_deleted += 1
- new_movie_status = 'done'
- elif delete_from == 'manage':
- if release.status_id == done_status.get('id'):
- db.delete(release)
- total_deleted += 1
- new_movie_status = 'active'
- db.commit()
-
- if total_releases == total_deleted:
- db.delete(movie)
- db.commit()
- deleted = True
- elif new_movie_status:
- new_status = fireEvent('status.get', new_movie_status, single = True)
- movie.profile_id = None
- movie.status_id = new_status.get('id')
- db.commit()
- else:
- fireEvent('movie.restatus', movie.id, single = True)
-
- if deleted:
- fireEvent('notify.frontend', type = 'movie.deleted', data = movie.to_dict())
-
- #db.close()
- return True
-
- def restatus(self, movie_id):
-
- active_status = fireEvent('status.get', 'active', single = True)
- done_status = fireEvent('status.get', 'done', single = True)
-
- db = get_session()
-
- m = db.query(Movie).filter_by(id = movie_id).first()
- if not m or len(m.library.titles) == 0:
- log.debug('Can\'t restatus movie, doesn\'t seem to exist.')
- return False
-
- log.debug('Changing status for %s', (m.library.titles[0].title))
- if not m.profile:
- m.status_id = done_status.get('id')
- else:
- move_to_wanted = True
-
- for t in m.profile.types:
- for release in m.releases:
- if t.quality.identifier is release.quality.identifier and (release.status_id is done_status.get('id') and t.finish):
- move_to_wanted = False
-
- m.status_id = active_status.get('id') if move_to_wanted else done_status.get('id')
-
- db.commit()
- #db.close()
-
- return True
-
- def createOnComplete(self, movie_id):
-
- def onComplete():
- db = get_session()
- movie = db.query(Movie).filter_by(id = movie_id).first()
- fireEventAsync('searcher.single', movie.to_dict(self.default_dict), on_complete = self.createNotifyFront(movie_id))
-
- return onComplete
-
-
- def createNotifyFront(self, movie_id):
-
- def notifyFront():
- db = get_session()
- movie = db.query(Movie).filter_by(id = movie_id).first()
- fireEvent('notify.frontend', type = 'movie.update.%s' % movie.id, data = movie.to_dict(self.default_dict))
-
- return notifyFront
diff --git a/couchpotato/core/plugins/movie/static/list.js b/couchpotato/core/plugins/movie/static/list.js
deleted file mode 100644
index 9e76fad3da..0000000000
--- a/couchpotato/core/plugins/movie/static/list.js
+++ /dev/null
@@ -1,534 +0,0 @@
-var MovieList = new Class({
-
- Implements: [Options],
-
- options: {
- navigation: true,
- limit: 50,
- load_more: true,
- menu: [],
- add_new: false
- },
-
- movies: [],
- movies_added: {},
- letters: {},
- filter: null,
-
- initialize: function(options){
- var self = this;
- self.setOptions(options);
-
- self.offset = 0;
- self.filter = self.options.filter || {
- 'startswith': null,
- 'search': null
- }
-
- self.el = new Element('div.movies').adopt(
- self.title = self.options.title ? new Element('h2', {
- 'text': self.options.title
- }) : null,
- self.movie_list = new Element('div'),
- self.load_more = self.options.load_more ? new Element('a.load_more', {
- 'events': {
- 'click': self.loadMore.bind(self)
- }
- }) : null
- );
-
- self.changeView(self.options.view || 'details');
-
- self.getMovies();
-
- App.addEvent('movie.added', self.movieAdded.bind(self))
- App.addEvent('movie.deleted', self.movieDeleted.bind(self))
- },
-
- movieDeleted: function(notification){
- var self = this;
-
- if(self.movies_added[notification.data.id]){
- self.movies.each(function(movie){
- if(movie.get('id') == notification.data.id){
- movie.destroy();
- delete self.movies_added[notification.data.id]
- }
- })
- }
-
- self.checkIfEmpty();
- },
-
- movieAdded: function(notification){
- var self = this;
-
- if(self.options.add_new && !self.movies_added[notification.data.id] && notification.data.status.identifier == self.options.status){
- window.scroll(0,0);
- self.createMovie(notification.data, 'top');
-
- self.checkIfEmpty();
- }
- },
-
- create: function(){
- var self = this;
-
- // Create the alphabet nav
- if(self.options.navigation)
- self.createNavigation();
-
- if(self.options.load_more)
- self.scrollspy = new ScrollSpy({
- min: function(){
- var c = self.load_more.getCoordinates()
- return c.top - window.document.getSize().y - 300
- },
- onEnter: self.loadMore.bind(self)
- });
-
- self.created = true;
- },
-
- addMovies: function(movies, total){
- var self = this;
-
- if(!self.created) self.create();
-
- // do scrollspy
- if(movies.length < self.options.limit && self.scrollspy){
- self.load_more.hide();
- self.scrollspy.stop();
- }
-
- Object.each(movies, function(movie){
- self.createMovie(movie);
- });
-
- self.total_movies = total;
- self.setCounter(total);
-
- },
-
- setCounter: function(count){
- var self = this;
-
- if(!self.navigation_counter) return;
-
- self.navigation_counter.set('text', (count || 0));
-
- },
-
- createMovie: function(movie, inject_at){
- var self = this;
-
- // Attach proper actions
- var a = self.options.actions,
- status = Status.get(movie.status_id),
- actions = a ? a[status.identifier.capitalize()] || a.Wanted : {};
-
- var m = new Movie(self, {
- 'actions': actions,
- 'view': self.current_view,
- 'onSelect': self.calculateSelected.bind(self)
- }, movie);
- $(m).inject(self.movie_list, inject_at || 'bottom');
- m.fireEvent('injected');
-
- self.movies.include(m)
- self.movies_added[movie.id] = true;
- },
-
- createNavigation: function(){
- var self = this;
- var chars = '#ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-
- self.current_view = self.getSavedView();
- self.el.addClass(self.current_view+'_list')
-
- self.navigation = new Element('div.alph_nav').adopt(
- self.navigation_actions = new Element('ul.inlay.actions.reversed'),
- self.navigation_counter = new Element('span.counter[title=Total]'),
- self.navigation_alpha = new Element('ul.numbers', {
- 'events': {
- 'click:relay(li)': function(e, el){
- self.movie_list.empty()
- self.activateLetter(el.get('data-letter'))
- self.getMovies()
- }
- }
- }),
- self.navigation_search_input = new Element('input.inlay', {
- 'placeholder': 'Search',
- 'events': {
- 'keyup': self.search.bind(self),
- 'change': self.search.bind(self)
- }
- }),
- self.navigation_menu = new Block.Menu(self),
- self.mass_edit_form = new Element('div.mass_edit_form').adopt(
- new Element('span.select').adopt(
- self.mass_edit_select = new Element('input[type=checkbox].inlay', {
- 'events': {
- 'change': self.massEditToggleAll.bind(self)
- }
- }),
- self.mass_edit_selected = new Element('span.count', {'text': 0}),
- self.mass_edit_selected_label = new Element('span', {'text': 'selected'})
- ),
- new Element('div.quality').adopt(
- self.mass_edit_quality = new Element('select'),
- new Element('a.button.orange', {
- 'text': 'Change quality',
- 'events': {
- 'click': self.changeQualitySelected.bind(self)
- }
- })
- ),
- new Element('div.delete').adopt(
- new Element('span[text=or]'),
- new Element('a.button.red', {
- 'text': 'Delete',
- 'events': {
- 'click': self.deleteSelected.bind(self)
- }
- })
- ),
- new Element('div.refresh').adopt(
- new Element('span[text=or]'),
- new Element('a.button.green', {
- 'text': 'Refresh',
- 'events': {
- 'click': self.refreshSelected.bind(self)
- }
- })
- )
- )
- ).inject(self.el, 'top');
-
- // Mass edit
- self.mass_edit_select_class = new Form.Check(self.mass_edit_select);
- Quality.getActiveProfiles().each(function(profile){
- new Element('option', {
- 'value': profile.id ? profile.id : profile.data.id,
- 'text': profile.label ? profile.label : profile.data.label
- }).inject(self.mass_edit_quality)
- });
-
- // Actions
- ['mass_edit', 'details', 'list'].each(function(view){
- self.navigation_actions.adopt(
- new Element('li.'+view+(self.current_view == view ? '.active' : '')+'[data-view='+view+']', {
- 'events': {
- 'click': function(e){
- var a = 'active';
- self.navigation_actions.getElements('.'+a).removeClass(a);
- self.changeView(this.get('data-view'));
- this.addClass(a);
- }
- }
- }).adopt(new Element('span'))
- )
- });
-
- // All
- self.letters['all'] = new Element('li.letter_all.available.active', {
- 'text': 'ALL',
- }).inject(self.navigation_alpha);
-
- // Chars
- chars.split('').each(function(c){
- self.letters[c] = new Element('li', {
- 'text': c,
- 'class': 'letter_'+c,
- 'data-letter': c
- }).inject(self.navigation_alpha);
- });
-
- // Get available chars and highlight
- Api.request('movie.available_chars', {
- 'data': Object.merge({
- 'status': self.options.status
- }, self.filter),
- 'onComplete': function(json){
-
- json.chars.split('').each(function(c){
- self.letters[c.capitalize()].addClass('available')
- })
-
- }
- });
-
- // Add menu or hide
- if (self.options.menu.length > 0)
- self.options.menu.each(function(menu_item){
- self.navigation_menu.addLink(menu_item);
- })
- else
- self.navigation_menu.hide()
-
- self.nav_scrollspy = new ScrollSpy({
- min: 10,
- onEnter: function(){
- self.navigation.addClass('float')
- },
- onLeave: function(){
- self.navigation.removeClass('float')
- }
- });
-
- },
-
- calculateSelected: function(){
- var self = this;
-
- var selected = 0,
- movies = self.movies.length;
- self.movies.each(function(movie){
- selected += movie.isSelected() ? 1 : 0
- })
-
- var indeterminate = selected > 0 && selected < movies,
- checked = selected == movies && selected > 0;
-
- self.mass_edit_select.set('indeterminate', indeterminate)
-
- self.mass_edit_select_class[checked ? 'check' : 'uncheck']()
- self.mass_edit_select_class.element[indeterminate ? 'addClass' : 'removeClass']('indeterminate')
-
- self.mass_edit_selected.set('text', selected);
- },
-
- deleteSelected: function(){
- var self = this,
- ids = self.getSelectedMovies(),
- help_msg = self.identifier == 'wanted' ? 'If you do, you won\'t be able to watch them, as they won\'t get downloaded!' : 'Your files will be safe, this will only delete the reference from the CouchPotato manage list';
-
- var qObj = new Question('Are you sure you want to delete '+ids.length+' movie'+ (ids.length != 1 ? 's' : '') +'?', help_msg, [{
- 'text': 'Yes, delete '+(ids.length != 1 ? 'them' : 'it'),
- 'class': 'delete',
- 'events': {
- 'click': function(e){
- (e).preventDefault();
- this.set('text', 'Deleting..')
- Api.request('movie.delete', {
- 'data': {
- 'id': ids.join(','),
- 'delete_from': self.options.identifier
- },
- 'onSuccess': function(){
- qObj.close();
-
- var erase_movies = [];
- self.movies.each(function(movie){
- if (movie.isSelected()){
- $(movie).destroy()
- erase_movies.include(movie)
- }
- });
-
- erase_movies.each(function(movie){
- self.movies.erase(movie);
-
- movie.destroy()
- });
-
- self.calculateSelected();
- }
- });
-
- }
- }
- }, {
- 'text': 'Cancel',
- 'cancel': true
- }]);
-
- },
-
- changeQualitySelected: function(){
- var self = this;
- var ids = self.getSelectedMovies()
-
- Api.request('movie.edit', {
- 'data': {
- 'id': ids.join(','),
- 'profile_id': self.mass_edit_quality.get('value')
- },
- 'onSuccess': self.search.bind(self)
- });
- },
-
- refreshSelected: function(){
- var self = this;
- var ids = self.getSelectedMovies()
-
- Api.request('movie.refresh', {
- 'data': {
- 'id': ids.join(','),
- }
- });
- },
-
- getSelectedMovies: function(){
- var self = this;
-
- var ids = []
- self.movies.each(function(movie){
- if (movie.isSelected())
- ids.include(movie.get('id'))
- });
-
- return ids
- },
-
- massEditToggleAll: function(){
- var self = this;
-
- var select = self.mass_edit_select.get('checked');
-
- self.movies.each(function(movie){
- movie.select(select)
- });
-
- self.calculateSelected()
- },
-
- reset: function(){
- var self = this;
-
- self.movies = []
- self.calculateSelected()
- self.navigation_alpha.getElements('.active').removeClass('active')
- self.offset = 0;
- if(self.scrollspy){
- self.load_more.show();
- self.scrollspy.start();
- }
- },
-
- activateLetter: function(letter){
- var self = this;
-
- self.reset()
-
- self.letters[letter || 'all'].addClass('active');
- self.filter.starts_with = letter;
-
- },
-
- changeView: function(new_view){
- var self = this;
-
- self.el
- .removeClass(self.current_view+'_list')
- .addClass(new_view+'_list')
-
- self.current_view = new_view;
- Cookie.write(self.options.identifier+'_view', new_view, {duration: 1000});
- },
-
- getSavedView: function(){
- var self = this;
- return Cookie.read(self.options.identifier+'_view') || 'thumbs';
- },
-
- search: function(){
- var self = this;
-
- if(self.search_timer) clearTimeout(self.search_timer);
- self.search_timer = (function(){
- var search_value = self.navigation_search_input.get('value');
- if (search_value == self.last_search_value) return
-
- self.reset()
-
- self.activateLetter();
- self.filter.search = search_value;
-
- self.movie_list.empty();
- self.getMovies();
-
- self.last_search_value = search_value;
-
- }).delay(250);
-
- },
-
- update: function(){
- var self = this;
-
- self.reset();
- self.movie_list.empty();
- self.getMovies();
- },
-
- getMovies: function(){
- var self = this;
-
- if(self.scrollspy){
- self.scrollspy.stop();
- self.load_more.set('text', 'loading...');
- }
-
- Api.request(self.options.api_call || 'movie.list', {
- 'data': Object.merge({
- 'status': self.options.status,
- 'limit_offset': self.options.limit + ',' + self.offset
- }, self.filter),
- 'onComplete': function(json){
- self.store(json.movies);
- self.addMovies(json.movies, json.total);
- if(self.scrollspy) {
- self.load_more.set('text', 'load more movies');
- self.scrollspy.start();
- }
-
- self.checkIfEmpty()
- }
- });
- },
-
- loadMore: function(){
- var self = this;
- if(self.offset >= self.options.limit)
- self.getMovies()
- },
-
- store: function(movies){
- var self = this;
-
- self.offset += movies.length;
-
- },
-
- checkIfEmpty: function(){
- var self = this;
-
- var is_empty = self.movies.length == 0 && self.total_movies == 0;
-
- if(self.title)
- self.title[is_empty ? 'hide' : 'show']()
-
- if(is_empty && self.options.on_empty_element){
- self.el.grab(self.options.on_empty_element);
-
- if(self.navigation)
- self.navigation.hide();
-
- self.empty_element = self.options.on_empty_element;
- }
- else if(self.empty_element){
- self.empty_element.destroy();
-
- if(self.navigation)
- self.navigation.show();
- }
-
- },
-
- toElement: function(){
- return this.el;
- }
-
-});
\ No newline at end of file
diff --git a/couchpotato/core/plugins/movie/static/movie.css b/couchpotato/core/plugins/movie/static/movie.css
deleted file mode 100644
index 9d67e62826..0000000000
--- a/couchpotato/core/plugins/movie/static/movie.css
+++ /dev/null
@@ -1,726 +0,0 @@
-.movies {
- padding: 60px 0 20px;
-}
-
- .movies h2 {
- margin-bottom: 20px;
- }
-
- .movies.thumbs_list {
- padding: 20px 0 20px;
- }
-
- .home .movies {
- padding-top: 6px;
- }
-
- .movies.mass_edit_list {
- padding-top: 90px;
- }
-
- .movies .movie {
- position: relative;
- border-radius: 4px;
- margin: 10px 0;
- overflow: hidden;
- width: 100%;
- height: 180px;
- transition: all 0.2s linear;
- }
-
- .movies.list_list .movie:not(.details_view),
- .movies.mass_edit_list .movie {
- height: 32px;
- }
-
- .movies.thumbs_list .movie {
- width: 153px;
- height: 230px;
- display: inline-block;
- margin: 0 8px 0 0;
- }
- .movies.thumbs_list .movie:nth-child(6n+6) {
- margin: 0;
- }
-
- .movies .movie .mask {
- position: absolute;
- top: 0;
- left: 0;
- height: 100%;
- width: 100%;
- }
-
- .movies.list_list .movie:not(.details_view),
- .movies.mass_edit_list .movie {
- margin: 1px 0;
- border-radius: 0;
- background: no-repeat;
- box-shadow: none;
- border-bottom: 1px solid rgba(255,255,255,0.05);
- }
-
- .movies.list_list .movie:hover:not(.details_view),
- .movies.mass_edit_list .movie {
- background: rgba(255,255,255,0.03);
- }
-
- .movies .data {
- padding: 20px;
- height: 100%;
- width: 840px;
- position: absolute;
- right: 0;
- border-radius: 0;
- transition: all .6s cubic-bezier(0.9,0,0.1,1);
- }
- .movies.list_list .movie:not(.details_view) .data,
- .movies.mass_edit_list .movie .data {
- height: 30px;
- padding: 3px 0 3px 10px;
- width: 938px;
- box-shadow: none;
- border: 0;
- background: none;
- }
-
- .movies.thumbs_list .data {
- left: 0;
- width: 100%;
- padding: 10px;
- height: 100%;
- background: none;
- transition: none;
- }
-
- .movies.thumbs_list .movie.no_thumbnail .data { background-image: linear-gradient(-30deg, rgba(255, 0, 85, .2) 0,rgba(125, 185, 235, .2) 100%);
- }
- .movies.thumbs_list .movie.no_thumbnail:nth-child(2n+6) .data { background-image: linear-gradient(-20deg, rgba(125, 0, 215, .2) 0, rgba(4, 55, 5, .7) 100%); }
- .movies.thumbs_list .movie.no_thumbnail:nth-child(3n+6) .data { background-image: linear-gradient(-30deg, rgba(155, 0, 85, .2) 0,rgba(25, 185, 235, .7) 100%); }
- .movies.thumbs_list .movie.no_thumbnail:nth-child(4n+6) .data { background-image: linear-gradient(-30deg, rgba(115, 5, 235, .2) 0, rgba(55, 180, 5, .7) 100%); }
- .movies.thumbs_list .movie.no_thumbnail:nth-child(5n+6) .data { background-image: linear-gradient(-30deg, rgba(35, 15, 215, .2) 0, rgba(135, 215, 115, .7) 100%); }
- .movies.thumbs_list .movie.no_thumbnail:nth-child(6n+6) .data { background-image: linear-gradient(-30deg, rgba(35, 15, 215, .2) 0, rgba(135, 15, 115, .7) 100%); }
-
- .movies.thumbs_list .movie:hover .data {
- background: rgba(0,0,0,0.9);
- }
-
- .movies .data.hide_right {
- right: -100%;
- }
-
- .movies .movie .check {
- display: none;
- }
-
- .movies.mass_edit_list .movie .check {
- position: absolute;
- left: 0;
- top: 0;
- display: block;
- margin: 7px 0 0 5px;
- }
-
- .movies .poster {
- position: absolute;
- left: 0;
- width: 120px;
- line-height: 0;
- overflow: hidden;
- height: 100%;
- border-radius: 4px 0 0 4px;
- transition: all .6s cubic-bezier(0.9,0,0.1,1);
-
- }
- .movies.list_list .movie:not(.details_view) .poster,
- .movies.mass_edit_list .poster {
- width: 20px;
- height: 30px;
- border-radius: 1px 0 0 1px;
- }
- .movies.mass_edit_list .poster {
- display: none;
- }
-
- .movies.thumbs_list .poster {
- width: 100%;
- height: 100%;
- }
-
- .movies .poster img,
- .options .poster img {
- width: 101%;
- height: 101%;
- }
-
- .movies .info {
- position: relative;
- height: 100%;
- }
-
- .movies .info .title {
- display: inline;
- position: absolute;
- font-size: 28px;
- font-weight: bold;
- margin-bottom: 10px;
- left: 0;
- top: 0;
- width: 90%;
- transition: all 0.2s linear;
- }
- .movies.list_list .movie:not(.details_view) .info .title,
- .movies.mass_edit_list .info .title {
- font-size: 16px;
- font-weight: normal;
- text-overflow: ellipsis;
- width: auto;
- overflow: hidden;
-
- }
-
- .movies.thumbs_list .movie:not(.no_thumbnail) .info {
- display: none;
- }
- .movies.thumbs_list .movie:hover .info {
- display: block;
- }
-
- .movies.thumbs_list .info .title {
- font-size: 21px;
- text-shadow: 0 0 10px #000;
- word-wrap: break-word;
- }
-
- .movies .info .year {
- position: absolute;
- font-size: 30px;
- margin-bottom: 10px;
- color: #bbb;
- width: 10%;
- right: 0;
- top: 0;
- text-align: right;
- transition: all 0.2s linear;
- }
- .movies.list_list .movie:not(.details_view) .info .year,
- .movies.mass_edit_list .info .year {
- font-size: 16px;
- width: 6%;
- right: 10px;
- }
-
- .movies.thumbs_list .info .year {
- font-size: 23px;
- margin: 0;
- bottom: 0;
- left: 0;
- top: auto;
- right: auto;
- color: #FFF;
- text-shadow: none;
- text-shadow: 0 0 6px #000;
- }
-
- .movies .info .description {
- position: absolute;
- top: 30px;
- clear: both;
- height: 80px;
- overflow: hidden;
- }
- .movies .data:hover .description {
- overflow: auto;
- }
- .movies.list_list .movie:not(.details_view) .info .description,
- .movies.mass_edit_list .info .description,
- .movies.thumbs_list .info .description {
- display: none;
- }
-
- .movies .data .quality {
- position: absolute;
- bottom: 0;
- display: block;
- min-height: 20px;
- vertical-align: mid;
- }
-
- .movies .status_suggest .data .quality,
- .movies.thumbs_list .data .quality {
- display: none;
- }
-
- .movies .data .quality span {
- padding: 2px 3px;
- font-weight: bold;
- opacity: 0.5;
- font-size: 10px;
- height: 16px;
- line-height: 12px;
- vertical-align: middle;
- display: inline-block;
- text-transform: uppercase;
- text-shadow: none;
- font-weight: normal;
- margin: 0 2px;
- border-radius: 2px;
- background-color: rgba(255,255,255,0.1);
- }
- .movies.list_list .data .quality,
- .movies.mass_edit_list .data .quality {
- text-align: right;
- right: 0;
- margin-right: 50px;
- z-index: 2;
- }
-
- .movies .data .quality .available,
- .movies .data .quality .snatched {
- opacity: 1;
- box-shadow: 1px 1px 0 rgba(0,0,0,0.2);
- cursor: pointer;
- }
-
- .movies .data .quality .available { background-color: #578bc3; }
- .movies .data .quality .snatched { background-color: #369545; }
- .movies .data .quality .done {
- background-color: #369545;
- opacity: 1;
- }
- .movies .data .quality .finish {
- background-image: url('../images/sprite.png');
- background-repeat: no-repeat;
- background-position: 0 2px;
- padding-left: 14px;
- background-size: 14px
- }
-
- .movies .data .actions {
- position: absolute;
- bottom: 20px;
- right: 20px;
- line-height: 0;
- margin-top: -25px;
- }
- .movies .data:hover .action { opacity: 0.6; }
- .movies .data:hover .action:hover { opacity: 1; }
- .movies.mass_edit_list .data .actions {
- display: none;
- }
-
- .movies .data .action {
- background-repeat: no-repeat;
- background-position: center;
- display: inline-block;
- width: 26px;
- height: 26px;
- padding: 3px;
- opacity: 0;
- }
-
- .movies.list_list .movie:not(.details_view) .data:hover .actions,
- .movies.mass_edit_list .data:hover .actions {
- margin: 0;
- background: #4e5969;
- top: 2px;
- bottom: 2px;
- right: 5px;
- z-index: 3;
- }
-
- .movies .delete_container {
- clear: both;
- text-align: center;
- font-size: 20px;
- position: absolute;
- padding: 70px 0 0;
- width: 100%;
- }
- .movies .delete_container .cancel {
- }
- .movies .delete_container .or {
- padding: 10px;
- }
- .movies .delete_container .delete {
- background-color: #ff321c;
- font-weight: normal;
- }
- .movies .delete_container .delete:hover {
- color: #fff;
- background-color: #d32917;
- }
-
- .movies .options {
- position: absolute;
- margin-left: 120px;
- width: 840px;
- }
-
- .movies .options .form {
- margin: 70px 20px 0;
- float: left;
- font-size: 20px;
- }
-
- .movies .options .form select {
- margin-right: 20px;
- }
-
- .movies .options .table {
- height: 180px;
- overflow: auto;
- }
- .movies .options .table .item {
- border-bottom: 1px solid rgba(255,255,255,0.1);
- }
- .movies .options .table .item.ignored span {
- text-decoration: line-through;
- color: rgba(255,255,255,0.4);
- text-shadow: none;
- }
- .movies .options .table .item.ignored .delete {
- background-image: url('../images/icon.undo.png');
- }
-
- .movies .options .table .item:last-child { border: 0; }
- .movies .options .table .item:nth-child(even) {
- background: rgba(255,255,255,0.05);
- }
- .movies .options .table .item:not(.head):hover {
- background: rgba(255,255,255,0.03);
- }
-
- .movies .options .table .item > * {
- display: inline-block;
- padding: 0 5px;
- width: 60px;
- min-height: 24px;
- white-space: nowrap;
- text-overflow: ellipsis;
- text-align: center;
- vertical-align: top;
- border-left: 1px solid rgba(255, 255, 255, 0.1);
- }
- .movies .options .table .item > *:first-child {
- border: 0;
- }
- .movies .options .table .provider {
- width: 120px;
- text-overflow: ellipsis;
- overflow: hidden;
- }
- .movies .options .table .name {
- width: 350px;
- overflow: hidden;
- text-align: left;
- padding: 0 10px;
- }
- .movies .options .table.files .name { width: 590px; }
- .movies .options .table .type { width: 130px; }
- .movies .options .table .is_available { width: 90px; }
- .movies .options .table .age,
- .movies .options .table .size { width: 40px; }
-
- .movies .options .table a {
- width: 30px !important;
- height: 20px;
- opacity: 0.8;
- }
- .movies .options .table a:hover {
- opacity: 1;
- }
-
- .movies .options .table .head > * {
- font-weight: bold;
- font-size: 14px;
- padding-top: 4px;
- padding-bottom: 4px;
- height: auto;
- }
-
- .movies .movie .trailer_container {
- width: 100%;
- background: #000;
- text-align: center;
- transition: all .6s cubic-bezier(0.9,0,0.1,1);
- overflow: hidden;
- }
- .movies .movie .trailer_container.hide {
- height: 0 !important;
- }
-
- .movies .movie .hide_trailer {
- position: absolute;
- top: 0;
- left: 50%;
- margin-left: -50px;
- width: 100px;
- text-align: center;
- padding: 3px 10px;
- background: #4e5969;
- border-radius: 0 0 2px 2px;
- transition: all .2s cubic-bezier(0.9,0,0.1,1) .2s;
- }
- .movies .movie .hide_trailer.hide {
- top: -30px;
- }
-
- .movies .movie .try_container {
- padding: 5px 10px;
- text-align: center;
- }
-
- .movies .movie .try_container a {
- margin: 0 5px;
- padding: 2px 5px;
- }
-
- .movies .movie .releases .next_release {
- border-left: 6px solid #2aa300;
- }
-
- .movies .movie .releases .next_release > :first-child {
- margin-left: -6px;
- }
-
- .movies .movie .releases .last_release {
- border-left: 6px solid #ffa200;
- }
-
- .movies .movie .releases .last_release > :first-child {
- margin-left: -6px;
- }
-
- .movies .load_more {
- display: block;
- padding: 10px;
- text-align: center;
- font-size: 20px;
- }
- .movies .load_more.loading {
- opacity: .5;
- }
-
-.movies .alph_nav {
- transition: box-shadow .4s linear;
- position: fixed;
- z-index: 2;
- top: 0;
- padding: 100px 60px 7px;
- width: 1080px;
- margin: 0 -60px;
- box-shadow: 0 20px 20px -22px rgba(0,0,0,0.1);
- background: #4e5969;
-}
-
- .movies .alph_nav.float {
- box-shadow: 0 30px 30px -32px rgba(0,0,0,0.5);
- border-radius: 0;
- }
-
-.movies .alph_nav ul.numbers,
-.movies .alph_nav .counter,
-.movies .alph_nav ul.actions {
- list-style: none;
- padding: 0 0 1px;
- margin: 0;
- float: left;
- user-select: none;
-}
-
- .movies .alph_nav .counter {
- width: 60px;
- text-align: center;
- }
-
- .movies .alph_nav .numbers li,
- .movies .alph_nav .actions li {
- display: inline-block;
- vertical-align: top;
- width: 20px;
- height: 24px;
- line-height: 26px;
- text-align: center;
- cursor: pointer;
- color: rgba(255,255,255,0.2);
- border: 1px solid transparent;
- transition: all 0.1s ease-in-out;
- text-shadow: none;
- }
- .movies .alph_nav .numbers li:first-child {
- width: 43px;
- }
- .movies .alph_nav li.available {
- color: rgba(255,255,255,0.8);
- font-weight: bolder;
-
- }
- .movies .alph_nav li.active.available, .movies .alph_nav li.available:hover {
- color: #fff;
- font-size: 20px;
- line-height: 20px;
- }
-
- .movies .alph_nav input {
- padding: 6px 5px;
- margin: 0 0 0 6px;
- float: left;
- width: 155px;
- height: 25px;
- }
-
- .movies .alph_nav .actions {
- margin: 0 6px 0 0;
- -moz-user-select: none;
- }
- .movies .alph_nav .actions li {
- border-radius: 1px;
- width: auto;
- }
- .movies .alph_nav .actions li.active {
- background: none;
- border: 1px solid transparent;
- box-shadow: none;
- }
- .movies .alph_nav .actions li span {
- display: block;
- background: url('../images/sprite.png') no-repeat;
- width: 25px;
- height: 100%;
- }
-
- .movies .alph_nav .actions li.mass_edit span {
- background-position: 3px 3px;
- }
-
- .movies .alph_nav .actions li.list span {
- background-position: 3px -95px;
- }
-
- .movies .alph_nav .actions li.details span {
- background-position: 3px -74px;
- }
-
- .movies .alph_nav .actions li:first-child {
- border-radius: 3px 0 0 3px;
- }
- .movies .alph_nav .actions li:last-child {
- border-radius: 0 3px 3px 0;
- }
-
- .movies .alph_nav .mass_edit_form {
- clear: both;
- text-align: center;
- display: none;
- }
- .movies.mass_edit_list .mass_edit_form {
- display: block;
- }
- .movies.mass_edit_list .mass_edit_form .select {
- float: left;
- margin: 5px 0 0 5px;
- font-size: 14px;
- }
- .movies.mass_edit_list .mass_edit_form .select span {
- vertical-align: middle;
- opacity: 0.7;
- }
- .movies.mass_edit_list .mass_edit_form .select .count {
- font-weight: bold;
- margin: 0 3px 0 10px;
- }
-
- .movies .alph_nav .mass_edit_form .quality {
- float: left;
- padding: 8px 0 0;
- margin: 0 0 0 16px;
- }
- .movies .alph_nav .mass_edit_form .quality select {
- width: 120px;
- margin-right: 5px;
- }
- .movies .alph_nav .mass_edit_form .button {
- padding: 3px 7px;
- }
-
- .movies .alph_nav .mass_edit_form .refresh,
- .movies .alph_nav .mass_edit_form .delete {
- float: left;
- padding: 8px 0 0 8px;
- }
-
- .movies .alph_nav .mass_edit_form .refresh span,
- .movies .alph_nav .mass_edit_form .delete span {
- margin: 0 10px 0 0;
- }
-
- .movies .alph_nav .more_menu {
- margin-left: 48px;
- }
-
- .movies .alph_nav .more_menu > a {
- background-position: center -158px;
- }
-
-.movies .empty_wanted {
- background-image: url('../images/emptylist.png');
- height: 750px;
- width: 800px;
- padding-top: 260px;
- margin-top: -50px;
-}
-
-.movies .empty_manage {
- text-align: center;
- font-size: 25px;
- line-height: 150%;
-}
-
- .movies .empty_manage .after_manage {
- margin-top: 30px;
- font-size: 16px;
- }
-
- .movies .progress {
- border-radius: 2px;
- padding: 10px;
- margin: 5px 0;
- text-align: left;
- }
-
- .movies .progress > div {
- padding: 5px 10px;
- font-size: 12px;
- line-height: 12px;
- text-align: left;
- display: inline-block;
- width: 49%;
- background: rgba(255, 255, 255, 0.05);
- margin: 2px 0.5%;
- border-radius: 3px;
- }
-
- .movies .progress > div .folder {
- display: inline-block;
- padding: 5px 20px 5px 0;
- white-space: nowrap;
- text-overflow: ellipsis;
- overflow: hidden;
- width: 85%;
- direction: rtl;
- vertical-align: middle;
- }
-
- .movies .progress > div .percentage {
- font-weight: bold;
- display: inline-block;
- text-transform: uppercase;
- text-shadow: none;
- font-weight: normal;
- font-size: 20px;
- border-left: 1px solid rgba(255, 255, 255, .2);
- width: 15%;
- text-align: right;
- vertical-align: middle;
- }
diff --git a/couchpotato/core/plugins/movie/static/movie.js b/couchpotato/core/plugins/movie/static/movie.js
deleted file mode 100644
index 283bb41415..0000000000
--- a/couchpotato/core/plugins/movie/static/movie.js
+++ /dev/null
@@ -1,684 +0,0 @@
-var Movie = new Class({
-
- Extends: BlockBase,
-
- action: {},
-
- initialize: function(list, options, data){
- var self = this;
-
- self.data = data;
- self.view = options.view || 'details';
- self.list = list;
-
- self.el = new Element('div.movie.inlay');
-
- self.profile = Quality.getProfile(data.profile_id) || {};
- self.parent(self, options);
-
- self.addEvents();
- },
-
- addEvents: function(){
- var self = this;
-
- App.addEvent('movie.update.'+self.data.id, self.update.bind(self));
-
- ['movie.busy', 'searcher.started'].each(function(listener){
- App.addEvent(listener+'.'+self.data.id, function(notification){
- if(notification.data)
- self.busy(true)
- });
- })
-
- App.addEvent('searcher.ended.'+self.data.id, function(notification){
- if(notification.data)
- self.busy(false)
- });
- },
-
- destroy: function(){
- var self = this;
-
- self.el.destroy();
- delete self.list.movies_added[self.get('id')];
- self.list.movies.erase(self)
-
- self.list.checkIfEmpty();
-
- // Remove events
- App.removeEvents('movie.update.'+self.data.id);
- ['movie.busy', 'searcher.started'].each(function(listener){
- App.removeEvents(listener+'.'+self.data.id);
- })
- },
-
- busy: function(set_busy){
- var self = this;
-
- if(!set_busy){
- if(self.spinner){
- self.mask.fade('out');
- setTimeout(function(){
- if(self.mask)
- self.mask.destroy();
- if(self.spinner)
- self.spinner.el.destroy();
- self.spinner = null;
- self.mask = null;
- }, 400);
- }
- }
- else if(!self.spinner) {
- self.createMask();
- self.spinner = createSpinner(self.mask);
- self.mask.fade('in');
- }
- },
-
- createMask: function(){
- var self = this;
- self.mask = new Element('div.mask', {
- 'styles': {
- 'z-index': '1'
- }
- }).inject(self.el, 'top').fade('hide');
- },
-
- positionMask: function(){
- var self = this,
- s = self.el.getSize()
-
- return self.mask.setStyles({
- 'width': s.x,
- 'height': s.y
- }).position({
- 'relativeTo': self.el
- })
- },
-
- update: function(notification){
- var self = this;
-
- self.data = notification.data;
- self.el.empty();
-
- self.profile = Quality.getProfile(self.data.profile_id) || {};
- self.create();
-
- self.busy(false);
- },
-
- create: function(){
- var self = this;
-
- var s = Status.get(self.get('status_id'));
- self.el.addClass('status_'+s.identifier);
-
- self.el.adopt(
- self.select_checkbox = new Element('input[type=checkbox].inlay', {
- 'events': {
- 'change': function(){
- self.fireEvent('select')
- }
- }
- }),
- self.thumbnail = File.Select.single('poster', self.data.library.files),
- self.data_container = new Element('div.data.inlay.light').adopt(
- self.info_container = new Element('div.info').adopt(
- self.title = new Element('div.title', {
- 'text': self.getTitle() || 'n/a'
- }),
- self.year = new Element('div.year', {
- 'text': self.data.library.year || 'n/a'
- }),
- self.rating = new Element('div.rating.icon', {
- 'text': self.data.library.rating
- }),
- self.description = new Element('div.description', {
- 'text': self.data.library.plot
- }),
- self.quality = new Element('div.quality', {
- 'events': {
- 'click': function(e){
- var releases = self.el.getElement('.actions .releases');
- if(releases)
- releases.fireEvent('click', [e])
- }
- }
- })
- ),
- self.actions = new Element('div.actions')
- )
- );
-
- if(self.thumbnail.empty)
- self.el.addClass('no_thumbnail');
-
- //self.changeView(self.view);
- self.select_checkbox_class = new Form.Check(self.select_checkbox);
-
- // Add profile
- if(self.profile.data)
- self.profile.getTypes().each(function(type){
-
- var q = self.addQuality(type.quality_id || type.get('quality_id'));
- if((type.finish == true || type.get('finish')) && !q.hasClass('finish')){
- q.addClass('finish');
- q.set('title', q.get('title') + ' Will finish searching for this movie if this quality is found.')
- }
-
- });
-
- // Add releases
- self.data.releases.each(function(release){
-
- var q = self.quality.getElement('.q_id'+ release.quality_id),
- status = Status.get(release.status_id);
-
- if(!q && (status.identifier == 'snatched' || status.identifier == 'done'))
- var q = self.addQuality(release.quality_id)
-
- if (status && q && !q.hasClass(status.identifier)){
- q.addClass(status.identifier);
- q.set('title', (q.get('title') ? q.get('title') : '') + ' status: '+ status.label)
- }
-
- });
-
- Object.each(self.options.actions, function(action, key){
- self.action[key.toLowerCase()] = action = new self.options.actions[key](self)
- if(action.el)
- self.actions.adopt(action)
- });
-
- if(!self.data.library.rating)
- self.rating.hide();
-
- },
-
- addQuality: function(quality_id){
- var self = this;
-
- var q = Quality.getQuality(quality_id);
- return new Element('span', {
- 'text': q.label,
- 'class': 'q_'+q.identifier + ' q_id' + q.id,
- 'title': ''
- }).inject(self.quality);
-
- },
-
- getTitle: function(){
- var self = this;
-
- var titles = self.data.library.titles;
-
- var title = titles.filter(function(title){
- return title['default']
- }).pop()
-
- if(title)
- return self.getUnprefixedTitle(title.title)
- else if(titles.length > 0)
- return self.getUnprefixedTitle(titles[0].title)
-
- return 'Unknown movie'
- },
-
- getUnprefixedTitle: function(t){
- if(t.substr(0, 4).toLowerCase() == 'the ')
- t = t.substr(4) + ', The';
- return t;
- },
-
- slide: function(direction, el){
- var self = this;
-
- if(direction == 'in'){
- self.temp_view = self.view;
- self.changeView('details')
-
- self.el.addEvent('outerClick', function(){
- self.removeView()
- self.slide('out')
- })
- el.show();
- self.data_container.addClass('hide_right');
- }
- else {
- self.el.removeEvents('outerClick')
-
- setTimeout(function(){
- self.el.getElements('> :not(.data):not(.poster):not(.movie_container)').hide();
- }, 600);
-
- self.data_container.removeClass('hide_right');
- }
- },
-
- changeView: function(new_view){
- var self = this;
-
- self.el
- .removeClass(self.view+'_view')
- .addClass(new_view+'_view')
-
- self.view = new_view;
- },
-
- removeView: function(){
- var self = this;
-
- self.el.removeClass(self.view+'_view')
- },
-
- get: function(attr){
- return this.data[attr] || this.data.library[attr]
- },
-
- select: function(bool){
- var self = this;
- self.select_checkbox_class[bool ? 'check' : 'uncheck']()
- },
-
- isSelected: function(){
- return this.select_checkbox.get('checked');
- },
-
- toElement: function(){
- return this.el;
- }
-
-});
-
-var MovieAction = new Class({
-
- class_name: 'action icon',
-
- initialize: function(movie){
- var self = this;
- self.movie = movie;
-
- self.create();
- if(self.el)
- self.el.addClass(self.class_name)
- },
-
- create: function(){},
-
- disable: function(){
- this.el.addClass('disable')
- },
-
- enable: function(){
- this.el.removeClass('disable')
- },
-
- createMask: function(){
- var self = this;
- self.mask = new Element('div.mask', {
- 'styles': {
- 'z-index': '1'
- }
- }).inject(self.movie, 'top').fade('hide');
- //self.positionMask();
- },
-
- positionMask: function(){
- var self = this,
- movie = $(self.movie),
- s = movie.getSize()
-
- return;
-
- return self.mask.setStyles({
- 'width': s.x,
- 'height': s.y
- }).position({
- 'relativeTo': movie
- })
- },
-
- toElement: function(){
- return this.el || null
- }
-
-});
-
-var IMDBAction = new Class({
-
- Extends: MovieAction,
- id: null,
-
- create: function(){
- var self = this;
-
- self.id = self.movie.get('identifier');
-
- self.el = new Element('a.imdb', {
- 'title': 'Go to the IMDB page of ' + self.movie.getTitle(),
- 'href': 'http://www.imdb.com/title/'+self.id+'/',
- 'target': '_blank'
- });
-
- if(!self.id) self.disable();
- }
-
-});
-
-var ReleaseAction = new Class({
-
- Extends: MovieAction,
-
- create: function(){
- var self = this;
-
- self.el = new Element('a.releases.icon.download', {
- 'title': 'Show the releases that are available for ' + self.movie.getTitle(),
- 'events': {
- 'click': self.show.bind(self)
- }
- });
-
- if(self.movie.data.releases.length == 0){
- self.el.hide()
- }
- else {
-
- var buttons_done = false;
-
- self.movie.data.releases.sortBy('-info.score').each(function(release){
- if(buttons_done) return;
-
- var status = Status.get(release.status_id);
-
- if((self.next_release && (status.identifier == 'ignored' || status.identifier == 'failed')) || (!self.next_release && status.identifier == 'available')){
- self.hide_on_click = false;
- self.show();
- buttons_done = true;
- }
-
- });
-
- }
-
- },
-
- show: function(e){
- var self = this;
- if(e)
- (e).preventDefault();
-
- if(!self.options_container){
- self.options_container = new Element('div.options').adopt(
- self.release_container = new Element('div.releases.table').adopt(
- self.trynext_container = new Element('div.buttons.try_container')
- )
- ).inject(self.movie, 'top');
-
- // Header
- new Element('div.item.head').adopt(
- new Element('span.name', {'text': 'Release name'}),
- new Element('span.status', {'text': 'Status'}),
- new Element('span.quality', {'text': 'Quality'}),
- new Element('span.size', {'text': 'Size'}),
- new Element('span.age', {'text': 'Age'}),
- new Element('span.score', {'text': 'Score'}),
- new Element('span.provider', {'text': 'Provider'})
- ).inject(self.release_container)
-
- self.movie.data.releases.sortBy('-info.score').each(function(release){
-
- var status = Status.get(release.status_id),
- quality = Quality.getProfile(release.quality_id) || {},
- info = release.info,
- provider = self.get(release, 'provider') + (release.info['provider_extra'] ? self.get(release, 'provider_extra') : '');
- release.status = status;
-
- // Create release
- new Element('div', {
- 'class': 'item '+status.identifier,
- 'id': 'release_'+release.id
- }).adopt(
- new Element('span.name', {'text': self.get(release, 'name'), 'title': self.get(release, 'name')}),
- new Element('span.status', {'text': status.identifier, 'class': 'release_status '+status.identifier}),
- new Element('span.quality', {'text': quality.get('label') || 'n/a'}),
- new Element('span.size', {'text': release.info['size'] ? Math.floor(self.get(release, 'size')) : 'n/a'}),
- new Element('span.age', {'text': self.get(release, 'age')}),
- new Element('span.score', {'text': self.get(release, 'score')}),
- new Element('span.provider', { 'text': provider, 'title': provider }),
- release.info['detail_url'] ? new Element('a.info.icon', {
- 'href': release.info['detail_url'],
- 'target': '_blank'
- }) : null,
- new Element('a.download.icon', {
- 'events': {
- 'click': function(e){
- (e).preventDefault();
- if(!this.hasClass('completed'))
- self.download(release);
- }
- }
- }),
- new Element('a.delete.icon', {
- 'events': {
- 'click': function(e){
- (e).preventDefault();
- self.ignore(release);
- this.getParent('.item').toggleClass('ignored')
- }
- }
- })
- ).inject(self.release_container)
-
- if(status.identifier == 'ignored' || status.identifier == 'failed' || status.identifier == 'snatched'){
- if(!self.last_release || (self.last_release && self.last_release.status.identifier != 'snatched' && status.identifier == 'snatched'))
- self.last_release = release;
- }
- else if(!self.next_release && status.identifier == 'available'){
- self.next_release = release;
- }
- });
-
- if(self.last_release){
- self.release_container.getElement('#release_'+self.last_release.id).addClass('last_release');
- }
-
- if(self.next_release){
- self.release_container.getElement('#release_'+self.next_release.id).addClass('next_release');
- }
-
- if(self.next_release || self.last_release){
-
- self.trynext_container.adopt(
- new Element('span.or', {
- 'text': 'This movie is snatched, if anything went wrong, download'
- }),
- self.last_release ? new Element('a.button.orange', {
- 'text': 'the same release again',
- 'events': {
- 'click': self.trySameRelease.bind(self)
- }
- }) : null,
- self.next_release && self.last_release ? new Element('span.or', {
- 'text': ','
- }) : null,
- self.next_release ? [new Element('a.button.green', {
- 'text': self.last_release ? 'another release' : 'the best release',
- 'events': {
- 'click': self.tryNextRelease.bind(self)
- }
- }),
- new Element('span.or', {
- 'text': 'or pick one below'
- })] : null
- )
- }
-
- }
-
- self.movie.slide('in', self.options_container);
- },
-
- get: function(release, type){
- return release.info[type] || 'n/a'
- },
-
- download: function(release){
- var self = this;
-
- var release_el = self.release_container.getElement('#release_'+release.id),
- icon = release_el.getElement('.download.icon');
-
- icon.addClass('spinner');
-
- Api.request('release.download', {
- 'data': {
- 'id': release.id
- },
- 'onComplete': function(json){
- icon.removeClass('spinner')
- if(json.success)
- icon.addClass('completed');
- else
- icon.addClass('attention').set('title', 'Something went wrong when downloading, please check logs.');
- }
- });
- },
-
- ignore: function(release){
- var self = this;
-
- Api.request('release.ignore', {
- 'data': {
- 'id': release.id
- }
- })
-
- },
-
- tryNextRelease: function(movie_id){
- var self = this;
-
- if(self.last_release)
- self.ignore(self.last_release);
-
- if(self.next_release)
- self.download(self.next_release);
-
- },
-
- trySameRelease: function(movie_id){
- var self = this;
-
- if(self.last_release)
- self.download(self.last_release);
-
- }
-
-});
-
-var TrailerAction = new Class({
-
- Extends: MovieAction,
- id: null,
-
- create: function(){
- var self = this;
-
- self.el = new Element('a.trailer', {
- 'title': 'Watch the trailer of ' + self.movie.getTitle(),
- 'events': {
- 'click': self.watch.bind(self)
- }
- });
-
- },
-
- watch: function(offset){
- var self = this;
-
- var data_url = 'http://gdata.youtube.com/feeds/videos?vq="{title}" {year} trailer&max-results=1&alt=json-in-script&orderby=relevance&sortorder=descending&format=5&fmt=18'
- var url = data_url.substitute({
- 'title': encodeURI(self.movie.getTitle()),
- 'year': self.movie.get('year'),
- 'offset': offset || 1
- }),
- size = $(self.movie).getSize(),
- height = (size.x/16)*9,
- id = 'trailer-'+randomString();
-
- self.player_container = new Element('div[id='+id+']');
- self.container = new Element('div.hide.trailer_container')
- .adopt(self.player_container)
- .inject($(self.movie), 'top');
-
- self.container.setStyle('height', 0);
- self.container.removeClass('hide');
-
- self.close_button = new Element('a.hide.hide_trailer', {
- 'text': 'Hide trailer',
- 'events': {
- 'click': self.stop.bind(self)
- }
- }).inject(self.movie);
-
- self.container.setStyle('height', height);
- $(self.movie).setStyle('height', height);
-
- new Request.JSONP({
- 'url': url,
- 'onComplete': function(json){
- var video_url = json.feed.entry[0].id.$t.split('/'),
- video_id = video_url[video_url.length-1];
-
- self.player = new YT.Player(id, {
- 'height': height,
- 'width': size.x,
- 'videoId': video_id,
- 'playerVars': {
- 'autoplay': 1,
- 'showsearch': 0,
- 'wmode': 'transparent',
- 'iv_load_policy': 3
- }
- });
-
- self.close_button.removeClass('hide');
-
- var quality_set = false;
- var change_quality = function(state){
- if(!quality_set && (state.data == 1 || state.data || 2)){
- try {
- self.player.setPlaybackQuality('hd720');
- quality_set = true;
- }
- catch(e){
-
- }
- }
- }
- self.player.addEventListener('onStateChange', change_quality);
-
- }
- }).send()
-
- },
-
- stop: function(){
- var self = this;
-
- self.player.stopVideo();
- self.container.addClass('hide');
- self.close_button.addClass('hide');
- $(self.movie).setStyle('height', null);
-
- setTimeout(function(){
- self.container.destroy()
- self.close_button.destroy();
- }, 1800)
- }
-
-
-});
\ No newline at end of file
diff --git a/couchpotato/core/plugins/movie/static/search.css b/couchpotato/core/plugins/movie/static/search.css
deleted file mode 100644
index 391e34763d..0000000000
--- a/couchpotato/core/plugins/movie/static/search.css
+++ /dev/null
@@ -1,212 +0,0 @@
-.search_form {
- display: inline-block;
- vertical-align: middle;
- width: 25%;
-}
-
- .search_form input {
- padding: 4px 20px 4px 4px;
- margin: 0;
- font-size: 14px;
- width: 100%;
- height: 24px;
- }
- .search_form input:focus {
- padding-right: 83px;
- }
-
- .search_form .input .enter {
- background: #369545 url('../images/sprite.png') right -188px no-repeat;
- padding: 0 20px 0 4px;
- border-radius: 2px;
- text-transform: uppercase;
- font-size: 10px;
- margin-left: -78px;
- display: inline-block;
- opacity: 0;
- position: relative;
- top: -2px;
- cursor: pointer;
- vertical-align: middle;
- visibility: hidden;
- }
- .search_form.focused .input .enter {
- visibility: visible;
- }
- .search_form.focused.filled .input .enter {
- opacity: 1;
- }
-
- .search_form .input a {
- width: 17px;
- height: 20px;
- display: inline-block;
- margin: -2px 0 0 2px;
- top: 4px;
- right: 5px;
- background: url('../images/sprite.png') left -37px no-repeat;
- cursor: pointer;
- opacity: 0;
- transition: all 0.2s ease-in-out;
- vertical-align: middle;
- }
-
- .search_form.filled .input a {
- opacity: 1;
- }
-
- .search_form .results_container {
- position: absolute;
- background: #5c697b;
- margin: 6px 0 0 -230px;
- width: 470px;
- min-height: 140px;
- border-radius: 3px;
- box-shadow: 0 20px 20px -10px rgba(0,0,0,0.55);
- display: none;
- }
- .search_form.shown.filled .results_container {
- display: block;
- }
-
- .search_form .results_container:before {
- content: ' ';
- height: 0;
- position: relative;
- width: 0;
- border: 10px solid transparent;
- border-bottom-color: #5c697b;
- display: block;
- top: -20px;
- left: 346px;
- }
-
- .search_form .results {
- max-height: 570px;
- overflow-x: hidden;
- padding: 10px 0;
- margin-top: -18px;
- }
-
- .movie_result {
- overflow: hidden;
- height: 140px;
- position: relative;
- }
-
- .movie_result .options {
- position: absolute;
- height: 100%;
- width: 100%;
- top: 0;
- left: 0;
- border: 1px solid transparent;
- border-width: 1px 0;
- border-radius: 0;
- box-shadow: inset 0 1px 8px rgba(0,0,0,0.25);
- }
-
- .movie_result .options > div {
- padding: 0 15px;
- border: 0;
- }
-
- .movie_result .options .thumbnail {
- vertical-align: middle;
- }
-
- .movie_result .options select {
- vertical-align: middle;
- display: inline-block;
- margin-right: 10px;
- }
- .movie_result .options select[name=title] { width: 180px; }
- .movie_result .options select[name=profile] { width: 90px; }
-
- .movie_result .options .button {
- vertical-align: middle;
- display: inline-block;
- }
-
- .movie_result .options .message {
- height: 100%;
- line-height: 140px;
- font-size: 20px;
- text-align: center;
- color: #fff;
- }
-
- .movie_result .data {
- padding: 0 15px;
- position: absolute;
- height: 100%;
- width: 100%;
- top: 0;
- left: 0;
- background: #5c697b;
- cursor: pointer;
-
- border-bottom: 1px solid #333;
- border-top: 1px solid rgba(255,255,255, 0.15);
- transition: all .6s cubic-bezier(0.9,0,0.1,1);
- }
- .movie_result .data.open {
- left: 100%;
- }
-
- .movie_result:last-child .data { border-bottom: 0; }
-
- .movie_result .in_wanted, .movie_result .in_library {
- position: absolute;
- margin-top: 105px;
- }
-
- .movie_result .thumbnail {
- width: 17%;
- display: inline-block;
- margin: 15px 3% 15px 0;
- vertical-align: top;
- border-radius: 3px;
- box-shadow: 0 0 3px rgba(0,0,0,0.35);
- }
-
- .movie_result .info {
- width: 80%;
- display: inline-block;
- vertical-align: top;
- padding: 15px 0;
- height: 120px;
- overflow: hidden;
- }
-
- .movie_result .info .tagline {
- max-height: 70px;
- overflow: hidden;
- display: inline-block;
- }
-
- .movie_result .add +.info {
- margin-left: 20%;
- }
-
- .movie_result .info h2 {
- margin: 0;
- font-size: 17px;
- line-height: 20px;
- }
-
- .movie_result .info h2 span {
- padding: 0 5px;
- }
-
- .movie_result .info h2 span:before { content: "("; }
- .movie_result .info h2 span:after { content: ")"; }
-
-.search_form .mask {
- border-radius: 3px;
- position: absolute;
- height: 100%;
- width: 100%;
- left: 0;
- top: 0;
-}
\ No newline at end of file
diff --git a/couchpotato/core/plugins/movie/static/search.js b/couchpotato/core/plugins/movie/static/search.js
deleted file mode 100644
index ba8b547ea0..0000000000
--- a/couchpotato/core/plugins/movie/static/search.js
+++ /dev/null
@@ -1,380 +0,0 @@
-Block.Search = new Class({
-
- Extends: BlockBase,
-
- cache: {},
-
- create: function(){
- var self = this;
-
- self.el = new Element('div.search_form').adopt(
- new Element('div.input').adopt(
- self.input = new Element('input.inlay', {
- 'placeholder': 'Search & add a new movie',
- 'events': {
- 'keyup': self.keyup.bind(self),
- 'focus': function(){
- self.el.addClass('focused')
- if(this.get('value'))
- self.hideResults(false)
- },
- 'blur': function(){
- (function(){
- self.el.removeClass('focused')
- }).delay(2000);
- }
- }
- }),
- new Element('span.enter', {
- 'events': {
- 'click': self.keyup.bind(self)
- },
- 'text':'Enter'
- }),
- new Element('a', {
- 'events': {
- 'click': self.clear.bind(self)
- }
- })
- ),
- self.result_container = new Element('div.results_container', {
- 'tween': {
- 'duration': 200
- },
- 'events': {
- 'mousewheel': function(e){
- (e).stopPropagation();
- }
- }
- }).adopt(
- self.results = new Element('div.results')
- )
- );
-
- self.mask = new Element('div.mask').inject(self.result_container).fade('hide');
-
- },
-
- clear: function(e){
- var self = this;
- (e).preventDefault();
-
- self.last_q = '';
- self.input.set('value', '');
- self.input.focus()
-
- self.movies = []
- self.results.empty()
- self.el.removeClass('filled')
- },
-
- hideResults: function(bool){
- var self = this;
-
- if(self.hidden == bool) return;
-
- self.el[bool ? 'removeClass' : 'addClass']('shown');
-
- if(bool){
- History.removeEvent('change', self.hideResults.bind(self, !bool));
- self.el.removeEvent('outerClick', self.hideResults.bind(self, !bool));
- }
- else {
- History.addEvent('change', self.hideResults.bind(self, !bool));
- self.el.addEvent('outerClick', self.hideResults.bind(self, !bool));
- }
-
- self.hidden = bool;
- },
-
- keyup: function(e){
- var self = this;
-
- self.el[self.q() ? 'addClass' : 'removeClass']('filled')
-
- if(self.q() != self.last_q && (['enter'].indexOf(e.key) > -1 || e.type == 'click'))
- self.autocomplete()
-
- },
-
- autocomplete: function(){
- var self = this;
-
- if(!self.q()){
- self.hideResults(true)
- return
- }
-
- self.list()
- },
-
- list: function(){
- var self = this;
-
- if(self.api_request && self.api_request.running) return
-
- var q = self.q();
- var cache = self.cache[q];
-
- self.hideResults(false);
-
- if(!cache){
- self.mask.fade('in');
-
- if(!self.spinner)
- self.spinner = createSpinner(self.mask);
-
- self.api_request = Api.request('movie.search', {
- 'data': {
- 'q': q
- },
- 'onComplete': self.fill.bind(self, q)
- })
- }
- else
- self.fill(q, cache)
-
- self.last_q = q;
-
- },
-
- fill: function(q, json){
- var self = this;
-
- self.cache[q] = json
-
- self.movies = {}
- self.results.empty()
-
- Object.each(json.movies, function(movie){
-
- var m = new Block.Search.Item(movie);
- $(m).inject(self.results)
- self.movies[movie.imdb || 'r-'+Math.floor(Math.random()*10000)] = m
-
- if(q == movie.imdb)
- m.showOptions()
-
- });
-
- if(q != self.q())
- self.list()
-
- // Calculate result heights
- var w = window.getSize(),
- rc = self.result_container.getCoordinates();
-
- self.results.setStyle('max-height', (w.y - rc.top - 50) + 'px')
- self.mask.fade('out')
-
- },
-
- loading: function(bool){
- this.el[bool ? 'addClass' : 'removeClass']('loading')
- },
-
- q: function(){
- return this.input.get('value').trim();
- }
-
-});
-
-Block.Search.Item = new Class({
-
- initialize: function(info, options){
- var self = this;
-
- self.info = info;
- self.alternative_titles = [];
-
- self.create();
- },
-
- create: function(){
- var self = this,
- info = self.info;
-
- self.el = new Element('div.movie_result', {
- 'id': info.imdb
- }).adopt(
- self.options_el = new Element('div.options.inlay'),
- self.data_container = new Element('div.data', {
- 'tween': {
- duration: 400,
- transition: 'quint:in:out'
- },
- 'events': {
- 'click': self.showOptions.bind(self)
- }
- }).adopt(
- self.thumbnail = info.images && info.images.poster.length > 0 ? new Element('img.thumbnail', {
- 'src': info.images.poster[0],
- 'height': null,
- 'width': null
- }) : null,
- new Element('div.info').adopt(
- self.title = new Element('h2', {
- 'text': info.titles[0]
- }).adopt(
- self.year = info.year ? new Element('span.year', {
- 'text': info.year
- }) : null
- ),
- self.tagline = new Element('span.tagline', {
- 'text': info.tagline ? info.tagline : info.plot,
- 'title': info.tagline ? info.tagline : info.plot
- }),
- self.director = self.info.director ? new Element('span.director', {
- 'text': 'Director:' + info.director
- }) : null,
- self.starring = info.actors ? new Element('span.actors', {
- 'text': 'Starring:'
- }) : null
- )
- )
- )
-
- if(info.actors){
- Object.each(info.actors, function(actor){
- new Element('span', {
- 'text': actor
- }).inject(self.starring)
- })
- }
-
- info.titles.each(function(title){
- self.alternativeTitle({
- 'title': title
- });
- })
- },
-
- alternativeTitle: function(alternative){
- var self = this;
-
- self.alternative_titles.include(alternative);
- },
-
- showOptions: function(){
- var self = this;
-
- self.createOptions();
-
- self.data_container.addClass('open');
- self.el.addEvent('outerClick', self.closeOptions.bind(self))
-
- },
-
- closeOptions: function(){
- var self = this;
-
- self.data_container.removeClass('open');
- self.el.removeEvents('outerClick')
- },
-
- add: function(e){
- var self = this;
- (e).preventDefault();
-
- self.loadingMask();
-
- Api.request('movie.add', {
- 'data': {
- 'identifier': self.info.imdb,
- 'title': self.title_select.get('value'),
- 'profile_id': self.profile_select.get('value')
- },
- 'onComplete': function(json){
- self.options_el.empty();
- self.options_el.adopt(
- new Element('div.message', {
- 'text': json.added ? 'Movie successfully added.' : 'Movie didn\'t add properly. Check logs'
- })
- );
- self.mask.fade('out');
- },
- 'onFailure': function(){
- self.options_el.empty();
- self.options_el.adopt(
- new Element('div.message', {
- 'text': 'Something went wrong, check the logs for more info.'
- })
- );
- self.mask.fade('out');
- }
- });
- },
-
- createOptions: function(){
- var self = this,
- info = self.info;
-
- if(!self.options_el.hasClass('set')){
-
- if(self.info.in_library){
- var in_library = [];
- self.info.in_library.releases.each(function(release){
- in_library.include(release.quality.label)
- });
- }
-
- self.options_el.grab(
- new Element('div').adopt(
- self.thumbnail = (info.images && info.images.poster.length > 0) ? new Element('img.thumbnail', {
- 'src': info.images.poster[0],
- 'height': null,
- 'width': null
- }) : null,
- self.info.in_wanted && self.info.in_wanted.profile ? new Element('span.in_wanted', {
- 'text': 'Already in wanted list: ' + self.info.in_wanted.profile.label
- }) : (in_library ? new Element('span.in_library', {
- 'text': 'Already in library: ' + in_library.join(', ')
- }) : null),
- self.title_select = new Element('select', {
- 'name': 'title'
- }),
- self.profile_select = new Element('select', {
- 'name': 'profile'
- }),
- new Element('a.button', {
- 'text': 'Add',
- 'events': {
- 'click': self.add.bind(self)
- }
- })
- )
- );
-
- Array.each(self.alternative_titles, function(alt){
- new Element('option', {
- 'text': alt.title
- }).inject(self.title_select)
- })
-
- Quality.getActiveProfiles().each(function(profile){
- new Element('option', {
- 'value': profile.id ? profile.id : profile.data.id,
- 'text': profile.label ? profile.label : profile.data.label
- }).inject(self.profile_select)
- });
-
- self.options_el.addClass('set');
- }
-
- },
-
- loadingMask: function(){
- var self = this;
-
- self.mask = new Element('span.mask').inject(self.el).fade('hide')
-
- createSpinner(self.mask)
- self.mask.fade('in')
-
- },
-
- toElement: function(){
- return this.el
- }
-
-});
diff --git a/couchpotato/core/plugins/profile/__init__.py b/couchpotato/core/plugins/profile/__init__.py
index ac19b01812..15a74eee51 100644
--- a/couchpotato/core/plugins/profile/__init__.py
+++ b/couchpotato/core/plugins/profile/__init__.py
@@ -1,6 +1,5 @@
from .main import ProfilePlugin
-def start():
- return ProfilePlugin()
-config = []
+def autoload():
+ return ProfilePlugin()
diff --git a/couchpotato/core/plugins/profile/index.py b/couchpotato/core/plugins/profile/index.py
new file mode 100644
index 0000000000..c2bf9445b8
--- /dev/null
+++ b/couchpotato/core/plugins/profile/index.py
@@ -0,0 +1,16 @@
+from CodernityDB.tree_index import TreeBasedIndex
+
+
+class ProfileIndex(TreeBasedIndex):
+ _version = 1
+
+ def __init__(self, *args, **kwargs):
+ kwargs['key_format'] = 'i'
+ super(ProfileIndex, self).__init__(*args, **kwargs)
+
+ def make_key(self, key):
+ return key
+
+ def make_key_value(self, data):
+ if data.get('_t') == 'profile':
+ return data.get('order', 99), None
diff --git a/couchpotato/core/plugins/profile/main.py b/couchpotato/core/plugins/profile/main.py
index 4caa54f701..29bd6cbe32 100644
--- a/couchpotato/core/plugins/profile/main.py
+++ b/couchpotato/core/plugins/profile/main.py
@@ -1,18 +1,22 @@
-from couchpotato import get_session
+import traceback
+
+from couchpotato import get_db, tryInt
from couchpotato.api import addApiView
from couchpotato.core.event import addEvent, fireEvent
from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.request import jsonified, getParams, getParam
from couchpotato.core.logger import CPLog
from couchpotato.core.plugins.base import Plugin
-from couchpotato.core.settings.model import Profile, ProfileType
+from .index import ProfileIndex
+
log = CPLog(__name__)
class ProfilePlugin(Plugin):
- to_dict = {'types': {}}
+ _database = {
+ 'profile': ProfileIndex
+ }
def __init__(self):
addEvent('profile.all', self.all)
@@ -30,155 +34,209 @@ def __init__(self):
})
addEvent('app.initialize', self.fill, priority = 90)
+ addEvent('app.load', self.forceDefaults, priority = 110)
- def allView(self):
+ def forceDefaults(self):
- return jsonified({
- 'success': True,
- 'list': self.all()
- })
+ db = get_db()
- def all(self):
+ # Fill qualities and profiles if they are empty somehow..
+ if db.count(db.all, 'profile') == 0:
- db = get_session()
- profiles = db.query(Profile).all()
+ if db.count(db.all, 'quality') == 0:
+ fireEvent('quality.fill', single = True)
- temp = []
- for profile in profiles:
- temp.append(profile.to_dict(self.to_dict))
+ self.fill()
- return temp
-
- def save(self):
-
- params = getParams()
+ # Get all active movies without profile
+ try:
+ medias = fireEvent('media.with_status', 'active', single = True)
- db = get_session()
+ profile_ids = [x.get('_id') for x in self.all()]
+ default_id = profile_ids[0]
- p = db.query(Profile).filter_by(id = params.get('id')).first()
- if not p:
- p = Profile()
- db.add(p)
+ for media in medias:
+ if media.get('profile_id') not in profile_ids:
+ media['profile_id'] = default_id
+ db.update(media)
+ except:
+ log.error('Failed: %s', traceback.format_exc())
- p.label = toUnicode(params.get('label'))
- p.order = params.get('order', p.order if p.order else 0)
- p.core = params.get('core', False)
+ def allView(self, **kwargs):
- #delete old types
- [db.delete(t) for t in p.types]
+ return {
+ 'success': True,
+ 'list': self.all()
+ }
- order = 0
- for type in params.get('types', []):
- t = ProfileType(
- order = order,
- finish = type.get('finish') if order > 0 else 1,
- wait_for = params.get('wait_for'),
- quality_id = type.get('quality_id')
- )
- p.types.append(t)
+ def all(self):
- order += 1
+ db = get_db()
+ profiles = db.all('profile', with_doc = True)
- db.commit()
+ return [x['doc'] for x in profiles]
- profile_dict = p.to_dict(self.to_dict)
+ def save(self, **kwargs):
- return jsonified({
- 'success': True,
- 'profile': profile_dict
- })
+ try:
+ db = get_db()
+
+ profile = {
+ '_t': 'profile',
+ 'label': toUnicode(kwargs.get('label')),
+ 'order': tryInt(kwargs.get('order', 999)),
+ 'core': kwargs.get('core', False),
+ 'minimum_score': tryInt(kwargs.get('minimum_score', 1)),
+ 'qualities': [],
+ 'wait_for': [],
+ 'stop_after': [],
+ 'finish': [],
+ '3d': []
+ }
+
+ # Update types
+ order = 0
+ for type in kwargs.get('types', []):
+ profile['qualities'].append(type.get('quality'))
+ profile['wait_for'].append(tryInt(kwargs.get('wait_for', 0)))
+ profile['stop_after'].append(tryInt(kwargs.get('stop_after', 0)))
+ profile['finish'].append((tryInt(type.get('finish')) == 1) if order > 0 else True)
+ profile['3d'].append(tryInt(type.get('3d')))
+ order += 1
+
+ id = kwargs.get('id')
+ try:
+ p = db.get('id', id)
+ profile['order'] = tryInt(kwargs.get('order', p.get('order', 999)))
+ except:
+ p = db.insert(profile)
+
+ p.update(profile)
+ db.update(p)
+
+ return {
+ 'success': True,
+ 'profile': p
+ }
+ except:
+ log.error('Failed: %s', traceback.format_exc())
+
+ return {
+ 'success': False
+ }
def default(self):
+ db = get_db()
+ return list(db.all('profile', limit = 1, with_doc = True))[0]['doc']
- db = get_session()
- default = db.query(Profile).first()
- default_dict = default.to_dict(self.to_dict)
+ def saveOrder(self, **kwargs):
- return default_dict
+ try:
+ db = get_db()
- def saveOrder(self):
+ order = 0
- params = getParams()
- db = get_session()
+ for profile_id in kwargs.get('ids', []):
+ p = db.get('id', profile_id)
+ p['hide'] = tryInt(kwargs.get('hidden')[order]) == 1
+ p['order'] = order
+ db.update(p)
- order = 0
- for profile in params.get('ids', []):
- p = db.query(Profile).filter_by(id = profile).first()
- p.hide = params.get('hidden')[order]
- p.order = order
+ order += 1
- order += 1
+ return {
+ 'success': True
+ }
+ except:
+ log.error('Failed: %s', traceback.format_exc())
- db.commit()
+ return {
+ 'success': False
+ }
- return jsonified({
- 'success': True
- })
+ def delete(self, id = None, **kwargs):
- def delete(self):
+ try:
+ db = get_db()
- id = getParam('id')
+ success = False
+ message = ''
- db = get_session()
+ try:
+ p = db.get('id', id)
+ db.delete(p)
- success = False
- message = ''
- try:
- p = db.query(Profile).filter_by(id = id).first()
+ # Force defaults on all empty profile movies
+ self.forceDefaults()
- db.delete(p)
- db.commit()
+ success = True
+ except Exception as e:
+ message = log.error('Failed deleting Profile: %s', e)
- success = True
- except Exception, e:
- message = log.error('Failed deleting Profile: %s', e)
+ return {
+ 'success': success,
+ 'message': message
+ }
+ except:
+ log.error('Failed: %s', traceback.format_exc())
- return jsonified({
- 'success': success,
- 'message': message
- })
+ return {
+ 'success': False
+ }
def fill(self):
- db = get_session();
-
- profiles = [{
- 'label': 'Best',
- 'qualities': ['720p', '1080p', 'brrip', 'dvdrip']
- }, {
- 'label': 'HD',
- 'qualities': ['720p', '1080p']
- }, {
- 'label': 'SD',
- 'qualities': ['dvdrip', 'dvdr']
- }]
-
- # Create default quality profile
- order = -2
- for profile in profiles:
- log.info('Creating default profile: %s', profile.get('label'))
- p = Profile(
- label = toUnicode(profile.get('label')),
- order = order
- )
- db.add(p)
-
- quality_order = 0
- for quality in profile.get('qualities'):
- quality = fireEvent('quality.single', identifier = quality, single = True)
- profile_type = ProfileType(
- quality_id = quality.get('id'),
- profile = p,
- finish = True,
- wait_for = 0,
- order = quality_order
- )
- p.types.append(profile_type)
-
- quality_order += 1
-
- order += 1
-
- db.commit()
-
- return True
+ try:
+ db = get_db()
+
+ profiles = [{
+ 'label': 'Best',
+ 'qualities': ['720p', '1080p', 'brrip', 'dvdrip']
+ }, {
+ 'label': 'HD',
+ 'qualities': ['720p', '1080p']
+ }, {
+ 'label': 'SD',
+ 'qualities': ['dvdrip', 'dvdr']
+ }, {
+ 'label': 'Prefer 3D HD',
+ 'qualities': ['1080p', '720p', '720p', '1080p'],
+ '3d': [True, True]
+ }, {
+ 'label': '3D HD',
+ 'qualities': ['1080p', '720p'],
+ '3d': [True, True]
+ }]
+
+ # Create default quality profile
+ order = 0
+ for profile in profiles:
+ log.info('Creating default profile: %s', profile.get('label'))
+
+ pro = {
+ '_t': 'profile',
+ 'label': toUnicode(profile.get('label')),
+ 'order': order,
+ 'qualities': profile.get('qualities'),
+ 'minimum_score': 1,
+ 'finish': [],
+ 'wait_for': [],
+ 'stop_after': [],
+ '3d': []
+ }
+
+ threed = profile.get('3d', [])
+ for q in profile.get('qualities'):
+ pro['finish'].append(True)
+ pro['wait_for'].append(0)
+ pro['stop_after'].append(0)
+ pro['3d'].append(threed.pop() if threed else False)
+
+ db.insert(pro)
+ order += 1
+
+ return True
+ except:
+ log.error('Failed: %s', traceback.format_exc())
+
+ return False
diff --git a/couchpotato/core/plugins/profile/static/profile.css b/couchpotato/core/plugins/profile/static/profile.css
deleted file mode 100644
index 9d50d2fd00..0000000000
--- a/couchpotato/core/plugins/profile/static/profile.css
+++ /dev/null
@@ -1,139 +0,0 @@
-.add_new_profile {
- padding: 20px;
- display: block;
- text-align: center;
- font-size: 20px;
- border-bottom: 1px solid rgba(255,255,255,0.2);
-}
-
-.profile { border-bottom: 1px solid rgba(255,255,255,0.2) }
-
- .profile > .delete {
- height: 20px;
- width: 20px;
- position: absolute;
- margin-left: 690px;
- padding: 14px;
- background-position: center;
- }
-
- .profile .qualities {
- min-height: 80px;
- }
-
- .profile .formHint {
- width: 250px !important;
- vertical-align: top !important;
- margin: 0 !important;
- padding-left: 3px !important;
- opacity: 0.1;
- }
- .profile:hover .formHint {
- opacity: 1;
- }
-
- .profile .wait_for {
- position: absolute;
- margin: -45px 0 0 437px;
- }
-
- .profile .wait_for input {
- margin: 0 5px !important;
- }
-
- .profile .types {
- padding: 0;
- margin: 0 20px 0 -4px;
- display: inline-block;
- }
-
- .profile .types li {
- padding: 3px 5px;
- border-bottom: 1px solid rgba(255,255,255,0.2);
- list-style: none;
- }
- .profile .types li:last-child { border: 0; }
-
- .profile .types li > * {
- display: inline-block;
- vertical-align: middle;
- line-height: 0;
- margin-right: 10px;
- }
-
- .profile .quality_type select {
- width: 186px;
- margin-left: -1px;
- }
-
- .profile .types li.is_empty .check, .profile .types li.is_empty .delete, .profile .types li.is_empty .handle {
- visibility: hidden;
- }
-
- .profile .types .type .handle {
- background: url('./handle.png') center;
- display: inline-block;
- height: 20px;
- width: 20px;
- cursor: grab;
- cursor: -moz-grab;
- cursor: -webkit-grab;
- margin: 0;
- }
-
- .profile .types .type .delete {
- background-position: left center;
- height: 20px;
- width: 20px;
- visibility: hidden;
- cursor: pointer;
- }
-
- .profile .types .type:hover:not(.is_empty) .delete {
- visibility: visible;
- }
-
-#profile_ordering {
-
-}
-
- #profile_ordering ul {
- float: left;
- margin: 0;
- width: 275px;
- padding: 0;
- }
-
- #profile_ordering li {
- cursor: grab;
- cursor: -moz-grab;
- cursor: -webkit-grab;
- border-bottom: 1px solid rgba(255,255,255,0.2);
- padding: 0 5px;
- }
- #profile_ordering li:last-child { border: 0; }
-
- #profile_ordering li .check {
- margin: 2px 10px 0 0;
- vertical-align: top;
- }
-
- #profile_ordering li > span {
- display: inline-block;
- height: 20px;
- vertical-align: top;
- line-height: 20px;
- }
-
- #profile_ordering li .handle {
- background: url('./handle.png') center;
- width: 20px;
- float: right;
- }
-
- #profile_ordering .formHint {
- clear: none;
- float: right;
- width: 250px;
- margin: 0;
- }
\ No newline at end of file
diff --git a/couchpotato/core/plugins/profile/static/profile.js b/couchpotato/core/plugins/profile/static/profile.js
index 3bb44989cf..01fad1e5f2 100644
--- a/couchpotato/core/plugins/profile/static/profile.js
+++ b/couchpotato/core/plugins/profile/static/profile.js
@@ -24,40 +24,69 @@ var Profile = new Class({
var data = self.data;
self.el = new Element('div.profile').adopt(
- self.delete_button = new Element('span.delete.icon', {
+ self.delete_button = new Element('span.delete.icon-delete', {
'events': {
'click': self.del.bind(self)
}
}),
new Element('.quality_label.ctrlHolder').adopt(
new Element('label', {'text':'Name'}),
- new Element('input.inlay', {
+ new Element('input', {
'type':'text',
'value': data.label,
'placeholder': 'Profile name'
})
),
- new Element('div.wait_for.ctrlHolder').adopt(
- new Element('span', {'text':'Wait'}),
- new Element('input.inlay.xsmall', {
- 'type':'text',
- 'value': data.types && data.types.length > 0 ? data.types[0].wait_for : 0
- }),
- new Element('span', {'text':'day(s) for a better quality.'})
- ),
new Element('div.qualities.ctrlHolder').adopt(
new Element('label', {'text': 'Search for'}),
self.type_container = new Element('ol.types'),
new Element('div.formHint', {
'html': "Search these qualities (2 minimum), from top to bottom. Use the checkbox, to stop searching after it found this quality."
})
+ ),
+ new Element('div.wait_for.ctrlHolder').adopt(
+ // "Wait the entered number of days for a checked quality, before downloading a lower quality release."
+ new Element('span', {'text':'Wait'}),
+ new Element('input.wait_for_input.xsmall', {
+ 'type':'text',
+ 'value': data.wait_for && data.wait_for.length > 0 ? data.wait_for[0] : 0
+ }),
+ new Element('span', {'text':'day(s) for a better quality '}),
+ new Element('span.advanced', {'text':'and keep searching'}),
+
+ // "After a checked quality is found and downloaded, continue searching for even better quality releases for the entered number of days."
+ new Element('input.xsmall.stop_after_input.advanced', {
+ 'type':'text',
+ 'value': data.stop_after && data.stop_after.length > 0 ? data.stop_after[0] : 0
+ }),
+ new Element('span.advanced', {'text':'day(s) for a better (checked) quality.'}),
+
+ // Minimum score of
+ new Element('span.advanced', {'html':'
Releases need a minimum score of'}), + new Element('input.advanced.xsmall.minimum_score_input', { + 'size': 4, + 'type':'text', + 'value': data.minimum_score || 1 + }) ) ); - self.makeSortable() + self.makeSortable(); + + // Combine qualities and properties into types + if(data.qualities){ + data.types = []; + data.qualities.each(function(quality, nr){ + data.types.include({ + 'quality': quality, + 'finish': data.finish[nr] || false, + '3d': data['3d'] ? data['3d'][nr] || false : false + }); + }); + } if(data.types) - Object.each(data.types, self.addType.bind(self)) + data.types.each(self.addType.bind(self)); else self.delete_button.hide(); @@ -67,8 +96,8 @@ var Profile = new Class({ save: function(delay){ var self = this; - if(self.save_timer) clearTimeout(self.save_timer); - self.save_timer = (function(){ + if(self.save_timer) clearRequestTimeout(self.save_timer); + self.save_timer = requestTimeout(function(){ self.addType(); @@ -87,14 +116,14 @@ var Profile = new Class({ 'onComplete': function(json){ if(json.success){ self.data = json.profile; - self.type_container.getElement('li:first-child input[type=checkbox]') + self.type_container.getElement('li:first-child input.finish[type=checkbox]') .set('checked', true) .getParent().addClass('checked'); } } }); - }).delay(delay, self) + }, delay); }, @@ -102,21 +131,24 @@ var Profile = new Class({ var self = this; var data = { - 'id' : self.data.id, + 'id' : self.data._id, 'label' : self.el.getElement('.quality_label input').get('value'), - 'wait_for' : self.el.getElement('.wait_for input').get('value'), + 'wait_for' : self.el.getElement('.wait_for_input').get('value'), + 'stop_after' : self.el.getElement('.stop_after_input').get('value'), + 'minimum_score' : self.el.getElement('.minimum_score_input').get('value'), 'types': [] - } + }; Array.each(self.type_container.getElements('.type'), function(type){ - if(!type.hasClass('deleted') && type.getElement('select').get('value') > 0) + if(!type.hasClass('deleted') && type.getElement('select').get('value') != -1) data.types.include({ - 'quality_id': type.getElement('select').get('value'), - 'finish': +type.getElement('input[type=checkbox]').checked + 'quality': type.getElement('select').get('value'), + 'finish': +type.getElement('input.finish[type=checkbox]').checked, + '3d': +type.getElement('input.3d[type=checkbox]').checked }); - }) + }); - return data + return data; }, addType: function(data){ @@ -145,7 +177,7 @@ var Profile = new Class({ var self = this; return self.types.filter(function(type){ - return type.get('quality_id') + return type.get('quality'); }); }, @@ -162,7 +194,7 @@ var Profile = new Class({ (e).preventDefault(); Api.request('profile.delete', { 'data': { - 'id': self.data.id + 'id': self.data._id }, 'useSpinner': true, 'spinnerOptions': { @@ -199,15 +231,15 @@ var Profile = new Class({ }, get: function(attr){ - return this.data[attr] + return this.data[attr]; }, isCore: function(){ - return this.data.core + return this.data.core; }, toElement: function(){ - return this.el + return this.el; } }); @@ -227,6 +259,7 @@ Profile.Type = new Class({ self.addEvent('change', function(){ self.el[self.qualities.get('value') == '-1' ? 'addClass' : 'removeClass']('is_empty'); + self.el[Quality.getQuality(self.qualities.get('value')).allow_3d ? 'addClass': 'removeClass']('allow_3d'); self.deleted = self.qualities.get('value') == '-1'; }); @@ -237,36 +270,48 @@ Profile.Type = new Class({ var data = self.data; self.el = new Element('li.type').adopt( - new Element('span.quality_type').adopt( + new Element('span.quality_type.select_wrapper.icon-dropdown').grab( self.fillQualities() ), - new Element('span.finish').adopt( - self.finish = new Element('input.inlay.finish[type=checkbox]', { + self.finish_container = new Element('label.finish').adopt( + self.finish = new Element('input.finish[type=checkbox]', { 'checked': data.finish !== undefined ? data.finish : 1, 'events': { - 'change': function(e){ + 'change': function(){ if(self.el == self.el.getParent().getElement(':first-child')){ - self.finish_class.check(); - alert('Top quality always finishes the search') + alert('Top quality always finishes the search'); return; } self.fireEvent('change'); } } - }) + }), + new Element('span.check_label[text=finish]') ), - new Element('span.delete.icon', { + self['3d_container'] = new Element('label.threed').adopt( + self['3d'] = new Element('input.3d[type=checkbox]', { + 'checked': data['3d'] !== undefined ? data['3d'] : 0, + 'events': { + 'change': function(){ + self.fireEvent('change'); + } + } + }), + new Element('span.check_label[text=3D]') + ), + new Element('span.delete.icon-cancel', { 'events': { 'click': self.del.bind(self) } }), - new Element('span.handle') + new Element('span.handle.icon-handle') ); - self.el[self.data.quality_id > 0 ? 'removeClass' : 'addClass']('is_empty'); + self.el[self.data.quality ? 'removeClass' : 'addClass']('is_empty'); - self.finish_class = new Form.Check(self.finish); + if(self.data.quality && Quality.getQuality(self.data.quality).allow_3d) + self.el.addClass('allow_3d'); }, @@ -277,7 +322,7 @@ Profile.Type = new Class({ 'events': { 'change': self.fireEvent.bind(self, 'change') } - }).adopt( + }).grab( new Element('option', { 'text': '+ Add another quality', 'value': -1 @@ -287,11 +332,12 @@ Profile.Type = new Class({ Object.each(Quality.qualities, function(q){ new Element('option', { 'text': q.label, - 'value': q.id - }).inject(self.qualities) + 'value': q.identifier, + 'data-allow_3d': q.allow_3d + }).inject(self.qualities); }); - self.qualities.set('value', self.data.quality_id); + self.qualities.set('value', self.data.quality); return self.qualities; @@ -301,9 +347,10 @@ Profile.Type = new Class({ var self = this; return { - 'quality_id': self.qualities.get('value'), - 'finish': +self.finish.checked - } + 'quality': self.qualities.get('value'), + 'finish': +self.finish.checked, + '3d': +self['3d'].checked + }; }, get: function(key){ @@ -324,4 +371,4 @@ Profile.Type = new Class({ return this.el; } -}) \ No newline at end of file +}); diff --git a/couchpotato/core/plugins/profile/static/profile.scss b/couchpotato/core/plugins/profile/static/profile.scss new file mode 100644 index 0000000000..a48f09ae95 --- /dev/null +++ b/couchpotato/core/plugins/profile/static/profile.scss @@ -0,0 +1,167 @@ +@import "_mixins"; + +.add_new_profile { + padding: 20px; + display: block; + text-align: center; + font-size: 20px; + border-bottom: 1px solid transparent; + @include theme(border-color, off); +} + +.profile { + margin-bottom: 20px; + + .quality_label input { + font-weight: bold; + } + + > .delete { + position: absolute; + padding: $padding/3 $padding; + right: 0; + cursor: pointer; + opacity: 0.6; + color: #fd5353; + font-size: 1.5em; + z-index: 2; + + &:hover { + opacity: 1; + } + } + + .ctrlHolder { + + .types { + flex: 1 1 auto; + min-width: 360px; + + .type { + display: flex; + flex-row: row nowrap; + align-items: center; + padding: 2px 0; + + label { + min-width: 0; + margin-left: $padding/2; + + span { + font-size: .9em; + } + } + + input[type=checkbox] { + margin-right: 3px; + } + + .delete, .handle { + margin-left: $padding/4; + width: 20px; + font-size: 20px; + opacity: .1; + text-align: center; + cursor: pointer; + + &.handle { + cursor: move; + cursor: grab; + } + + &:hover { + opacity: 1; + } + } + + &.is_empty { + .delete, .handle { + display: none; + } + } + } + + } + + &.wait_for.wait_for { + display: block; + + input { + min-width: 0; + width: 40px; + text-align: center; + margin: 0 2px; + } + + .advanced { + display: none; + @include theme(color, primary); + + .show_advanced & { + display: inline; + } + } + + } + + .formHint { + } + + } +} + +#profile_ordering { + ul { + list-style: none; + margin: 0; + width: 275px; + padding: 0; + } + + li { + border-bottom: 1px solid transparent; + @include theme(border-color, off); + padding: 5px; + display: flex; + align-items: center; + + &:hover { + @include theme(background, off); + } + + &:last-child { border: 0; } + + input[type=checkbox] { + margin: 2px 10px 0 0; + vertical-align: top; + } + + > span { + display: inline-block; + height: 20px; + vertical-align: top; + line-height: 20px; + + &.profile_label { + flex: 1 1 auto; + } + } + + .handle { + font-size: 20px; + width: 20px; + float: right; + cursor: move; + cursor: grab; + opacity: .5; + text-align: center; + + &:hover { + opacity: 1; + } + } + } + + .formHint { + } +} diff --git a/couchpotato/core/plugins/quality/__init__.py b/couchpotato/core/plugins/quality/__init__.py index e1b97ad0d8..7710251c7c 100644 --- a/couchpotato/core/plugins/quality/__init__.py +++ b/couchpotato/core/plugins/quality/__init__.py @@ -1,6 +1,5 @@ from .main import QualityPlugin -def start(): - return QualityPlugin() -config = [] +def autoload(): + return QualityPlugin() diff --git a/couchpotato/core/plugins/quality/index.py b/couchpotato/core/plugins/quality/index.py new file mode 100644 index 0000000000..7804397216 --- /dev/null +++ b/couchpotato/core/plugins/quality/index.py @@ -0,0 +1,18 @@ +from hashlib import md5 + +from CodernityDB.hash_index import HashIndex + + +class QualityIndex(HashIndex): + _version = 1 + + def __init__(self, *args, **kwargs): + kwargs['key_format'] = '32s' + super(QualityIndex, self).__init__(*args, **kwargs) + + def make_key(self, key): + return md5(key).hexdigest() + + def make_key_value(self, data): + if data.get('_t') == 'quality' and data.get('identifier'): + return md5(data.get('identifier')).hexdigest(), None diff --git a/couchpotato/core/plugins/quality/main.py b/couchpotato/core/plugins/quality/main.py index 4cd5b8de68..3ed1a7a4a7 100644 --- a/couchpotato/core/plugins/quality/main.py +++ b/couchpotato/core/plugins/quality/main.py @@ -1,42 +1,59 @@ -from couchpotato import get_session +from math import fabs, ceil +import traceback +import re + +from CodernityDB.database import RecordNotFound +from couchpotato import get_db from couchpotato.api import addApiView -from couchpotato.core.event import addEvent -from couchpotato.core.helpers.encoding import toUnicode -from couchpotato.core.helpers.request import jsonified, getParams -from couchpotato.core.helpers.variable import mergeDicts, md5, getExt +from couchpotato.core.event import addEvent, fireEvent +from couchpotato.core.helpers.encoding import toUnicode, ss +from couchpotato.core.helpers.variable import mergeDicts, getExt, tryInt, splitString, tryFloat from couchpotato.core.logger import CPLog from couchpotato.core.plugins.base import Plugin -from couchpotato.core.settings.model import Quality, Profile, ProfileType -from sqlalchemy.sql.expression import or_ -import os.path -import re -import time +from couchpotato.core.plugins.quality.index import QualityIndex + log = CPLog(__name__) class QualityPlugin(Plugin): + _database = { + 'quality': QualityIndex + } + qualities = [ - {'identifier': 'bd50', 'hd': True, 'size': (15000, 60000), 'label': 'BR-Disk', 'alternative': ['bd25'], 'allow': ['1080p'], 'ext':[], 'tags': ['bdmv', 'certificate', ('complete', 'bluray')]}, - {'identifier': '1080p', 'hd': True, 'size': (5000, 20000), 'label': '1080P', 'width': 1920, 'height': 1080, 'alternative': [], 'allow': [], 'ext':['mkv', 'm2ts'], 'tags': ['m2ts']}, - {'identifier': '720p', 'hd': True, 'size': (3500, 10000), 'label': '720P', 'width': 1280, 'height': 720, 'alternative': [], 'allow': [], 'ext':['mkv', 'ts']}, - {'identifier': 'brrip', 'hd': True, 'size': (700, 7000), 'label': 'BR-Rip', 'alternative': ['bdrip'], 'allow': ['720p', '1080p'], 'ext':['avi']}, - {'identifier': 'dvdr', 'size': (3000, 10000), 'label': 'DVD-R', 'alternative': [], 'allow': [], 'ext':['iso', 'img'], 'tags': ['pal', 'ntsc', 'video_ts', 'audio_ts']}, - {'identifier': 'dvdrip', 'size': (600, 2400), 'label': 'DVD-Rip', 'width': 720, 'alternative': ['dvdrip'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg'], 'tags': [('dvd', 'rip'), ('dvd', 'xvid'), ('dvd', 'divx')]}, - {'identifier': 'scr', 'size': (600, 1600), 'label': 'Screener', 'alternative': ['screener', 'dvdscr', 'ppvrip'], 'allow': ['dvdr', 'dvd'], 'ext':['avi', 'mpg', 'mpeg']}, - {'identifier': 'r5', 'size': (600, 1000), 'label': 'R5', 'alternative': [], 'allow': ['dvdr'], 'ext':['avi', 'mpg', 'mpeg']}, - {'identifier': 'tc', 'size': (600, 1000), 'label': 'TeleCine', 'alternative': ['telecine'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg']}, - {'identifier': 'ts', 'size': (600, 1000), 'label': 'TeleSync', 'alternative': ['telesync', 'hdts'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg']}, - {'identifier': 'cam', 'size': (600, 1000), 'label': 'Cam', 'alternative': ['camrip', 'hdcam'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg']} + {'identifier': 'bd50', 'hd': True, 'allow_3d': True, 'size': (20000, 60000), 'median_size': 40000, 'label': 'BR-Disk', 'alternative': ['bd25', ('br', 'disk')], 'allow': ['1080p'], 'ext':['iso', 'img'], 'tags': ['bdmv', 'certificate', ('complete', 'bluray'), 'avc', 'mvc']}, + {'identifier': '1080p', 'hd': True, 'allow_3d': True, 'size': (4000, 20000), 'median_size': 10000, 'label': '1080p', 'width': 1920, 'height': 1080, 'alternative': [], 'allow': [], 'ext':['mkv', 'm2ts', 'ts'], 'tags': ['m2ts', 'x264', 'h264', '1080']}, + {'identifier': '720p', 'hd': True, 'allow_3d': True, 'size': (3000, 10000), 'median_size': 5500, 'label': '720p', 'width': 1280, 'height': 720, 'alternative': [], 'allow': [], 'ext':['mkv', 'ts'], 'tags': ['x264', 'h264', '720']}, + {'identifier': 'brrip', 'hd': True, 'allow_3d': True, 'size': (700, 7000), 'median_size': 2000, 'label': 'BR-Rip', 'alternative': ['bdrip', ('br', 'rip'), 'hdtv', 'hdrip'], 'allow': ['720p', '1080p'], 'ext':['mp4', 'avi'], 'tags': ['webdl', ('web', 'dl')]}, + {'identifier': 'dvdr', 'size': (3000, 10000), 'median_size': 4500, 'label': 'DVD-R', 'alternative': ['br2dvd', ('dvd', 'r')], 'allow': [], 'ext':['iso', 'img', 'vob'], 'tags': ['pal', 'ntsc', 'video_ts', 'audio_ts', ('dvd', 'r'), 'dvd9']}, + {'identifier': 'dvdrip', 'size': (600, 2400), 'median_size': 1500, 'label': 'DVD-Rip', 'width': 720, 'alternative': [('dvd', 'rip')], 'allow': [], 'ext':['avi'], 'tags': [('dvd', 'rip'), ('dvd', 'xvid'), ('dvd', 'divx')]}, + {'identifier': 'scr', 'size': (600, 1600), 'median_size': 700, 'label': 'Screener', 'alternative': ['screener', 'dvdscr', 'ppvrip', 'dvdscreener', 'hdscr', 'webrip', ('web', 'rip')], 'allow': ['dvdr', 'dvdrip', '720p', '1080p'], 'ext':[], 'tags': []}, + {'identifier': 'r5', 'size': (600, 1000), 'median_size': 700, 'label': 'R5', 'alternative': ['r6'], 'allow': ['dvdr', '720p', '1080p'], 'ext':[]}, + {'identifier': 'tc', 'size': (600, 1000), 'median_size': 700, 'label': 'TeleCine', 'alternative': ['telecine'], 'allow': ['720p', '1080p'], 'ext':[]}, + {'identifier': 'ts', 'size': (600, 1000), 'median_size': 700, 'label': 'TeleSync', 'alternative': ['telesync', 'hdts'], 'allow': ['720p', '1080p'], 'ext':[]}, + {'identifier': 'cam', 'size': (600, 1000), 'median_size': 700, 'label': 'Cam', 'alternative': ['camrip', 'hdcam'], 'allow': ['720p', '1080p'], 'ext':[]} ] pre_releases = ['cam', 'ts', 'tc', 'r5', 'scr'] + threed_tags = { + 'sbs': [('half', 'sbs'), 'hsbs', ('full', 'sbs'), 'fsbs'], + 'ou': [('half', 'ou'), 'hou', ('full', 'ou'), 'fou'], + '3d': ['2d3d', '3d2d', '3d'], + } + + cached_qualities = None + cached_order = None def __init__(self): addEvent('quality.all', self.all) addEvent('quality.single', self.single) addEvent('quality.guess', self.guess) addEvent('quality.pre_releases', self.preReleases) + addEvent('quality.order', self.getOrder) + addEvent('quality.ishigher', self.isHigher) + addEvent('quality.isfinish', self.isFinish) + addEvent('quality.fill', self.fill) addApiView('quality.size.save', self.saveSize) addApiView('quality.list', self.allView, docs = { @@ -49,37 +66,55 @@ def __init__(self): addEvent('app.initialize', self.fill, priority = 10) + addEvent('app.test', self.doTest) + + self.order = [] + self.addOrder() + + def addOrder(self): + self.order = [] + for q in self.qualities: + self.order.append(q.get('identifier')) + + def getOrder(self): + return self.order + def preReleases(self): return self.pre_releases - def allView(self): + def allView(self, **kwargs): - return jsonified({ + return { 'success': True, 'list': self.all() - }) + } def all(self): - db = get_session() + if self.cached_qualities: + return self.cached_qualities - qualities = db.query(Quality).all() + db = get_db() temp = [] - for quality in qualities: - q = mergeDicts(self.getQuality(quality.identifier), quality.to_dict()) + for quality in self.qualities: + quality_doc = db.get('quality', quality.get('identifier'), with_doc = True)['doc'] + q = mergeDicts(quality, quality_doc) temp.append(q) + if len(temp) == len(self.qualities): + self.cached_qualities = temp + return temp def single(self, identifier = ''): - db = get_session() + db = get_db() quality_dict = {} - quality = db.query(Quality).filter(or_(Quality.identifier == identifier, Quality.id == identifier)).first() + quality = db.get('quality', identifier, with_doc = True)['doc'] if quality: - quality_dict = dict(self.getQuality(quality.identifier), **quality.to_dict()) + quality_dict = mergeDicts(self.getQuality(quality['identifier']), quality) return quality_dict @@ -89,128 +124,393 @@ def getQuality(self, identifier): if identifier == q.get('identifier'): return q - def saveSize(self): + def saveSize(self, **kwargs): - params = getParams() + try: + db = get_db() + quality = db.get('quality', kwargs.get('identifier'), with_doc = True) - db = get_session() - quality = db.query(Quality).filter_by(identifier = params.get('identifier')).first() + if quality: + quality['doc'][kwargs.get('value_type')] = tryInt(kwargs.get('value')) + db.update(quality['doc']) - if quality: - setattr(quality, params.get('value_type'), params.get('value')) - db.commit() + self.cached_qualities = None - return jsonified({ - 'success': True - }) + return { + 'success': True + } + except: + log.error('Failed: %s', traceback.format_exc()) + + return { + 'success': False + } def fill(self): - db = get_session(); + try: + db = get_db() + + order = 0 + for q in self.qualities: + + existing = None + try: + existing = db.get('quality', q.get('identifier')) + except RecordNotFound: + pass + + if not existing: + db.insert({ + '_t': 'quality', + 'order': order, + 'identifier': q.get('identifier'), + 'size_min': tryInt(q.get('size')[0]), + 'size_max': tryInt(q.get('size')[1]), + }) + + log.info('Creating profile: %s', q.get('label')) + db.insert({ + '_t': 'profile', + 'order': order + 20, # Make sure it goes behind other profiles + 'core': True, + 'qualities': [q.get('identifier')], + 'label': toUnicode(q.get('label')), + 'finish': [True], + 'wait_for': [0], + }) + + order += 1 + + return True + except: + log.error('Failed: %s', traceback.format_exc()) + + return False + + def guess(self, files, extra = None, size = None, use_cache = True): + if not extra: extra = {} - order = 0 - for q in self.qualities: + # Create hash for cache + cache_key = str([f.replace('.' + getExt(f), '') if len(getExt(f)) < 4 else f for f in files]) + if use_cache: + cached = self.getCache(cache_key) + if cached and len(extra) == 0: + return cached - # Create quality - qual = db.query(Quality).filter_by(identifier = q.get('identifier')).first() + qualities = self.all() - if not qual: - log.info('Creating quality: %s', q.get('label')) - qual = Quality() - qual.order = order - qual.identifier = q.get('identifier') - qual.label = toUnicode(q.get('label')) - qual.size_min, qual.size_max = q.get('size') + # Start with 0 + score = {} + for quality in qualities: + score[quality.get('identifier')] = { + 'score': 0, + '3d': {} + } - db.add(qual) + # Use metadata titles as extra check + if extra and extra.get('titles'): + files.extend(extra.get('titles')) - # Create single quality profile - prof = db.query(Profile).filter( - Profile.core == True - ).filter( - Profile.types.any(quality = qual) - ).all() + for cur_file in files: + words = re.split('\W+', cur_file.lower()) + name_year = fireEvent('scanner.name_year', cur_file, file_name = cur_file, single = True) + threed_words = words + if name_year and name_year.get('name'): + split_name = splitString(name_year.get('name'), ' ') + threed_words = [x for x in words if x not in split_name] - if not prof: - log.info('Creating profile: %s', q.get('label')) - prof = Profile( - core = True, - label = toUnicode(qual.label), - order = order - ) - db.add(prof) + for quality in qualities: + contains_score = self.containsTagScore(quality, words, cur_file) + threedscore = self.contains3D(quality, threed_words, cur_file) if quality.get('allow_3d') else (0, None) - profile_type = ProfileType( - quality = qual, - profile = prof, - finish = True, - order = 0 - ) - prof.types.append(profile_type) + self.calcScore(score, quality, contains_score, threedscore, penalty = contains_score) - order += 1 + size_scores = [] + for quality in qualities: - db.commit() + # Evaluate score based on size + size_score = self.guessSizeScore(quality, size = size) + loose_score = self.guessLooseScore(quality, extra = extra) - time.sleep(0.3) # Wait a moment + if size_score > 0: + size_scores.append(quality) - return True + self.calcScore(score, quality, size_score + loose_score) - def guess(self, files, extra = {}): + # Add additional size score if only 1 size validated + if len(size_scores) == 1: + self.calcScore(score, size_scores[0], 7) + del size_scores - # Create hash for cache - hash = md5(str([f.replace('.' + getExt(f), '') for f in files])) - cached = self.getCache(hash) - if cached and extra is {}: return cached + # Return nothing if all scores are <= 0 + has_non_zero = 0 + for s in score: + if score[s]['score'] > 0: + has_non_zero += 1 - for cur_file in files: - size = (os.path.getsize(cur_file) / 1024 / 1024) if os.path.isfile(cur_file) else 0 - words = re.split('\W+', cur_file.lower()) + if not has_non_zero: + return None + + heighest_quality = max(score, key = lambda p: score[p]['score']) + if heighest_quality: + for quality in qualities: + if quality.get('identifier') == heighest_quality: + quality['is_3d'] = False + if score[heighest_quality].get('3d'): + quality['is_3d'] = True + return self.setCache(cache_key, quality) - for quality in self.all(): + return None - # Check tags - if quality['identifier'] in words: - log.debug('Found via identifier "%s" in %s', (quality['identifier'], cur_file)) - return self.setCache(hash, quality) + def containsTagScore(self, quality, words, cur_file = ''): + cur_file = ss(cur_file) + score = 0.0 - if list(set(quality.get('alternative', [])) & set(words)): - log.debug('Found %s via alt %s in %s', (quality['identifier'], quality.get('alternative'), cur_file)) - return self.setCache(hash, quality) + extension = words[-1] + words = words[:-1] - for tag in quality.get('tags', []): - if isinstance(tag, tuple) and '.'.join(tag) in '.'.join(words): - log.debug('Found %s via tag %s in %s', (quality['identifier'], quality.get('tags'), cur_file)) - return self.setCache(hash, quality) + points = { + 'identifier': 25, + 'label': 25, + 'alternative': 20, + 'tags': 11, + 'ext': 5, + } - if list(set(quality.get('tags', [])) & set(words)): - log.debug('Found %s via tag %s in %s', (quality['identifier'], quality.get('tags'), cur_file)) - return self.setCache(hash, quality) + scored_on = [] - # Try again with loose testing - quality = self.guessLoose(hash, extra = extra) - if quality: - return self.setCache(hash, quality) + # Check alt and tags + for tag_type in ['identifier', 'alternative', 'tags', 'label']: + qualities = quality.get(tag_type, []) + qualities = [qualities] if isinstance(qualities, (str, unicode)) else qualities - log.debug('Could not identify quality for: %s', files) - return None + for alt in qualities: + if isinstance(alt, tuple): + if len(set(words) & set(alt)) == len(alt): + log.debug('Found %s via %s %s in %s', (quality['identifier'], tag_type, quality.get(tag_type), cur_file)) + score += points.get(tag_type) + + if isinstance(alt, (str, unicode)) and ss(alt.lower()) in words and ss(alt.lower()) not in scored_on: + log.debug('Found %s via %s %s in %s', (quality['identifier'], tag_type, quality.get(tag_type), cur_file)) + score += points.get(tag_type) + + # Don't score twice on same tag + scored_on.append(ss(alt).lower()) + + # Check extention + for ext in quality.get('ext', []): + if ext == extension: + log.debug('Found %s with .%s extension in %s', (quality['identifier'], ext, cur_file)) + score += points['ext'] + + return score + + def contains3D(self, quality, words, cur_file = ''): + cur_file = ss(cur_file) + + for key in self.threed_tags: + tags = self.threed_tags.get(key, []) - def guessLoose(self, hash, extra): + for tag in tags: + if isinstance(tag, tuple): + if len(set(words) & set(tag)) == len(tag): + log.debug('Found %s in %s', (tag, cur_file)) + return 1, key + elif tag in words: + log.debug('Found %s in %s', (tag, cur_file)) + return 1, key - for quality in self.all(): + return 0, None + + def guessLooseScore(self, quality, extra = None): + + score = 0 + + if extra: # Check width resolution, range 20 - if (quality.get('width', 720) - 20) <= extra.get('resolution_width', 0) <= (quality.get('width', 720) + 20): - log.debug('Found %s via resolution_width: %s == %s', (quality['identifier'], quality.get('width', 720), extra.get('resolution_width', 0))) - return self.setCache(hash, quality) + if quality.get('width') and (quality.get('width') - 20) <= extra.get('resolution_width', 0) <= (quality.get('width') + 20): + log.debug('Found %s via resolution_width: %s == %s', (quality['identifier'], quality.get('width'), extra.get('resolution_width', 0))) + score += 10 # Check height resolution, range 20 - if (quality.get('height', 480) - 20) <= extra.get('resolution_height', 0) <= (quality.get('height', 480) + 20): - log.debug('Found %s via resolution_height: %s == %s', (quality['identifier'], quality.get('height', 480), extra.get('resolution_height', 0))) - return self.setCache(hash, quality) + if quality.get('height') and (quality.get('height') - 20) <= extra.get('resolution_height', 0) <= (quality.get('height') + 20): + log.debug('Found %s via resolution_height: %s == %s', (quality['identifier'], quality.get('height'), extra.get('resolution_height', 0))) + score += 5 + + if quality.get('identifier') == 'dvdrip' and 480 <= extra.get('resolution_width', 0) <= 720: + log.debug('Add point for correct dvdrip resolutions') + score += 1 + + return score + + + def guessSizeScore(self, quality, size = None): + + score = 0 + + if size: + + size = tryFloat(size) + size_min = tryFloat(quality['size_min']) + size_max = tryFloat(quality['size_max']) + + if size_min <= size <= size_max: + log.debug('Found %s via release size: %s MB < %s MB < %s MB', (quality['identifier'], size_min, size, size_max)) + + proc_range = size_max - size_min + size_diff = size - size_min + size_proc = (size_diff / proc_range) + + median_diff = quality['median_size'] - size_min + median_proc = (median_diff / proc_range) + + max_points = 8 + score += ceil(max_points - (fabs(size_proc - median_proc) * max_points)) + else: + score -= 5 + + return score + + def calcScore(self, score, quality, add_score, threedscore = (0, None), penalty = 0): + + score[quality['identifier']]['score'] += add_score + + threedscore, threedtag = threedscore + if threedscore and threedtag: + if threedscore not in score[quality['identifier']]['3d']: + score[quality['identifier']]['3d'][threedtag] = 0 + + score[quality['identifier']]['3d'][threedtag] += threedscore + + # Set order for allow calculation (and cache) + if not self.cached_order: + self.cached_order = {} + for q in self.qualities: + self.cached_order[q.get('identifier')] = self.qualities.index(q) + + if penalty and add_score != 0: + for allow in quality.get('allow', []): + score[allow]['score'] -= ((penalty * 2) if self.cached_order[allow] < self.cached_order[quality['identifier']] else penalty) * 2 + + # Give panelty for all other qualities + for q in self.qualities: + if quality.get('identifier') != q.get('identifier') and score.get(q.get('identifier')): + score[q.get('identifier')]['score'] -= 1 + + def isFinish(self, quality, profile, release_age = 0): + if not isinstance(profile, dict) or not profile.get('qualities'): + # No profile so anything (scanned) is good enough + return True + + try: + index = [i for i, identifier in enumerate(profile['qualities']) if identifier == quality['identifier'] and bool(profile['3d'][i] if profile.get('3d') else False) == bool(quality.get('is_3d', False))][0] + + if index == 0 or (profile['finish'][index] and int(release_age) >= int(profile.get('stop_after', [0])[0])): + return True + + return False + except: + return False + + def isHigher(self, quality, compare_with, profile = None): + if not isinstance(profile, dict) or not profile.get('qualities'): + profile = fireEvent('profile.default', single = True) + + # Try to find quality in profile, if not found: a quality we do not want is lower than anything else + try: + quality_order = [i for i, identifier in enumerate(profile['qualities']) if identifier == quality['identifier'] and bool(profile['3d'][i] if profile.get('3d') else 0) == bool(quality.get('is_3d', 0))][0] + except: + log.debug('Quality %s not found in profile identifiers %s', (quality['identifier'] + (' 3D' if quality.get('is_3d', 0) else ''), \ + [identifier + (' 3D' if (profile['3d'][i] if profile.get('3d') else 0) else '') for i, identifier in enumerate(profile['qualities'])])) + return 'lower' + + # Try to find compare quality in profile, if not found: anything is higher than a not wanted quality + try: + compare_order = [i for i, identifier in enumerate(profile['qualities']) if identifier == compare_with['identifier'] and bool(profile['3d'][i] if profile.get('3d') else 0) == bool(compare_with.get('is_3d', 0))][0] + except: + log.debug('Compare quality %s not found in profile identifiers %s', (compare_with['identifier'] + (' 3D' if compare_with.get('is_3d', 0) else ''), \ + [identifier + (' 3D' if (profile['3d'][i] if profile.get('3d') else 0) else '') for i, identifier in enumerate(profile['qualities'])])) + return 'higher' + + # Note to self: a lower number means higher quality + if quality_order > compare_order: + return 'lower' + elif quality_order == compare_order: + return 'equal' + else: + return 'higher' + + def doTest(self): + + tests = { + 'Movie Name (1999)-DVD-Rip.avi': {'size': 700, 'quality': 'dvdrip'}, + 'Movie Name 1999 720p Bluray.mkv': {'size': 4200, 'quality': '720p'}, + 'Movie Name 1999 BR-Rip 720p.avi': {'size': 1000, 'quality': 'brrip'}, + 'Movie Name 1999 720p Web Rip.avi': {'size': 1200, 'quality': 'scr'}, + 'Movie Name 1999 Web DL.avi': {'size': 800, 'quality': 'brrip'}, + 'Movie.Name.1999.1080p.WEBRip.H264-Group': {'size': 1500, 'quality': 'scr'}, + 'Movie.Name.1999.DVDRip-Group': {'size': 750, 'quality': 'dvdrip'}, + 'Movie.Name.1999.DVD-Rip-Group': {'size': 700, 'quality': 'dvdrip'}, + 'Movie.Name.1999.DVD-R-Group': {'size': 4500, 'quality': 'dvdr'}, + 'Movie.Name.Camelie.1999.720p.BluRay.x264-Group': {'size': 5500, 'quality': '720p'}, + 'Movie.Name.2008.German.DL.AC3.1080p.BluRay.x264-Group': {'size': 8500, 'extra': {'resolution_width': 1920, 'resolution_height': 1080} , 'quality': '1080p'}, + 'Movie.Name.2004.GERMAN.AC3D.DL.1080p.BluRay.x264-Group': {'size': 8000, 'quality': '1080p'}, + 'Movie.Name.2013.BR-Disk-Group.iso': {'size': 48000, 'quality': 'bd50'}, + 'Movie.Name.2013.2D+3D.BR-Disk-Group.iso': {'size': 52000, 'quality': 'bd50', 'is_3d': True}, + 'Movie.Rising.Name.Girl.2011.NTSC.DVD9-GroupDVD': {'size': 7200, 'quality': 'dvdr'}, + 'Movie Name (2013) 2D + 3D': {'size': 49000, 'quality': 'bd50', 'is_3d': True}, + 'Movie Monuments 2013 BrRip 1080p': {'size': 1800, 'quality': 'brrip'}, + 'Movie Monuments 2013 BrRip 720p': {'size': 1300, 'quality': 'brrip'}, + 'The.Movie.2014.3D.1080p.BluRay.AVC.DTS-HD.MA.5.1-GroupName': {'size': 30000, 'quality': 'bd50', 'is_3d': True}, + '/home/namehou/Movie Monuments (2012)/Movie Monuments.mkv': {'size': 5500, 'quality': '720p', 'is_3d': False}, + '/home/namehou/Movie Monuments (2012)/Movie Monuments Full-OU.mkv': {'size': 5500, 'quality': '720p', 'is_3d': True}, + '/home/namehou/Movie Monuments (2013)/Movie Monuments.mkv': {'size': 10000, 'quality': '1080p', 'is_3d': False}, + '/home/namehou/Movie Monuments (2013)/Movie Monuments Full-OU.mkv': {'size': 10000, 'quality': '1080p', 'is_3d': True}, + '/volume1/Public/3D/Moviename/Moviename (2009).3D.SBS.ts': {'size': 7500, 'quality': '1080p', 'is_3d': True}, + '/volume1/Public/Moviename/Moviename (2009).ts': {'size': 7500, 'quality': '1080p'}, + '/movies/BluRay HDDVD H.264 MKV 720p EngSub/QuiQui le fou (criterion collection #123, 1915)/QuiQui le fou (1915) 720p x264 BluRay.mkv': {'size': 5500, 'quality': '720p'}, + 'C:\\movies\QuiQui le fou (collection #123, 1915)\QuiQui le fou (1915) 720p x264 BluRay.mkv': {'size': 5500, 'quality': '720p'}, + 'C:\\movies\QuiQui le fou (collection #123, 1915)\QuiQui le fou (1915) half-sbs 720p x264 BluRay.mkv': {'size': 5500, 'quality': '720p', 'is_3d': True}, + 'Moviename 2014 720p HDCAM XviD DualAudio': {'size': 4000, 'quality': 'cam'}, + 'Moviename (2014) - 720p CAM x264': {'size': 2250, 'quality': 'cam'}, + 'Movie Name (2014).mp4': {'size': 750, 'quality': 'brrip'}, + 'Moviename.2014.720p.R6.WEB-DL.x264.AC3-xyz': {'size': 750, 'quality': 'r5'}, + 'Movie name 2014 New Source 720p HDCAM x264 AC3 xyz': {'size': 750, 'quality': 'cam'}, + 'Movie.Name.2014.720p.HD.TS.AC3.x264': {'size': 750, 'quality': 'ts'}, + 'Movie.Name.2014.1080p.HDrip.x264.aac-ReleaseGroup': {'size': 7000, 'quality': 'brrip'}, + 'Movie.Name.2014.HDCam.Chinese.Subs-ReleaseGroup': {'size': 15000, 'quality': 'cam'}, + 'Movie Name 2014 HQ DVDRip X264 AC3 (bla)': {'size': 0, 'quality': 'dvdrip'}, + 'Movie Name1 (2012).mkv': {'size': 4500, 'quality': '720p'}, + 'Movie Name (2013).mkv': {'size': 8500, 'quality': '1080p'}, + 'Movie Name (2014).mkv': {'size': 4500, 'quality': '720p', 'extra': {'titles': ['Movie Name 2014 720p Bluray']}}, + 'Movie Name (2015).mkv': {'size': 500, 'quality': '1080p', 'extra': {'resolution_width': 1920}}, + 'Movie Name (2015).mp4': {'size': 6500, 'quality': 'brrip'}, + 'Movie Name.2014.720p Web-Dl Aac2.0 h264-ReleaseGroup': {'size': 3800, 'quality': 'brrip'}, + 'Movie Name.2014.720p.WEBRip.x264.AC3-ReleaseGroup': {'size': 3000, 'quality': 'scr'}, + 'Movie.Name.2014.1080p.HDCAM.-.ReleaseGroup': {'size': 5300, 'quality': 'cam'}, + 'Movie.Name.2014.720p.HDSCR.4PARTS.MP4.AAC.ReleaseGroup': {'size': 2401, 'quality': 'scr'}, + 'Movie.Name.2014.720p.BluRay.x264-ReleaseGroup': {'size': 10300, 'quality': '720p'}, + 'Movie.Name.2014.720.Bluray.x264.DTS-ReleaseGroup': {'size': 9700, 'quality': '720p'}, + } + + correct = 0 + for name in tests: + test_quality = self.guess(files = [name], extra = tests[name].get('extra', None), size = tests[name].get('size', None), use_cache = False) or {} + success = test_quality.get('identifier') == tests[name]['quality'] and test_quality.get('is_3d') == tests[name].get('is_3d', False) + if not success: + log.error('%s failed check, thinks it\'s "%s" expecting "%s"', (name, + test_quality.get('identifier') + (' 3D' if test_quality.get('is_3d') else ''), + tests[name]['quality'] + (' 3D' if tests[name].get('is_3d') else '') + )) + + correct += success + + if correct == len(tests): + log.info('Quality test successful') + return True + else: + log.error('Quality test failed: %s out of %s succeeded', (correct, len(tests))) - if 480 <= extra.get('resolution_width', 0) <= 720: - log.debug('Found as dvdrip') - return self.setCache(hash, self.single('dvdrip')) - return None diff --git a/couchpotato/core/plugins/quality/static/quality.css b/couchpotato/core/plugins/quality/static/quality.css deleted file mode 100644 index f71f007e8c..0000000000 --- a/couchpotato/core/plugins/quality/static/quality.css +++ /dev/null @@ -1,26 +0,0 @@ -.group_sizes { - -} - - .group_sizes .head { - font-weight: bold; - } - - .group_sizes .ctrlHolder { - padding-top: 4px !important; - padding-bottom: 4px !important; - font-size: 12px; - } - - .group_sizes .label { - max-width: 120px; - } - - .group_sizes .min, .group_sizes .max { - text-align: center; - width: 50px; - max-width: 50px; - margin: 0 5px !important; - padding: 0 3px; - display: inline-block; - } \ No newline at end of file diff --git a/couchpotato/core/plugins/quality/static/quality.js b/couchpotato/core/plugins/quality/static/quality.js index bd2ff2acbc..60a24498e2 100644 --- a/couchpotato/core/plugins/quality/static/quality.js +++ b/couchpotato/core/plugins/quality/static/quality.js @@ -8,40 +8,47 @@ var QualityBase = new Class({ self.qualities = data.qualities; - self.profiles = [] + self.profiles_list = null; + self.profiles = []; Array.each(data.profiles, self.createProfilesClass.bind(self)); - App.addEvent('load', self.addSettings.bind(self)) + App.addEvent('loadSettings', self.addSettings.bind(self)); }, getProfile: function(id){ return this.profiles.filter(function(profile){ - return profile.data.id == id - }).pick() + return profile.data._id == id; + }).pick(); }, // Hide items when getting profiles getActiveProfiles: function(){ return Array.filter(this.profiles, function(profile){ - return !profile.data.hide + return !profile.data.hide; }); }, - getQuality: function(id){ - return this.qualities.filter(function(q){ - return q.id == id; - }).pick(); + getQuality: function(identifier){ + try { + return this.qualities.filter(function(q){ + return q.identifier == identifier; + }).pick(); + } + catch(e){} + + return {}; }, addSettings: function(){ var self = this; - self.settings = App.getPage('Settings') + self.settings = App.getPage('Settings'); self.settings.addEvent('create', function(){ var tab = self.settings.createSubTab('profile', { 'label': 'Quality', - 'name': 'profile' + 'name': 'profile', + 'subtab_label': 'Qualities' }, self.settings.tabs.searcher ,'searcher'); self.tab = tab.tab; @@ -51,7 +58,7 @@ var QualityBase = new Class({ self.createProfileOrdering(); self.createSizes(); - }) + }); }, @@ -61,7 +68,7 @@ var QualityBase = new Class({ createProfiles: function(){ var self = this; - var non_core_profiles = Array.filter(self.profiles, function(profile){ return !profile.isCore() }); + var non_core_profiles = Array.filter(self.profiles, function(profile){ return !profile.isCore(); }); var count = non_core_profiles.length; self.settings.createGroup({ @@ -74,7 +81,7 @@ var QualityBase = new Class({ 'events': { 'click': function(){ var profile = self.createProfilesClass(); - $(profile).inject(self.profile_container) + $(profile).inject(self.profile_container); } } }) @@ -82,7 +89,7 @@ var QualityBase = new Class({ // Add profiles, that aren't part of the core (for editing) Array.each(non_core_profiles, function(profile){ - $(profile).inject(self.profile_container) + $(profile).inject(self.profile_container); }); }, @@ -90,9 +97,9 @@ var QualityBase = new Class({ createProfilesClass: function(data){ var self = this; - var data = data || {'id': randomString()} - var profile = new Profile(data) - self.profiles.include(profile) + data = data || {'id': randomString()}; + var profile = new Profile(data); + self.profiles.include(profile); return profile; }, @@ -100,23 +107,23 @@ var QualityBase = new Class({ createProfileOrdering: function(){ var self = this; - var profile_list; - var group = self.settings.createGroup({ - 'label': 'Profile Defaults' - }).adopt( + self.settings.createGroup({ + 'label': 'Profile Defaults', + 'description': '(Needs refresh \'' +(App.isMac() ? 'CMD+R' : 'F5')+ '\' after editing)' + }).grab( new Element('.ctrlHolder#profile_ordering').adopt( new Element('label[text=Order]'), - profile_list = new Element('ul'), + self.profiles_list = new Element('ul'), new Element('p.formHint', { 'html': 'Change the order the profiles are in the dropdown list. Uncheck to hide it completely.
First one will be default.' }) ) - ).inject(self.content) + ).inject(self.content); Array.each(self.profiles, function(profile){ var check; - new Element('li', {'data-id': profile.data.id}).adopt( - check = new Element('input.inlay[type=checkbox]', { + new Element('li', {'data-id': profile.data._id}).adopt( + check = new Element('input[type=checkbox]', { 'checked': !profile.data.hide, 'events': { 'change': self.saveProfileOrdering.bind(self) @@ -125,30 +132,35 @@ var QualityBase = new Class({ new Element('span.profile_label', { 'text': profile.data.label }), - new Element('span.handle') - ).inject(profile_list); - - new Form.Check(check); - + new Element('span.handle.icon-handle') + ).inject(self.profiles_list); }); // Sortable - self.profile_sortable = new Sortables(profile_list, { + var sorted_changed = false; + self.profile_sortable = new Sortables(self.profiles_list, { 'revert': true, - 'handle': '', + 'handle': '.handle', 'opacity': 0.5, - 'onComplete': self.saveProfileOrdering.bind(self) + 'onSort': function(){ + sorted_changed = true; + }, + 'onComplete': function(){ + if(sorted_changed){ + self.saveProfileOrdering(); + sorted_changed = false; + } + } }); }, saveProfileOrdering: function(){ - var self = this; - - var ids = []; - var hidden = []; + var self = this, + ids = [], + hidden = []; - self.profile_sortable.list.getElements('li').each(function(el, nr){ + self.profiles_list.getElements('li').each(function(el, nr){ ids.include(el.get('data-id')); hidden[nr] = +!el.getElement('input[type=checkbox]').get('checked'); }); @@ -173,35 +185,34 @@ var QualityBase = new Class({ 'description': 'Edit the minimal and maximum sizes (in MB) for each quality.', 'advanced': true, 'name': 'sizes' - }).inject(self.content) - + }).inject(self.content); new Element('div.item.head.ctrlHolder').adopt( new Element('span.label', {'text': 'Quality'}), new Element('span.min', {'text': 'Min'}), new Element('span.max', {'text': 'Max'}) - ).inject(group) + ).inject(group); Array.each(self.qualities, function(quality){ new Element('div.ctrlHolder.item').adopt( new Element('span.label', {'text': quality.label}), - new Element('input.min.inlay[type=text]', { + new Element('input.min[type=text]', { 'value': quality.size_min, 'events': { 'keyup': function(e){ - self.changeSize(quality.identifier, 'size_min', e.target.get('value')) + self.changeSize(quality.identifier, 'size_min', e.target.get('value')); } } }), - new Element('input.max.inlay[type=text]', { + new Element('input.max[type=text]', { 'value': quality.size_max, 'events': { 'keyup': function(e){ - self.changeSize(quality.identifier, 'size_max', e.target.get('value')) + self.changeSize(quality.identifier, 'size_max', e.target.get('value')); } } }) - ).inject(group) + ).inject(group); }); }, @@ -210,9 +221,9 @@ var QualityBase = new Class({ changeSize: function(identifier, type, value){ var self = this; - if(self.size_timer[identifier + type]) clearTimeout(self.size_timer[identifier + type]); + if(self.size_timer[identifier + type]) clearRequestTimeout(self.size_timer[identifier + type]); - self.size_timer[identifier + type] = (function(){ + self.size_timer[identifier + type] = requestTimeout(function(){ Api.request('quality.size.save', { 'data': { 'identifier': identifier, @@ -220,7 +231,7 @@ var QualityBase = new Class({ 'value': value } }); - }).delay(300) + }, 300); } diff --git a/couchpotato/core/plugins/quality/static/quality.scss b/couchpotato/core/plugins/quality/static/quality.scss new file mode 100644 index 0000000000..c2aa9f99b7 --- /dev/null +++ b/couchpotato/core/plugins/quality/static/quality.scss @@ -0,0 +1,19 @@ +@import "_mixins"; + +.group_sizes { + + .item { + .label { + min-width: 150px; + } + + .min, .max { + display: inline-block; + width: 70px !important; + min-width: 0 !important; + margin-right: $padding/2; + text-align: center; + } + } + +} diff --git a/couchpotato/core/plugins/release/__init__.py b/couchpotato/core/plugins/release/__init__.py index b6a667c219..e6e60c4bbd 100644 --- a/couchpotato/core/plugins/release/__init__.py +++ b/couchpotato/core/plugins/release/__init__.py @@ -1,6 +1,5 @@ from .main import Release -def start(): - return Release() -config = [] +def autoload(): + return Release() diff --git a/couchpotato/core/plugins/release/index.py b/couchpotato/core/plugins/release/index.py new file mode 100644 index 0000000000..8265fe332d --- /dev/null +++ b/couchpotato/core/plugins/release/index.py @@ -0,0 +1,64 @@ +from hashlib import md5 + +from CodernityDB.hash_index import HashIndex +from CodernityDB.tree_index import TreeBasedIndex + + +class ReleaseIndex(TreeBasedIndex): + _version = 1 + + def __init__(self, *args, **kwargs): + kwargs['key_format'] = '32s' + super(ReleaseIndex, self).__init__(*args, **kwargs) + + def make_key(self, key): + return key + + def make_key_value(self, data): + if data.get('_t') == 'release' and data.get('media_id'): + return data['media_id'], None + + +class ReleaseStatusIndex(TreeBasedIndex): + _version = 1 + + def __init__(self, *args, **kwargs): + kwargs['key_format'] = '32s' + super(ReleaseStatusIndex, self).__init__(*args, **kwargs) + + def make_key(self, key): + return md5(key).hexdigest() + + def make_key_value(self, data): + if data.get('_t') == 'release' and data.get('status'): + return md5(data.get('status')).hexdigest(), {'media_id': data.get('media_id')} + + +class ReleaseIDIndex(HashIndex): + _version = 1 + + def __init__(self, *args, **kwargs): + kwargs['key_format'] = '32s' + super(ReleaseIDIndex, self).__init__(*args, **kwargs) + + def make_key(self, key): + return md5(key).hexdigest() + + def make_key_value(self, data): + if data.get('_t') == 'release' and data.get('identifier'): + return md5(data.get('identifier')).hexdigest(), {'media_id': data.get('media_id')} + + +class ReleaseDownloadIndex(HashIndex): + _version = 2 + + def __init__(self, *args, **kwargs): + kwargs['key_format'] = '32s' + super(ReleaseDownloadIndex, self).__init__(*args, **kwargs) + + def make_key(self, key): + return md5(key.lower()).hexdigest() + + def make_key_value(self, data): + if data.get('_t') == 'release' and data.get('download_info') and data['download_info']['id'] and data['download_info']['downloader']: + return md5(('%s-%s' % (data['download_info']['downloader'], data['download_info']['id'])).lower()).hexdigest(), None diff --git a/couchpotato/core/plugins/release/main.py b/couchpotato/core/plugins/release/main.py index 02843f855a..8320a247d5 100644 --- a/couchpotato/core/plugins/release/main.py +++ b/couchpotato/core/plugins/release/main.py @@ -1,24 +1,34 @@ -from couchpotato import get_session +from inspect import ismethod, isfunction +import os +import time +import traceback + +from CodernityDB.database import RecordDeleted, RecordNotFound +from couchpotato import md5, get_db from couchpotato.api import addApiView from couchpotato.core.event import fireEvent, addEvent -from couchpotato.core.helpers.encoding import ss -from couchpotato.core.helpers.request import getParam, jsonified +from couchpotato.core.helpers.encoding import toUnicode, sp +from couchpotato.core.helpers.variable import getTitle, tryInt from couchpotato.core.logger import CPLog from couchpotato.core.plugins.base import Plugin -from couchpotato.core.plugins.scanner.main import Scanner -from couchpotato.core.settings.model import File, Release as Relea, Movie -from sqlalchemy.sql.expression import and_, or_ -import os +from .index import ReleaseIndex, ReleaseStatusIndex, ReleaseIDIndex, ReleaseDownloadIndex +from couchpotato.environment import Env + log = CPLog(__name__) class Release(Plugin): - def __init__(self): - addEvent('release.add', self.add) + _database = { + 'release': ReleaseIndex, + 'release_status': ReleaseStatusIndex, + 'release_identifier': ReleaseIDIndex, + 'release_download': ReleaseDownloadIndex + } - addApiView('release.download', self.download, docs = { + def __init__(self): + addApiView('release.manual_download', self.manualDownload, docs = { 'desc': 'Send a release manually to the downloaders', 'params': { 'id': {'type': 'id', 'desc': 'ID of the release object in release-table'} @@ -37,160 +47,522 @@ def __init__(self): } }) + addEvent('release.add', self.add) + addEvent('release.download', self.download) + addEvent('release.try_download_result', self.tryDownloadResult) + addEvent('release.create_from_search', self.createFromSearch) addEvent('release.delete', self.delete) addEvent('release.clean', self.clean) + addEvent('release.update_status', self.updateStatus) + addEvent('release.with_status', self.withStatus) + addEvent('release.for_media', self.forMedia) - def add(self, group): - db = get_session() - - identifier = '%s.%s.%s' % (group['library']['identifier'], group['meta_data'].get('audio', 'unknown'), group['meta_data']['quality']['identifier']) - - # Add movie - done_status = fireEvent('status.get', 'done', single = True) - movie = db.query(Movie).filter_by(library_id = group['library'].get('id')).first() - if not movie: - movie = Movie( - library_id = group['library'].get('id'), - profile_id = 0, - status_id = done_status.get('id') - ) - db.add(movie) - db.commit() - - # Add Release - snatched_status = fireEvent('status.get', 'snatched', single = True) - rel = db.query(Relea).filter( - or_( - Relea.identifier == identifier, - and_(Relea.identifier.startswith(group['library']['identifier']), Relea.status_id == snatched_status.get('id')) - ) - ).first() - if not rel: - rel = Relea( - identifier = identifier, - movie = movie, - quality_id = group['meta_data']['quality'].get('id'), - status_id = done_status.get('id') - ) - db.add(rel) - db.commit() - - # Add each file type - for type in group['files']: - for cur_file in group['files'][type]: - added_file = self.saveFile(cur_file, type = type, include_media_info = type is 'movie') - try: - added_file = db.query(File).filter_by(id = added_file.get('id')).one() - rel.files.append(added_file) - db.commit() - except Exception, e: - log.debug('Failed to attach "%s" to release: %s', (cur_file, e)) + # Clean releases that didn't have activity in the last week + addEvent('app.load', self.cleanDone, priority = 1000) + fireEvent('schedule.interval', 'movie.clean_releases', self.cleanDone, hours = 12) - fireEvent('movie.restatus', movie.id) + def cleanDone(self): + log.debug('Removing releases from dashboard') - return True + now = time.time() + week = 604800 + db = get_db() - def saveFile(self, filepath, type = 'unknown', include_media_info = False): + # Get (and remove) parentless releases + releases = db.all('release', with_doc = False) + media_exist = [] + reindex = 0 + for release in releases: + if release.get('key') in media_exist: + continue - properties = {} + try: - # Get media info for files - if include_media_info: - properties = {} + try: + doc = db.get('id', release.get('_id')) + except RecordDeleted: + reindex += 1 + continue - # Check database and update/insert if necessary - return fireEvent('file.add', path = filepath, part = fireEvent('scanner.partnumber', file, single = True), type_tuple = Scanner.file_types.get(type), properties = properties, single = True) + db.get('id', release.get('key')) + media_exist.append(release.get('key')) - def deleteView(self): + try: + if doc.get('status') == 'ignore': + doc['status'] = 'ignored' + db.update(doc) + except: + log.error('Failed fixing mis-status tag: %s', traceback.format_exc()) + except ValueError: + fireEvent('database.delete_corrupted', release.get('key'), traceback_error = traceback.format_exc(0)) + reindex += 1 + except RecordDeleted: + db.delete(doc) + log.debug('Deleted orphaned release: %s', doc) + reindex += 1 + except: + log.debug('Failed cleaning up orphaned releases: %s', traceback.format_exc()) + + if reindex > 0: + db.reindex() + + del media_exist + + # get movies last_edit more than a week ago + medias = fireEvent('media.with_status', ['done', 'active'], single = True) + + for media in medias: + if media.get('last_edit', 0) > (now - week): + continue + + for rel in self.forMedia(media['_id']): + + # Remove all available releases + if rel['status'] in ['available']: + self.delete(rel['_id']) + + # Set all snatched and downloaded releases to ignored to make sure they are ignored when re-adding the media + elif rel['status'] in ['snatched', 'downloaded']: + self.updateStatus(rel['_id'], status = 'ignored') + + if 'recent' in media.get('tags', []): + fireEvent('media.untag', media.get('_id'), 'recent', single = True) + + def add(self, group, update_info = True, update_id = None): + + try: + db = get_db() + + release_identifier = '%s.%s.%s' % (group['identifier'], group['meta_data'].get('audio', 'unknown'), group['meta_data']['quality']['identifier']) + + # Add movie if it doesn't exist + try: + media = db.get('media', 'imdb-%s' % group['identifier'], with_doc = True)['doc'] + except: + media = fireEvent('movie.add', params = { + 'identifier': group['identifier'], + 'profile_id': None, + }, search_after = False, update_after = update_info, notify_after = False, status = 'done', single = True) + + release = None + if update_id: + try: + release = db.get('id', update_id) + release.update({ + 'identifier': release_identifier, + 'last_edit': int(time.time()), + 'status': 'done', + }) + except: + log.error('Failed updating existing release: %s', traceback.format_exc()) + else: + + # Add Release + if not release: + release = { + '_t': 'release', + 'media_id': media['_id'], + 'identifier': release_identifier, + 'quality': group['meta_data']['quality'].get('identifier'), + 'is_3d': group['meta_data']['quality'].get('is_3d', 0), + 'last_edit': int(time.time()), + 'status': 'done' + } - release_id = getParam('id') + try: + r = db.get('release_identifier', release_identifier, with_doc = True)['doc'] + r['media_id'] = media['_id'] + except: + log.debug('Failed updating release by identifier "%s". Inserting new.', release_identifier) + r = db.insert(release) - return jsonified({ - 'success': self.delete(release_id) - }) + # Update with ref and _id + release.update({ + '_id': r['_id'], + '_rev': r['_rev'], + }) - def delete(self, id): + # Empty out empty file groups + release['files'] = dict((k, [toUnicode(x) for x in v]) for k, v in group['files'].items() if v) + db.update(release) - db = get_session() + fireEvent('media.restatus', media['_id'], allowed_restatus = ['done'], single = True) - rel = db.query(Relea).filter_by(id = id).first() - if rel: - rel.delete() - db.commit() return True + except: + log.error('Failed: %s', traceback.format_exc()) return False - def clean(self, id): + def deleteView(self, id = None, **kwargs): + + return { + 'success': self.delete(id) + } - db = get_session() + def delete(self, release_id): + + try: + db = get_db() + rel = db.get('id', release_id) + db.delete(rel) + return True + except RecordDeleted: + log.debug('Already deleted: %s', release_id) + return True + except: + log.error('Failed: %s', traceback.format_exc()) + + return False - rel = db.query(Relea).filter_by(id = id).first() - if rel: - for release_file in rel.files: - if not os.path.isfile(ss(release_file.path)): - db.delete(release_file) - db.commit() + def clean(self, release_id): - if len(rel.files) == 0: - self.delete(id) + try: + db = get_db() + rel = db.get('id', release_id) + raw_files = rel.get('files') + + if len(raw_files) == 0: + self.delete(rel['_id']) + else: + + files = {} + for file_type in raw_files: + + for release_file in raw_files.get(file_type, []): + if os.path.isfile(sp(release_file)): + if file_type not in files: + files[file_type] = [] + files[file_type].append(release_file) + + rel['files'] = files + db.update(rel) return True + except: + log.error('Failed: %s', traceback.format_exc()) return False - def ignore(self): + def ignore(self, id = None, **kwargs): - db = get_session() - id = getParam('id') + db = get_db() - rel = db.query(Relea).filter_by(id = id).first() - if rel: - ignored_status = fireEvent('status.get', 'ignored', single = True) - available_status = fireEvent('status.get', 'available', single = True) - rel.status_id = available_status.get('id') if rel.status_id is ignored_status.get('id') else ignored_status.get('id') - db.commit() + try: + if id: + rel = db.get('id', id, with_doc = True) + self.updateStatus(id, 'available' if rel['status'] in ['ignored', 'failed'] else 'ignored') - return jsonified({ - 'success': True - }) + return { + 'success': True + } + except: + log.error('Failed: %s', traceback.format_exc()) - def download(self): + return { + 'success': False + } + + def manualDownload(self, id = None, **kwargs): - db = get_session() - id = getParam('id') - status_snatched = fireEvent('status.add', 'snatched', single = True) + db = get_db() - rel = db.query(Relea).filter_by(id = id).first() - if rel: - item = {} - for info in rel.info: - item[info.identifier] = info.value + try: + release = db.get('id', id) + item = release['info'] + movie = db.get('id', release['media_id']) + + fireEvent('notify.frontend', type = 'release.manual_download', data = True, message = 'Snatching "%s"' % item['name']) # Get matching provider provider = fireEvent('provider.belongs_to', item['url'], provider = item.get('provider'), single = True) - if item['type'] != 'torrent_magnet': - item['download'] = provider.download + if item.get('protocol') != 'torrent_magnet': + item['download'] = provider.loginDownload if provider.urls.get('login') else provider.download - success = fireEvent('searcher.download', data = item, movie = rel.movie.to_dict({ - 'profile': {'types': {'quality': {}}}, - 'releases': {'status': {}, 'quality': {}}, - 'library': {'titles': {}, 'files':{}}, - 'files': {} - }), manual = True, single = True) + success = self.download(data = item, media = movie, manual = True) if success: - rel.status_id = status_snatched.get('id') - db.commit() + fireEvent('notify.frontend', type = 'release.manual_download', data = True, message = 'Successfully snatched "%s"' % item['name']) - return jsonified({ - 'success': success - }) - else: - log.error('Couldn\'t find release with id: %s', id) + return { + 'success': success == True + } - return jsonified({ - 'success': False - }) + except: + log.error('Couldn\'t find release with id: %s: %s', (id, traceback.format_exc())) + return { + 'success': False + } + + def download(self, data, media, manual = False): + + # Test to see if any downloaders are enabled for this type + downloader_enabled = fireEvent('download.enabled', manual, data, single = True) + if not downloader_enabled: + log.info('Tried to download, but none of the "%s" downloaders are enabled or gave an error', data.get('protocol')) + return False + + # Download NZB or torrent file + filedata = None + if data.get('download') and (ismethod(data.get('download')) or isfunction(data.get('download'))): + try: + filedata = data.get('download')(url = data.get('url'), nzb_id = data.get('id')) + except: + log.error('Tried to download, but the "%s" provider gave an error: %s', (data.get('protocol'), traceback.format_exc())) + return False + + if filedata == 'try_next': + return filedata + elif not filedata: + return False + + # Send NZB or torrent file to downloader + download_result = fireEvent('download', data = data, media = media, manual = manual, filedata = filedata, single = True) + if not download_result: + log.info('Tried to download, but the "%s" downloader gave an error', data.get('protocol')) + return False + log.debug('Downloader result: %s', download_result) + + try: + db = get_db() + + try: + rls = db.get('release_identifier', md5(data['url']), with_doc = True)['doc'] + except: + log.error('No release found to store download information in') + return False + + renamer_enabled = Env.setting('enabled', 'renamer') + + # Save download-id info if returned + if isinstance(download_result, dict): + rls['download_info'] = download_result + db.update(rls) + + log_movie = '%s (%s) in %s' % (getTitle(media), media['info'].get('year'), rls['quality']) + snatch_message = 'Snatched "%s": %s from %s' % (data.get('name'), log_movie, (data.get('provider', '') + data.get('provider_extra', ''))) + log.info(snatch_message) + fireEvent('%s.snatched' % data['type'], message = snatch_message, data = media) + + # Mark release as snatched + if renamer_enabled: + self.updateStatus(rls['_id'], status = 'snatched') + + # If renamer isn't used, mark media done if finished or release downloaded + else: + + if media['status'] == 'active': + profile = db.get('id', media['profile_id']) + if fireEvent('quality.isfinish', {'identifier': rls['quality'], 'is_3d': rls.get('is_3d', False)}, profile, single = True): + log.info('Renamer disabled, marking media as finished: %s', log_movie) + + # Mark release done + self.updateStatus(rls['_id'], status = 'done') + + # Mark media done + fireEvent('media.restatus', media['_id'], single = True) + + return True + + # Assume release downloaded + self.updateStatus(rls['_id'], status = 'downloaded') + + except: + log.error('Failed storing download status: %s', traceback.format_exc()) + return False + + return True + + def tryDownloadResult(self, results, media, quality_custom): + + wait_for = False + let_through = False + filtered_results = [] + minimum_seeders = tryInt(Env.setting('minimum_seeders', section = 'torrent', default = 1)) + + # Filter out ignored and other releases we don't want + for rel in results: + + if rel['status'] in ['ignored', 'failed']: + log.info('Ignored: %s', rel['name']) + continue + + if rel['score'] < quality_custom.get('minimum_score'): + log.info('Ignored, score "%s" to low, need at least "%s": %s', (rel['score'], quality_custom.get('minimum_score'), rel['name'])) + continue + + if rel['size'] <= 50: + log.info('Ignored, size "%sMB" to low: %s', (rel['size'], rel['name'])) + continue + + if 'seeders' in rel and rel.get('seeders') < minimum_seeders: + log.info('Ignored, not enough seeders, has %s needs %s: %s', (rel.get('seeders'), minimum_seeders, rel['name'])) + continue + + # If a single release comes through the "wait for", let through all + rel['wait_for'] = False + if quality_custom.get('index') != 0 and quality_custom.get('wait_for', 0) > 0 and rel.get('age') <= quality_custom.get('wait_for', 0): + rel['wait_for'] = True + else: + let_through = True + + filtered_results.append(rel) + + # Loop through filtered results + for rel in filtered_results: + + # Only wait if not a single release is old enough + if rel.get('wait_for') and not let_through: + log.info('Ignored, waiting %s days: %s', (quality_custom.get('wait_for') - rel.get('age'), rel['name'])) + wait_for = True + continue + + downloaded = fireEvent('release.download', data = rel, media = media, single = True) + if downloaded is True: + return True + elif downloaded != 'try_next': + break + + return wait_for + + def createFromSearch(self, search_results, media, quality): + + try: + db = get_db() + + found_releases = [] + + is_3d = False + try: is_3d = quality['custom']['3d'] + except: pass + + for rel in search_results: + + rel_identifier = md5(rel['url']) + + release = { + '_t': 'release', + 'identifier': rel_identifier, + 'media_id': media.get('_id'), + 'quality': quality.get('identifier'), + 'is_3d': is_3d, + 'status': rel.get('status', 'available'), + 'last_edit': int(time.time()), + 'info': {} + } + + # Add downloader info if provided + try: + release['download_info'] = rel['download_info'] + del rel['download_info'] + except: + pass + + try: + rls = db.get('release_identifier', rel_identifier, with_doc = True)['doc'] + except: + rls = db.insert(release) + rls.update(release) + + # Update info, but filter out functions + for info in rel: + try: + if not isinstance(rel[info], (str, unicode, int, long, float)): + continue + + rls['info'][info] = toUnicode(rel[info]) if isinstance(rel[info], (str, unicode)) else rel[info] + except: + log.debug('Couldn\'t add %s to ReleaseInfo: %s', (info, traceback.format_exc())) + + db.update(rls) + + # Update release in search_results + rel['status'] = rls.get('status') + + if rel['status'] == 'available': + found_releases.append(rel_identifier) + + return found_releases + except: + log.error('Failed: %s', traceback.format_exc()) + + return [] + + def updateStatus(self, release_id, status = None): + if not status: return False + + try: + db = get_db() + + rel = db.get('id', release_id) + if rel and rel.get('status') != status: + + release_name = None + if rel.get('files'): + for file_type in rel.get('files', {}): + if file_type == 'movie': + for release_file in rel['files'][file_type]: + release_name = os.path.basename(release_file) + break + + if not release_name and rel.get('info'): + release_name = rel['info'].get('name') + + #update status in Db + log.debug('Marking release %s as %s', (release_name, status)) + rel['status'] = status + rel['last_edit'] = int(time.time()) + + db.update(rel) + + #Update all movie info as there is no release update function + fireEvent('notify.frontend', type = 'release.update_status', data = rel) + + return True + except: + log.error('Failed: %s', traceback.format_exc()) + + return False + + def withStatus(self, status, with_doc = True): + + db = get_db() + + status = list(status if isinstance(status, (list, tuple)) else [status]) + + for s in status: + for ms in db.get_many('release_status', s): + if with_doc: + try: + doc = db.get('id', ms['_id']) + yield doc + except RecordNotFound: + log.debug('Record not found, skipping: %s', ms['_id']) + else: + yield ms + + def forMedia(self, media_id): + + db = get_db() + raw_releases = db.get_many('release', media_id) + + releases = [] + for r in raw_releases: + try: + doc = db.get('id', r.get('_id')) + releases.append(doc) + except RecordDeleted: + pass + except (ValueError, EOFError): + fireEvent('database.delete_corrupted', r.get('_id'), traceback_error = traceback.format_exc(0)) + + releases = sorted(releases, key = lambda k: k.get('info', {}).get('score', 0), reverse = True) + + # Sort based on preferred search method + download_preference = self.conf('preferred_method', section = 'searcher') + if download_preference != 'both': + releases = sorted(releases, key = lambda k: k.get('info', {}).get('protocol', '')[:3], reverse = (download_preference == 'torrent')) + + return releases or [] diff --git a/couchpotato/core/plugins/renamer.py b/couchpotato/core/plugins/renamer.py new file mode 100755 index 0000000000..fd710d5a41 --- /dev/null +++ b/couchpotato/core/plugins/renamer.py @@ -0,0 +1,1488 @@ +import fnmatch +import os +import re +import shutil +import time +import traceback + +from couchpotato import get_db +from couchpotato.api import addApiView +from couchpotato.core.event import addEvent, fireEvent, fireEventAsync +from couchpotato.core.helpers.encoding import toUnicode, ss, sp +from couchpotato.core.helpers.variable import getExt, mergeDicts, getTitle, \ + getImdb, link, symlink, tryInt, splitString, fnEscape, isSubFolder, \ + getIdentifier, randomString, getFreeSpace, getSize +from couchpotato.core.logger import CPLog +from couchpotato.core.plugins.base import Plugin +from couchpotato.environment import Env +from unrar2 import RarFile +import six +from six.moves import filter + + +log = CPLog(__name__) + +autoload = 'Renamer' + + +class Renamer(Plugin): + + renaming_started = False + checking_snatched = False + + def __init__(self): + addApiView('renamer.scan', self.scanView, docs = { + 'desc': 'For the renamer to check for new files to rename in a folder', + 'params': { + 'async': {'desc': 'Optional: Set to 1 if you dont want to fire the renamer.scan asynchronous.'}, + 'to_folder': {'desc': 'Optional: The folder to move releases to. Leave empty for default folder.'}, + 'media_folder': {'desc': 'Optional: The folder of the media to scan. Keep empty for default renamer folder.'}, + 'files': {'desc': 'Optional: Provide the release files if more releases are in the same media_folder, delimited with a \'|\'. Note that no dedicated release folder is expected for releases with one file.'}, + 'base_folder': {'desc': 'Optional: The folder to find releases in. Leave empty for default folder.'}, + 'downloader': {'desc': 'Optional: The downloader the release has been downloaded with. \'download_id\' is required with this option.'}, + 'download_id': {'desc': 'Optional: The nzb/torrent ID of the release in media_folder. \'downloader\' is required with this option.'}, + 'status': {'desc': 'Optional: The status of the release: \'completed\' (default) or \'seeding\''}, + }, + }) + + addApiView('renamer.progress', self.getProgress, docs = { + 'desc': 'Get the progress of current renamer scan', + 'return': {'type': 'object', 'example': """{ + 'progress': False || True, +}"""}, + }) + + addEvent('renamer.scan', self.scan) + addEvent('renamer.check_snatched', self.checkSnatched) + + addEvent('app.load', self.scan) + addEvent('app.load', self.setCrons) + + # Enable / disable interval + addEvent('setting.save.renamer.enabled.after', self.setCrons) + addEvent('setting.save.renamer.run_every.after', self.setCrons) + addEvent('setting.save.renamer.force_every.after', self.setCrons) + + def setCrons(self): + + fireEvent('schedule.remove', 'renamer.check_snatched') + if self.isEnabled() and self.conf('run_every') > 0: + fireEvent('schedule.interval', 'renamer.check_snatched', self.checkSnatched, minutes = self.conf('run_every'), single = True) + + fireEvent('schedule.remove', 'renamer.check_snatched_forced') + if self.isEnabled() and self.conf('force_every') > 0: + fireEvent('schedule.interval', 'renamer.check_snatched_forced', self.scan, hours = self.conf('force_every'), single = True) + + return True + + def getProgress(self, **kwargs): + return { + 'progress': self.renaming_started + } + + def scanView(self, **kwargs): + + async = tryInt(kwargs.get('async', 0)) + base_folder = kwargs.get('base_folder') + media_folder = sp(kwargs.get('media_folder')) + to_folder = kwargs.get('to_folder') + + # Backwards compatibility, to be removed after a few versions :) + if not media_folder: + media_folder = sp(kwargs.get('movie_folder')) + + downloader = kwargs.get('downloader') + download_id = kwargs.get('download_id') + files = [sp(filename) for filename in splitString(kwargs.get('files'), '|')] + status = kwargs.get('status', 'completed') + + release_download = None + if not base_folder and media_folder: + release_download = {'folder': media_folder} + + if download_id: + release_download.update({ + 'id': download_id, + 'downloader': downloader, + 'status': status, + 'files': files + }) + + fire_handle = fireEvent if not async else fireEventAsync + fire_handle('renamer.scan', base_folder = base_folder, release_download = release_download, to_folder = to_folder) + + return { + 'success': True + } + + def scan(self, base_folder = None, release_download = None, to_folder = None): + if not release_download: release_download = {} + + if self.isDisabled(): + return + + if self.renaming_started is True: + log.info('Renamer is already running, if you see this often, check the logs above for errors.') + return + + if not base_folder: + base_folder = sp(self.conf('from')) + + from_folder = sp(self.conf('from')) + + if not to_folder: + to_folder = sp(self.conf('to')) + + # Get media folder to process + media_folder = sp(release_download.get('folder')) + + # Get all folders that should not be processed + no_process = [to_folder] + cat_list = fireEvent('category.all', single = True) or [] + no_process.extend([item['destination'] for item in cat_list]) + + # Check to see if the no_process folders are inside the "from" folder. + if not os.path.isdir(base_folder) or not os.path.isdir(to_folder): + log.error('Both the "To" and "From" folder have to exist.') + return + else: + for item in no_process: + if isSubFolder(item, base_folder): + log.error('To protect your data, the media libraries can\'t be inside of or the same as the "from" folder. "%s" in "%s"', (item, base_folder)) + return + + # Check to see if the no_process folders are inside the provided media_folder + if media_folder and not os.path.isdir(media_folder): + log.debug('The provided media folder %s does not exist. Trying to find it in the \'from\' folder.', media_folder) + + # Update to the from folder + if len(release_download.get('files', [])) == 1: + new_media_folder = sp(from_folder) + else: + new_media_folder = sp(os.path.join(from_folder, os.path.basename(media_folder))) + + if not os.path.isdir(new_media_folder): + log.error('The provided media folder %s does not exist and could also not be found in the \'from\' folder.', media_folder) + return + + # Update the files + new_files = [os.path.join(new_media_folder, os.path.relpath(filename, media_folder)) for filename in release_download.get('files', [])] + if new_files and not os.path.isfile(new_files[0]): + log.error('The provided media folder %s does not exist and its files could also not be found in the \'from\' folder.', media_folder) + return + + # Update release_download info to the from folder + log.debug('Release %s found in the \'from\' folder.', media_folder) + release_download['folder'] = new_media_folder + release_download['files'] = new_files + media_folder = new_media_folder + + if media_folder: + for item in no_process: + if isSubFolder(item, media_folder): + log.error('To protect your data, the media libraries can\'t be inside of or the same as the provided media folder. "%s" in "%s"', (item, media_folder)) + return + + # Make sure a checkSnatched marked all downloads/seeds as such + if not release_download and self.conf('run_every') > 0: + self.checkSnatched(fire_scan = False) + + self.renaming_started = True + + # make sure the media folder name is included in the search + folder = None + files = [] + if media_folder: + log.info('Scanning media folder %s...', media_folder) + folder = os.path.dirname(media_folder) + + release_files = release_download.get('files', []) + if release_files: + files = release_files + + # If there is only one file in the torrent, the downloader did not create a subfolder + if len(release_files) == 1: + folder = media_folder + else: + # Get all files from the specified folder + try: + for root, folders, names in os.walk(media_folder): + files.extend([sp(os.path.join(root, name)) for name in names]) + except: + log.error('Failed getting files from %s: %s', (media_folder, traceback.format_exc())) + + db = get_db() + + # Extend the download info with info stored in the downloaded release + keep_original = self.moveTypeIsLinked() + is_torrent = False + if release_download: + release_download = self.extendReleaseDownload(release_download) + is_torrent = self.downloadIsTorrent(release_download) + keep_original = True if is_torrent and self.conf('file_action') not in ['move'] else keep_original + + # Unpack any archives + extr_files = None + if self.conf('unrar'): + folder, media_folder, files, extr_files = self.extractFiles(folder = folder, media_folder = media_folder, files = files, + cleanup = self.conf('cleanup') and not keep_original) + + groups = fireEvent('scanner.scan', folder = folder if folder else base_folder, + files = files, release_download = release_download, return_ignored = False, single = True) or [] + + folder_name = self.conf('folder_name') + file_name = self.conf('file_name') + trailer_name = self.conf('trailer_name') + nfo_name = self.conf('nfo_name') + separator = self.conf('separator') + + if len(file_name) == 0: + log.error('Please fill in the filename option under renamer settings. Forcing it on. to keep the same name as source file.')
+ file_name = '.'
+
+ cd_keys = ['','', '']
+ if not any(x in folder_name for x in cd_keys) and not any(x in file_name for x in cd_keys):
+ log.error('Missing `cd` or `cd_nr` in the renamer. This will cause multi-file releases of being renamed to the same file. '
+ 'Please add it in the renamer settings. Force adding it for now.')
+ file_name = '%s %s' % ('', file_name)
+
+ # Tag release folder as failed_rename in case no groups were found. This prevents check_snatched from removing the release from the downloader.
+ if not groups and self.statusInfoComplete(release_download):
+ self.tagRelease(release_download = release_download, tag = 'failed_rename')
+
+ for group_identifier in groups:
+
+ group = groups[group_identifier]
+ group['release_download'] = None
+ rename_files = {}
+ remove_files = []
+ remove_releases = []
+
+ media_title = getTitle(group)
+
+ # Add _UNKNOWN_ if no library item is connected
+ if not group.get('media') or not media_title:
+ self.tagRelease(group = group, tag = 'unknown')
+ continue
+ # Rename the files using the library data
+ else:
+
+ # Media not in library, add it first
+ if not group['media'].get('_id'):
+ group['media'] = fireEvent('movie.add', params = {
+ 'identifier': group['identifier'],
+ 'profile_id': None
+ }, search_after = False, status = 'done', single = True)
+ else:
+ group['media'] = fireEvent('movie.update', media_id = group['media'].get('_id'), single = True)
+
+ if not group['media'] or not group['media'].get('_id'):
+ log.error('Could not rename, no library item to work with: %s', group_identifier)
+ continue
+
+ media = group['media']
+ media_title = getTitle(media)
+
+ # Overwrite destination when set in category
+ destination = to_folder
+ category_label = ''
+
+ if media.get('category_id') and media.get('category_id') != '-1':
+ try:
+ category = db.get('id', media['category_id'])
+ category_label = category['label']
+
+ if category['destination'] and len(category['destination']) > 0 and category['destination'] != 'None':
+ destination = sp(category['destination'])
+ log.debug('Setting category destination for "%s": %s' % (media_title, destination))
+ else:
+ log.debug('No category destination found for "%s"' % media_title)
+ except:
+ log.error('Failed getting category label: %s', traceback.format_exc())
+
+
+ # Find subtitle for renaming
+ group['before_rename'] = []
+ fireEvent('renamer.before', group)
+
+ # Add extracted files to the before_rename list
+ if extr_files:
+ group['before_rename'].extend(extr_files)
+
+ # Remove weird chars from movie name
+ movie_name = re.sub(r"[\x00\/\\:\*\?\"<>\|]", '', media_title)
+
+ # Put 'The' at the end
+ name_the = movie_name
+ for prefix in ['the ', 'an ', 'a ']:
+ if prefix == movie_name[:len(prefix)].lower():
+ name_the = movie_name[len(prefix):] + ', ' + prefix.strip().capitalize()
+ break
+
+ replacements = {
+ 'ext': 'mkv',
+ 'namethe': name_the.strip(),
+ 'thename': movie_name.strip(),
+ 'year': media['info']['year'],
+ 'first': name_the[0].upper(),
+ 'quality': group['meta_data']['quality']['label'],
+ 'quality_type': group['meta_data']['quality_type'],
+ 'video': group['meta_data'].get('video'),
+ 'audio': group['meta_data'].get('audio'),
+ 'group': group['meta_data']['group'],
+ 'source': group['meta_data']['source'],
+ 'resolution_width': group['meta_data'].get('resolution_width'),
+ 'resolution_height': group['meta_data'].get('resolution_height'),
+ 'audio_channels': group['meta_data'].get('audio_channels'),
+ 'imdb_id': group['identifier'],
+ 'cd': '',
+ 'cd_nr': '',
+ 'mpaa': media['info'].get('mpaa', ''),
+ 'mpaa_only': media['info'].get('mpaa', ''),
+ 'category': category_label,
+ '3d': '3D' if group['meta_data']['quality'].get('is_3d', 0) else '',
+ '3d_type': group['meta_data'].get('3d_type'),
+ }
+
+ if replacements['mpaa_only'] not in ('G', 'PG', 'PG-13', 'R', 'NC-17'):
+ replacements['mpaa_only'] = 'Not Rated'
+
+ for file_type in group['files']:
+
+ # Move nfo depending on settings
+ if file_type is 'nfo' and not self.conf('rename_nfo'):
+ log.debug('Skipping, renaming of %s disabled', file_type)
+ for current_file in group['files'][file_type]:
+ if self.conf('cleanup') and (not keep_original or self.fileIsAdded(current_file, group)):
+ remove_files.append(current_file)
+ continue
+
+ # Subtitle extra
+ if file_type is 'subtitle_extra':
+ continue
+
+ # Move other files
+ multiple = len(group['files'][file_type]) > 1 and not group['is_dvd']
+ cd = 1 if multiple else 0
+
+ for current_file in sorted(list(group['files'][file_type])):
+ current_file = sp(current_file)
+
+ # Original filename
+ replacements['original'] = os.path.splitext(os.path.basename(current_file))[0]
+ replacements['original_folder'] = fireEvent('scanner.remove_cptag', group['dirname'], single = True)
+
+ if not replacements['original_folder'] or len(replacements['original_folder']) == 0:
+ replacements['original_folder'] = replacements['original']
+
+ # Extension
+ replacements['ext'] = getExt(current_file)
+
+ # cd #
+ replacements['cd'] = ' cd%d' % cd if multiple else ''
+ replacements['cd_nr'] = cd if multiple else ''
+
+ # Naming
+ final_folder_name = self.doReplace(folder_name, replacements, folder = True)
+ final_file_name = self.doReplace(file_name, replacements)
+ replacements['filename'] = final_file_name[:-(len(getExt(final_file_name)) + 1)]
+
+ # Meta naming
+ if file_type is 'trailer':
+ final_file_name = self.doReplace(trailer_name, replacements, remove_multiple = True)
+ elif file_type is 'nfo':
+ final_file_name = self.doReplace(nfo_name, replacements, remove_multiple = True)
+
+ # Move DVD files (no structure renaming)
+ if group['is_dvd'] and file_type is 'movie':
+ found = False
+ for top_dir in ['video_ts', 'audio_ts', 'bdmv', 'certificate']:
+ has_string = current_file.lower().find(os.path.sep + top_dir + os.path.sep)
+ if has_string >= 0:
+ structure_dir = current_file[has_string:].lstrip(os.path.sep)
+ rename_files[current_file] = os.path.join(destination, final_folder_name, structure_dir)
+ found = True
+ break
+
+ if not found:
+ log.error('Could not determine dvd structure for: %s', current_file)
+
+ # Do rename others
+ else:
+ if file_type is 'leftover':
+ if self.conf('move_leftover'):
+ rename_files[current_file] = os.path.join(destination, final_folder_name, os.path.basename(current_file))
+ elif file_type not in ['subtitle']:
+ rename_files[current_file] = os.path.join(destination, final_folder_name, final_file_name)
+
+ # Check for extra subtitle files
+ if file_type is 'subtitle':
+
+ remove_multiple = False
+ if len(group['files']['movie']) == 1:
+ remove_multiple = True
+
+ sub_langs = group['subtitle_language'].get(current_file, [])
+
+ # rename subtitles with or without language
+ sub_name = self.doReplace(file_name, replacements, remove_multiple = remove_multiple)
+ rename_files[current_file] = os.path.join(destination, final_folder_name, sub_name)
+
+ rename_extras = self.getRenameExtras(
+ extra_type = 'subtitle_extra',
+ replacements = replacements,
+ folder_name = folder_name,
+ file_name = file_name,
+ destination = destination,
+ group = group,
+ current_file = current_file,
+ remove_multiple = remove_multiple,
+ )
+
+ # Don't add language if multiple languages in 1 subtitle file
+ if len(sub_langs) == 1:
+ sub_suffix = '%s.%s' % (sub_langs[0], replacements['ext'])
+
+ # Don't add language to subtitle file it it's already there
+ if not sub_name.endswith(sub_suffix):
+ sub_name = sub_name.replace(replacements['ext'], sub_suffix)
+ rename_files[current_file] = os.path.join(destination, final_folder_name, sub_name)
+
+ rename_files = mergeDicts(rename_files, rename_extras)
+
+ # Filename without cd etc
+ elif file_type is 'movie':
+ rename_extras = self.getRenameExtras(
+ extra_type = 'movie_extra',
+ replacements = replacements,
+ folder_name = folder_name,
+ file_name = file_name,
+ destination = destination,
+ group = group,
+ current_file = current_file
+ )
+ rename_files = mergeDicts(rename_files, rename_extras)
+
+ group['filename'] = self.doReplace(file_name, replacements, remove_multiple = True)[:-(len(getExt(final_file_name)) + 1)]
+ group['destination_dir'] = os.path.join(destination, final_folder_name)
+
+ if multiple:
+ cd += 1
+
+ # Before renaming, remove the lower quality files
+ remove_leftovers = True
+
+ # Get media quality profile
+ profile = None
+ if media.get('profile_id'):
+ try:
+ profile = db.get('id', media['profile_id'])
+ except:
+ # Set profile to None as it does not exist anymore
+ mdia = db.get('id', media['_id'])
+ mdia['profile_id'] = None
+ db.update(mdia)
+ log.error('Error getting quality profile for %s: %s', (media_title, traceback.format_exc()))
+ else:
+ log.debug('Media has no quality profile: %s', media_title)
+
+ # Mark media for dashboard
+ mark_as_recent = False
+
+ # Go over current movie releases
+ for release in fireEvent('release.for_media', media['_id'], single = True):
+
+ # When a release already exists
+ if release.get('status') == 'done':
+
+ # This is where CP removes older, lesser quality releases or releases that are not wanted anymore
+ is_higher = fireEvent('quality.ishigher', \
+ group['meta_data']['quality'], {'identifier': release['quality'], 'is_3d': release.get('is_3d', False)}, profile, single = True)
+
+ if is_higher == 'higher':
+ log.info('Removing lesser or not wanted quality %s for %s.', (media_title, release.get('quality')))
+ for file_type in release.get('files', {}):
+ for release_file in release['files'][file_type]:
+ remove_files.append(release_file)
+ remove_releases.append(release)
+
+ # Same quality, but still downloaded, so maybe repack/proper/unrated/directors cut etc
+ elif is_higher == 'equal':
+ log.info('Same quality release already exists for %s, with quality %s. Assuming repack.', (media_title, release.get('quality')))
+ for file_type in release.get('files', {}):
+ for release_file in release['files'][file_type]:
+ remove_files.append(release_file)
+ remove_releases.append(release)
+
+ # Downloaded a lower quality, rename the newly downloaded files/folder to exclude them from scan
+ else:
+ log.info('Better quality release already exists for %s, with quality %s', (media_title, release.get('quality')))
+
+ # Add exists tag to the .ignore file
+ self.tagRelease(group = group, tag = 'exists')
+
+ # Notify on rename fail
+ download_message = 'Renaming of %s (%s) cancelled, exists in %s already.' % (media_title, group['meta_data']['quality']['label'], release.get('quality'))
+ fireEvent('movie.renaming.canceled', message = download_message, data = group)
+ remove_leftovers = False
+
+ break
+
+ elif release.get('status') in ['snatched', 'seeding']:
+ if release_download and release_download.get('release_id'):
+ if release_download['release_id'] == release['_id']:
+ if release_download['status'] == 'completed':
+ # Set the release to downloaded
+ fireEvent('release.update_status', release['_id'], status = 'downloaded', single = True)
+ group['release_download'] = release_download
+ mark_as_recent = True
+ elif release_download['status'] == 'seeding':
+ # Set the release to seeding
+ fireEvent('release.update_status', release['_id'], status = 'seeding', single = True)
+ mark_as_recent = True
+
+ elif release.get('quality') == group['meta_data']['quality']['identifier']:
+ # Set the release to downloaded
+ fireEvent('release.update_status', release['_id'], status = 'downloaded', single = True)
+ group['release_download'] = release_download
+ mark_as_recent = True
+
+ # Mark media for dashboard
+ if mark_as_recent:
+ fireEvent('media.tag', group['media'].get('_id'), 'recent', update_edited = True, single = True)
+
+ # Remove leftover files
+ if not remove_leftovers: # Don't remove anything
+ continue
+
+ log.debug('Removing leftover files')
+ for current_file in group['files']['leftover']:
+ if self.conf('cleanup') and not self.conf('move_leftover') and \
+ (not keep_original or self.fileIsAdded(current_file, group)):
+ remove_files.append(current_file)
+
+ if self.conf('check_space'):
+ total_space, available_space = getFreeSpace(destination)
+ renaming_size = getSize(rename_files.keys())
+ if renaming_size > available_space:
+ log.error('Not enough space left, need %s MB but only %s MB available', (renaming_size, available_space))
+ self.tagRelease(group = group, tag = 'not_enough_space')
+ continue
+
+ # Remove files
+ delete_folders = []
+ for src in remove_files:
+
+ if rename_files.get(src):
+ log.debug('Not removing file that will be renamed: %s', src)
+ continue
+
+ log.info('Removing "%s"', src)
+ try:
+ src = sp(src)
+ if os.path.isfile(src):
+ os.remove(src)
+
+ parent_dir = os.path.dirname(src)
+ if parent_dir not in delete_folders and os.path.isdir(parent_dir) and \
+ not isSubFolder(destination, parent_dir) and not isSubFolder(media_folder, parent_dir) and \
+ isSubFolder(parent_dir, base_folder):
+
+ delete_folders.append(parent_dir)
+
+ except:
+ log.error('Failed removing %s: %s', (src, traceback.format_exc()))
+ self.tagRelease(group = group, tag = 'failed_remove')
+
+ # Delete leftover folder from older releases
+ delete_folders = sorted(delete_folders, key = len, reverse = True)
+ for delete_folder in delete_folders:
+ try:
+ self.deleteEmptyFolder(delete_folder, show_error = False)
+ except Exception as e:
+ log.error('Failed to delete folder: %s %s', (e, traceback.format_exc()))
+
+ # Rename all files marked
+ group['renamed_files'] = []
+ failed_rename = False
+ for src in rename_files:
+ if rename_files[src]:
+ dst = rename_files[src]
+
+ if dst in group['renamed_files']:
+ log.error('File "%s" already renamed once, adding random string at the end to prevent data loss', dst)
+ dst = '%s.random-%s' % (dst, randomString())
+
+ # Create dir
+ self.makeDir(os.path.dirname(dst))
+
+ try:
+ self.moveFile(src, dst, use_default = not is_torrent or self.fileIsAdded(src, group))
+ group['renamed_files'].append(dst)
+ except:
+ log.error('Failed renaming the file "%s" : %s', (os.path.basename(src), traceback.format_exc()))
+ failed_rename = True
+ break
+
+ # If renaming failed tag the release folder as failed and continue with next group. Note that all old files have already been deleted.
+ if failed_rename:
+ self.tagRelease(group = group, tag = 'failed_rename')
+ continue
+ # If renaming succeeded, make sure it is not tagged as failed (scanner didn't return a group, but a download_ID was provided in an earlier attempt)
+ else:
+ self.untagRelease(group = group, tag = 'failed_rename')
+
+ # Tag folder if it is in the 'from' folder and it will not be removed because it is a torrent
+ if self.movieInFromFolder(media_folder) and keep_original:
+ self.tagRelease(group = group, tag = 'renamed_already')
+
+ # Remove matching releases
+ for release in remove_releases:
+ log.debug('Removing release %s', release.get('identifier'))
+ try:
+ db.delete(release)
+ except:
+ log.error('Failed removing %s: %s', (release, traceback.format_exc()))
+
+ if group['dirname'] and group['parentdir'] and not keep_original:
+ if media_folder:
+ # Delete the movie folder
+ group_folder = media_folder
+ else:
+ # Delete the first empty subfolder in the tree relative to the 'from' folder
+ group_folder = sp(os.path.join(base_folder, os.path.relpath(group['parentdir'], base_folder).split(os.path.sep)[0]))
+
+ try:
+ if self.conf('cleanup') or self.conf('move_leftover'):
+ log.info('Deleting folder: %s', group_folder)
+ self.deleteEmptyFolder(group_folder)
+ except:
+ log.error('Failed removing %s: %s', (group_folder, traceback.format_exc()))
+
+ # Notify on download, search for trailers etc
+ download_message = 'Downloaded %s (%s%s)' % (media_title, replacements['quality'], (' ' + replacements['3d']) if replacements['3d'] else '')
+ try:
+ fireEvent('renamer.after', message = download_message, group = group, in_order = True)
+ except:
+ log.error('Failed firing (some) of the renamer.after events: %s', traceback.format_exc())
+
+ # Break if CP wants to shut down
+ if self.shuttingDown():
+ break
+
+ self.renaming_started = False
+
+ def getRenameExtras(self, extra_type = '', replacements = None, folder_name = '', file_name = '', destination = '', group = None, current_file = '', remove_multiple = False):
+ if not group: group = {}
+ if not replacements: replacements = {}
+
+ replacements = replacements.copy()
+ rename_files = {}
+
+ def test(s):
+ return current_file[:-len(replacements['ext'])] in sp(s)
+
+ for extra in set(filter(test, group['files'][extra_type])):
+ replacements['ext'] = getExt(extra)
+
+ final_folder_name = self.doReplace(folder_name, replacements, remove_multiple = remove_multiple, folder = True)
+ final_file_name = self.doReplace(file_name, replacements, remove_multiple = remove_multiple)
+ rename_files[extra] = os.path.join(destination, final_folder_name, final_file_name)
+
+ return rename_files
+
+ # This adds a file to ignore / tag a release so it is ignored later
+ def tagRelease(self, tag, group = None, release_download = None):
+ if not tag:
+ return
+
+ text = """This file is from CouchPotato
+It has marked this release as "%s"
+This file hides the release from the renamer
+Remove it if you want it to be renamed (again, or at least let it try again)
+""" % tag
+
+ tag_files = []
+
+ # Tag movie files if they are known
+ if isinstance(group, dict):
+ tag_files = [sorted(list(group['files']['movie']))[0]]
+
+ elif isinstance(release_download, dict):
+ # Tag download_files if they are known
+ if release_download.get('files', []):
+ tag_files = [filename for filename in release_download.get('files', []) if os.path.exists(filename)]
+
+ # Tag all files in release folder
+ elif release_download['folder']:
+ for root, folders, names in os.walk(sp(release_download['folder'])):
+ tag_files.extend([os.path.join(root, name) for name in names])
+
+ for filename in tag_files:
+
+ # Don't tag .ignore files
+ if os.path.splitext(filename)[1] == '.ignore':
+ continue
+
+ tag_filename = '%s.%s.ignore' % (os.path.splitext(filename)[0], tag)
+ if not os.path.isfile(tag_filename):
+ self.createFile(tag_filename, text)
+
+ def untagRelease(self, group = None, release_download = None, tag = ''):
+ if not release_download:
+ return
+
+ tag_files = []
+ folder = None
+
+ # Tag movie files if they are known
+ if isinstance(group, dict):
+ tag_files = [sorted(list(group['files']['movie']))[0]]
+
+ folder = sp(group['parentdir'])
+ if not group.get('dirname') or not os.path.isdir(folder):
+ return False
+
+ elif isinstance(release_download, dict):
+
+ folder = sp(release_download['folder'])
+ if not os.path.isdir(folder):
+ return False
+
+ # Untag download_files if they are known
+ if release_download.get('files'):
+ tag_files = release_download.get('files', [])
+
+ # Untag all files in release folder
+ else:
+ for root, folders, names in os.walk(folder):
+ tag_files.extend([sp(os.path.join(root, name)) for name in names if not os.path.splitext(name)[1] == '.ignore'])
+
+ if not folder:
+ return False
+
+ # Find all .ignore files in folder
+ ignore_files = []
+ for root, dirnames, filenames in os.walk(folder):
+ ignore_files.extend(fnmatch.filter([sp(os.path.join(root, filename)) for filename in filenames], '*%s.ignore' % tag))
+
+ # Match all found ignore files with the tag_files and delete if found
+ for tag_file in tag_files:
+ ignore_file = fnmatch.filter(ignore_files, fnEscape('%s.%s.ignore' % (os.path.splitext(tag_file)[0], tag if tag else '*')))
+ for filename in ignore_file:
+ try:
+ os.remove(filename)
+ except:
+ log.debug('Unable to remove ignore file: %s. Error: %s.' % (filename, traceback.format_exc()))
+
+ def hastagRelease(self, release_download, tag = ''):
+ if not release_download:
+ return False
+
+ folder = sp(release_download['folder'])
+ if not os.path.isdir(folder):
+ return False
+
+ tag_files = []
+ ignore_files = []
+
+ # Find tag on download_files if they are known
+ if release_download.get('files'):
+ tag_files = release_download.get('files', [])
+
+ # Find tag on all files in release folder
+ else:
+ for root, folders, names in os.walk(folder):
+ tag_files.extend([sp(os.path.join(root, name)) for name in names if not os.path.splitext(name)[1] == '.ignore'])
+
+ # Find all .ignore files in folder
+ for root, dirnames, filenames in os.walk(folder):
+ ignore_files.extend(fnmatch.filter([sp(os.path.join(root, filename)) for filename in filenames], '*%s.ignore' % tag))
+
+ # Match all found ignore files with the tag_files and return True found
+ for tag_file in tag_files:
+ ignore_file = fnmatch.filter(ignore_files, fnEscape('%s.%s.ignore' % (os.path.splitext(tag_file)[0], tag if tag else '*')))
+ if ignore_file:
+ return True
+
+ return False
+
+ def moveFile(self, old, dest, use_default = False):
+ dest = sp(dest)
+ try:
+
+ if os.path.exists(dest) and os.path.isfile(dest):
+ raise Exception('Destination "%s" already exists' % dest)
+
+ move_type = self.conf('file_action')
+ if use_default:
+ move_type = self.conf('default_file_action')
+
+ if move_type not in ['copy', 'link']:
+ try:
+ log.info('Moving "%s" to "%s"', (old, dest))
+ shutil.move(old, dest)
+ except:
+ exists = os.path.exists(dest)
+ if exists and os.path.getsize(old) == os.path.getsize(dest):
+ log.error('Successfully moved file "%s", but something went wrong: %s', (dest, traceback.format_exc()))
+ os.unlink(old)
+ else:
+ # remove faultly copied file
+ if exists:
+ os.unlink(dest)
+ raise
+ elif move_type == 'copy':
+ log.info('Copying "%s" to "%s"', (old, dest))
+ shutil.copy(old, dest)
+ else:
+ log.info('Linking "%s" to "%s"', (old, dest))
+ # First try to hardlink
+ try:
+ log.debug('Hardlinking file "%s" to "%s"...', (old, dest))
+ link(old, dest)
+ except:
+ # Try to simlink next
+ log.debug('Couldn\'t hardlink file "%s" to "%s". Symlinking instead. Error: %s.', (old, dest, traceback.format_exc()))
+ shutil.copy(old, dest)
+ try:
+ old_link = '%s.link' % sp(old)
+ symlink(dest, old_link)
+ os.unlink(old)
+ os.rename(old_link, old)
+ except:
+ log.error('Couldn\'t symlink file "%s" to "%s". Copied instead. Error: %s. ', (old, dest, traceback.format_exc()))
+
+ try:
+ os.chmod(dest, Env.getPermission('file'))
+ if os.name == 'nt' and self.conf('ntfs_permission'):
+ os.popen('icacls "' + dest + '"* /reset /T')
+ except:
+ log.debug('Failed setting permissions for file: %s, %s', (dest, traceback.format_exc(1)))
+ except:
+ log.error('Couldn\'t move file "%s" to "%s": %s', (old, dest, traceback.format_exc()))
+ raise
+
+ return True
+
+ def doReplace(self, string, replacements, remove_multiple = False, folder = False):
+ """
+ replace confignames with the real thing
+ """
+
+ replacements = replacements.copy()
+ if remove_multiple:
+ replacements['cd'] = ''
+ replacements['cd_nr'] = ''
+
+ replaced = toUnicode(string)
+ for x, r in replacements.items():
+ if x in ['thename', 'namethe']:
+ continue
+ if r is not None:
+ replaced = replaced.replace(six.u('<%s>') % toUnicode(x), toUnicode(r))
+ else:
+ #If information is not available, we don't want the tag in the filename
+ replaced = replaced.replace('<' + x + '>', '')
+
+ if self.conf('replace_doubles'):
+ replaced = self.replaceDoubles(replaced.lstrip('. '))
+
+ for x, r in replacements.items():
+ if x in ['thename', 'namethe']:
+ replaced = replaced.replace(six.u('<%s>') % toUnicode(x), toUnicode(r))
+ replaced = re.sub(r"[\x00:\*\?\"<>\|]", '', replaced)
+
+ sep = self.conf('foldersep') if folder else self.conf('separator')
+ return ss(replaced.replace(' ', ' ' if not sep else sep))
+
+ def replaceDoubles(self, string):
+
+ replaces = [
+ ('\.+', '.'), ('_+', '_'), ('-+', '-'), ('\s+', ' '), (' \\\\', '\\\\'), (' /', '/'),
+ ('(\s\.)+', '.'), ('(-\.)+', '.'), ('(\s-)+', '-'),
+ ]
+
+ for r in replaces:
+ reg, replace_with = r
+ string = re.sub(reg, replace_with, string)
+
+ string = string.rstrip(',_-/\\ ')
+
+ return string
+
+ def checkSnatched(self, fire_scan = True):
+
+ if self.checking_snatched:
+ log.debug('Already checking snatched')
+ return False
+
+ self.checking_snatched = True
+
+ try:
+ db = get_db()
+
+ rels = list(fireEvent('release.with_status', ['snatched', 'seeding', 'missing'], single = True))
+
+ if not rels:
+ #No releases found that need status checking
+ self.checking_snatched = False
+ return True
+
+ # Collect all download information with the download IDs from the releases
+ download_ids = []
+ no_status_support = []
+ try:
+ for rel in rels:
+ if not rel.get('download_info'): continue
+
+ if rel['download_info'].get('id') and rel['download_info'].get('downloader'):
+ download_ids.append(rel['download_info'])
+
+ ds = rel['download_info'].get('status_support')
+ if ds is False or ds == 'False':
+ no_status_support.append(ss(rel['download_info'].get('downloader')))
+ except:
+ log.error('Error getting download IDs from database')
+ self.checking_snatched = False
+ return False
+
+ release_downloads = fireEvent('download.status', download_ids, merge = True) if download_ids else []
+
+ if len(no_status_support) > 0:
+ log.debug('Download status functionality is not implemented for one of the active downloaders: %s', list(set(no_status_support)))
+
+ if not release_downloads:
+ if fire_scan:
+ self.scan()
+
+ self.checking_snatched = False
+ return True
+
+ scan_releases = []
+ scan_required = False
+
+ log.debug('Checking status snatched releases...')
+
+ try:
+ for rel in rels:
+ if not rel.get('media_id'): continue
+ movie_dict = db.get('id', rel.get('media_id'))
+ download_info = rel.get('download_info')
+
+ if not isinstance(download_info, dict):
+ log.error('Faulty release found without any info, ignoring.')
+ fireEvent('release.update_status', rel.get('_id'), status = 'ignored', single = True)
+ continue
+
+ # Check if download ID is available
+ if not download_info.get('id') or not download_info.get('downloader'):
+ log.debug('Download status functionality is not implemented for downloader (%s) of release %s.', (download_info.get('downloader', 'unknown'), rel['info']['name']))
+ scan_required = True
+
+ # Continue with next release
+ continue
+
+ # Find release in downloaders
+ nzbname = self.createNzbName(rel['info'], movie_dict)
+
+ found_release = False
+ for release_download in release_downloads:
+ found_release = False
+ if download_info.get('id'):
+ if release_download['id'] == download_info['id'] and release_download['downloader'] == download_info['downloader']:
+ log.debug('Found release by id: %s', release_download['id'])
+ found_release = True
+ break
+ else:
+ if release_download['name'] == nzbname or rel['info']['name'] in release_download['name'] or getImdb(release_download['name']) == getIdentifier(movie_dict):
+ log.debug('Found release by release name or imdb ID: %s', release_download['name'])
+ found_release = True
+ break
+
+ if not found_release:
+ log.info('%s not found in downloaders', nzbname)
+
+ #Check status if already missing and for how long, if > 1 week, set to ignored else to missing
+ if rel.get('status') == 'missing':
+ if rel.get('last_edit') < int(time.time()) - 7 * 24 * 60 * 60:
+ fireEvent('release.update_status', rel.get('_id'), status = 'ignored', single = True)
+ else:
+ # Set the release to missing
+ fireEvent('release.update_status', rel.get('_id'), status = 'missing', single = True)
+
+ # Continue with next release
+ continue
+
+ # Log that we found the release
+ timeleft = 'N/A' if release_download['timeleft'] == -1 else release_download['timeleft']
+ log.debug('Found %s: %s, time to go: %s', (release_download['name'], release_download['status'].upper(), timeleft))
+
+ # Check status of release
+ if release_download['status'] == 'busy':
+ # Set the release to snatched if it was missing before
+ fireEvent('release.update_status', rel.get('_id'), status = 'snatched', single = True)
+
+ # Tag folder if it is in the 'from' folder and it will not be processed because it is still downloading
+ if self.movieInFromFolder(release_download['folder']):
+ self.tagRelease(release_download = release_download, tag = 'downloading')
+
+ elif release_download['status'] == 'seeding':
+ #If linking setting is enabled, process release
+ if self.conf('file_action') != 'move' and not rel.get('status') == 'seeding' and self.statusInfoComplete(release_download):
+ log.info('Download of %s completed! It is now being processed while leaving the original files alone for seeding. Current ratio: %s.', (release_download['name'], release_download['seed_ratio']))
+
+ # Remove the downloading tag
+ self.untagRelease(release_download = release_download, tag = 'downloading')
+
+ # Scan and set the torrent to paused if required
+ release_download.update({'pause': True, 'scan': True, 'process_complete': False})
+ scan_releases.append(release_download)
+ else:
+ #let it seed
+ log.debug('%s is seeding with ratio: %s', (release_download['name'], release_download['seed_ratio']))
+
+ # Set the release to seeding
+ fireEvent('release.update_status', rel.get('_id'), status = 'seeding', single = True)
+
+ elif release_download['status'] == 'failed':
+ # Set the release to failed
+ fireEvent('release.update_status', rel.get('_id'), status = 'failed', single = True)
+
+ fireEvent('download.remove_failed', release_download, single = True)
+
+ if self.conf('next_on_failed'):
+ fireEvent('movie.searcher.try_next_release', media_id = rel.get('media_id'))
+
+ elif release_download['status'] == 'completed':
+ log.info('Download of %s completed!', release_download['name'])
+
+ #Make sure the downloader sent over a path to look in
+ if self.statusInfoComplete(release_download):
+
+ # If the release has been seeding, process now the seeding is done
+ if rel.get('status') == 'seeding':
+ if self.conf('file_action') != 'move':
+ # Set the release to done as the movie has already been renamed
+ fireEvent('release.update_status', rel.get('_id'), status = 'downloaded', single = True)
+
+ # Allow the downloader to clean-up
+ release_download.update({'pause': False, 'scan': False, 'process_complete': True})
+ scan_releases.append(release_download)
+ else:
+ # Scan and Allow the downloader to clean-up
+ release_download.update({'pause': False, 'scan': True, 'process_complete': True})
+ scan_releases.append(release_download)
+
+ else:
+ # Set the release to snatched if it was missing before
+ fireEvent('release.update_status', rel.get('_id'), status = 'snatched', single = True)
+
+ # Remove the downloading tag
+ self.untagRelease(release_download = release_download, tag = 'downloading')
+
+ # Scan and Allow the downloader to clean-up
+ release_download.update({'pause': False, 'scan': True, 'process_complete': True})
+ scan_releases.append(release_download)
+ else:
+ scan_required = True
+
+ except:
+ log.error('Failed checking for release in downloader: %s', traceback.format_exc())
+
+ # The following can either be done here, or inside the scanner if we pass it scan_items in one go
+ for release_download in scan_releases:
+ # Ask the renamer to scan the item
+ if release_download['scan']:
+ if release_download['pause'] and self.conf('file_action') == 'link':
+ fireEvent('download.pause', release_download = release_download, pause = True, single = True)
+ self.scan(release_download = release_download)
+ if release_download['pause'] and self.conf('file_action') == 'link':
+ fireEvent('download.pause', release_download = release_download, pause = False, single = True)
+ if release_download['process_complete']:
+ # First make sure the files were successfully processed
+ if not self.hastagRelease(release_download = release_download, tag = 'failed_rename'):
+ # Remove the seeding tag if it exists
+ self.untagRelease(release_download = release_download, tag = 'renamed_already')
+ # Ask the downloader to process the item
+ fireEvent('download.process_complete', release_download = release_download, single = True)
+
+ if fire_scan and (scan_required or len(no_status_support) > 0):
+ self.scan()
+
+ self.checking_snatched = False
+ return True
+ except:
+ log.error('Failed checking snatched: %s', traceback.format_exc())
+
+ self.checking_snatched = False
+ return False
+
+ def extendReleaseDownload(self, release_download):
+
+ rls = None
+ db = get_db()
+
+ if release_download and release_download.get('id'):
+ try:
+ rls = db.get('release_download', '%s-%s' % (release_download.get('downloader'), release_download.get('id')), with_doc = True)['doc']
+ except:
+ log.error('Download ID %s from downloader %s not found in releases', (release_download.get('id'), release_download.get('downloader')))
+
+ if rls:
+ media = db.get('id', rls['media_id'])
+ release_download.update({
+ 'imdb_id': getIdentifier(media),
+ 'quality': rls['quality'],
+ 'is_3d': rls['is_3d'],
+ 'protocol': rls.get('info', {}).get('protocol') or rls.get('info', {}).get('type'),
+ 'release_id': rls['_id'],
+ })
+
+ return release_download
+
+ def downloadIsTorrent(self, release_download):
+ return release_download and release_download.get('protocol') in ['torrent', 'torrent_magnet']
+
+ def fileIsAdded(self, src, group):
+ if not group or not group.get('before_rename'):
+ return False
+ return src in group['before_rename']
+
+ def moveTypeIsLinked(self):
+ return self.conf('default_file_action') in ['copy', 'link']
+
+ def statusInfoComplete(self, release_download):
+ return release_download.get('id') and release_download.get('downloader') and release_download.get('folder')
+
+ def movieInFromFolder(self, media_folder):
+ return media_folder and isSubFolder(media_folder, sp(self.conf('from'))) or not media_folder
+
+ def extractFiles(self, folder = None, media_folder = None, files = None, cleanup = False):
+ if not files: files = []
+
+ # RegEx for finding rar files
+ archive_regex = '(?P^(?P ()',
+ 'type': 'choice',
+ 'options': rename_options
+ },
+ {
+ 'name': 'file_name',
+ 'label': 'File naming',
+ 'description': 'Name of the file',
+ 'default': '.',
+ 'type': 'choice',
+ 'options': rename_options
+ },
+ {
+ 'advanced': True,
+ 'name': 'replace_doubles',
+ 'type': 'bool',
+ 'label': 'Clean Name',
+ 'description': ('Attempt to clean up double separaters due to missing data for fields.','Sometimes this eliminates wanted white space (see #2782).'),
+ 'default': True
+ },
+ {
+ 'name': 'unrar',
+ 'type': 'bool',
+ 'description': 'Extract rar files if found.',
+ 'default': False,
+ },
+ {
+ 'advanced': True,
+ 'name': 'unrar_path',
+ 'description': 'Custom path to unrar bin',
+ },
+ {
+ 'advanced': True,
+ 'name': 'unrar_modify_date',
+ 'type': 'bool',
+ 'description': ('Set modify date of unrar-ed files to the rar-file\'s date.', 'This will allow XBMC to recognize extracted files as recently added even if the movie was released some time ago.'),
+ 'default': False,
+ },
+ {
+ 'name': 'cleanup',
+ 'type': 'bool',
+ 'description': 'Cleanup leftover files after successful rename.',
+ 'default': False,
+ },
+ {
+ 'advanced': True,
+ 'name': 'run_every',
+ 'label': 'Run every',
+ 'default': 1,
+ 'type': 'int',
+ 'unit': 'min(s)',
+ 'description': ('Detect movie status every X minutes.', 'Will start the renamer if movie is completed or handle failed download if these options are enabled'),
+ },
+ {
+ 'advanced': True,
+ 'name': 'force_every',
+ 'label': 'Force every',
+ 'default': 2,
+ 'type': 'int',
+ 'unit': 'hour(s)',
+ 'description': 'Forces the renamer to scan every X hours',
+ },
+ {
+ 'advanced': True,
+ 'name': 'next_on_failed',
+ 'default': True,
+ 'type': 'bool',
+ 'description': 'Try the next best release for a movie after a download failed.',
+ },
+ {
+ 'name': 'move_leftover',
+ 'type': 'bool',
+ 'description': 'Move all leftover file after renaming, to the movie folder.',
+ 'default': False,
+ 'advanced': True,
+ },
+ {
+ 'advanced': True,
+ 'name': 'separator',
+ 'label': 'File-Separator',
+ 'description': ('Replace all the spaces with a character.', 'Example: ".", "-" (without quotes). Leave empty to use spaces.'),
+ },
+ {
+ 'advanced': True,
+ 'name': 'foldersep',
+ 'label': 'Folder-Separator',
+ 'description': ('Replace all the spaces with a character.', 'Example: ".", "-" (without quotes). Leave empty to use spaces.'),
+ },
+ {
+ 'name': 'check_space',
+ 'label': 'Check space',
+ 'default': True,
+ 'type': 'bool',
+ 'description': ('Check if there\'s enough available space to rename the files', 'Disable when the filesystem doesn\'t return the proper value'),
+ 'advanced': True,
+ },
+ {
+ 'name': 'default_file_action',
+ 'label': 'Default File Action',
+ 'default': 'move',
+ 'type': 'dropdown',
+ 'values': [('Link', 'link'), ('Copy', 'copy'), ('Move', 'move')],
+ 'description': ('Link, Copy or Move after download completed.',
+ 'Link first tries hard link, then sym link and falls back to Copy.'),
+ 'advanced': True,
+ },
+ {
+ 'name': 'file_action',
+ 'label': 'Torrent File Action',
+ 'default': 'link',
+ 'type': 'dropdown',
+ 'values': [('Link', 'link'), ('Copy', 'copy'), ('Move', 'move')],
+ 'description': 'See above. It is prefered to use link when downloading torrents as it will save you space, while still being able to seed.',
+ 'advanced': True,
+ },
+ {
+ 'advanced': True,
+ 'name': 'ntfs_permission',
+ 'label': 'NTFS Permission',
+ 'type': 'bool',
+ 'hidden': os.name != 'nt',
+ 'description': 'Set permission of moved files to that of destination folder (Windows NTFS only).',
+ 'default': False,
+ },
+ ],
+ }, {
+ 'tab': 'renamer',
+ 'name': 'meta_renamer',
+ 'label': 'Advanced renaming',
+ 'description': 'Meta data file renaming. Use <filename> to use the above "File naming" settings, without the file extention.',
+ 'advanced': True,
+ 'options': [
+ {
+ 'name': 'rename_nfo',
+ 'label': 'Rename .NFO',
+ 'description': 'Rename original .nfo file',
+ 'type': 'bool',
+ 'default': True,
+ },
+ {
+ 'name': 'nfo_name',
+ 'label': 'NFO naming',
+ 'default': '.orig.',
+ 'type': 'choice',
+ 'options': rename_options
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/plugins/renamer/__init__.py b/couchpotato/core/plugins/renamer/__init__.py
deleted file mode 100644
index 6ce21922d5..0000000000
--- a/couchpotato/core/plugins/renamer/__init__.py
+++ /dev/null
@@ -1,149 +0,0 @@
-from couchpotato.core.plugins.renamer.main import Renamer
-import os
-
-def start():
- return Renamer()
-
-rename_options = {
- 'pre': '<',
- 'post': '>',
- 'choices': {
- 'ext': 'Extention (mkv)',
- 'namethe': 'Moviename, The',
- 'thename': 'The Moviename',
- 'year': 'Year (2011)',
- 'first': 'First letter (M)',
- 'quality': 'Quality (720P)',
- 'video': 'Video (x264)',
- 'audio': 'Audio (DTS)',
- 'group': 'Releasegroup name',
- 'source': 'Source media (Bluray)',
- 'original': 'Original filename',
- 'original_folder': 'Original foldername',
- 'imdb_id': 'IMDB id (tt0123456)',
- 'cd': 'CD number (cd1)',
- 'cd_nr': 'Just the cd nr. (1)',
- },
-}
-
-config = [{
- 'name': 'renamer',
- 'order': 40,
- 'description': 'Move and rename your downloaded movies to your movie directory.',
- 'groups': [
- {
- 'tab': 'renamer',
- 'name': 'renamer',
- 'label': 'Rename downloaded movies',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'default': False,
- 'type': 'enabler',
- },
- {
- 'name': 'from',
- 'type': 'directory',
- 'description': 'Folder where CP searches for movies.',
- },
- {
- 'name': 'to',
- 'type': 'directory',
- 'description': 'Folder where the movies should be moved to.',
- },
- {
- 'name': 'folder_name',
- 'label': 'Folder naming',
- 'description': 'Name of the folder. Keep empty for no folder.',
- 'default': ' ()',
- 'type': 'choice',
- 'options': rename_options
- },
- {
- 'name': 'file_name',
- 'label': 'File naming',
- 'description': 'Name of the file',
- 'default': '.',
- 'type': 'choice',
- 'options': rename_options
- },
- {
- 'name': 'cleanup',
- 'type': 'bool',
- 'description': 'Cleanup leftover files after successful rename.',
- 'default': False,
- },
- {
- 'advanced': True,
- 'name': 'run_every',
- 'label': 'Run every',
- 'default': 1,
- 'type': 'int',
- 'unit': 'min(s)',
- 'description': 'Detect movie status every X minutes. Will start the renamer if movie is completed or handle failed download if these options are enabled',
- },
- {
- 'advanced': True,
- 'name': 'force_every',
- 'label': 'Force every',
- 'default': 2,
- 'type': 'int',
- 'unit': 'hour(s)',
- 'description': 'Forces the renamer to scan every X hours',
- },
- {
- 'advanced': True,
- 'name': 'next_on_failed',
- 'default': True,
- 'type': 'bool',
- 'description': 'Try the next best release for a movie after a download failed.',
- },
- {
- 'name': 'move_leftover',
- 'type': 'bool',
- 'description': 'Move all leftover file after renaming, to the movie folder.',
- 'default': False,
- 'advanced': True,
- },
- {
- 'advanced': True,
- 'name': 'separator',
- 'label': 'Separator',
- 'description': 'Replace all the spaces with a character. Example: ".", "-" (without quotes). Leave empty to use spaces.',
- },
- {
- 'advanced': True,
- 'name': 'ntfs_permission',
- 'label': 'NTFS Permission',
- 'type': 'bool',
- 'hidden': os.name != 'nt',
- 'description': 'Set permission of moved files to that of destination folder (Windows NTFS only).',
- 'default': False,
- },
- ],
- }, {
- 'tab': 'renamer',
- 'name': 'meta_renamer',
- 'label': 'Advanced renaming',
- 'description': 'Meta data file renaming. Use <filename> to use the above "File naming" settings, without the file extention.',
- 'advanced': True,
- 'options': [
- {
- 'name': 'rename_nfo',
- 'label': 'Rename .NFO',
- 'description': 'Rename original .nfo file',
- 'type': 'bool',
- 'default': True,
- },
- {
- 'name': 'nfo_name',
- 'label': 'NFO naming',
- 'default': '.orig.',
- 'type': 'choice',
- 'options': rename_options
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/plugins/renamer/main.py b/couchpotato/core/plugins/renamer/main.py
deleted file mode 100644
index 7df93b83bd..0000000000
--- a/couchpotato/core/plugins/renamer/main.py
+++ /dev/null
@@ -1,602 +0,0 @@
-from couchpotato import get_session
-from couchpotato.api import addApiView
-from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
-from couchpotato.core.helpers.encoding import toUnicode, ss
-from couchpotato.core.helpers.request import jsonified
-from couchpotato.core.helpers.variable import getExt, mergeDicts, getTitle, \
- getImdb
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.core.settings.model import Library, File, Profile, Release
-from couchpotato.environment import Env
-import errno
-import os
-import re
-import shutil
-import traceback
-
-log = CPLog(__name__)
-
-
-class Renamer(Plugin):
-
- renaming_started = False
- checking_snatched = False
-
- def __init__(self):
-
- addApiView('renamer.scan', self.scanView, docs = {
- 'desc': 'For the renamer to check for new files to rename',
- })
-
- addEvent('renamer.scan', self.scan)
- addEvent('renamer.check_snatched', self.checkSnatched)
-
- addEvent('app.load', self.scan)
- addEvent('app.load', self.checkSnatched)
-
- if self.conf('run_every') > 0:
- fireEvent('schedule.interval', 'renamer.check_snatched', self.checkSnatched, minutes = self.conf('run_every'))
-
- if self.conf('force_every') > 0:
- fireEvent('schedule.interval', 'renamer.check_snatched_forced', self.scan, hours = self.conf('force_every'))
-
- def scanView(self):
-
- fireEventAsync('renamer.scan')
-
- return jsonified({
- 'success': True
- })
-
- def scan(self):
-
- if self.isDisabled():
- return
-
- if self.renaming_started is True:
- log.info('Renamer is already running, if you see this often, check the logs above for errors.')
- return
-
- # Check to see if the "to" folder is inside the "from" folder.
- if not os.path.isdir(self.conf('from')) or not os.path.isdir(self.conf('to')):
- log.debug('"To" and "From" have to exist.')
- return
- elif self.conf('from') in self.conf('to'):
- log.error('The "to" can\'t be inside of the "from" folder. You\'ll get an infinite loop.')
- return
-
- groups = fireEvent('scanner.scan', folder = self.conf('from'), single = True)
-
- self.renaming_started = True
-
- destination = self.conf('to')
- folder_name = self.conf('folder_name')
- file_name = self.conf('file_name')
- trailer_name = self.conf('trailer_name')
- nfo_name = self.conf('nfo_name')
- separator = self.conf('separator')
-
- # Statusses
- done_status = fireEvent('status.get', 'done', single = True)
- active_status = fireEvent('status.get', 'active', single = True)
- downloaded_status = fireEvent('status.get', 'downloaded', single = True)
- snatched_status = fireEvent('status.get', 'snatched', single = True)
-
- db = get_session()
-
- for group_identifier in groups:
-
- group = groups[group_identifier]
- rename_files = {}
- remove_files = []
- remove_releases = []
-
- movie_title = getTitle(group['library'])
-
- # Add _UNKNOWN_ if no library item is connected
- if not group['library'] or not movie_title:
- self.tagDir(group, 'unknown')
- continue
- # Rename the files using the library data
- else:
- group['library'] = fireEvent('library.update', identifier = group['library']['identifier'], single = True)
- if not group['library']:
- log.error('Could not rename, no library item to work with: %s', group_identifier)
- continue
-
- library = group['library']
- movie_title = getTitle(library)
-
- # Find subtitle for renaming
- fireEvent('renamer.before', group)
-
- # Remove weird chars from moviename
- movie_name = re.sub(r"[\x00\/\\:\*\?\"<>\|]", '', movie_title)
-
- # Put 'The' at the end
- name_the = movie_name
- if movie_name[:4].lower() == 'the ':
- name_the = movie_name[4:] + ', The'
-
- replacements = {
- 'ext': 'mkv',
- 'namethe': name_the.strip(),
- 'thename': movie_name.strip(),
- 'year': library['year'],
- 'first': name_the[0].upper(),
- 'quality': group['meta_data']['quality']['label'],
- 'quality_type': group['meta_data']['quality_type'],
- 'video': group['meta_data'].get('video'),
- 'audio': group['meta_data'].get('audio'),
- 'group': group['meta_data']['group'],
- 'source': group['meta_data']['source'],
- 'resolution_width': group['meta_data'].get('resolution_width'),
- 'resolution_height': group['meta_data'].get('resolution_height'),
- 'imdb_id': library['identifier'],
- 'cd': '',
- 'cd_nr': '',
- }
-
- for file_type in group['files']:
-
- # Move nfo depending on settings
- if file_type is 'nfo' and not self.conf('rename_nfo'):
- log.debug('Skipping, renaming of %s disabled', file_type)
- if self.conf('cleanup'):
- for current_file in group['files'][file_type]:
- remove_files.append(current_file)
- continue
-
- # Subtitle extra
- if file_type is 'subtitle_extra':
- continue
-
- # Move other files
- multiple = len(group['files'][file_type]) > 1 and not group['is_dvd']
- cd = 1 if multiple else 0
-
- for current_file in sorted(list(group['files'][file_type])):
-
- # Original filename
- replacements['original'] = os.path.splitext(os.path.basename(current_file))[0]
- replacements['original_folder'] = fireEvent('scanner.remove_cptag', group['dirname'], single = True)
-
- # Extension
- replacements['ext'] = getExt(current_file)
-
- # cd #
- replacements['cd'] = ' cd%d' % cd if multiple else ''
- replacements['cd_nr'] = cd if multiple else ''
-
- # Naming
- final_folder_name = self.doReplace(folder_name, replacements).lstrip('. ')
- final_file_name = self.doReplace(file_name, replacements).lstrip('. ')
- replacements['filename'] = final_file_name[:-(len(getExt(final_file_name)) + 1)]
-
- # Meta naming
- if file_type is 'trailer':
- final_file_name = self.doReplace(trailer_name, replacements, remove_multiple = True).lstrip('. ')
- elif file_type is 'nfo':
- final_file_name = self.doReplace(nfo_name, replacements, remove_multiple = True).lstrip('. ')
-
- # Seperator replace
- if separator:
- final_file_name = final_file_name.replace(' ', separator)
-
- # Move DVD files (no structure renaming)
- if group['is_dvd'] and file_type is 'movie':
- found = False
- for top_dir in ['video_ts', 'audio_ts', 'bdmv', 'certificate']:
- has_string = current_file.lower().find(os.path.sep + top_dir + os.path.sep)
- if has_string >= 0:
- structure_dir = current_file[has_string:].lstrip(os.path.sep)
- rename_files[current_file] = os.path.join(destination, final_folder_name, structure_dir)
- found = True
- break
-
- if not found:
- log.error('Could not determine dvd structure for: %s', current_file)
-
- # Do rename others
- else:
- if file_type is 'leftover':
- if self.conf('move_leftover'):
- rename_files[current_file] = os.path.join(destination, final_folder_name, os.path.basename(current_file))
- elif file_type not in ['subtitle']:
- rename_files[current_file] = os.path.join(destination, final_folder_name, final_file_name)
-
- # Check for extra subtitle files
- if file_type is 'subtitle':
-
- remove_multiple = False
- if len(group['files']['movie']) == 1:
- remove_multiple = True
-
- sub_langs = group['subtitle_language'].get(current_file, [])
-
- # rename subtitles with or without language
- sub_name = self.doReplace(file_name, replacements, remove_multiple = remove_multiple)
- rename_files[current_file] = os.path.join(destination, final_folder_name, sub_name)
-
- rename_extras = self.getRenameExtras(
- extra_type = 'subtitle_extra',
- replacements = replacements,
- folder_name = folder_name,
- file_name = file_name,
- destination = destination,
- group = group,
- current_file = current_file,
- remove_multiple = remove_multiple,
- )
-
- # Don't add language if multiple languages in 1 subtitle file
- if len(sub_langs) == 1:
- sub_name = final_file_name.replace(replacements['ext'], '%s.%s' % (sub_langs[0], replacements['ext']))
- rename_files[current_file] = os.path.join(destination, final_folder_name, sub_name)
-
- rename_files = mergeDicts(rename_files, rename_extras)
-
- # Filename without cd etc
- elif file_type is 'movie':
- rename_extras = self.getRenameExtras(
- extra_type = 'movie_extra',
- replacements = replacements,
- folder_name = folder_name,
- file_name = file_name,
- destination = destination,
- group = group,
- current_file = current_file
- )
- rename_files = mergeDicts(rename_files, rename_extras)
-
- group['filename'] = self.doReplace(file_name, replacements, remove_multiple = True)[:-(len(getExt(final_file_name)) + 1)]
- group['destination_dir'] = os.path.join(destination, final_folder_name)
-
- if multiple:
- cd += 1
-
- # Before renaming, remove the lower quality files
- library = db.query(Library).filter_by(identifier = group['library']['identifier']).first()
- remove_leftovers = True
-
- # Add it to the wanted list before we continue
- if len(library.movies) == 0:
- profile = db.query(Profile).filter_by(core = True, label = group['meta_data']['quality']['label']).first()
- fireEvent('movie.add', params = {'identifier': group['library']['identifier'], 'profile_id': profile.id}, search_after = False)
- db.expire_all()
- library = db.query(Library).filter_by(identifier = group['library']['identifier']).first()
-
- for movie in library.movies:
-
- # Mark movie "done" onces it found the quality with the finish check
- try:
- if movie.status_id == active_status.get('id') and movie.profile:
- for profile_type in movie.profile.types:
- if profile_type.quality_id == group['meta_data']['quality']['id'] and profile_type.finish:
- movie.status_id = done_status.get('id')
- db.commit()
- except Exception, e:
- log.error('Failed marking movie finished: %s %s', (e, traceback.format_exc()))
-
- # Go over current movie releases
- for release in movie.releases:
-
- # When a release already exists
- if release.status_id is done_status.get('id'):
-
- # This is where CP removes older, lesser quality releases
- if release.quality.order > group['meta_data']['quality']['order']:
- log.info('Removing lesser quality %s for %s.', (movie.library.titles[0].title, release.quality.label))
- for current_file in release.files:
- remove_files.append(current_file)
- remove_releases.append(release)
- # Same quality, but still downloaded, so maybe repack/proper/unrated/directors cut etc
- elif release.quality.order is group['meta_data']['quality']['order']:
- log.info('Same quality release already exists for %s, with quality %s. Assuming repack.', (movie.library.titles[0].title, release.quality.label))
- for current_file in release.files:
- remove_files.append(current_file)
- remove_releases.append(release)
-
- # Downloaded a lower quality, rename the newly downloaded files/folder to exclude them from scan
- else:
- log.info('Better quality release already exists for %s, with quality %s', (movie.library.titles[0].title, release.quality.label))
-
- # Add _EXISTS_ to the parent dir
- self.tagDir(group, 'exists')
-
- # Notify on rename fail
- download_message = 'Renaming of %s (%s) canceled, exists in %s already.' % (movie.library.titles[0].title, group['meta_data']['quality']['label'], release.quality.label)
- fireEvent('movie.renaming.canceled', message = download_message, data = group)
- remove_leftovers = False
-
- break
- elif release.status_id is snatched_status.get('id'):
- if release.quality.id is group['meta_data']['quality']['id']:
- log.debug('Marking release as downloaded')
- try:
- release.status_id = downloaded_status.get('id')
- except Exception, e:
- log.error('Failed marking release as finished: %s %s', (e, traceback.format_exc()))
- db.commit()
-
- # Remove leftover files
- if self.conf('cleanup') and not self.conf('move_leftover') and remove_leftovers:
- log.debug('Removing leftover files')
- for current_file in group['files']['leftover']:
- remove_files.append(current_file)
- elif not remove_leftovers: # Don't remove anything
- break
-
- # Remove files
- delete_folders = []
- for src in remove_files:
-
- if isinstance(src, File):
- src = src.path
-
- if rename_files.get(src):
- log.debug('Not removing file that will be renamed: %s', src)
- continue
-
- log.info('Removing "%s"', src)
- try:
- src = ss(src)
- if os.path.isfile(src):
- os.remove(src)
-
- parent_dir = os.path.normpath(os.path.dirname(src))
- if delete_folders.count(parent_dir) == 0 and os.path.isdir(parent_dir) and destination != parent_dir:
- delete_folders.append(parent_dir)
-
- except:
- log.error('Failed removing %s: %s', (src, traceback.format_exc()))
- self.tagDir(group, 'failed_remove')
-
- # Delete leftover folder from older releases
- for delete_folder in delete_folders:
- try:
- self.deleteEmptyFolder(delete_folder, show_error = False)
- except Exception, e:
- log.error('Failed to delete folder: %s %s', (e, traceback.format_exc()))
-
- # Rename all files marked
- group['renamed_files'] = []
- for src in rename_files:
- if rename_files[src]:
- dst = rename_files[src]
- log.info('Renaming "%s" to "%s"', (src, dst))
-
- # Create dir
- self.makeDir(os.path.dirname(dst))
-
- try:
- self.moveFile(src, dst)
- group['renamed_files'].append(dst)
- except:
- log.error('Failed moving the file "%s" : %s', (os.path.basename(src), traceback.format_exc()))
- self.tagDir(group, 'failed_rename')
-
- # Remove matching releases
- for release in remove_releases:
- log.debug('Removing release %s', release.identifier)
- try:
- db.delete(release)
- except:
- log.error('Failed removing %s: %s', (release.identifier, traceback.format_exc()))
-
- if group['dirname'] and group['parentdir']:
- try:
- log.info('Deleting folder: %s', group['parentdir'])
- self.deleteEmptyFolder(group['parentdir'])
- except:
- log.error('Failed removing %s: %s', (group['parentdir'], traceback.format_exc()))
-
- # Notify on download, search for trailers etc
- download_message = 'Downloaded %s (%s)' % (movie_title, replacements['quality'])
- try:
- fireEvent('renamer.after', message = download_message, group = group, in_order = True)
- except:
- log.error('Failed firing (some) of the renamer.after events: %s', traceback.format_exc())
-
- # Break if CP wants to shut down
- if self.shuttingDown():
- break
-
- self.renaming_started = False
-
- def getRenameExtras(self, extra_type = '', replacements = {}, folder_name = '', file_name = '', destination = '', group = {}, current_file = '', remove_multiple = False):
-
- replacements = replacements.copy()
- rename_files = {}
-
- def test(s):
- return current_file[:-len(replacements['ext'])] in s
-
- for extra in set(filter(test, group['files'][extra_type])):
- replacements['ext'] = getExt(extra)
-
- final_folder_name = self.doReplace(folder_name, replacements, remove_multiple = remove_multiple)
- final_file_name = self.doReplace(file_name, replacements, remove_multiple = remove_multiple)
- rename_files[extra] = os.path.join(destination, final_folder_name, final_file_name)
-
- return rename_files
-
- def tagDir(self, group, tag):
-
- rename_files = {}
-
- if group['dirname']:
- rename_files[group['parentdir']] = group['parentdir'].replace(group['dirname'], '_%s_%s' % (tag.upper(), group['dirname']))
- else: # Add it to filename
- for file_type in group['files']:
- for rename_me in group['files'][file_type]:
- filename = os.path.basename(rename_me)
- rename_files[rename_me] = rename_me.replace(filename, '_%s_%s' % (tag.upper(), filename))
-
- for src in rename_files:
- if rename_files[src]:
- dst = rename_files[src]
- log.info('Renaming "%s" to "%s"', (src, dst))
-
- # Create dir
- self.makeDir(os.path.dirname(dst))
-
- try:
- self.moveFile(src, dst)
- except:
- log.error('Failed moving the file "%s" : %s', (os.path.basename(src), traceback.format_exc()))
- raise
-
- def moveFile(self, old, dest):
- dest = ss(dest)
- try:
- shutil.move(old, dest)
-
- try:
- os.chmod(dest, Env.getPermission('file'))
- if os.name == 'nt' and self.conf('ntfs_permission'):
- os.popen('icacls "' + dest + '"* /reset /T')
- except:
- log.error('Failed setting permissions for file: %s, %s', (dest, traceback.format_exc(1)))
-
- except OSError, err:
- # Copying from a filesystem with octal permission to an NTFS file system causes a permission error. In this case ignore it.
- if not hasattr(os, 'chmod') or err.errno != errno.EPERM:
- raise
- else:
- if os.path.exists(dest):
- os.unlink(old)
-
- except:
- log.error('Couldn\'t move file "%s" to "%s": %s', (old, dest, traceback.format_exc()))
- raise
-
- return True
-
- def doReplace(self, string, replacements, remove_multiple = False):
- '''
- replace confignames with the real thing
- '''
-
- replacements = replacements.copy()
- if remove_multiple:
- replacements['cd'] = ''
- replacements['cd_nr'] = ''
-
- replaced = toUnicode(string)
- for x, r in replacements.iteritems():
- if r is not None:
- replaced = replaced.replace(u'<%s>' % toUnicode(x), toUnicode(r))
- else:
- #If information is not available, we don't want the tag in the filename
- replaced = replaced.replace('<' + x + '>', '')
-
- replaced = re.sub(r"[\x00:\*\?\"<>\|]", '', replaced)
-
- sep = self.conf('separator')
- return self.replaceDoubles(replaced).replace(' ', ' ' if not sep else sep)
-
- def replaceDoubles(self, string):
- return string.replace(' ', ' ').replace(' .', '.')
-
- def deleteEmptyFolder(self, folder, show_error = True):
- folder = ss(folder)
-
- loge = log.error if show_error else log.debug
- for root, dirs, files in os.walk(folder):
-
- for dir_name in dirs:
- full_path = os.path.join(root, dir_name)
- if len(os.listdir(full_path)) == 0:
- try:
- os.rmdir(full_path)
- except:
- loge('Couldn\'t remove empty directory %s: %s', (full_path, traceback.format_exc()))
-
- try:
- os.rmdir(folder)
- except:
- loge('Couldn\'t remove empty directory %s: %s', (folder, traceback.format_exc()))
-
- def checkSnatched(self):
- if self.checking_snatched:
- log.debug('Already checking snatched')
-
- self.checking_snatched = True
-
- snatched_status = fireEvent('status.get', 'snatched', single = True)
- ignored_status = fireEvent('status.get', 'ignored', single = True)
- failed_status = fireEvent('status.get', 'failed', single = True)
-
- done_status = fireEvent('status.get', 'done', single = True)
-
- db = get_session()
- rels = db.query(Release).filter_by(status_id = snatched_status.get('id')).all()
-
- scan_required = False
-
- if rels:
- self.checking_snatched = True
- log.debug('Checking status snatched releases...')
-
- statuses = fireEvent('download.status', merge = True)
- if not statuses:
- log.debug('Download status functionality is not implemented for active downloaders.')
- scan_required = True
- else:
- try:
- for rel in rels:
- rel_dict = rel.to_dict({'info': {}})
-
- # Get current selected title
- default_title = getTitle(rel.movie.library)
-
- # Check if movie has already completed and is manage tab (legacy db correction)
- if rel.movie.status_id == done_status.get('id'):
- log.debug('Found a completed movie with a snatched release : %s. Setting release status to ignored...' , default_title)
- rel.status_id = ignored_status.get('id')
- db.commit()
- continue
-
- movie_dict = fireEvent('movie.get', rel.movie_id, single = True)
-
- # check status
- nzbname = self.createNzbName(rel_dict['info'], movie_dict)
-
- found = False
- for item in statuses:
- if item['name'] == nzbname or rel_dict['info']['name'] in item['name'] or getImdb(item['name']) == movie_dict['library']['identifier']:
-
- timeleft = 'N/A' if item['timeleft'] == -1 else item['timeleft']
- log.debug('Found %s: %s, time to go: %s', (item['name'], item['status'].upper(), timeleft))
-
- if item['status'] == 'busy':
- pass
- elif item['status'] == 'failed':
- fireEvent('download.remove_failed', item, single = True)
-
- if self.conf('next_on_failed'):
- fireEvent('searcher.try_next_release', movie_id = rel.movie_id)
- else:
- rel.status_id = failed_status.get('id')
- db.commit()
- elif item['status'] == 'completed':
- log.info('Download of %s completed!', item['name'])
- scan_required = True
-
- found = True
- break
-
- if not found:
- log.info('%s not found in downloaders', nzbname)
-
- except:
- log.error('Failed checking for release in downloader: %s', traceback.format_exc())
-
- if scan_required:
- fireEvent('renamer.scan')
-
- self.checking_snatched = False
-
- return True
diff --git a/couchpotato/core/plugins/scanner.py b/couchpotato/core/plugins/scanner.py
new file mode 100644
index 0000000000..04b90a4833
--- /dev/null
+++ b/couchpotato/core/plugins/scanner.py
@@ -0,0 +1,972 @@
+import os
+import re
+import threading
+import time
+import traceback
+
+from couchpotato import get_db
+from couchpotato.core.event import fireEvent, addEvent
+from couchpotato.core.helpers.encoding import toUnicode, simplifyString, sp, ss
+from couchpotato.core.helpers.variable import getExt, getImdb, tryInt, \
+ splitString, getIdentifier
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+from guessit import guess_movie_info
+from subliminal.videos import Video
+import enzyme
+from six.moves import filter, map, zip
+
+
+log = CPLog(__name__)
+
+autoload = 'Scanner'
+
+
+class Scanner(Plugin):
+
+ ignored_in_path = [os.path.sep + 'extracted' + os.path.sep, 'extracting', '_unpack', '_failed_', '_unknown_', '_exists_', '_failed_remove_',
+ '_failed_rename_', '.appledouble', '.appledb', '.appledesktop', os.path.sep + '._', '.ds_store', 'cp.cpnfo',
+ 'thumbs.db', 'ehthumbs.db', 'desktop.ini'] # unpacking, smb-crap, hidden files
+ ignore_names = ['extract', 'extracting', 'extracted', 'movie', 'movies', 'film', 'films', 'download', 'downloads', 'video_ts', 'audio_ts', 'bdmv', 'certificate']
+ extensions = {
+ 'movie': ['mkv', 'wmv', 'avi', 'mpg', 'mpeg', 'mp4', 'm2ts', 'iso', 'img', 'mdf', 'ts', 'm4v', 'flv'],
+ 'movie_extra': ['mds'],
+ 'dvd': ['vts_*', 'vob'],
+ 'nfo': ['nfo', 'txt', 'tag'],
+ 'subtitle': ['sub', 'srt', 'ssa', 'ass'],
+ 'subtitle_extra': ['idx'],
+ 'trailer': ['mov', 'mp4', 'flv']
+ }
+
+ threed_types = {
+ 'Half SBS': [('half', 'sbs'), ('h', 'sbs'), 'hsbs'],
+ 'Full SBS': [('full', 'sbs'), ('f', 'sbs'), 'fsbs'],
+ 'SBS': ['sbs'],
+ 'Half OU': [('half', 'ou'), ('h', 'ou'), 'hou'],
+ 'Full OU': [('full', 'ou'), ('h', 'ou'), 'fou'],
+ 'OU': ['ou'],
+ 'Frame Packed': ['mvc', ('complete', 'bluray')],
+ '3D': ['3d']
+ }
+
+ file_types = {
+ 'subtitle': ('subtitle', 'subtitle'),
+ 'subtitle_extra': ('subtitle', 'subtitle_extra'),
+ 'trailer': ('video', 'trailer'),
+ 'nfo': ('nfo', 'nfo'),
+ 'movie': ('video', 'movie'),
+ 'movie_extra': ('movie', 'movie_extra'),
+ 'backdrop': ('image', 'backdrop'),
+ 'poster': ('image', 'poster'),
+ 'thumbnail': ('image', 'thumbnail'),
+ 'leftover': ('leftover', 'leftover'),
+ }
+
+ file_sizes = { # in MB
+ 'movie': {'min': 200},
+ 'trailer': {'min': 2, 'max': 199},
+ 'backdrop': {'min': 0, 'max': 5},
+ }
+
+ codecs = {
+ 'audio': ['DTS', 'AC3', 'AC3D', 'MP3'],
+ 'video': ['x264', 'H264', 'DivX', 'Xvid']
+ }
+
+ resolutions = {
+ '1080p': {'resolution_width': 1920, 'resolution_height': 1080, 'aspect': 1.78},
+ '1080i': {'resolution_width': 1920, 'resolution_height': 1080, 'aspect': 1.78},
+ '720p': {'resolution_width': 1280, 'resolution_height': 720, 'aspect': 1.78},
+ '720i': {'resolution_width': 1280, 'resolution_height': 720, 'aspect': 1.78},
+ '480p': {'resolution_width': 640, 'resolution_height': 480, 'aspect': 1.33},
+ '480i': {'resolution_width': 640, 'resolution_height': 480, 'aspect': 1.33},
+ 'default': {'resolution_width': 0, 'resolution_height': 0, 'aspect': 1},
+ }
+
+ audio_codec_map = {
+ 0x2000: 'AC3',
+ 0x2001: 'DTS',
+ 0x0055: 'MP3',
+ 0x0050: 'MP2',
+ 0x0001: 'PCM',
+ 0x003: 'WAV',
+ 0x77a1: 'TTA1',
+ 0x5756: 'WAV',
+ 0x6750: 'Vorbis',
+ 0xF1AC: 'FLAC',
+ 0x00ff: 'AAC',
+ }
+
+ source_media = {
+ 'Blu-ray': ['bluray', 'blu-ray', 'brrip', 'br-rip'],
+ 'HD DVD': ['hddvd', 'hd-dvd'],
+ 'DVD': ['dvd'],
+ 'HDTV': ['hdtv']
+ }
+
+ clean = '([ _\,\.\(\)\[\]\-]|^)(3d|hsbs|sbs|half.sbs|full.sbs|ou|half.ou|full.ou|extended|extended.cut|directors.cut|french|fr|swedisch|sw|danish|dutch|nl|swesub|subs|spanish|german|ac3|dts|custom|dc|divx|divx5|dsr|dsrip|dutch|dvd|dvdr|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip' \
+ '|hdtvrip|webdl|web.dl|webrip|web.rip|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|r3|r5|bd5|se|svcd|swedish|german|read.nfo|nfofix|unrated|ws|telesync|ts|telecine|tc|brrip|bdrip|video_ts|audio_ts|480p|480i|576p|576i|720p|720i|1080p|1080i|hrhd|hrhdtv|hddvd|bluray|x264|h264|xvid|xvidvd|xxx|www.www|hc|\[.*\])(?=[ _\,\.\(\)\[\]\-]|$)'
+ multipart_regex = [
+ '[ _\.-]+cd[ _\.-]*([0-9a-d]+)', #*cd1
+ '[ _\.-]+dvd[ _\.-]*([0-9a-d]+)', #*dvd1
+ '[ _\.-]+part[ _\.-]*([0-9a-d]+)', #*part1
+ '[ _\.-]+dis[ck][ _\.-]*([0-9a-d]+)', #*disk1
+ 'cd[ _\.-]*([0-9a-d]+)$', #cd1.ext
+ 'dvd[ _\.-]*([0-9a-d]+)$', #dvd1.ext
+ 'part[ _\.-]*([0-9a-d]+)$', #part1.mkv
+ 'dis[ck][ _\.-]*([0-9a-d]+)$', #disk1.mkv
+ '()[ _\.-]+([0-9]*[abcd]+)(\.....?)$',
+ '([a-z])([0-9]+)(\.....?)$',
+ '()([ab])(\.....?)$' #*a.mkv
+ ]
+
+ cp_imdb = '\.cp\((?Ptt[0-9]+),?\s?(?P[A-Za-z0-9]+)?\)'
+
+ def __init__(self):
+
+ addEvent('scanner.create_file_identifier', self.createStringIdentifier)
+ addEvent('scanner.remove_cptag', self.removeCPTag)
+
+ addEvent('scanner.scan', self.scan)
+ addEvent('scanner.name_year', self.getReleaseNameYear)
+ addEvent('scanner.partnumber', self.getPartNumber)
+
+ def scan(self, folder = None, files = None, release_download = None, simple = False, newer_than = 0, return_ignored = True, check_file_date = True, on_found = None):
+
+ folder = sp(folder)
+
+ if not folder or not os.path.isdir(folder):
+ log.error('Folder doesn\'t exists: %s', folder)
+ return {}
+
+ # Get movie "master" files
+ movie_files = {}
+ leftovers = []
+
+ # Scan all files of the folder if no files are set
+ if not files:
+ try:
+ files = []
+ for root, dirs, walk_files in os.walk(folder, followlinks=True):
+ files.extend([sp(os.path.join(sp(root), ss(filename))) for filename in walk_files])
+
+ # Break if CP wants to shut down
+ if self.shuttingDown():
+ break
+
+ except:
+ log.error('Failed getting files from %s: %s', (folder, traceback.format_exc()))
+
+ log.debug('Found %s files to scan and group in %s', (len(files), folder))
+ else:
+ check_file_date = False
+ files = [sp(x) for x in files]
+
+ for file_path in files:
+
+ if not os.path.exists(file_path):
+ continue
+
+ # Remove ignored files
+ if self.isSampleFile(file_path):
+ leftovers.append(file_path)
+ continue
+ elif not self.keepFile(file_path):
+ continue
+
+ is_dvd_file = self.isDVDFile(file_path)
+ if self.filesizeBetween(file_path, self.file_sizes['movie']) or is_dvd_file: # Minimal 300MB files or is DVD file
+
+ # Normal identifier
+ identifier = self.createStringIdentifier(file_path, folder, exclude_filename = is_dvd_file)
+ identifiers = [identifier]
+
+ # Identifier with quality
+ quality = fireEvent('quality.guess', files = [file_path], size = self.getFileSize(file_path), single = True) if not is_dvd_file else {'identifier':'dvdr'}
+ if quality:
+ identifier_with_quality = '%s %s' % (identifier, quality.get('identifier', ''))
+ identifiers = [identifier_with_quality, identifier]
+
+ if not movie_files.get(identifier):
+ movie_files[identifier] = {
+ 'unsorted_files': [],
+ 'identifiers': identifiers,
+ 'is_dvd': is_dvd_file,
+ }
+
+ movie_files[identifier]['unsorted_files'].append(file_path)
+ else:
+ leftovers.append(file_path)
+
+ # Break if CP wants to shut down
+ if self.shuttingDown():
+ break
+
+ # Cleanup
+ del files
+
+ # Sort reverse, this prevents "Iron man 2" from getting grouped with "Iron man" as the "Iron Man 2"
+ # files will be grouped first.
+ leftovers = set(sorted(leftovers, reverse = True))
+
+ # Group files minus extension
+ ignored_identifiers = []
+ for identifier, group in movie_files.items():
+ if identifier not in group['identifiers'] and len(identifier) > 0: group['identifiers'].append(identifier)
+
+ log.debug('Grouping files: %s', identifier)
+
+ has_ignored = 0
+ for file_path in list(group['unsorted_files']):
+ ext = getExt(file_path)
+ wo_ext = file_path[:-(len(ext) + 1)]
+ found_files = set([i for i in leftovers if wo_ext in i])
+ group['unsorted_files'].extend(found_files)
+ leftovers = leftovers - found_files
+
+ has_ignored += 1 if ext == 'ignore' else 0
+
+ if has_ignored == 0:
+ for file_path in list(group['unsorted_files']):
+ ext = getExt(file_path)
+ has_ignored += 1 if ext == 'ignore' else 0
+
+ if has_ignored > 0:
+ ignored_identifiers.append(identifier)
+
+ # Break if CP wants to shut down
+ if self.shuttingDown():
+ break
+
+
+ # Create identifiers for all leftover files
+ path_identifiers = {}
+ for file_path in leftovers:
+ identifier = self.createStringIdentifier(file_path, folder)
+
+ if not path_identifiers.get(identifier):
+ path_identifiers[identifier] = []
+
+ path_identifiers[identifier].append(file_path)
+
+
+ # Group the files based on the identifier
+ delete_identifiers = []
+ for identifier, found_files in path_identifiers.items():
+ log.debug('Grouping files on identifier: %s', identifier)
+
+ group = movie_files.get(identifier)
+ if group:
+ group['unsorted_files'].extend(found_files)
+ delete_identifiers.append(identifier)
+
+ # Remove the found files from the leftover stack
+ leftovers = leftovers - set(found_files)
+
+ # Break if CP wants to shut down
+ if self.shuttingDown():
+ break
+
+ # Cleaning up used
+ for identifier in delete_identifiers:
+ if path_identifiers.get(identifier):
+ del path_identifiers[identifier]
+ del delete_identifiers
+
+ # Group based on folder
+ delete_identifiers = []
+ for identifier, found_files in path_identifiers.items():
+ log.debug('Grouping files on foldername: %s', identifier)
+
+ for ff in found_files:
+ new_identifier = self.createStringIdentifier(os.path.dirname(ff), folder)
+
+ group = movie_files.get(new_identifier)
+ if group:
+ group['unsorted_files'].extend([ff])
+ delete_identifiers.append(identifier)
+
+ # Remove the found files from the leftover stack
+ leftovers -= leftovers - set([ff])
+
+ # Break if CP wants to shut down
+ if self.shuttingDown():
+ break
+
+ # leftovers should be empty
+ if leftovers:
+ log.debug('Some files are still left over: %s', leftovers)
+
+ # Cleaning up used
+ for identifier in delete_identifiers:
+ if path_identifiers.get(identifier):
+ del path_identifiers[identifier]
+ del delete_identifiers
+
+ # Make sure we remove older / still extracting files
+ valid_files = {}
+ while True and not self.shuttingDown():
+ try:
+ identifier, group = movie_files.popitem()
+ except:
+ break
+
+ # Check if movie is fresh and maybe still unpacking, ignore files newer than 1 minute
+ if check_file_date:
+ files_too_new, time_string = self.checkFilesChanged(group['unsorted_files'])
+ if files_too_new:
+ log.info('Files seem to be still unpacking or just unpacked (created on %s), ignoring for now: %s', (time_string, identifier))
+
+ # Delete the unsorted list
+ del group['unsorted_files']
+
+ continue
+
+ # Only process movies newer than x
+ if newer_than and newer_than > 0:
+ has_new_files = False
+ for cur_file in group['unsorted_files']:
+ file_time = self.getFileTimes(cur_file)
+ if file_time[0] > newer_than or file_time[1] > newer_than:
+ has_new_files = True
+ break
+
+ if not has_new_files:
+ log.debug('None of the files have changed since %s for %s, skipping.', (time.ctime(newer_than), identifier))
+
+ # Delete the unsorted list
+ del group['unsorted_files']
+
+ continue
+
+ valid_files[identifier] = group
+
+ del movie_files
+
+ total_found = len(valid_files)
+
+ # Make sure only one movie was found if a download ID is provided
+ if release_download and total_found == 0:
+ log.info('Download ID provided (%s), but no groups found! Make sure the download contains valid media files (fully extracted).', release_download.get('imdb_id'))
+ elif release_download and total_found > 1:
+ log.info('Download ID provided (%s), but more than one group found (%s). Ignoring Download ID...', (release_download.get('imdb_id'), len(valid_files)))
+ release_download = None
+
+ # Determine file types
+ processed_movies = {}
+ while True and not self.shuttingDown():
+ try:
+ identifier, group = valid_files.popitem()
+ except:
+ break
+
+ if return_ignored is False and identifier in ignored_identifiers:
+ log.debug('Ignore file found, ignoring release: %s', identifier)
+ total_found -= 1
+ continue
+
+ # Group extra (and easy) files first
+ group['files'] = {
+ 'movie_extra': self.getMovieExtras(group['unsorted_files']),
+ 'subtitle': self.getSubtitles(group['unsorted_files']),
+ 'subtitle_extra': self.getSubtitlesExtras(group['unsorted_files']),
+ 'nfo': self.getNfo(group['unsorted_files']),
+ 'trailer': self.getTrailers(group['unsorted_files']),
+ 'leftover': set(group['unsorted_files']),
+ }
+
+ # Media files
+ if group['is_dvd']:
+ group['files']['movie'] = self.getDVDFiles(group['unsorted_files'])
+ else:
+ group['files']['movie'] = self.getMediaFiles(group['unsorted_files'])
+
+ if len(group['files']['movie']) == 0:
+ log.error('Couldn\'t find any movie files for %s', identifier)
+ total_found -= 1
+ continue
+
+ log.debug('Getting metadata for %s', identifier)
+ group['meta_data'] = self.getMetaData(group, folder = folder, release_download = release_download)
+
+ # Subtitle meta
+ group['subtitle_language'] = self.getSubtitleLanguage(group) if not simple else {}
+
+ # Get parent dir from movie files
+ for movie_file in group['files']['movie']:
+ group['parentdir'] = os.path.dirname(movie_file)
+ group['dirname'] = None
+
+ folder_names = group['parentdir'].replace(folder, '').split(os.path.sep)
+ folder_names.reverse()
+
+ # Try and get a proper dirname, so no "A", "Movie", "Download" etc
+ for folder_name in folder_names:
+ if folder_name.lower() not in self.ignore_names and len(folder_name) > 2:
+ group['dirname'] = folder_name
+ break
+
+ break
+
+ # Leftover "sorted" files
+ for file_type in group['files']:
+ if not file_type is 'leftover':
+ group['files']['leftover'] -= set(group['files'][file_type])
+ group['files'][file_type] = list(group['files'][file_type])
+ group['files']['leftover'] = list(group['files']['leftover'])
+
+ # Delete the unsorted list
+ del group['unsorted_files']
+
+ # Determine movie
+ group['media'] = self.determineMedia(group, release_download = release_download)
+ if not group['media']:
+ log.error('Unable to determine media: %s', group['identifiers'])
+ else:
+ group['identifier'] = getIdentifier(group['media']) or group['media']['info'].get('imdb')
+
+ processed_movies[identifier] = group
+
+ # Notify parent & progress on something found
+ if on_found:
+ on_found(group, total_found, len(valid_files))
+
+ # Wait for all the async events calm down a bit
+ while threading.activeCount() > 100 and not self.shuttingDown():
+ log.debug('Too many threads active, waiting a few seconds')
+ time.sleep(10)
+
+ if len(processed_movies) > 0:
+ log.info('Found %s movies in the folder %s', (len(processed_movies), folder))
+ else:
+ log.debug('Found no movies in the folder %s', folder)
+
+ return processed_movies
+
+ def getMetaData(self, group, folder = '', release_download = None):
+
+ data = {}
+ files = list(group['files']['movie'])
+
+ for cur_file in files:
+ if not self.filesizeBetween(cur_file, self.file_sizes['movie']): continue # Ignore smaller files
+
+ if not data.get('audio'): # Only get metadata from first media file
+ meta = self.getMeta(cur_file)
+
+ try:
+ data['titles'] = meta.get('titles', [])
+ data['video'] = meta.get('video', self.getCodec(cur_file, self.codecs['video']))
+ data['audio'] = meta.get('audio', self.getCodec(cur_file, self.codecs['audio']))
+ data['audio_channels'] = meta.get('audio_channels', 2.0)
+ if meta.get('resolution_width'):
+ data['resolution_width'] = meta.get('resolution_width')
+ data['resolution_height'] = meta.get('resolution_height')
+ data['aspect'] = round(float(meta.get('resolution_width')) / meta.get('resolution_height', 1), 2)
+ else:
+ data.update(self.getResolution(cur_file))
+ except:
+ log.debug('Error parsing metadata: %s %s', (cur_file, traceback.format_exc()))
+ pass
+
+ data['size'] = data.get('size', 0) + self.getFileSize(cur_file)
+
+ data['quality'] = None
+ quality = fireEvent('quality.guess', size = data.get('size'), files = files, extra = data, single = True)
+
+ # Use the quality that we snatched but check if it matches our guess
+ if release_download and release_download.get('quality'):
+ data['quality'] = fireEvent('quality.single', release_download.get('quality'), single = True)
+ data['quality']['is_3d'] = release_download.get('is_3d', 0)
+ if data['quality']['identifier'] != quality['identifier']:
+ log.info('Different quality snatched than detected for %s: %s vs. %s. Assuming snatched quality is correct.', (files[0], data['quality']['identifier'], quality['identifier']))
+ if data['quality']['is_3d'] != quality['is_3d']:
+ log.info('Different 3d snatched than detected for %s: %s vs. %s. Assuming snatched 3d is correct.', (files[0], data['quality']['is_3d'], quality['is_3d']))
+
+ if not data['quality']:
+ data['quality'] = quality
+
+ if not data['quality']:
+ data['quality'] = fireEvent('quality.single', 'dvdr' if group['is_dvd'] else 'dvdrip', single = True)
+
+ data['quality_type'] = 'HD' if data.get('resolution_width', 0) >= 1280 or data['quality'].get('hd') else 'SD'
+
+ filename = re.sub(self.cp_imdb, '', files[0])
+ data['group'] = self.getGroup(filename[len(folder):])
+ data['source'] = self.getSourceMedia(filename)
+ if data['quality'].get('is_3d', 0):
+ data['3d_type'] = self.get3dType(filename)
+ return data
+
+ def get3dType(self, filename):
+ filename = ss(filename)
+
+ words = re.split('\W+', filename.lower())
+
+ for key in self.threed_types:
+ tags = self.threed_types.get(key, [])
+
+ for tag in tags:
+ if (isinstance(tag, tuple) and '.'.join(tag) in '.'.join(words)) or (isinstance(tag, (str, unicode)) and ss(tag.lower()) in words):
+ log.debug('Found %s in %s', (tag, filename))
+ return key
+
+ return ''
+
+ def getMeta(self, filename):
+
+ try:
+ p = enzyme.parse(filename)
+
+ # Video codec
+ vc = ('H264' if p.video[0].codec == 'AVC1' else p.video[0].codec)
+
+ # Audio codec
+ ac = p.audio[0].codec
+ try: ac = self.audio_codec_map.get(p.audio[0].codec)
+ except: pass
+
+ # Find title in video headers
+ titles = []
+
+ try:
+ if p.title and self.findYear(p.title):
+ titles.append(ss(p.title))
+ except:
+ log.error('Failed getting title from meta: %s', traceback.format_exc())
+
+ for video in p.video:
+ try:
+ if video.title and self.findYear(video.title):
+ titles.append(ss(video.title))
+ except:
+ log.error('Failed getting title from meta: %s', traceback.format_exc())
+
+ return {
+ 'titles': list(set(titles)),
+ 'video': vc,
+ 'audio': ac,
+ 'resolution_width': tryInt(p.video[0].width),
+ 'resolution_height': tryInt(p.video[0].height),
+ 'audio_channels': p.audio[0].channels,
+ }
+ except enzyme.exceptions.ParseError:
+ log.debug('Failed to parse meta for %s', filename)
+ except enzyme.exceptions.NoParserError:
+ log.debug('No parser found for %s', filename)
+ except:
+ log.debug('Failed parsing %s', filename)
+
+ return {}
+
+ def getSubtitleLanguage(self, group):
+ detected_languages = {}
+
+ # Subliminal scanner
+ paths = None
+ try:
+ paths = group['files']['movie']
+ scan_result = []
+ for p in paths:
+ if not group['is_dvd']:
+ video = Video.from_path(sp(p))
+ video_result = [(video, video.scan())]
+ scan_result.extend(video_result)
+
+ for video, detected_subtitles in scan_result:
+ for s in detected_subtitles:
+ if s.language and s.path not in paths:
+ detected_languages[s.path] = [s.language]
+ except:
+ log.debug('Failed parsing subtitle languages for %s: %s', (paths, traceback.format_exc()))
+
+ # IDX
+ for extra in group['files']['subtitle_extra']:
+ try:
+ if os.path.isfile(extra):
+ output = open(extra, 'r')
+ txt = output.read()
+ output.close()
+
+ idx_langs = re.findall('\nid: (\w+)', txt)
+
+ sub_file = '%s.sub' % os.path.splitext(extra)[0]
+ if len(idx_langs) > 0 and os.path.isfile(sub_file):
+ detected_languages[sub_file] = idx_langs
+ except:
+ log.error('Failed parsing subtitle idx for %s: %s', (extra, traceback.format_exc()))
+
+ return detected_languages
+
+ def determineMedia(self, group, release_download = None):
+
+ # Get imdb id from downloader
+ imdb_id = release_download and release_download.get('imdb_id')
+ if imdb_id:
+ log.debug('Found movie via imdb id from it\'s download id: %s', release_download.get('imdb_id'))
+
+ files = group['files']
+
+ # Check for CP(imdb_id) string in the file paths
+ if not imdb_id:
+ for cur_file in files['movie']:
+ imdb_id = self.getCPImdb(cur_file)
+ if imdb_id:
+ log.debug('Found movie via CP tag: %s', cur_file)
+ break
+
+ # Check and see if nfo contains the imdb-id
+ nfo_file = None
+ if not imdb_id:
+ try:
+ for nf in files['nfo']:
+ imdb_id = getImdb(nf, check_inside = True)
+ if imdb_id:
+ log.debug('Found movie via nfo file: %s', nf)
+ nfo_file = nf
+ break
+ except:
+ pass
+
+ # Check and see if filenames contains the imdb-id
+ if not imdb_id:
+ try:
+ for filetype in files:
+ for filetype_file in files[filetype]:
+ imdb_id = getImdb(filetype_file)
+ if imdb_id:
+ log.debug('Found movie via imdb in filename: %s', nfo_file)
+ break
+ except:
+ pass
+
+ # Search based on identifiers
+ if not imdb_id:
+ for identifier in group['identifiers']:
+
+ if len(identifier) > 2:
+ try: filename = list(group['files'].get('movie'))[0]
+ except: filename = None
+
+ name_year = self.getReleaseNameYear(identifier, file_name = filename if not group['is_dvd'] else None)
+ if name_year.get('name') and name_year.get('year'):
+ search_q = '%(name)s %(year)s' % name_year
+ movie = fireEvent('movie.search', q = search_q, merge = True, limit = 1)
+
+ # Try with other
+ if len(movie) == 0 and name_year.get('other') and name_year['other'].get('name') and name_year['other'].get('year'):
+ search_q2 = '%(name)s %(year)s' % name_year.get('other')
+ if search_q2 != search_q:
+ movie = fireEvent('movie.search', q = search_q2, merge = True, limit = 1)
+
+ if len(movie) > 0:
+ imdb_id = movie[0].get('imdb')
+ log.debug('Found movie via search: %s', identifier)
+ if imdb_id: break
+ else:
+ log.debug('Identifier to short to use for search: %s', identifier)
+
+ if imdb_id:
+ try:
+ db = get_db()
+ return db.get('media', 'imdb-%s' % imdb_id, with_doc = True)['doc']
+ except:
+ log.debug('Movie "%s" not in library, just getting info', imdb_id)
+ return {
+ 'identifier': imdb_id,
+ 'info': fireEvent('movie.info', identifier = imdb_id, merge = True, extended = False)
+ }
+
+ log.error('No imdb_id found for %s. Add a NFO file with IMDB id or add the year to the filename.', group['identifiers'])
+ return {}
+
+ def getCPImdb(self, string):
+
+ try:
+ m = re.search(self.cp_imdb, string.lower())
+ id = m.group('id')
+ if id: return id
+ except AttributeError:
+ pass
+
+ return False
+
+ def removeCPTag(self, name):
+ try:
+ return re.sub(self.cp_imdb, '', name).strip()
+ except:
+ pass
+ return name
+
+ def getSamples(self, files):
+ return set(filter(lambda s: self.isSampleFile(s), files))
+
+ def getMediaFiles(self, files):
+
+ def test(s):
+ return self.filesizeBetween(s, self.file_sizes['movie']) and getExt(s.lower()) in self.extensions['movie'] and not self.isSampleFile(s)
+
+ return set(filter(test, files))
+
+ def getMovieExtras(self, files):
+ return set(filter(lambda s: getExt(s.lower()) in self.extensions['movie_extra'], files))
+
+ def getDVDFiles(self, files):
+ def test(s):
+ return self.isDVDFile(s)
+
+ return set(filter(test, files))
+
+ def getSubtitles(self, files):
+ return set(filter(lambda s: getExt(s.lower()) in self.extensions['subtitle'], files))
+
+ def getSubtitlesExtras(self, files):
+ return set(filter(lambda s: getExt(s.lower()) in self.extensions['subtitle_extra'], files))
+
+ def getNfo(self, files):
+ return set(filter(lambda s: getExt(s.lower()) in self.extensions['nfo'], files))
+
+ def getTrailers(self, files):
+
+ def test(s):
+ return re.search('(^|[\W_])trailer\d*[\W_]', s.lower()) and self.filesizeBetween(s, self.file_sizes['trailer'])
+
+ return set(filter(test, files))
+
+ def getImages(self, files):
+
+ def test(s):
+ return getExt(s.lower()) in ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'tbn']
+ files = set(filter(test, files))
+
+ images = {
+ 'backdrop': set(filter(lambda s: re.search('(^|[\W_])fanart|backdrop\d*[\W_]', s.lower()) and self.filesizeBetween(s, self.file_sizes['backdrop']), files))
+ }
+
+ # Rest
+ images['rest'] = files - images['backdrop']
+
+ return images
+
+
+ def isDVDFile(self, file_name):
+
+ if list(set(file_name.lower().split(os.path.sep)) & set(['video_ts', 'audio_ts'])):
+ return True
+
+ for needle in ['vts_', 'video_ts', 'audio_ts', 'bdmv', 'certificate']:
+ if needle in file_name.lower():
+ return True
+
+ return False
+
+ def keepFile(self, filename):
+
+ # ignoredpaths
+ for i in self.ignored_in_path:
+ if i in filename.lower():
+ log.debug('Ignored "%s" contains "%s".', (filename, i))
+ return False
+
+ # All is OK
+ return True
+
+ def isSampleFile(self, filename):
+ is_sample = re.search('(^|[\W_])sample\d*[\W_]', filename.lower())
+ if is_sample: log.debug('Is sample file: %s', filename)
+ return is_sample
+
+ def filesizeBetween(self, file, file_size = None):
+ if not file_size: file_size = []
+
+ try:
+ return file_size.get('min', 0) < self.getFileSize(file) < file_size.get('max', 100000)
+ except:
+ log.error('Couldn\'t get filesize of %s.', file)
+
+ return False
+
+ def getFileSize(self, file):
+ try:
+ return os.path.getsize(file) / 1024 / 1024
+ except:
+ return None
+
+ def createStringIdentifier(self, file_path, folder = '', exclude_filename = False):
+
+ identifier = file_path.replace(folder, '').lstrip(os.path.sep) # root folder
+ identifier = os.path.splitext(identifier)[0] # ext
+
+ # Exclude file name path if needed (f.e. for DVD files)
+ if exclude_filename:
+ identifier = identifier[:len(identifier) - len(os.path.split(identifier)[-1])]
+
+ # Make sure the identifier is lower case as all regex is with lower case tags
+ identifier = identifier.lower()
+
+ try:
+ path_split = splitString(identifier, os.path.sep)
+ identifier = path_split[-2] if len(path_split) > 1 and len(path_split[-2]) > len(path_split[-1]) else path_split[-1] # Only get filename
+ except: pass
+
+ # multipart
+ identifier = self.removeMultipart(identifier)
+
+ # remove cptag
+ identifier = self.removeCPTag(identifier)
+
+ # simplify the string
+ identifier = simplifyString(identifier)
+
+ year = self.findYear(file_path)
+
+ # groups, release tags, scenename cleaner
+ identifier = re.sub(self.clean, '::', identifier).strip(':')
+
+ # Year
+ if year and identifier[:4] != year:
+ split_by = ':::' if ':::' in identifier else year
+ identifier = '%s %s' % (identifier.split(split_by)[0].strip(), year)
+ else:
+ identifier = identifier.split('::')[0]
+
+ # Remove duplicates
+ out = []
+ for word in identifier.split():
+ if not word in out:
+ out.append(word)
+
+ identifier = ' '.join(out)
+
+ return simplifyString(identifier)
+
+
+ def removeMultipart(self, name):
+ for regex in self.multipart_regex:
+ try:
+ found = re.sub(regex, '', name)
+ if found != name:
+ name = found
+ except:
+ pass
+ return name
+
+ def getPartNumber(self, name):
+ for regex in self.multipart_regex:
+ try:
+ found = re.search(regex, name)
+ if found:
+ return found.group(1)
+ return 1
+ except:
+ pass
+ return 1
+
+ def getCodec(self, filename, codecs):
+ codecs = map(re.escape, codecs)
+ try:
+ codec = re.search('[^A-Z0-9](?P' + '|'.join(codecs) + ')[^A-Z0-9]', filename, re.I)
+ return (codec and codec.group('codec')) or ''
+ except:
+ return ''
+
+ def getResolution(self, filename):
+ try:
+ for key in self.resolutions:
+ if key in filename.lower() and key != 'default':
+ return self.resolutions[key]
+ except:
+ pass
+
+ return self.resolutions['default']
+
+ def getGroup(self, file):
+ try:
+ match = re.findall('\-([A-Z0-9]+)[\.\/]', file, re.I)
+ return match[-1] or ''
+ except:
+ return ''
+
+ def getSourceMedia(self, file):
+ for media in self.source_media:
+ for alias in self.source_media[media]:
+ if alias in file.lower():
+ return media
+
+ return None
+
+ def findYear(self, text):
+
+ # Search year inside () or [] first
+ matches = re.findall('(\(|\[)(?P19[0-9]{2}|20[0-9]{2})(\]|\))', text)
+ if matches:
+ return matches[-1][1]
+
+ # Search normal
+ matches = re.findall('(?P19[0-9]{2}|20[0-9]{2})', text)
+ if matches:
+ return matches[-1]
+
+ return ''
+
+ def getReleaseNameYear(self, release_name, file_name = None):
+
+ release_name = release_name.strip(' .-_')
+
+ # Use guessit first
+ guess = {}
+ if file_name:
+ try:
+ guessit = guess_movie_info(toUnicode(file_name))
+ if guessit.get('title') and guessit.get('year'):
+ guess = {
+ 'name': guessit.get('title'),
+ 'year': guessit.get('year'),
+ }
+ except:
+ log.debug('Could not detect via guessit "%s": %s', (file_name, traceback.format_exc()))
+
+ # Backup to simple
+ release_name = os.path.basename(release_name.replace('\\', '/'))
+ cleaned = ' '.join(re.split('\W+', simplifyString(release_name)))
+ cleaned = re.sub(self.clean, ' ', cleaned)
+
+ year = None
+ for year_str in [file_name, release_name, cleaned]:
+ if not year_str: continue
+ year = self.findYear(year_str)
+ if year:
+ break
+
+ cp_guess = {}
+
+ if year: # Split name on year
+ try:
+ movie_name = cleaned.rsplit(year, 1).pop(0).strip()
+ if movie_name:
+ cp_guess = {
+ 'name': movie_name,
+ 'year': int(year),
+ }
+ except:
+ pass
+
+ if not cp_guess: # Split name on multiple spaces
+ try:
+ movie_name = cleaned.split(' ').pop(0).strip()
+ cp_guess = {
+ 'name': movie_name,
+ 'year': int(year) if movie_name[:4] != year else 0,
+ }
+ except:
+ pass
+
+ if cp_guess.get('year') == guess.get('year') and len(cp_guess.get('name', '')) > len(guess.get('name', '')):
+ cp_guess['other'] = guess
+ return cp_guess
+ elif guess == {}:
+ cp_guess['other'] = guess
+ return cp_guess
+
+ guess['other'] = cp_guess
+ return guess
diff --git a/couchpotato/core/plugins/scanner/__init__.py b/couchpotato/core/plugins/scanner/__init__.py
deleted file mode 100644
index 3d640465bd..0000000000
--- a/couchpotato/core/plugins/scanner/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import Scanner
-
-def start():
- return Scanner()
-
-config = []
diff --git a/couchpotato/core/plugins/scanner/main.py b/couchpotato/core/plugins/scanner/main.py
deleted file mode 100644
index b822bc0f9a..0000000000
--- a/couchpotato/core/plugins/scanner/main.py
+++ /dev/null
@@ -1,829 +0,0 @@
-from couchpotato import get_session
-from couchpotato.core.event import fireEvent, addEvent
-from couchpotato.core.helpers.encoding import toUnicode, simplifyString, ss
-from couchpotato.core.helpers.variable import getExt, getImdb, tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.core.settings.model import File, Movie
-from enzyme.exceptions import NoParserError, ParseError
-from guessit import guess_movie_info
-from subliminal.videos import Video
-import enzyme
-import os
-import re
-import time
-import traceback
-
-log = CPLog(__name__)
-
-
-class Scanner(Plugin):
-
- minimal_filesize = {
- 'media': 314572800, # 300MB
- 'trailer': 1048576, # 1MB
- }
- ignored_in_path = [os.path.sep + 'extracted' + os.path.sep, 'extracting', '_unpack', '_failed_', '_unknown_', '_exists_', '_failed_remove_', '_failed_rename_', '.appledouble', '.appledb', '.appledesktop', os.path.sep + '._', '.ds_store', 'cp.cpnfo'] #unpacking, smb-crap, hidden files
- ignore_names = ['extract', 'extracting', 'extracted', 'movie', 'movies', 'film', 'films', 'download', 'downloads', 'video_ts', 'audio_ts', 'bdmv', 'certificate']
- extensions = {
- 'movie': ['mkv', 'wmv', 'avi', 'mpg', 'mpeg', 'mp4', 'm2ts', 'iso', 'img', 'mdf', 'ts', 'm4v'],
- 'movie_extra': ['mds'],
- 'dvd': ['vts_*', 'vob'],
- 'nfo': ['nfo', 'txt', 'tag'],
- 'subtitle': ['sub', 'srt', 'ssa', 'ass'],
- 'subtitle_extra': ['idx'],
- 'trailer': ['mov', 'mp4', 'flv']
- }
-
- file_types = {
- 'subtitle': ('subtitle', 'subtitle'),
- 'subtitle_extra': ('subtitle', 'subtitle_extra'),
- 'trailer': ('video', 'trailer'),
- 'nfo': ('nfo', 'nfo'),
- 'movie': ('video', 'movie'),
- 'movie_extra': ('movie', 'movie_extra'),
- 'backdrop': ('image', 'backdrop'),
- 'poster': ('image', 'poster'),
- 'thumbnail': ('image', 'thumbnail'),
- 'leftover': ('leftover', 'leftover'),
- }
-
- codecs = {
- 'audio': ['dts', 'ac3', 'ac3d', 'mp3'],
- 'video': ['x264', 'h264', 'divx', 'xvid']
- }
-
- audio_codec_map = {
- 0x2000: 'ac3',
- 0x2001: 'dts',
- 0x0055: 'mp3',
- 0x0050: 'mp2',
- 0x0001: 'pcm',
- 0x003: 'pcm',
- 0x77a1: 'tta1',
- 0x5756: 'wav',
- 0x6750: 'vorbis',
- 0xF1AC: 'flac',
- 0x00ff: 'aac',
- }
-
- source_media = {
- 'bluray': ['bluray', 'blu-ray', 'brrip', 'br-rip'],
- 'hddvd': ['hddvd', 'hd-dvd'],
- 'dvd': ['dvd'],
- 'hdtv': ['hdtv']
- }
-
- clean = '[ _\,\.\(\)\[\]\-](french|swedisch|danish|dutch|swesub|spanish|german|ac3|dts|custom|dc|divx|divx5|dsr|dsrip|dutch|dvd|dvdr|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip|hdtvrip|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|r3|r5|bd5|se|svcd|swedish|german|read.nfo|nfofix|unrated|ws|telesync|ts|telecine|tc|brrip|bdrip|video_ts|audio_ts|480p|480i|576p|576i|720p|720i|1080p|1080i|hrhd|hrhdtv|hddvd|bluray|x264|h264|xvid|xvidvd|xxx|www.www|cd[1-9]|\[.*\])([ _\,\.\(\)\[\]\-]|$)'
- multipart_regex = [
- '[ _\.-]+cd[ _\.-]*([0-9a-d]+)', #*cd1
- '[ _\.-]+dvd[ _\.-]*([0-9a-d]+)', #*dvd1
- '[ _\.-]+part[ _\.-]*([0-9a-d]+)', #*part1
- '[ _\.-]+dis[ck][ _\.-]*([0-9a-d]+)', #*disk1
- 'cd[ _\.-]*([0-9a-d]+)$', #cd1.ext
- 'dvd[ _\.-]*([0-9a-d]+)$', #dvd1.ext
- 'part[ _\.-]*([0-9a-d]+)$', #part1.mkv
- 'dis[ck][ _\.-]*([0-9a-d]+)$', #disk1.mkv
- '()[ _\.-]+([0-9]*[abcd]+)(\.....?)$',
- '([a-z])([0-9]+)(\.....?)$',
- '()([ab])(\.....?)$' #*a.mkv
- ]
-
- cp_imdb = '(.cp.(?Ptt[0-9{7}]+).)'
-
- def __init__(self):
-
- addEvent('scanner.create_file_identifier', self.createStringIdentifier)
- addEvent('scanner.remove_cptag', self.removeCPTag)
-
- addEvent('scanner.scan', self.scan)
- addEvent('scanner.name_year', self.getReleaseNameYear)
- addEvent('scanner.partnumber', self.getPartNumber)
-
- def scan(self, folder = None, files = None, simple = False, newer_than = 0, on_found = None):
-
- folder = ss(os.path.normpath(folder))
-
- if not folder or not os.path.isdir(folder):
- log.error('Folder doesn\'t exists: %s', folder)
- return {}
-
- # Get movie "master" files
- movie_files = {}
- leftovers = []
-
- # Scan all files of the folder if no files are set
- if not files:
- check_file_date = True
- try:
- files = []
- for root, dirs, walk_files in os.walk(folder):
- for filename in walk_files:
- files.append(os.path.join(root, filename))
- except:
- log.error('Failed getting files from %s: %s', (folder, traceback.format_exc()))
- else:
- check_file_date = False
- files = [ss(x) for x in files]
-
- db = get_session()
-
- for file_path in files:
-
- if not os.path.exists(file_path):
- continue
-
- # Remove ignored files
- if self.isSampleFile(file_path):
- leftovers.append(file_path)
- continue
- elif not self.keepFile(file_path):
- continue
-
- is_dvd_file = self.isDVDFile(file_path)
- if os.path.getsize(file_path) > self.minimal_filesize['media'] or is_dvd_file: # Minimal 300MB files or is DVD file
-
- # Normal identifier
- identifier = self.createStringIdentifier(file_path, folder, exclude_filename = is_dvd_file)
- identifiers = [identifier]
-
- # Identifier with quality
- quality = fireEvent('quality.guess', [file_path], single = True) if not is_dvd_file else {'identifier':'dvdr'}
- if quality:
- identifier_with_quality = '%s %s' % (identifier, quality.get('identifier', ''))
- identifiers = [identifier_with_quality, identifier]
-
- if not movie_files.get(identifier):
- movie_files[identifier] = {
- 'unsorted_files': [],
- 'identifiers': identifiers,
- 'is_dvd': is_dvd_file,
- }
-
- movie_files[identifier]['unsorted_files'].append(file_path)
- else:
- leftovers.append(file_path)
-
- # Break if CP wants to shut down
- if self.shuttingDown():
- break
-
- # Cleanup
- del files
-
- # Sort reverse, this prevents "Iron man 2" from getting grouped with "Iron man" as the "Iron Man 2"
- # files will be grouped first.
- leftovers = set(sorted(leftovers, reverse = True))
-
-
- # Group files minus extension
- for identifier, group in movie_files.iteritems():
- if identifier not in group['identifiers'] and len(identifier) > 0: group['identifiers'].append(identifier)
-
- log.debug('Grouping files: %s', identifier)
-
- for file_path in group['unsorted_files']:
- wo_ext = file_path[:-(len(getExt(file_path)) + 1)]
- found_files = set([i for i in leftovers if wo_ext in i])
- group['unsorted_files'].extend(found_files)
- leftovers = leftovers - found_files
-
- # Break if CP wants to shut down
- if self.shuttingDown():
- break
-
-
- # Create identifiers for all leftover files
- path_identifiers = {}
- for file_path in leftovers:
- identifier = self.createStringIdentifier(file_path, folder)
-
- if not path_identifiers.get(identifier):
- path_identifiers[identifier] = []
-
- path_identifiers[identifier].append(file_path)
-
-
- # Group the files based on the identifier
- delete_identifiers = []
- for identifier, found_files in path_identifiers.iteritems():
- log.debug('Grouping files on identifier: %s', identifier)
-
- group = movie_files.get(identifier)
- if group:
- group['unsorted_files'].extend(found_files)
- delete_identifiers.append(identifier)
-
- # Remove the found files from the leftover stack
- leftovers = leftovers - set(found_files)
-
- # Break if CP wants to shut down
- if self.shuttingDown():
- break
-
- # Cleaning up used
- for identifier in delete_identifiers:
- if path_identifiers.get(identifier):
- del path_identifiers[identifier]
- del delete_identifiers
-
- # Group based on folder
- delete_identifiers = []
- for identifier, found_files in path_identifiers.iteritems():
- log.debug('Grouping files on foldername: %s', identifier)
-
- for ff in found_files:
- new_identifier = self.createStringIdentifier(os.path.dirname(ff), folder)
-
- group = movie_files.get(new_identifier)
- if group:
- group['unsorted_files'].extend([ff])
- delete_identifiers.append(identifier)
-
- # Remove the found files from the leftover stack
- leftovers = leftovers - set([ff])
-
- # Break if CP wants to shut down
- if self.shuttingDown():
- break
-
- # Cleaning up used
- for identifier in delete_identifiers:
- if path_identifiers.get(identifier):
- del path_identifiers[identifier]
- del delete_identifiers
-
- # Make sure we remove older / still extracting files
- valid_files = {}
- while True and not self.shuttingDown():
- try:
- identifier, group = movie_files.popitem()
- except:
- break
-
- # Check if movie is fresh and maybe still unpacking, ignore files new then 1 minute
- file_too_new = False
- for cur_file in group['unsorted_files']:
- if not os.path.isfile(cur_file):
- file_too_new = time.time()
- break
- file_time = [os.path.getmtime(cur_file), os.path.getctime(cur_file)]
- for t in file_time:
- if t > time.time() - 60:
- file_too_new = tryInt(time.time() - t)
- break
-
- if file_too_new:
- break
-
- if check_file_date and file_too_new:
- try:
- time_string = time.ctime(file_time[0])
- except:
- try:
- time_string = time.ctime(file_time[1])
- except:
- time_string = 'unknown'
-
- log.info('Files seem to be still unpacking or just unpacked (created on %s), ignoring for now: %s', (time_string, identifier))
-
- # Delete the unsorted list
- del group['unsorted_files']
-
- continue
-
- # Only process movies newer than x
- if newer_than and newer_than > 0:
- has_new_files = False
- for cur_file in group['unsorted_files']:
- file_time = [os.path.getmtime(cur_file), os.path.getctime(cur_file)]
- if file_time[0] > newer_than or file_time[1] > newer_than:
- has_new_files = True
- break
-
- if not has_new_files:
- log.debug('None of the files have changed since %s for %s, skipping.', (time.ctime(newer_than), identifier))
-
- # Delete the unsorted list
- del group['unsorted_files']
-
- continue
-
- valid_files[identifier] = group
-
- del movie_files
-
- # Determine file types
- processed_movies = {}
- total_found = len(valid_files)
- while True and not self.shuttingDown():
- try:
- identifier, group = valid_files.popitem()
- except:
- break
-
- # Group extra (and easy) files first
- # images = self.getImages(group['unsorted_files'])
- group['files'] = {
- 'movie_extra': self.getMovieExtras(group['unsorted_files']),
- 'subtitle': self.getSubtitles(group['unsorted_files']),
- 'subtitle_extra': self.getSubtitlesExtras(group['unsorted_files']),
- 'nfo': self.getNfo(group['unsorted_files']),
- 'trailer': self.getTrailers(group['unsorted_files']),
- #'backdrop': images['backdrop'],
- 'leftover': set(group['unsorted_files']),
- }
-
- # Media files
- if group['is_dvd']:
- group['files']['movie'] = self.getDVDFiles(group['unsorted_files'])
- else:
- group['files']['movie'] = self.getMediaFiles(group['unsorted_files'])
-
- if len(group['files']['movie']) == 0:
- log.error('Couldn\'t find any movie files for %s', identifier)
- continue
-
- log.debug('Getting metadata for %s', identifier)
- group['meta_data'] = self.getMetaData(group, folder = folder)
-
- # Subtitle meta
- group['subtitle_language'] = self.getSubtitleLanguage(group) if not simple else {}
-
- # Get parent dir from movie files
- for movie_file in group['files']['movie']:
- group['parentdir'] = os.path.dirname(movie_file)
- group['dirname'] = None
-
- folder_names = group['parentdir'].replace(folder, '').split(os.path.sep)
- folder_names.reverse()
-
- # Try and get a proper dirname, so no "A", "Movie", "Download" etc
- for folder_name in folder_names:
- if folder_name.lower() not in self.ignore_names and len(folder_name) > 2:
- group['dirname'] = folder_name
- break
-
- break
-
- # Leftover "sorted" files
- for file_type in group['files']:
- if not file_type is 'leftover':
- group['files']['leftover'] -= set(group['files'][file_type])
-
- # Delete the unsorted list
- del group['unsorted_files']
-
- # Determine movie
- group['library'] = self.determineMovie(group)
- if not group['library']:
- log.error('Unable to determine movie: %s', group['identifiers'])
- else:
- movie = db.query(Movie).filter_by(library_id = group['library']['id']).first()
- group['movie_id'] = None if not movie else movie.id
-
- processed_movies[identifier] = group
-
- # Notify parent & progress on something found
- if on_found:
- on_found(group, total_found, total_found - len(processed_movies))
-
- if len(processed_movies) > 0:
- log.info('Found %s movies in the folder %s', (len(processed_movies), folder))
- else:
- log.debug('Found no movies in the folder %s', (folder))
-
- return processed_movies
-
- def getMetaData(self, group, folder = ''):
-
- data = {}
- files = list(group['files']['movie'])
-
- for cur_file in files:
- if os.path.getsize(cur_file) < self.minimal_filesize['media']: continue # Ignore smaller files
-
- meta = self.getMeta(cur_file)
-
- try:
- data['video'] = meta.get('video', self.getCodec(cur_file, self.codecs['video']))
- data['audio'] = meta.get('audio', self.getCodec(cur_file, self.codecs['audio']))
- data['resolution_width'] = meta.get('resolution_width', 720)
- data['resolution_height'] = meta.get('resolution_height', 480)
- data['aspect'] = meta.get('resolution_width', 720) / meta.get('resolution_height', 480)
- except:
- log.debug('Error parsing metadata: %s %s', (cur_file, traceback.format_exc()))
- pass
-
- if data.get('audio'): break
-
- data['quality'] = fireEvent('quality.guess', files = files, extra = data, single = True)
- if not data['quality']:
- data['quality'] = fireEvent('quality.single', 'dvdr' if group['is_dvd'] else 'dvdrip', single = True)
-
- data['quality_type'] = 'HD' if data.get('resolution_width', 0) >= 1280 or data['quality'].get('hd') else 'SD'
-
- filename = re.sub('(.cp\(tt[0-9{7}]+\))', '', files[0])
- data['group'] = self.getGroup(filename[len(folder):])
- data['source'] = self.getSourceMedia(filename)
-
- return data
-
- def getMeta(self, filename):
-
- try:
- p = enzyme.parse(filename)
-
- # Video codec
- vc = ('h264' if p.video[0].codec == 'AVC1' else p.video[0].codec).lower()
-
- # Audio codec
- ac = p.audio[0].codec
- try: ac = self.audio_codec_map.get(p.audio[0].codec)
- except: pass
-
- return {
- 'video': vc,
- 'audio': ac,
- 'resolution_width': tryInt(p.video[0].width),
- 'resolution_height': tryInt(p.video[0].height),
- }
- except ParseError:
- log.debug('Failed to parse meta for %s', filename)
- except NoParserError:
- log.debug('No parser found for %s', filename)
- except:
- log.debug('Failed parsing %s', filename)
-
- return {}
-
- def getSubtitleLanguage(self, group):
- detected_languages = {}
-
- # Subliminal scanner
- try:
- paths = group['files']['movie']
- scan_result = []
- for p in paths:
- if not group['is_dvd']:
- video = Video.from_path(toUnicode(p))
- video_result = [(video, video.scan())]
- scan_result.extend(video_result)
-
- for video, detected_subtitles in scan_result:
- for s in detected_subtitles:
- if s.language and s.path not in paths:
- detected_languages[s.path] = [s.language]
- except:
- log.debug('Failed parsing subtitle languages for %s: %s', (paths, traceback.format_exc()))
-
- # IDX
- for extra in group['files']['subtitle_extra']:
- try:
- if os.path.isfile(extra):
- output = open(extra, 'r')
- txt = output.read()
- output.close()
-
- idx_langs = re.findall('\nid: (\w+)', txt)
-
- sub_file = '%s.sub' % os.path.splitext(extra)[0]
- if len(idx_langs) > 0 and os.path.isfile(sub_file):
- detected_languages[sub_file] = idx_langs
- except:
- log.error('Failed parsing subtitle idx for %s: %s', (extra, traceback.format_exc()))
-
- return detected_languages
-
- def determineMovie(self, group):
- imdb_id = None
-
- files = group['files']
-
- # Check for CP(imdb_id) string in the file paths
- for cur_file in files['movie']:
- imdb_id = self.getCPImdb(cur_file)
- if imdb_id:
- log.debug('Found movie via CP tag: %s', cur_file)
- break
-
- # Check and see if nfo contains the imdb-id
- if not imdb_id:
- try:
- for nfo_file in files['nfo']:
- imdb_id = getImdb(nfo_file)
- if imdb_id:
- log.debug('Found movie via nfo file: %s', nfo_file)
- break
- except:
- pass
-
- # Check and see if filenames contains the imdb-id
- if not imdb_id:
- try:
- for filetype in files:
- for filetype_file in files[filetype]:
- imdb_id = getImdb(filetype_file, check_inside = False)
- if imdb_id:
- log.debug('Found movie via imdb in filename: %s', nfo_file)
- break
- except:
- pass
-
- # Check if path is already in db
- if not imdb_id:
- db = get_session()
- for cur_file in files['movie']:
- f = db.query(File).filter_by(path = toUnicode(cur_file)).first()
- try:
- imdb_id = f.library[0].identifier
- log.debug('Found movie via database: %s', cur_file)
- break
- except:
- pass
-
- # Search based on OpenSubtitleHash
- if not imdb_id and not group['is_dvd']:
- for cur_file in files['movie']:
- movie = fireEvent('movie.by_hash', file = cur_file, merge = True)
-
- if len(movie) > 0:
- imdb_id = movie[0]['imdb']
- if imdb_id:
- log.debug('Found movie via OpenSubtitleHash: %s', cur_file)
- break
-
- # Search based on identifiers
- if not imdb_id:
- for identifier in group['identifiers']:
-
- if len(identifier) > 2:
- try: filename = list(group['files'].get('movie'))[0]
- except: filename = None
-
- name_year = self.getReleaseNameYear(identifier, file_name = filename if not group['is_dvd'] else None)
- if name_year.get('name') and name_year.get('year'):
- movie = fireEvent('movie.search', q = '%(name)s %(year)s' % name_year, merge = True, limit = 1)
-
- if len(movie) > 0:
- imdb_id = movie[0]['imdb']
- log.debug('Found movie via search: %s', cur_file)
- if imdb_id: break
- else:
- log.debug('Identifier to short to use for search: %s', identifier)
-
- if imdb_id:
- return fireEvent('library.add', attrs = {
- 'identifier': imdb_id
- }, update_after = False, single = True)
-
- log.error('No imdb_id found for %s. Add a NFO file with IMDB id or add the year to the filename.', group['identifiers'])
- return {}
-
- def getCPImdb(self, string):
-
- try:
- m = re.search(self.cp_imdb, string.lower())
- id = m.group('id')
- if id: return id
- except AttributeError:
- pass
-
- return False
-
- def removeCPTag(self, name):
- try:
- return re.sub(self.cp_imdb, '', name)
- except:
- pass
- return name
-
- def getSamples(self, files):
- return set(filter(lambda s: self.isSampleFile(s), files))
-
- def getMediaFiles(self, files):
-
- def test(s):
- return self.filesizeBetween(s, 300, 100000) and getExt(s.lower()) in self.extensions['movie'] and not self.isSampleFile(s)
-
- return set(filter(test, files))
-
- def getMovieExtras(self, files):
- return set(filter(lambda s: getExt(s.lower()) in self.extensions['movie_extra'], files))
-
- def getDVDFiles(self, files):
- def test(s):
- return self.isDVDFile(s)
-
- return set(filter(test, files))
-
- def getSubtitles(self, files):
- return set(filter(lambda s: getExt(s.lower()) in self.extensions['subtitle'], files))
-
- def getSubtitlesExtras(self, files):
- return set(filter(lambda s: getExt(s.lower()) in self.extensions['subtitle_extra'], files))
-
- def getNfo(self, files):
- return set(filter(lambda s: getExt(s.lower()) in self.extensions['nfo'], files))
-
- def getTrailers(self, files):
-
- def test(s):
- return re.search('(^|[\W_])trailer\d*[\W_]', s.lower()) and self.filesizeBetween(s, 2, 250)
-
- return set(filter(test, files))
-
- def getImages(self, files):
-
- def test(s):
- return getExt(s.lower()) in ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'tbn']
- files = set(filter(test, files))
-
- images = {}
-
- # Fanart
- images['backdrop'] = set(filter(lambda s: re.search('(^|[\W_])fanart|backdrop\d*[\W_]', s.lower()) and self.filesizeBetween(s, 0, 5), files))
-
- # Rest
- images['rest'] = files - images['backdrop']
-
- return images
-
-
- def isDVDFile(self, file_name):
-
- if list(set(file_name.lower().split(os.path.sep)) & set(['video_ts', 'audio_ts'])):
- return True
-
- for needle in ['vts_', 'video_ts', 'audio_ts', 'bdmv', 'certificate']:
- if needle in file_name.lower():
- return True
-
- return False
-
- def keepFile(self, filename):
-
- # ignoredpaths
- for i in self.ignored_in_path:
- if i in filename.lower():
- log.debug('Ignored "%s" contains "%s".', (filename, i))
- return False
-
- # Sample file
- if self.isSampleFile(filename):
- log.debug('Is sample file "%s".', filename)
- return False
-
- # Minimal size
- if self.filesizeBetween(filename, self.minimal_filesize['media']):
- log.debug('File to small: %s', filename)
- return False
-
- # All is OK
- return True
-
- def isSampleFile(self, filename):
- is_sample = re.search('(^|[\W_])sample\d*[\W_]', filename.lower())
- if is_sample: log.debug('Is sample file: %s', filename)
- return is_sample
-
- def filesizeBetween(self, file, min = 0, max = 100000):
- try:
- return (min * 1048576) < os.path.getsize(file) < (max * 1048576)
- except:
- log.error('Couldn\'t get filesize of %s.', file)
-
- return False
-
- def createStringIdentifier(self, file_path, folder = '', exclude_filename = False):
-
- identifier = file_path.replace(folder, '') # root folder
- identifier = os.path.splitext(identifier)[0] # ext
-
- if exclude_filename:
- identifier = identifier[:len(identifier) - len(os.path.split(identifier)[-1])]
-
- # multipart
- identifier = self.removeMultipart(identifier)
-
- # remove cptag
- identifier = self.removeCPTag(identifier)
-
- # groups, release tags, scenename cleaner, regex isn't correct
- identifier = re.sub(self.clean, '::', simplifyString(identifier)).strip(':')
-
- # Year
- year = self.findYear(identifier)
- if year:
- identifier = '%s %s' % (identifier.split(year)[0].strip(), year)
- else:
- identifier = identifier.split('::')[0]
-
- # Remove duplicates
- out = []
- for word in identifier.split():
- if not word in out:
- out.append(word)
-
- identifier = ' '.join(out)
-
- return simplifyString(identifier)
-
-
- def removeMultipart(self, name):
- for regex in self.multipart_regex:
- try:
- found = re.sub(regex, '', name)
- if found != name:
- name = found
- except:
- pass
- return name
-
- def getPartNumber(self, name):
- for regex in self.multipart_regex:
- try:
- found = re.search(regex, name)
- if found:
- return found.group(1)
- return 1
- except:
- pass
- return 1
-
- def getCodec(self, filename, codecs):
- codecs = map(re.escape, codecs)
- try:
- codec = re.search('[^A-Z0-9](?P' + '|'.join(codecs) + ')[^A-Z0-9]', filename, re.I)
- return (codec and codec.group('codec')) or ''
- except:
- return ''
-
- def getGroup(self, file):
- try:
- match = re.findall('\-([A-Z0-9]+)[\.\/]', file, re.I)
- return match[-1] or ''
- except:
- return ''
-
- def getSourceMedia(self, file):
- for media in self.source_media:
- for alias in self.source_media[media]:
- if alias in file.lower():
- return media
-
- return None
-
- def findYear(self, text):
- matches = re.search('(?P19[0-9]{2}|20[0-9]{2})', text)
- if matches:
- return matches.group('year')
-
- return ''
-
- def getReleaseNameYear(self, release_name, file_name = None):
-
- # Use guessit first
- guess = {}
- if file_name:
- try:
- guess = guess_movie_info(toUnicode(file_name))
- if guess.get('title') and guess.get('year'):
- guess = {
- 'name': guess.get('title'),
- 'year': guess.get('year'),
- }
- except:
- log.debug('Could not detect via guessit "%s": %s', (file_name, traceback.format_exc()))
-
- # Backup to simple
- cleaned = ' '.join(re.split('\W+', simplifyString(release_name)))
- cleaned = re.sub(self.clean, ' ', cleaned)
- year = self.findYear(cleaned)
- cp_guess = {}
-
- if year: # Split name on year
- try:
- movie_name = cleaned.split(year).pop(0).strip()
- cp_guess = {
- 'name': movie_name,
- 'year': int(year),
- }
- except:
- pass
- else: # Split name on multiple spaces
- try:
- movie_name = cleaned.split(' ').pop(0).strip()
- cp_guess = {
- 'name': movie_name,
- 'year': int(year),
- }
- except:
- pass
-
- if cp_guess.get('year') == guess.get('year') and len(cp_guess.get('name', '')) > len(guess.get('name', '')):
- return cp_guess
- elif guess == {}:
- return cp_guess
-
- return guess
diff --git a/couchpotato/core/plugins/score/__init__.py b/couchpotato/core/plugins/score/__init__.py
index 2c367f896e..65cadd9919 100644
--- a/couchpotato/core/plugins/score/__init__.py
+++ b/couchpotato/core/plugins/score/__init__.py
@@ -1,6 +1,5 @@
from .main import Score
-def start():
- return Score()
-config = []
+def autoload():
+ return Score()
diff --git a/couchpotato/core/plugins/score/main.py b/couchpotato/core/plugins/score/main.py
index f853be95ad..e6fef25324 100644
--- a/couchpotato/core/plugins/score/main.py
+++ b/couchpotato/core/plugins/score/main.py
@@ -1,11 +1,12 @@
from couchpotato.core.event import addEvent
from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import getTitle
+from couchpotato.core.helpers.variable import getTitle, splitString, removeDuplicate
from couchpotato.core.logger import CPLog
from couchpotato.core.plugins.base import Plugin
from couchpotato.core.plugins.score.scores import nameScore, nameRatioScore, \
sizeScore, providerScore, duplicateScore, partialIgnoredScore, namePositionScore, \
- halfMultipartScore
+ halfMultipartScore, sceneScore
+from couchpotato.environment import Env
log = CPLog(__name__)
@@ -16,21 +17,26 @@ def __init__(self):
addEvent('score.calculate', self.calculate)
def calculate(self, nzb, movie):
- ''' Calculate the score of a NZB, used for sorting later '''
+ """ Calculate the score of a NZB, used for sorting later """
- score = nameScore(toUnicode(nzb['name']), movie['library']['year'])
+ # Merge global and category
+ preferred_words = splitString(Env.setting('preferred_words', section = 'searcher').lower())
+ try: preferred_words = removeDuplicate(preferred_words + splitString(movie['category']['preferred'].lower()))
+ except: pass
- for movie_title in movie['library']['titles']:
- score += nameRatioScore(toUnicode(nzb['name']), toUnicode(movie_title['title']))
- score += namePositionScore(toUnicode(nzb['name']), toUnicode(movie_title['title']))
+ score = nameScore(toUnicode(nzb['name']), movie['info']['year'], preferred_words)
+
+ for movie_title in movie['info']['titles']:
+ score += nameRatioScore(toUnicode(nzb['name']), toUnicode(movie_title))
+ score += namePositionScore(toUnicode(nzb['name']), toUnicode(movie_title))
score += sizeScore(nzb['size'])
# Torrents only
if nzb.get('seeders'):
try:
- score += nzb.get('seeders') / 5
- score += nzb.get('leechers') / 10
+ score += nzb.get('seeders') * 100 / 15
+ score += nzb.get('leechers') * 100 / 30
except:
pass
@@ -38,10 +44,15 @@ def calculate(self, nzb, movie):
score += providerScore(nzb['provider'])
# Duplicates in name
- score += duplicateScore(nzb['name'], getTitle(movie['library']))
+ score += duplicateScore(nzb['name'], getTitle(movie))
+
+ # Merge global and category
+ ignored_words = splitString(Env.setting('ignored_words', section = 'searcher').lower())
+ try: ignored_words = removeDuplicate(ignored_words + splitString(movie['category']['ignored'].lower()))
+ except: pass
# Partial ignored words
- score += partialIgnoredScore(nzb['name'], getTitle(movie['library']))
+ score += partialIgnoredScore(nzb['name'], getTitle(movie), ignored_words)
# Ignore single downloads from multipart
score += halfMultipartScore(nzb['name'])
@@ -51,4 +62,7 @@ def calculate(self, nzb, movie):
if extra_score:
score += extra_score(nzb)
+ # Scene / Nuke scoring
+ score += sceneScore(nzb['name'])
+
return score
diff --git a/couchpotato/core/plugins/score/scores.py b/couchpotato/core/plugins/score/scores.py
index 3d5a9e69b6..f53f69a31c 100644
--- a/couchpotato/core/plugins/score/scores.py
+++ b/couchpotato/core/plugins/score/scores.py
@@ -1,8 +1,15 @@
+import re
+import traceback
+
from couchpotato.core.event import fireEvent
from couchpotato.core.helpers.encoding import simplifyString
from couchpotato.core.helpers.variable import tryInt
+from couchpotato.core.logger import CPLog
from couchpotato.environment import Env
-import re
+
+
+log = CPLog(__name__)
+
name_scores = [
# Tags
@@ -23,39 +30,46 @@
]
-def nameScore(name, year):
- ''' Calculate score for words in the NZB name '''
+def nameScore(name, year, preferred_words):
+ """ Calculate score for words in the NZB name """
- score = 0
- name = name.lower()
-
- # give points for the cool stuff
- for value in name_scores:
- v = value.split(':')
- add = int(v.pop())
- if v.pop() in name:
- score = score + add
-
- # points if the year is correct
- if str(year) in name:
- score = score + 5
-
- # Contains preferred word
- nzb_words = re.split('\W+', simplifyString(name))
- preferred_words = [x.strip() for x in Env.setting('preferred_words', section = 'searcher').split(',')]
- for word in preferred_words:
- if word.strip() and word.strip().lower() in nzb_words:
- score = score + 100
+ try:
+ score = 0
+ name = name.lower()
- return score
+ # give points for the cool stuff
+ for value in name_scores:
+ v = value.split(':')
+ add = int(v.pop())
+ if v.pop() in name:
+ score += add
+
+ # points if the year is correct
+ if str(year) in name:
+ score += 5
+
+ # Contains preferred word
+ nzb_words = re.split('\W+', simplifyString(name))
+ score += 100 * len(list(set(nzb_words) & set(preferred_words)))
+
+ return score
+ except:
+ log.error('Failed doing nameScore: %s', traceback.format_exc())
+
+ return 0
def nameRatioScore(nzb_name, movie_name):
- nzb_words = re.split('\W+', fireEvent('scanner.create_file_identifier', nzb_name, single = True))
- movie_words = re.split('\W+', simplifyString(movie_name))
+ try:
+ nzb_words = re.split('\W+', fireEvent('scanner.create_file_identifier', nzb_name, single = True))
+ movie_words = re.split('\W+', simplifyString(movie_name))
+
+ left_over = set(nzb_words) - set(movie_words)
+ return 10 - len(left_over)
+ except:
+ log.error('Failed doing nameRatioScore: %s', traceback.format_exc())
- left_over = set(nzb_words) - set(movie_words)
- return 10 - len(left_over)
+ return 0
def namePositionScore(nzb_name, movie_name):
@@ -72,9 +86,12 @@ def namePositionScore(nzb_name, movie_name):
name_year = fireEvent('scanner.name_year', nzb_name, single = True)
# Give points for movies beginning with the correct name
- name_split = simplifyString(nzb_name).split(simplifyString(movie_name))
- if name_split[0].strip() == '':
- score += 10
+ split_by = simplifyString(movie_name)
+ name_split = []
+ if len(split_by) > 0:
+ name_split = simplifyString(nzb_name).split(split_by)
+ if name_split[0].strip() == '':
+ score += 10
# If year is second in line, give more points
if len(name_split) > 1 and name_year:
@@ -116,49 +133,98 @@ def sizeScore(size):
def providerScore(provider):
- if provider in ['OMGWTFNZBs', 'PassThePopcorn', 'SceneAccess', 'TorrentLeech']:
- return 20
- if provider in ['Newznab']:
- return 10
+ try:
+ score = tryInt(Env.setting('extra_score', section = provider.lower(), default = 0))
+ except:
+ score = 0
- return 0
+ return score
def duplicateScore(nzb_name, movie_name):
- nzb_words = re.split('\W+', simplifyString(nzb_name))
- movie_words = re.split('\W+', simplifyString(movie_name))
+ try:
+ nzb_words = re.split('\W+', simplifyString(nzb_name))
+ movie_words = re.split('\W+', simplifyString(movie_name))
- # minus for duplicates
- duplicates = [x for i, x in enumerate(nzb_words) if nzb_words[i:].count(x) > 1]
+ # minus for duplicates
+ duplicates = [x for i, x in enumerate(nzb_words) if nzb_words[i:].count(x) > 1]
- return len(list(set(duplicates) - set(movie_words))) * -4
+ return len(list(set(duplicates) - set(movie_words))) * -4
+ except:
+ log.error('Failed doing duplicateScore: %s', traceback.format_exc())
+ return 0
-def partialIgnoredScore(nzb_name, movie_name):
- nzb_name = nzb_name.lower()
- movie_name = movie_name.lower()
+def partialIgnoredScore(nzb_name, movie_name, ignored_words):
- ignored_words = [x.strip().lower() for x in Env.setting('ignored_words', section = 'searcher').split(',')]
+ try:
+ nzb_name = nzb_name.lower()
+ movie_name = movie_name.lower()
- score = 0
- for ignored_word in ignored_words:
- if ignored_word in nzb_name and ignored_word not in movie_name:
- score -= 5
+ score = 0
+ for ignored_word in ignored_words:
+ if ignored_word in nzb_name and ignored_word not in movie_name:
+ score -= 5
+
+ return score
+ except:
+ log.error('Failed doing partialIgnoredScore: %s', traceback.format_exc())
+
+ return 0
- return score
def halfMultipartScore(nzb_name):
- wrong_found = 0
- for nr in [1, 2, 3, 4, 5, 'i', 'ii', 'iii', 'iv', 'v', 'a', 'b', 'c', 'd', 'e']:
- for wrong in ['cd', 'part', 'dis', 'disc', 'dvd']:
- if '%s%s' % (wrong, nr) in nzb_name.lower():
- wrong_found += 1
+ try:
+ wrong_found = 0
+ for nr in [1, 2, 3, 4, 5, 'i', 'ii', 'iii', 'iv', 'v', 'a', 'b', 'c', 'd', 'e']:
+ for wrong in ['cd', 'part', 'dis', 'disc', 'dvd']:
+ if '%s%s' % (wrong, nr) in nzb_name.lower():
+ wrong_found += 1
+
+ if wrong_found == 1:
+ return -30
+
+ return 0
+ except:
+ log.error('Failed doing halfMultipartScore: %s', traceback.format_exc())
+
+ return 0
+
+
+def sceneScore(nzb_name):
+
+ check_names = [nzb_name]
+
+ # Match names between "
+ try: check_names.append(re.search(r'([\'"])[^\1]*\1', nzb_name).group(0))
+ except: pass
+
+ # Match longest name between []
+ try: check_names.append(max(re.findall(r'[^[]*\[([^]]*)\]', nzb_name), key = len).strip())
+ except: pass
+
+ for name in check_names:
+
+ # Strip twice, remove possible file extensions
+ name = name.lower().strip(' "\'\.-_\[\]')
+ name = re.sub('\.([a-z0-9]{0,4})$', '', name)
+ name = name.strip(' "\'\.-_\[\]')
+
+ # Make sure year and groupname is in there
+ year = re.findall('(?P19[0-9]{2}|20[0-9]{2})', name)
+ group = re.findall('\-([a-z0-9]+)$', name)
- if wrong_found == 1:
- return -30
+ if len(year) > 0 and len(group) > 0:
+ try:
+ validate = fireEvent('release.validate', name, single = True)
+ if validate and tryInt(validate.get('score')) != 0:
+ log.debug('Release "%s" scored %s, reason: %s', (nzb_name, validate['score'], validate['reasons']))
+ return tryInt(validate.get('score'))
+ except:
+ log.error('Failed scoring scene: %s', traceback.format_exc())
return 0
diff --git a/couchpotato/core/plugins/searcher/__init__.py b/couchpotato/core/plugins/searcher/__init__.py
deleted file mode 100644
index a6dd6913ab..0000000000
--- a/couchpotato/core/plugins/searcher/__init__.py
+++ /dev/null
@@ -1,96 +0,0 @@
-from .main import Searcher
-import random
-
-def start():
- return Searcher()
-
-config = [{
- 'name': 'searcher',
- 'order': 20,
- 'groups': [
- {
- 'tab': 'searcher',
- 'name': 'searcher',
- 'label': 'Search',
- 'description': 'Options for the searchers',
- 'options': [
- {
- 'name': 'preferred_words',
- 'label': 'Preferred words',
- 'default': '',
- 'description': 'These words will give the releases a higher score.'
- },
- {
- 'name': 'required_words',
- 'label': 'Required words',
- 'default': '',
- 'placeholder': 'Example: DTS, AC3 & English',
- 'description': 'Ignore releases that don\'t contain at least one set of words. Sets are separated by "," and each word within a set must be separated with "&"'
- },
- {
- 'name': 'ignored_words',
- 'label': 'Ignored words',
- 'default': 'german, dutch, french, truefrench, danish, swedish, spanish, italian, korean, dubbed, swesub, korsub, dksubs',
- },
- {
- 'name': 'preferred_method',
- 'label': 'First search',
- 'description': 'Which of the methods do you prefer',
- 'default': 'both',
- 'type': 'dropdown',
- 'values': [('usenet & torrents', 'both'), ('usenet', 'nzb'), ('torrents', 'torrent')],
- },
- ],
- }, {
- 'tab': 'searcher',
- 'name': 'cronjob',
- 'label': 'Cronjob',
- 'advanced': True,
- 'description': 'Cron settings for the searcher see: APScheduler for details.',
- 'options': [
- {
- 'name': 'cron_day',
- 'label': 'Day',
- 'advanced': True,
- 'default': '*',
- 'type': 'string',
- 'description': '*: Every day, */2: Every 2 days, 1: Every first of the month.',
- },
- {
- 'name': 'cron_hour',
- 'label': 'Hour',
- 'advanced': True,
- 'default': random.randint(0, 23),
- 'type': 'string',
- 'description': '*: Every hour, */8: Every 8 hours, 3: At 3, midnight.',
- },
- {
- 'name': 'cron_minute',
- 'label': 'Minute',
- 'advanced': True,
- 'default': random.randint(0, 59),
- 'type': 'string',
- 'description': "Just keep it random, so the providers don't get DDOSed by every CP user on a 'full' hour."
- },
- ],
- },
- ],
-}, {
- 'name': 'nzb',
- 'groups': [
- {
- 'tab': 'searcher',
- 'name': 'nzb',
- 'label': 'NZB',
- 'wizard': True,
- 'options': [
- {
- 'name': 'retention',
- 'default': 1000,
- 'type': 'int',
- 'unit': 'days'
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/plugins/searcher/main.py b/couchpotato/core/plugins/searcher/main.py
deleted file mode 100644
index c5ed13800d..0000000000
--- a/couchpotato/core/plugins/searcher/main.py
+++ /dev/null
@@ -1,605 +0,0 @@
-from couchpotato import get_session
-from couchpotato.api import addApiView
-from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
-from couchpotato.core.helpers.encoding import simplifyString, toUnicode
-from couchpotato.core.helpers.request import jsonified, getParam
-from couchpotato.core.helpers.variable import md5, getTitle, splitString, \
- possibleTitles
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.core.settings.model import Movie, Release, ReleaseInfo
-from couchpotato.environment import Env
-from inspect import ismethod, isfunction
-from sqlalchemy.exc import InterfaceError
-import datetime
-import random
-import re
-import time
-import traceback
-
-log = CPLog(__name__)
-
-
-class Searcher(Plugin):
-
- in_progress = False
-
- def __init__(self):
- addEvent('searcher.all', self.allMovies)
- addEvent('searcher.single', self.single)
- addEvent('searcher.correct_movie', self.correctMovie)
- addEvent('searcher.download', self.download)
- addEvent('searcher.try_next_release', self.tryNextRelease)
- addEvent('searcher.could_be_released', self.couldBeReleased)
-
- addApiView('searcher.try_next', self.tryNextReleaseView, docs = {
- 'desc': 'Marks the snatched results as ignored and try the next best release',
- 'params': {
- 'id': {'desc': 'The id of the movie'},
- },
- })
-
- addApiView('searcher.full_search', self.allMoviesView, docs = {
- 'desc': 'Starts a full search for all wanted movies',
- })
-
- addApiView('searcher.progress', self.getProgress, docs = {
- 'desc': 'Get the progress of current full search',
- 'return': {'type': 'object', 'example': """{
- 'progress': False || object, total & to_go,
-}"""},
- })
-
- # Schedule cronjob
- fireEvent('schedule.cron', 'searcher.all', self.allMovies, day = self.conf('cron_day'), hour = self.conf('cron_hour'), minute = self.conf('cron_minute'))
-
- def allMoviesView(self):
-
- in_progress = self.in_progress
- if not in_progress:
- fireEventAsync('searcher.all')
- fireEvent('notify.frontend', type = 'searcher.started', data = True, message = 'Full search started')
- else:
- fireEvent('notify.frontend', type = 'searcher.already_started', data = True, message = 'Full search already in progress')
-
- return jsonified({
- 'success': not in_progress
- })
-
- def getProgress(self):
-
- return jsonified({
- 'progress': self.in_progress
- })
-
- def allMovies(self):
-
- if self.in_progress:
- log.info('Search already in progress')
- return
-
- self.in_progress = True
-
- db = get_session()
-
- movies = db.query(Movie).filter(
- Movie.status.has(identifier = 'active')
- ).all()
- random.shuffle(movies)
-
- self.in_progress = {
- 'total': len(movies),
- 'to_go': len(movies),
- }
-
- try:
- search_types = self.getSearchTypes()
-
- for movie in movies:
- movie_dict = movie.to_dict({
- 'profile': {'types': {'quality': {}}},
- 'releases': {'status': {}, 'quality': {}},
- 'library': {'titles': {}, 'files':{}},
- 'files': {}
- })
-
- try:
- self.single(movie_dict, search_types)
- except IndexError:
- log.error('Forcing library update for %s, if you see this often, please report: %s', (movie_dict['library']['identifier'], traceback.format_exc()))
- fireEvent('library.update', movie_dict['library']['identifier'], force = True)
- except:
- log.error('Search failed for %s: %s', (movie_dict['library']['identifier'], traceback.format_exc()))
-
- self.in_progress['to_go'] -= 1
-
- # Break if CP wants to shut down
- if self.shuttingDown():
- break
-
- except SearchSetupError:
- pass
-
- self.in_progress = False
-
- def single(self, movie, search_types = None):
-
- # Find out search type
- try:
- if not search_types:
- search_types = self.getSearchTypes()
- except SearchSetupError:
- return
-
- done_status = fireEvent('status.get', 'done', single = True)
-
- if not movie['profile'] or movie['status_id'] == done_status.get('id'):
- log.debug('Movie doesn\'t have a profile or already done, assuming in manage tab.')
- return
-
- db = get_session()
-
- pre_releases = fireEvent('quality.pre_releases', single = True)
- release_dates = fireEvent('library.update_release_date', identifier = movie['library']['identifier'], merge = True)
- available_status = fireEvent('status.get', 'available', single = True)
- ignored_status = fireEvent('status.get', 'ignored', single = True)
-
- found_releases = []
-
- default_title = getTitle(movie['library'])
- if not default_title:
- log.error('No proper info found for movie, removing it from library to cause it from having more issues.')
- fireEvent('movie.delete', movie['id'], single = True)
- return
-
- fireEvent('notify.frontend', type = 'searcher.started.%s' % movie['id'], data = True, message = 'Searching for "%s"' % default_title)
-
-
- ret = False
- for quality_type in movie['profile']['types']:
- if not self.couldBeReleased(quality_type['quality']['identifier'] in pre_releases, release_dates):
- log.info('Too early to search for %s, %s', (quality_type['quality']['identifier'], default_title))
- continue
-
- has_better_quality = 0
-
- # See if better quality is available
- for release in movie['releases']:
- if release['quality']['order'] <= quality_type['quality']['order'] and release['status_id'] not in [available_status.get('id'), ignored_status.get('id')]:
- has_better_quality += 1
-
- # Don't search for quality lower then already available.
- if has_better_quality is 0:
-
- log.info('Search for %s in %s', (default_title, quality_type['quality']['label']))
- quality = fireEvent('quality.single', identifier = quality_type['quality']['identifier'], single = True)
-
- results = []
- for search_type in search_types:
- type_results = fireEvent('%s.search' % search_type, movie, quality, merge = True)
- if type_results:
- results += type_results
-
- sorted_results = sorted(results, key = lambda k: k['score'], reverse = True)
- if len(sorted_results) == 0:
- log.debug('Nothing found for %s in %s', (default_title, quality_type['quality']['label']))
-
- download_preference = self.conf('preferred_method')
- if download_preference != 'both':
- sorted_results = sorted(sorted_results, key = lambda k: k['type'], reverse = (download_preference == 'torrent'))
-
- # Check if movie isn't deleted while searching
- if not db.query(Movie).filter_by(id = movie.get('id')).first():
- break
-
- # Add them to this movie releases list
- for nzb in sorted_results:
-
- nzb_identifier = md5(nzb['url'])
- found_releases.append(nzb_identifier)
-
- rls = db.query(Release).filter_by(identifier = nzb_identifier).first()
- if not rls:
- rls = Release(
- identifier = nzb_identifier,
- movie_id = movie.get('id'),
- quality_id = quality_type.get('quality_id'),
- status_id = available_status.get('id')
- )
- db.add(rls)
- else:
- [db.delete(old_info) for old_info in rls.info]
-
- db.commit()
-
- for info in nzb:
- try:
- if not isinstance(nzb[info], (str, unicode, int, long, float)):
- continue
-
- rls_info = ReleaseInfo(
- identifier = info,
- value = toUnicode(nzb[info])
- )
- rls.info.append(rls_info)
- except InterfaceError:
- log.debug('Couldn\'t add %s to ReleaseInfo: %s', (info, traceback.format_exc()))
-
- db.commit()
-
- nzb['status_id'] = rls.status_id
-
-
- for nzb in sorted_results:
- if not quality_type.get('finish', False) and quality_type.get('wait_for', 0) > 0 and nzb.get('age') <= quality_type.get('wait_for', 0):
- log.info('Ignored, waiting %s days: %s', (quality_type.get('wait_for'), nzb['name']))
- continue
-
- if nzb['status_id'] == ignored_status.get('id'):
- log.info('Ignored: %s', nzb['name'])
- continue
-
- if nzb['score'] <= 0:
- log.info('Ignored, score to low: %s', nzb['name'])
- continue
-
- downloaded = self.download(data = nzb, movie = movie)
- if downloaded is True:
- ret = True
- break
- elif downloaded != 'try_next':
- break
-
- # Remove releases that aren't found anymore
- for release in movie.get('releases', []):
- if release.get('status_id') == available_status.get('id') and release.get('identifier') not in found_releases:
- fireEvent('release.delete', release.get('id'), single = True)
-
- else:
- log.info('Better quality (%s) already available or snatched for %s', (quality_type['quality']['label'], default_title))
- fireEvent('movie.restatus', movie['id'])
- break
-
- # Break if CP wants to shut down
- if self.shuttingDown() or ret:
- break
-
- fireEvent('notify.frontend', type = 'searcher.ended.%s' % movie['id'], data = True)
-
- return ret
-
- def download(self, data, movie, manual = False):
-
- # Test to see if any downloaders are enabled for this type
- downloader_enabled = fireEvent('download.enabled', manual, data, single = True)
-
- if downloader_enabled:
-
- snatched_status = fireEvent('status.get', 'snatched', single = True)
-
- # Download movie to temp
- filedata = None
- if data.get('download') and (ismethod(data.get('download')) or isfunction(data.get('download'))):
- filedata = data.get('download')(url = data.get('url'), nzb_id = data.get('id'))
- if filedata == 'try_next':
- return filedata
-
- successful = fireEvent('download', data = data, movie = movie, manual = manual, filedata = filedata, single = True)
-
- if successful:
-
- try:
- # Mark release as snatched
- db = get_session()
- rls = db.query(Release).filter_by(identifier = md5(data['url'])).first()
- if rls:
- rls.status_id = snatched_status.get('id')
- db.commit()
-
- log_movie = '%s (%s) in %s' % (getTitle(movie['library']), movie['library']['year'], rls.quality.label)
- snatch_message = 'Snatched "%s": %s' % (data.get('name'), log_movie)
- log.info(snatch_message)
- fireEvent('movie.snatched', message = snatch_message, data = rls.to_dict())
-
- # If renamer isn't used, mark movie done
- if not Env.setting('enabled', 'renamer'):
- active_status = fireEvent('status.get', 'active', single = True)
- done_status = fireEvent('status.get', 'done', single = True)
- try:
- if movie['status_id'] == active_status.get('id'):
- for profile_type in movie['profile']['types']:
- if rls and profile_type['quality_id'] == rls.quality.id and profile_type['finish']:
- log.info('Renamer disabled, marking movie as finished: %s', log_movie)
-
- # Mark release done
- rls.status_id = done_status.get('id')
- db.commit()
-
- # Mark movie done
- mvie = db.query(Movie).filter_by(id = movie['id']).first()
- mvie.status_id = done_status.get('id')
- db.commit()
- except:
- log.error('Failed marking movie finished, renamer disabled: %s', traceback.format_exc())
-
- except:
- log.error('Failed marking movie finished: %s', traceback.format_exc())
-
- return True
-
- log.info('Tried to download, but none of the "%s" downloaders are enabled', (data.get('type', '')))
-
- return False
-
- def getSearchTypes(self):
-
- download_types = fireEvent('download.enabled_types', merge = True)
- provider_types = fireEvent('provider.enabled_types', merge = True)
-
- if download_types and len(list(set(provider_types) & set(download_types))) == 0:
- log.error('There aren\'t any providers enabled for your downloader (%s). Check your settings.', ','.join(download_types))
- raise NoProviders
-
- for useless_provider in list(set(provider_types) - set(download_types)):
- log.debug('Provider for "%s" enabled, but no downloader.', useless_provider)
-
- search_types = download_types
-
- if len(search_types) == 0:
- log.error('There aren\'t any downloaders enabled. Please pick one in settings.')
- raise NoDownloaders
-
- return search_types
-
- def correctMovie(self, nzb = {}, movie = {}, quality = {}, **kwargs):
-
- imdb_results = kwargs.get('imdb_results', False)
- retention = Env.setting('retention', section = 'nzb')
-
- if nzb.get('seeders') is None and 0 < retention < nzb.get('age', 0):
- log.info2('Wrong: Outside retention, age is %s, needs %s or lower: %s', (nzb['age'], retention, nzb['name']))
- return False
-
- movie_name = getTitle(movie['library'])
- movie_words = re.split('\W+', simplifyString(movie_name))
- nzb_name = simplifyString(nzb['name'])
- nzb_words = re.split('\W+', nzb_name)
- required_words = splitString(self.conf('required_words').lower())
-
- req_match = 0
- for req_set in required_words:
- req = splitString(req_set, '&')
- req_match += len(list(set(nzb_words) & set(req))) == len(req)
-
- if self.conf('required_words') and req_match == 0:
- log.info2("Wrong: Required word missing: %s" % nzb['name'])
- return False
-
- ignored_words = splitString(self.conf('ignored_words').lower())
- blacklisted = list(set(nzb_words) & set(ignored_words) - set(movie_words))
- if self.conf('ignored_words') and blacklisted:
- log.info2("Wrong: '%s' blacklisted words: %s" % (nzb['name'], ", ".join(blacklisted)))
- return False
-
- pron_tags = ['xxx', 'sex', 'anal', 'tits', 'fuck', 'porn', 'orgy', 'milf', 'boobs', 'erotica', 'erotic']
- pron_words = list(set(nzb_words) & set(pron_tags) - set(movie_words))
- if pron_words:
- log.info('Wrong: %s, probably pr0n', (nzb['name']))
- return False
-
- #qualities = fireEvent('quality.all', single = True)
- preferred_quality = fireEvent('quality.single', identifier = quality['identifier'], single = True)
-
- # Contains lower quality string
- if self.containsOtherQuality(nzb, movie_year = movie['library']['year'], preferred_quality = preferred_quality):
- log.info2('Wrong: %s, looking for %s', (nzb['name'], quality['label']))
- return False
-
-
- # File to small
- if nzb['size'] and preferred_quality['size_min'] > nzb['size']:
- log.info2('Wrong: "%s" is too small to be %s. %sMB instead of the minimal of %sMB.', (nzb['name'], preferred_quality['label'], nzb['size'], preferred_quality['size_min']))
- return False
-
- # File to large
- if nzb['size'] and preferred_quality.get('size_max') < nzb['size']:
- log.info2('Wrong: "%s" is too large to be %s. %sMB instead of the maximum of %sMB.', (nzb['name'], preferred_quality['label'], nzb['size'], preferred_quality['size_max']))
- return False
-
-
- # Provider specific functions
- get_more = nzb.get('get_more_info')
- if get_more:
- get_more(nzb)
-
- extra_check = nzb.get('extra_check')
- if extra_check and not extra_check(nzb):
- return False
-
-
- if imdb_results:
- return True
-
- # Check if nzb contains imdb link
- if self.checkIMDB([nzb.get('description', '')], movie['library']['identifier']):
- return True
-
- for raw_title in movie['library']['titles']:
- for movie_title in possibleTitles(raw_title['title']):
- movie_words = re.split('\W+', simplifyString(movie_title))
-
- if self.correctName(nzb['name'], movie_title):
- # if no IMDB link, at least check year range 1
- if len(movie_words) > 2 and self.correctYear([nzb['name']], movie['library']['year'], 1):
- return True
-
- # if no IMDB link, at least check year
- if len(movie_words) <= 2 and self.correctYear([nzb['name']], movie['library']['year'], 0):
- return True
-
- log.info("Wrong: %s, undetermined naming. Looking for '%s (%s)'" % (nzb['name'], movie_name, movie['library']['year']))
- return False
-
- def containsOtherQuality(self, nzb, movie_year = None, preferred_quality = {}):
-
- name = nzb['name']
- size = nzb.get('size', 0)
- nzb_words = re.split('\W+', simplifyString(name))
-
- qualities = fireEvent('quality.all', single = True)
-
- found = {}
- for quality in qualities:
- # Main in words
- if quality['identifier'] in nzb_words:
- found[quality['identifier']] = True
-
- # Alt in words
- if list(set(nzb_words) & set(quality['alternative'])):
- found[quality['identifier']] = True
-
- # Try guessing via quality tags
- guess = fireEvent('quality.guess', [nzb.get('name')], single = True)
- if guess:
- found[guess['identifier']] = True
-
- # Hack for older movies that don't contain quality tag
- year_name = fireEvent('scanner.name_year', name, single = True)
- if len(found) == 0 and movie_year < datetime.datetime.now().year - 3 and not year_name.get('year', None):
- if size > 3000: # Assume dvdr
- log.info('Quality was missing in name, assuming it\'s a DVD-R based on the size: %s', (size))
- found['dvdr'] = True
- else: # Assume dvdrip
- log.info('Quality was missing in name, assuming it\'s a DVD-Rip based on the size: %s', (size))
- found['dvdrip'] = True
-
- # Allow other qualities
- for allowed in preferred_quality.get('allow'):
- if found.get(allowed):
- del found[allowed]
-
- return not (found.get(preferred_quality['identifier']) and len(found) == 1)
-
- def checkIMDB(self, haystack, imdbId):
-
- for string in haystack:
- if 'imdb.com/title/' + imdbId in string:
- return True
-
- return False
-
- def correctYear(self, haystack, year, year_range):
-
- for string in haystack:
-
- year_name = fireEvent('scanner.name_year', string, single = True)
-
- if year_name and ((year - year_range) <= year_name.get('year') <= (year + year_range)):
- log.debug('Movie year matches range: %s looking for %s', (year_name.get('year'), year))
- return True
-
- log.debug('Movie year doesn\'t matche range: %s looking for %s', (year_name.get('year'), year))
- return False
-
- def correctName(self, check_name, movie_name):
-
- check_names = [check_name]
-
- # Match names between "
- try: check_names.append(re.search(r'([\'"])[^\1]*\1', check_name).group(0))
- except: pass
-
- # Match longest name between []
- try: check_names.append(max(check_name.split('['), key = len))
- except: pass
-
- for check_name in list(set(check_names)):
- check_movie = fireEvent('scanner.name_year', check_name, single = True)
-
- try:
- check_words = filter(None, re.split('\W+', check_movie.get('name', '')))
- movie_words = filter(None, re.split('\W+', simplifyString(movie_name)))
-
- if len(check_words) > 0 and len(movie_words) > 0 and len(list(set(check_words) - set(movie_words))) == 0:
- return True
- except:
- pass
-
- return False
-
- def couldBeReleased(self, is_pre_release, dates):
-
- now = int(time.time())
-
- if not dates or (dates.get('theater', 0) == 0 and dates.get('dvd', 0) == 0):
- return True
- else:
-
- # For movies before 1972
- if dates.get('theater', 0) < 0 or dates.get('dvd', 0) < 0:
- return True
-
- if is_pre_release:
- # Prerelease 1 week before theaters
- if dates.get('theater') - 604800 < now:
- return True
- else:
- # 12 weeks after theater release
- if dates.get('theater') > 0 and dates.get('theater') + 7257600 < now:
- return True
-
- if dates.get('dvd') > 0:
-
- # 4 weeks before dvd release
- if dates.get('dvd') - 2419200 < now:
- return True
-
- # Dvd should be released
- if dates.get('dvd') < now:
- return True
-
-
- return False
-
- def tryNextReleaseView(self):
-
- trynext = self.tryNextRelease(getParam('id'))
-
- return jsonified({
- 'success': trynext
- })
-
- def tryNextRelease(self, movie_id, manual = False):
-
- snatched_status = fireEvent('status.get', 'snatched', single = True)
- ignored_status = fireEvent('status.get', 'ignored', single = True)
-
- try:
- db = get_session()
- rels = db.query(Release).filter_by(
- status_id = snatched_status.get('id'),
- movie_id = movie_id
- ).all()
-
- for rel in rels:
- rel.status_id = ignored_status.get('id')
- db.commit()
-
- movie_dict = fireEvent('movie.get', movie_id, single = True)
- log.info('Trying next release for: %s', getTitle(movie_dict['library']))
- fireEvent('searcher.single', movie_dict)
-
- return True
-
- except:
- log.error('Failed searching for next release: %s', traceback.format_exc())
- return False
-
-class SearchSetupError(Exception):
- pass
-
-class NoDownloaders(SearchSetupError):
- pass
-
-class NoProviders(SearchSetupError):
- pass
diff --git a/couchpotato/core/plugins/status/__init__.py b/couchpotato/core/plugins/status/__init__.py
deleted file mode 100644
index fb5b4cc79b..0000000000
--- a/couchpotato/core/plugins/status/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import StatusPlugin
-
-def start():
- return StatusPlugin()
-
-config = []
diff --git a/couchpotato/core/plugins/status/main.py b/couchpotato/core/plugins/status/main.py
deleted file mode 100644
index c01caef597..0000000000
--- a/couchpotato/core/plugins/status/main.py
+++ /dev/null
@@ -1,109 +0,0 @@
-from couchpotato import get_session
-from couchpotato.api import addApiView
-from couchpotato.core.event import addEvent
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.request import jsonified
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.core.settings.model import Status
-
-log = CPLog(__name__)
-
-
-class StatusPlugin(Plugin):
-
- statuses = {
- 'needs_update': 'Needs update',
- 'active': 'Active',
- 'done': 'Done',
- 'downloaded': 'Downloaded',
- 'wanted': 'Wanted',
- 'snatched': 'Snatched',
- 'failed': 'Failed',
- 'deleted': 'Deleted',
- 'ignored': 'Ignored',
- 'available': 'Available',
- 'suggest': 'Suggest',
- }
-
- def __init__(self):
- addEvent('status.add', self.add)
- addEvent('status.get', self.add) # Alias for .add
- addEvent('status.get_by_id', self.getById)
- addEvent('status.all', self.all)
- addEvent('app.initialize', self.fill)
-
- addApiView('status.list', self.list, docs = {
- 'desc': 'Check for available update',
- 'return': {'type': 'object', 'example': """{
- 'success': True,
- 'list': array, statuses
-}"""}
- })
-
- def list(self):
-
- return jsonified({
- 'success': True,
- 'list': self.all()
- })
-
- def getById(self, id):
- db = get_session()
- status = db.query(Status).filter_by(id = id).first()
- status_dict = status.to_dict()
- #db.close()
-
- return status_dict
-
- def all(self):
-
- db = get_session()
-
- statuses = db.query(Status).all()
-
- temp = []
- for status in statuses:
- s = status.to_dict()
- temp.append(s)
-
- #db.close()
- return temp
-
- def add(self, identifier):
-
- db = get_session()
-
- s = db.query(Status).filter_by(identifier = identifier).first()
- if not s:
- s = Status(
- identifier = identifier,
- label = toUnicode(identifier.capitalize())
- )
- db.add(s)
- db.commit()
-
- status_dict = s.to_dict()
-
- #db.close()
- return status_dict
-
- def fill(self):
-
- db = get_session()
-
- for identifier, label in self.statuses.iteritems():
- s = db.query(Status).filter_by(identifier = identifier).first()
- if not s:
- log.info('Creating status: %s', label)
- s = Status(
- identifier = identifier,
- label = toUnicode(label)
- )
- db.add(s)
-
- s.label = toUnicode(label)
- db.commit()
-
- #db.close()
-
diff --git a/couchpotato/core/plugins/status/static/status.js b/couchpotato/core/plugins/status/static/status.js
deleted file mode 100644
index 2b8d30f348..0000000000
--- a/couchpotato/core/plugins/status/static/status.js
+++ /dev/null
@@ -1,17 +0,0 @@
-var StatusBase = new Class({
-
- setup: function(statuses){
- var self = this;
-
- self.statuses = statuses;
-
- },
-
- get: function(id){
- return this.statuses.filter(function(status){
- return status.id == id
- }).pick()
- },
-
-});
-window.Status = new StatusBase();
diff --git a/couchpotato/core/plugins/subtitle.py b/couchpotato/core/plugins/subtitle.py
new file mode 100644
index 0000000000..e8baef0db8
--- /dev/null
+++ b/couchpotato/core/plugins/subtitle.py
@@ -0,0 +1,86 @@
+import traceback
+
+from couchpotato.core.event import addEvent
+from couchpotato.core.helpers.encoding import toUnicode, sp
+from couchpotato.core.helpers.variable import splitString
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+from couchpotato.environment import Env
+import subliminal
+
+
+log = CPLog(__name__)
+
+autoload = 'Subtitle'
+
+
+class Subtitle(Plugin):
+
+ services = ['opensubtitles', 'thesubdb', 'subswiki', 'subscenter']
+
+ def __init__(self):
+ addEvent('renamer.before', self.searchSingle)
+
+ def searchSingle(self, group):
+ if self.isDisabled(): return
+
+ try:
+ available_languages = sum(group['subtitle_language'].values(), [])
+ downloaded = []
+ files = [toUnicode(x) for x in group['files']['movie']]
+ log.debug('Searching for subtitles for: %s', files)
+
+ for lang in self.getLanguages():
+ if lang not in available_languages:
+ download = subliminal.download_subtitles(files, multi = True, force = self.conf('force'), languages = [lang], services = self.services, cache_dir = Env.get('cache_dir'))
+ for subtitle in download:
+ downloaded.extend(download[subtitle])
+
+ for d_sub in downloaded:
+ log.info('Found subtitle (%s): %s', (d_sub.language.alpha2, files))
+ group['files']['subtitle'].append(sp(d_sub.path))
+ group['before_rename'].append(sp(d_sub.path))
+ group['subtitle_language'][sp(d_sub.path)] = [d_sub.language.alpha2]
+
+ return True
+
+ except:
+ log.error('Failed searching for subtitle: %s', (traceback.format_exc()))
+
+ return False
+
+ def getLanguages(self):
+ return splitString(self.conf('languages'))
+
+
+config = [{
+ 'name': 'subtitle',
+ 'groups': [
+ {
+ 'tab': 'renamer',
+ 'name': 'subtitle',
+ 'label': 'Download subtitles',
+ 'description': 'after rename',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'label': 'Search and download subtitles',
+ 'default': False,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'languages',
+ 'description': ('Comma separated, 2 letter country code.', 'Example: en, nl. See the codes at on Wikipedia'),
+ },
+ {
+ 'advanced': True,
+ 'name': 'force',
+ 'label': 'Force',
+ 'description': ('Force download all languages (including embedded).', 'This will also overwrite all existing subtitles.'),
+ 'default': False,
+ 'type': 'bool',
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/plugins/subtitle/__init__.py b/couchpotato/core/plugins/subtitle/__init__.py
deleted file mode 100644
index 686d385e6c..0000000000
--- a/couchpotato/core/plugins/subtitle/__init__.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from .main import Subtitle
-
-def start():
- return Subtitle()
-
-config = [{
- 'name': 'subtitle',
- 'groups': [
- {
- 'tab': 'renamer',
- 'name': 'subtitle',
- 'label': 'Download subtitles',
- 'description': 'after rename',
- 'options': [
- {
- 'name': 'enabled',
- 'label': 'Search and download subtitles',
- 'default': False,
- 'type': 'enabler',
- },
- {
- 'name': 'languages',
- 'description': 'Comma separated, 2 letter country code. Example: en, nl',
- },
-# {
-# 'name': 'automatic',
-# 'default': True,
-# 'type': 'bool',
-# 'description': 'Automaticly search & download for movies in library',
-# },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/plugins/subtitle/main.py b/couchpotato/core/plugins/subtitle/main.py
deleted file mode 100644
index 73ead0871f..0000000000
--- a/couchpotato/core/plugins/subtitle/main.py
+++ /dev/null
@@ -1,73 +0,0 @@
-from couchpotato import get_session
-from couchpotato.core.event import addEvent, fireEvent
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import splitString
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.core.settings.model import Library, FileType
-from couchpotato.environment import Env
-import subliminal
-import traceback
-
-log = CPLog(__name__)
-
-
-class Subtitle(Plugin):
-
- services = ['opensubtitles', 'thesubdb', 'subswiki', 'podnapisi']
-
- def __init__(self):
- addEvent('renamer.before', self.searchSingle)
-
- def searchLibrary(self):
-
- # Get all active and online movies
- db = get_session()
-
- library = db.query(Library).all()
- done_status = fireEvent('status.get', 'done', single = True)
-
- for movie in library.movies:
-
- for release in movie.releases:
-
- # get releases and their movie files
- if release.status_id is done_status.get('id'):
-
- files = []
- for file in release.files.filter(FileType.status.has(identifier = 'movie')).all():
- files.append(file.path);
-
- # get subtitles for those files
- subliminal.list_subtitles(files, cache_dir = Env.get('cache_dir'), multi = True, languages = self.getLanguages(), services = self.services)
-
- def searchSingle(self, group):
-
- if self.isDisabled(): return
-
- try:
- available_languages = sum(group['subtitle_language'].itervalues(), [])
- downloaded = []
- files = [toUnicode(x) for x in group['files']['movie']]
- log.debug('Searching for subtitles for: %s', files)
-
- for lang in self.getLanguages():
- if lang not in available_languages:
- download = subliminal.download_subtitles(files, multi = True, force = False, languages = [lang], services = self.services, cache_dir = Env.get('cache_dir'))
- for subtitle in download:
- downloaded.extend(download[subtitle])
-
- for d_sub in downloaded:
- log.info('Found subtitle (%s): %s', (d_sub.language.alpha2, files))
- group['files']['subtitle'].add(d_sub.path)
- group['subtitle_language'][d_sub.path] = [d_sub.language.alpha2]
-
- return True
-
- except:
- log.error('Failed searching for subtitle: %s', (traceback.format_exc()))
-
- return False
-
- def getLanguages(self):
- return splitString(self.conf('languages'))
diff --git a/couchpotato/core/plugins/suggestion/__init__.py b/couchpotato/core/plugins/suggestion/__init__.py
deleted file mode 100644
index b63b5b13ef..0000000000
--- a/couchpotato/core/plugins/suggestion/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import Suggestion
-
-def start():
- return Suggestion()
-
-config = []
diff --git a/couchpotato/core/plugins/suggestion/main.py b/couchpotato/core/plugins/suggestion/main.py
deleted file mode 100644
index 2c31ca32ad..0000000000
--- a/couchpotato/core/plugins/suggestion/main.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from couchpotato.api import addApiView
-from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.request import jsonified, getParam
-from couchpotato.core.plugins.base import Plugin
-
-class Suggestion(Plugin):
-
- def __init__(self):
-
- addApiView('suggestion.view', self.getView)
-
- def getView(self):
-
- limit_offset = getParam('limit_offset', None)
- total_movies, movies = fireEvent('movie.list', status = 'suggest', limit_offset = limit_offset, single = True)
-
- return jsonified({
- 'success': True,
- 'empty': len(movies) == 0,
- 'total': total_movies,
- 'movies': movies,
- })
diff --git a/couchpotato/core/plugins/trailer.py b/couchpotato/core/plugins/trailer.py
new file mode 100644
index 0000000000..82216b8ed0
--- /dev/null
+++ b/couchpotato/core/plugins/trailer.py
@@ -0,0 +1,80 @@
+import os
+
+from couchpotato.core.event import addEvent, fireEvent
+from couchpotato.core.helpers.variable import getExt, getTitle
+from couchpotato.core.logger import CPLog
+from couchpotato.core.plugins.base import Plugin
+
+
+log = CPLog(__name__)
+
+autoload = 'Trailer'
+
+
+class Trailer(Plugin):
+
+ def __init__(self):
+ addEvent('renamer.after', self.searchSingle)
+
+ def searchSingle(self, message = None, group = None):
+ if not group: group = {}
+ if self.isDisabled() or len(group['files']['trailer']) > 0: return
+
+ trailers = fireEvent('trailer.search', group = group, merge = True)
+ if not trailers or trailers == []:
+ log.info('No trailers found for: %s', getTitle(group))
+ return False
+
+ for trailer in trailers.get(self.conf('quality'), []):
+
+ ext = getExt(trailer)
+ filename = self.conf('name').replace('', group['filename']) + ('.%s' % ('mp4' if len(ext) > 5 else ext))
+ destination = os.path.join(group['destination_dir'], filename)
+ if not os.path.isfile(destination):
+ trailer_file = fireEvent('file.download', url = trailer, dest = destination, urlopen_kwargs = {'headers': {'User-Agent': 'Quicktime'}}, single = True)
+ if trailer_file and os.path.getsize(trailer_file) < (1024 * 1024): # Don't trust small trailers (1MB), try next one
+ os.unlink(trailer_file)
+ continue
+ else:
+ log.debug('Trailer already exists: %s', destination)
+
+ group['renamed_files'].append(destination)
+
+ # Download first and break
+ break
+
+ return True
+
+
+config = [{
+ 'name': 'trailer',
+ 'groups': [
+ {
+ 'tab': 'renamer',
+ 'name': 'trailer',
+ 'label': 'Download trailer',
+ 'description': 'after rename',
+ 'options': [
+ {
+ 'name': 'enabled',
+ 'label': 'Search and download trailers',
+ 'default': False,
+ 'type': 'enabler',
+ },
+ {
+ 'name': 'quality',
+ 'default': '720p',
+ 'type': 'dropdown',
+ 'values': [('1080p', '1080p'), ('720p', '720p'), ('480P', '480p')],
+ },
+ {
+ 'name': 'name',
+ 'label': 'Naming',
+ 'default': '-trailer',
+ 'advanced': True,
+ 'description': 'Use <filename> to use above settings.'
+ },
+ ],
+ },
+ ],
+}]
diff --git a/couchpotato/core/plugins/trailer/__init__.py b/couchpotato/core/plugins/trailer/__init__.py
deleted file mode 100644
index 282b3482a9..0000000000
--- a/couchpotato/core/plugins/trailer/__init__.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from .main import Trailer
-
-def start():
- return Trailer()
-
-config = [{
- 'name': 'trailer',
- 'groups': [
- {
- 'tab': 'renamer',
- 'name': 'trailer',
- 'label': 'Download trailer',
- 'description': 'after rename',
- 'options': [
- {
- 'name': 'enabled',
- 'label': 'Search and download trailers',
- 'default': False,
- 'type': 'enabler',
- },
- {
- 'name': 'quality',
- 'default': '720p',
- 'type': 'dropdown',
- 'values': [('1080P', '1080p'), ('720P', '720p'), ('480P', '480p')],
- },
- {
- 'name': 'name',
- 'label': 'Naming',
- 'default': '-trailer',
- 'advanced': True,
- 'description': 'Use to use above settings.'
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/plugins/trailer/main.py b/couchpotato/core/plugins/trailer/main.py
deleted file mode 100644
index 4ab51e788d..0000000000
--- a/couchpotato/core/plugins/trailer/main.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from couchpotato.core.event import addEvent, fireEvent
-from couchpotato.core.helpers.variable import getExt, getTitle
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-import os
-
-log = CPLog(__name__)
-
-
-class Trailer(Plugin):
-
- def __init__(self):
- addEvent('renamer.after', self.searchSingle)
-
- def searchSingle(self, message = None, group = {}):
-
- if self.isDisabled() or len(group['files']['trailer']) > 0: return
-
- trailers = fireEvent('trailer.search', group = group, merge = True)
- if not trailers or trailers == []:
- log.info('No trailers found for: %s', getTitle(group['library']))
- return False
-
- for trailer in trailers.get(self.conf('quality'), []):
- filename = self.conf('name').replace('', group['filename']) + ('.%s' % getExt(trailer))
- destination = os.path.join(group['destination_dir'], filename)
- if not os.path.isfile(destination):
- fireEvent('file.download', url = trailer, dest = destination, urlopen_kwargs = {'headers': {'User-Agent': 'Quicktime'}}, single = True)
- else:
- log.debug('Trailer already exists: %s', destination)
-
- group['renamed_files'].append(destination)
-
- # Download first and break
- break
-
- return True
-
diff --git a/couchpotato/core/plugins/userscript/__init__.py b/couchpotato/core/plugins/userscript/__init__.py
index 5df5a801f1..9d708593ba 100644
--- a/couchpotato/core/plugins/userscript/__init__.py
+++ b/couchpotato/core/plugins/userscript/__init__.py
@@ -1,6 +1,5 @@
from .main import Userscript
-def start():
- return Userscript()
-config = []
+def autoload():
+ return Userscript()
diff --git a/couchpotato/core/plugins/userscript/bookmark.js b/couchpotato/core/plugins/userscript/bookmark.js
deleted file mode 100644
index 5ee8c376cc..0000000000
--- a/couchpotato/core/plugins/userscript/bookmark.js
+++ /dev/null
@@ -1,43 +0,0 @@
-var includes = {{includes|tojson}};
-var excludes = {{excludes|tojson}};
-
-var specialChars = '\\{}+.():-|^$';
-var makeRegex = function(pattern) {
- pattern = pattern.split('');
- var i, len = pattern.length;
- for( i = 0; i < len; i++) {
- var character = pattern[i];
- if(specialChars.indexOf(character) > -1) {
- pattern[i] = '\\' + character;
- } else if(character === '?') {
- pattern[i] = '.';
- } else if(character === '*') {
- pattern[i] = '.*';
- }
- }
- return new RegExp('^' + pattern.join('') + '$');
-};
-
-var isCorrectUrl = function() {
- for(i in includes) {
- var reg = includes[i]
- if (makeRegex(reg).test(document.location.href))
- return true;
- }
- return false;
-}
-var addUserscript = function() {
- // Add window param
- document.body.setAttribute('cp_auto_open', true)
-
- // Load userscript
- var e = document.createElement('script');
- e.setAttribute('type', 'text/javascript');
- e.setAttribute('charset', 'UTF-8');
- e.setAttribute('src', '{{host}}couchpotato.js?r=' + Math.random() * 99999999);
- document.body.appendChild(e)
-}
-if(isCorrectUrl())
- addUserscript()
-else
- alert('Can\'t find a proper movie on this page..')
diff --git a/couchpotato/core/plugins/userscript/bookmark.js_tmpl b/couchpotato/core/plugins/userscript/bookmark.js_tmpl
new file mode 100644
index 0000000000..cc04baf7f1
--- /dev/null
+++ b/couchpotato/core/plugins/userscript/bookmark.js_tmpl
@@ -0,0 +1,47 @@
+{% autoescape None %}
+
+var includes = {{ json_encode(includes) }};
+var excludes = {{ json_encode(excludes) }};
+
+var specialChars = '\\{}+.():-|^$';
+var makeRegex = function(pattern) {
+ pattern = pattern.split('');
+ var i, len = pattern.length;
+ for( i = 0; i < len; i++) {
+ var character = pattern[i];
+ if(specialChars.indexOf(character) > -1) {
+ pattern[i] = '\\' + character;
+ } else if(character === '?') {
+ pattern[i] = '.';
+ } else if(character === '*') {
+ pattern[i] = '.*';
+ }
+ }
+ return new RegExp('^' + pattern.join('') + '$');
+};
+
+var isCorrectUrl = function() {
+ for(i in includes) {
+ if(!includes.hasOwnProperty(i)) continue;
+
+ var reg = includes[i]
+ if (makeRegex(reg).test(document.location.href))
+ return true;
+ }
+ return false;
+}
+var addUserscript = function() {
+ // Add window param
+ document.body.setAttribute('cp_auto_open', 'true')
+
+ // Load userscript
+ var e = document.createElement('script');
+ e.setAttribute('type', 'text/javascript');
+ e.setAttribute('charset', 'UTF-8');
+ e.setAttribute('src', '{{host}}couchpotato.js?r=' + Math.random() * 99999999);
+ document.body.appendChild(e)
+}
+if(isCorrectUrl())
+ addUserscript()
+else
+ alert('Can\'t find a proper movie on this page..')
diff --git a/couchpotato/core/plugins/userscript/main.py b/couchpotato/core/plugins/userscript/main.py
index 3ff7fb072b..04995260e6 100644
--- a/couchpotato/core/plugins/userscript/main.py
+++ b/couchpotato/core/plugins/userscript/main.py
@@ -1,63 +1,75 @@
+import os
+import traceback
+import time
+from base64 import b64encode, b64decode
+
+from couchpotato import index
from couchpotato.api import addApiView
from couchpotato.core.event import fireEvent, addEvent
-from couchpotato.core.helpers.request import getParam, jsonified
from couchpotato.core.helpers.variable import isDict
from couchpotato.core.logger import CPLog
from couchpotato.core.plugins.base import Plugin
from couchpotato.environment import Env
-from flask.globals import request
-from flask.helpers import url_for
-from flask.templating import render_template
-import os
+from tornado.web import RequestHandler
+
log = CPLog(__name__)
class Userscript(Plugin):
- version = 3
+ version = 8
def __init__(self):
- addApiView('userscript.get//', self.getUserScript, static = True)
+ addApiView('userscript.get/(.*)/(.*)', self.getUserScript, static = True)
+
addApiView('userscript', self.iFrame)
addApiView('userscript.add_via_url', self.getViaUrl)
addApiView('userscript.includes', self.getIncludes)
addApiView('userscript.bookmark', self.bookmark)
addEvent('userscript.get_version', self.getVersion)
+ addEvent('app.test', self.doTest)
- def bookmark(self):
+ def bookmark(self, host = None, **kwargs):
params = {
'includes': fireEvent('userscript.get_includes', merge = True),
'excludes': fireEvent('userscript.get_excludes', merge = True),
- 'host': getParam('host', None),
+ 'host': host,
}
- return self.renderTemplate(__file__, 'bookmark.js', **params)
+ return self.renderTemplate(__file__, 'bookmark.js_tmpl', **params)
- def getIncludes(self):
+ def getIncludes(self, **kwargs):
- return jsonified({
+ return {
'includes': fireEvent('userscript.get_includes', merge = True),
'excludes': fireEvent('userscript.get_excludes', merge = True),
- })
+ }
- def getUserScript(self, random = '', filename = ''):
+ def getUserScript(self, script_route, **kwargs):
- params = {
- 'includes': fireEvent('userscript.get_includes', merge = True),
- 'excludes': fireEvent('userscript.get_excludes', merge = True),
- 'version': self.getVersion(),
- 'api': '%suserscript/' % url_for('api.index').lstrip('/'),
- 'host': request.host_url,
- }
+ klass = self
+
+ class UserscriptHandler(RequestHandler):
+
+ def get(self, random, route):
- script = self.renderTemplate(__file__, 'template.js', **params)
- self.createFile(os.path.join(Env.get('cache_dir'), 'couchpotato.user.js'), script)
+ params = {
+ 'includes': fireEvent('userscript.get_includes', merge = True),
+ 'excludes': fireEvent('userscript.get_excludes', merge = True),
+ 'version': klass.getVersion(),
+ 'api': '%suserscript/' % Env.get('api_base'),
+ 'host': '%s://%s' % (self.request.protocol, self.request.headers.get('X-Forwarded-Host') or self.request.headers.get('host')),
+ }
- from flask.helpers import send_from_directory
- return send_from_directory(Env.get('cache_dir'), 'couchpotato.user.js')
+ script = klass.renderTemplate(__file__, 'template.js_tmpl', **params)
+ klass.createFile(os.path.join(Env.get('cache_dir'), 'couchpotato.user.js'), script)
+
+ self.redirect(Env.get('api_base') + 'file.cache/couchpotato.user.js')
+
+ Env.get('app').add_handlers(".*$", [('%s%s' % (Env.get('api_base'), script_route), UserscriptHandler)])
def getVersion(self):
@@ -69,12 +81,10 @@ def getVersion(self):
return version
- def iFrame(self):
- return render_template('index.html', sep = os.sep, fireEvent = fireEvent, env = Env)
-
- def getViaUrl(self):
+ def iFrame(self, **kwargs):
+ return index()
- url = getParam('url')
+ def getViaUrl(self, url = None, **kwargs):
params = {
'url': url,
@@ -84,4 +94,47 @@ def getViaUrl(self):
log.error('Failed adding movie via url: %s', url)
params['error'] = params['movie'] if params['movie'] else 'Failed getting movie info'
- return jsonified(params)
+ return params
+
+ def doTest(self):
+ time.sleep(1)
+
+ tests = [
+ 'aHR0cDovL3d3dy5hbGxvY2luZS5mci9maWxtL2ZpY2hlZmlsbV9nZW5fY2ZpbG09MjAxMTA1Lmh0bWw=',
+ 'aHR0cDovL3RyYWlsZXJzLmFwcGxlLmNvbS90cmFpbGVycy9wYXJhbW91bnQvbWlzc2lvbmltcG9zc2libGVyb2d1ZW5hdGlvbi8=',
+ 'aHR0cDovL3d3dy55b3V0aGVhdGVyLmNvbS92aWV3LnBocD9pZD0xMTI2Mjk5',
+ 'aHR0cDovL3RyYWt0LnR2L21vdmllcy9taXNzaW9uLWltcG9zc2libGUtcm9ndWUtbmF0aW9uLTIwMTU=',
+ 'aHR0cHM6Ly93d3cucmVkZGl0LmNvbS9yL0lqdXN0d2F0Y2hlZC9jb21tZW50cy8zZjk3bzYvaWp3X21pc3Npb25faW1wb3NzaWJsZV9yb2d1ZV9uYXRpb25fMjAxNS8=',
+ 'aHR0cDovL3d3dy5yb3R0ZW50b21hdG9lcy5jb20vbS9taXNzaW9uX2ltcG9zc2libGVfcm9ndWVfbmF0aW9uLw==',
+ 'aHR0cHM6Ly93d3cudGhlbW92aWVkYi5vcmcvbW92aWUvMTc3Njc3LW1pc3Npb24taW1wb3NzaWJsZS01',
+ 'aHR0cDovL3d3dy5jcml0aWNrZXIuY29tL2ZpbG0vTWlzc2lvbl9JbXBvc3NpYmxlX1JvZ3VlLw==',
+ 'aHR0cDovL2ZpbG1jZW50cnVtLm5sL2ZpbG1zLzE4MzIzL21pc3Npb24taW1wb3NzaWJsZS1yb2d1ZS1uYXRpb24v',
+ 'aHR0cDovL3d3dy5maWxtc3RhcnRzLmRlL2tyaXRpa2VuLzIwMTEwNS5odG1s',
+ 'aHR0cDovL3d3dy5maWxtd2ViLnBsL2ZpbG0vTWlzc2lvbiUzQStJbXBvc3NpYmxlKy0rUm9ndWUrTmF0aW9uLTIwMTUtNjU1MDQ4',
+ 'aHR0cDovL3d3dy5mbGlja2NoYXJ0LmNvbS9tb3ZpZS8zM0NFMzEyNUJB',
+ 'aHR0cDovL3d3dy5pbWRiLmNvbS90aXRsZS90dDIzODEyNDkv',
+ 'aHR0cDovL2xldHRlcmJveGQuY29tL2ZpbG0vbWlzc2lvbi1pbXBvc3NpYmxlLXJvZ3VlLW5hdGlvbi8=',
+ 'aHR0cDovL3d3dy5tb3ZpZW1ldGVyLm5sL2ZpbG0vMTA0MTcw',
+ 'aHR0cDovL21vdmllcy5pby9tLzMxL2Vu',
+ ]
+
+ success = 0
+ for x in tests:
+ x = b64decode(x)
+ try:
+ movie = self.getViaUrl(x)
+ movie = movie.get('movie', {}) or {}
+ imdb = movie.get('imdb')
+
+ if imdb and b64encode(imdb) in ['dHQxMjI5MjM4', 'dHQyMzgxMjQ5']:
+ success += 1
+ continue
+ except:
+ log.error('Failed userscript test "%s": %s', (x, traceback.format_exc()))
+
+ log.error('Failed userscript test "%s"', x)
+
+ if success == len(tests):
+ log.debug('All userscript tests successful')
+ else:
+ log.error('Failed userscript tests, %s out of %s', (success, len(tests)))
diff --git a/couchpotato/core/plugins/userscript/static/userscript.css b/couchpotato/core/plugins/userscript/static/userscript.css
deleted file mode 100644
index 304dfa74f0..0000000000
--- a/couchpotato/core/plugins/userscript/static/userscript.css
+++ /dev/null
@@ -1,14 +0,0 @@
-.page.userscript {
- position: absolute;
- width: 100%;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
-}
-
- .page.userscript .frame.loading {
- text-align: center;
- font-size: 20px;
- padding: 20px;
- }
diff --git a/couchpotato/core/plugins/userscript/static/userscript.js b/couchpotato/core/plugins/userscript/static/userscript.js
index d6d5983c24..15e018dc1a 100644
--- a/couchpotato/core/plugins/userscript/static/userscript.js
+++ b/couchpotato/core/plugins/userscript/static/userscript.js
@@ -2,6 +2,7 @@ Page.Userscript = new Class({
Extends: PageBase,
+ order: 80,
name: 'userscript',
has_tab: false,
@@ -12,10 +13,10 @@ Page.Userscript = new Class({
}
},
- indexAction: function(param){
+ indexAction: function(){
var self = this;
- self.el.adopt(
+ self.content.grab(
self.frame = new Element('div.frame.loading', {
'text': 'Loading...'
})
@@ -34,7 +35,7 @@ Page.Userscript = new Class({
if(json.error)
self.frame.set('html', json.error);
else {
- var item = new Block.Search.Item(json.movie);
+ var item = new BlockSearchMovieItem(json.movie);
self.frame.adopt(item);
item.showOptions();
}
@@ -53,60 +54,56 @@ var UserscriptSettingTab = new Class({
initialize: function(){
var self = this;
- App.addEvent('load', self.addSettings.bind(self))
+ App.addEvent('loadSettings', self.addSettings.bind(self));
},
addSettings: function(){
var self = this;
- self.settings = App.getPage('Settings')
+ self.settings = App.getPage('Settings');
self.settings.addEvent('create', function(){
- // See if userscript can be installed
- var userscript = false;
- try {
- if(Components.interfaces.gmIGreasemonkeyService)
- userscript = true
- }
- catch(e){
- userscript = Browser.chrome === true;
- }
-
var host_url = window.location.protocol + '//' + window.location.host;
self.settings.createGroup({
'name': 'userscript',
- 'label': 'Install the bookmarklet' + (userscript ? ' or userscript' : ''),
+ 'label': 'Install the browser extension or bookmarklet',
'description': 'Easily add movies via imdb.com, appletrailers and more'
}).inject(self.settings.tabs.automation.content, 'top').adopt(
- (userscript ? [new Element('a.userscript.button', {
- 'text': 'Install userscript',
- 'href': Api.createUrl('userscript.get')+randomString()+'/couchpotato.user.js',
- 'target': '_self'
- }), new Element('span.or[text=or]')] : null),
- new Element('span.bookmarklet').adopt(
- new Element('a.button.green', {
- 'text': '+CouchPotato',
- 'href': "javascript:void((function(){var e=document.createElement('script');e.setAttribute('type','text/javascript');e.setAttribute('charset','UTF-8');e.setAttribute('src','" +
- host_url + Api.createUrl('userscript.bookmark') +
- "?host="+ encodeURI(host_url + Api.createUrl('userscript.get')+randomString()+'/') +
- "&r='+Math.random()*99999999);document.body.appendChild(e)})());",
- 'target': '',
- 'events': {
- 'click': function(e){
- (e).stop()
- alert('Drag it to your bookmark ;)')
- }
- }
+ new Element('div').adopt(
+ new Element('a.userscript.button', {
+ 'text': 'Install extension',
+ 'href': 'https://couchpota.to/extension/',
+ 'target': '_blank'
}),
- new Element('span', {
- 'text': 'Б┤╫ Drag this to your bookmarks'
- })
- )
- ).setStyles({
- 'background-image': "url('"+Api.createUrl('static/userscript/userscript.png')+"')"
- });
+ new Element('span.or[text=or]'),
+ new Element('span.bookmarklet').adopt(
+ new Element('a.button.green', {
+ 'text': '+CouchPotato',
+ /* jshint ignore:start */
+ 'href': "javascript:void((function(){var e=document.createElement('script');e.setAttribute('type','text/javascript');e.setAttribute('charset','UTF-8');e.setAttribute('src','" +
+ host_url + Api.createUrl('userscript.bookmark') +
+ "?host="+ encodeURI(host_url + Api.createUrl('userscript.get')+randomString()+'/') +
+ "&r='+Math.random()*99999999);document.body.appendChild(e)})());",
+ /* jshint ignore:end */
+ 'target': '',
+ 'events': {
+ 'click': function(e){
+ (e).stop();
+ alert('Drag it to your bookmark ;)');
+ }
+ }
+ }),
+ new Element('span', {
+ 'text': 'Б┤╫ Drag this to your bookmarks'
+ })
+ )
+ ),
+ new Element('img', {
+ 'src': 'https://couchpota.to/media/images/userscript.gif'
+ })
+ );
});
diff --git a/couchpotato/core/plugins/userscript/static/userscript.png b/couchpotato/core/plugins/userscript/static/userscript.png
deleted file mode 100644
index c8e7657783..0000000000
Binary files a/couchpotato/core/plugins/userscript/static/userscript.png and /dev/null differ
diff --git a/couchpotato/core/plugins/userscript/static/userscript.scss b/couchpotato/core/plugins/userscript/static/userscript.scss
new file mode 100644
index 0000000000..12f4fd2c66
--- /dev/null
+++ b/couchpotato/core/plugins/userscript/static/userscript.scss
@@ -0,0 +1,125 @@
+@import "_mixins";
+
+.page.userscript {
+ position: absolute;
+ width: 100%;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ padding: 0;
+
+ .frame.loading {
+ text-align: center;
+ font-size: 20px;
+ padding: 20px;
+ }
+
+ .media_result {
+ height: 140px;
+ display: flex;
+ }
+
+ .thumbnail {
+ width: 90px;
+ }
+
+ .options {
+ left: 90px;
+ display: flex;
+ align-items: center;
+ padding: $padding/2;
+
+ > div {
+ display: flex;
+ flex-wrap: wrap;
+
+ div {
+ flex: 1 auto;
+ margin: 0;
+ padding: 0 $padding/4;
+ }
+
+ .title {
+ min-width: 100%;
+ margin-bottom: $padding;
+ }
+
+ .add {
+ text-align: right;
+
+ a {
+ display: block;
+ text-align: center;
+ }
+ }
+
+ select {
+ width: 100%;
+ }
+ }
+ }
+
+ .message {
+ font-size: 1.5em;
+ }
+
+ .year,
+ .data {
+ display: none;
+ }
+
+}
+
+
+.group_userscript.group_userscript {
+ display: block;
+
+ .empty_wanted & {
+ padding: $padding 0;
+ }
+
+ .wgroup_automation & {
+ padding: $padding/2 0;
+ margin-left: 0;
+ }
+
+ h2 {
+ margin: 0 0 $padding/2;
+ }
+
+ .userscript {
+ margin-left: $padding;
+
+ @include media-tablet {
+ margin-left: $padding/2;
+ }
+
+ .wgroup_automation & {
+ margin-left: 0;
+ }
+ }
+
+ .bookmarklet {
+
+ span {
+ margin-left: 10px;
+ display: inline-block;
+ }
+ }
+
+ img {
+ clear: both;
+ margin: $padding;
+ width: 100%;
+ max-width: 600px;
+
+ @include media-tablet {
+ margin: $padding/2;
+ }
+
+ .wgroup_automation & {
+ margin-left: 0;
+ }
+ }
+}
diff --git a/couchpotato/core/plugins/userscript/template.js b/couchpotato/core/plugins/userscript/template.js
deleted file mode 100644
index c30fad5bab..0000000000
--- a/couchpotato/core/plugins/userscript/template.js
+++ /dev/null
@@ -1,138 +0,0 @@
-// ==UserScript==
-// @name CouchPotato UserScript
-// @description Add movies like a real CouchPotato
-// @grant none
-// @version {{version}}
-
-// @match {{host}}*
-{% for include in includes %}
-// @match {{include}}{% endfor %}
-{% for exclude in excludes %}
-// @exclude {{exclude}}{% endfor %}
-// @exclude {{host}}{{api.rstrip('/')}}*
-
-// ==/UserScript==
-
-if (window.top == window.self){ // Only run on top window
-
-var version = {{version}},
- host = '{{host}}',
- api = '{{api}}';
-
-function create() {
- switch (arguments.length) {
- case 1:
- var A = document.createTextNode(arguments[0]);
- break;
- default:
- var A = document.createElement(arguments[0]), B = arguments[1];
- for ( var b in B) {
- if (b.indexOf("on") == 0){
- A.addEventListener(b.substring(2), B[b], false);
- }
- else if (",style,accesskey,id,name,src,href,which".indexOf(","
- + b.toLowerCase()) != -1){
- A.setAttribute(b, B[b]);
- }
- else{
- A[b] = B[b];
- }
- }
- for ( var i = 2, len = arguments.length; i < len; ++i){
- A.appendChild(arguments[i]);
- }
- }
- return A;
-}
-
-var addStyle = function(css) {
- var head = document.getElementsByTagName('head')[0],
- style = document.createElement('style');
- if (!head)
- return;
-
- style.type = 'text/css';
- style.textContent = css;
- head.appendChild(style);
-}
-
-// Styles
-addStyle('\
- #cp_popup { font-family: "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif; -moz-border-radius: 6px 0px 0px 6px; -webkit-border-radius: 6px 0px 0px 6px; border-radius: 6px 0px 0px 6px; -moz-box-shadow: 0 0 20px rgba(0,0,0,0.5); -webkit-box-shadow: 0 0 20px rgba(0,0,0,0.5); box-shadow: 0 0 20px rgba(0,0,0,0.5); position:fixed; z-index:9999; bottom:0; right:0; font-size:15px; margin: 20px 0; display: block; background:#4E5969; } \
- #cp_popup.opened { width: 492px; } \
- #cp_popup a#add_to { cursor:pointer; text-align:center; text-decoration:none; color: #000; display:block; padding:5px 0 5px 5px; } \
- #cp_popup a#close_button { cursor:pointer; float: right; padding:120px 10px 10px; } \
- #cp_popup a img { vertical-align: middle; } \
- #cp_popup a:hover { color:#000; } \
- #cp_popup iframe{ background:#4E5969; margin:6px 0 2px 6px; height:140px; width:450px; overflow:hidden; border:none; } \
-');
-
-var cp_icon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAADHmlDQ1BJQ0MgUHJvZmlsZQAAeAGFVN9r01AU/tplnbDhizpnEQk+aJFuZFN0Q5y2a1e6zVrqNrchSJumbVyaxiTtfrAH2YtvOsV38Qc++QcM2YNve5INxhRh+KyIIkz2IrOemzRNJ1MDufe73/nuOSfn5F6g+XFa0xQvDxRVU0/FwvzE5BTf8gFeHEMr/GhNi4YWSiZHQA/Tsnnvs/MOHsZsdO5v36v+Y9WalQwR8BwgvpQ1xCLhWaBpXNR0E+DWie+dMTXCzUxzWKcECR9nOG9jgeGMjSOWZjQ1QJoJwgfFQjpLuEA4mGng8w3YzoEU5CcmqZIuizyrRVIv5WRFsgz28B9zg/JfsKiU6Zut5xCNbZoZTtF8it4fOX1wjOYA1cE/Xxi9QbidcFg246M1fkLNJK4RJr3n7nRpmO1lmpdZKRIlHCS8YlSuM2xp5gsDiZrm0+30UJKwnzS/NDNZ8+PtUJUE6zHF9fZLRvS6vdfbkZMH4zU+pynWf0D+vff1corleZLw67QejdX0W5I6Vtvb5M2mI8PEd1E/A0hCgo4cZCjgkUIMYZpjxKr4TBYZIkqk0ml0VHmyONY7KJOW7RxHeMlfDrheFvVbsrj24Pue3SXXjrwVhcW3o9hR7bWB6bqyE5obf3VhpaNu4Te55ZsbbasLCFH+iuWxSF5lyk+CUdd1NuaQU5f8dQvPMpTuJXYSWAy6rPBe+CpsCk+FF8KXv9TIzt6tEcuAcSw+q55TzcbsJdJM0utkuL+K9ULGGPmQMUNanb4kTZyKOfLaUAsnBneC6+biXC/XB567zF3h+rkIrS5yI47CF/VFfCHwvjO+Pl+3b4hhp9u+02TrozFa67vTkbqisXqUj9sn9j2OqhMZsrG+sX5WCCu0omNqSrN0TwADJW1Ol/MFk+8RhAt8iK4tiY+rYleQTysKb5kMXpcMSa9I2S6wO4/tA7ZT1l3maV9zOfMqcOkb/cPrLjdVBl4ZwNFzLhegM3XkCbB8XizrFdsfPJ63gJE722OtPW1huos+VqvbdC5bHgG7D6vVn8+q1d3n5H8LeKP8BqkjCtbCoV8yAAAACXBIWXMAAAsTAAALEwEAmpwYAAABZGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iPgogICAgICAgICA8eG1wOkNyZWF0b3JUb29sPkFkb2JlIEltYWdlUmVhZHk8L3htcDpDcmVhdG9yVG9vbD4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+Chvleg4AAAdrSURBVFgJzZfPb1VVEMfn3PfaUgotVIpi+a3BWETFRIkYEzTRtRv8BxSiCRp1JStkBXGhC42J7Ay4wGrcqHHhAjfEaNSoESOoVQIWBIGW/qB9797r93Pem8d9zwe4KJFJpnPOnDkz35k559zXkOe5XS8KFsKW3VbC/8CQ5cNbjWAxYG7/LXC4XgABdzUQIYREsbNrFee6AAy7FXxXnt25N6wWgBdL8+1oeaH9Uh6wP5Zutj8/6c/HrwXM18s+mEu5xSyRv8yCbe5cbM9nM2bphHjcqidO2OmN88KZ8iI79NUT9pI6nquaFKrtWbsuAC8uEzRRKNtawGWzNqPwnVKVbdYGBX0wndHfOjhsr0RkOue0cLR2EZKSrUu6ItBS0mFBnCdAFGn8ZQy81TiLbasX7aLRHP859IqluAwlu41aClTQmDkyqYP+DZst62vVZtyO5rzF8faqIptfD92h21YE9SgHINFrj0yIJzSxY+0AtermvsW7axWZWGTLdAaXxgrSXpUiqMXSlfKqxmYjgDmk97EVVHE+ZxX0R3n9UKzPrACs1vPSJTB6DmugGQlkyCp2LpmykxHIkasDnJN3sN2jvHF/2FZeYPuyaUtVolIdRqrLUapO2A/fPWX3cDmu9sSQQNsK7tYrPxS7UCy22XDzNM4Wb9ctfDuvbHotrKv22gMdK+2nLx63b8rdNiQwRgX9/Omu5sk8OZ6wkQjua9XzPcuGn5RFO+eK8K8KDuuebc3zeAvb4LmiSlWcv+Gg/T6vywYU9nRWtR69dAsaG2oXpFLqsY6p47b3++35zsbaVQZNAPeF0LE9zysHensfzi5VdiRZVglpzkUMmaXp16aGiXhxVZzYNWWSp7dYuetU3/ljz409evQx21jWJYg/EYJMhNxPmb68aqmFypiNJKkdXpLa1Noxs01vylxXhhz844ykSo0Wq63lXQJ3sK/v/uzixUNKPWGDX/M+jZeLz4oXidkIT4ovncL5mA2+EezMUJ5dWKUE9KHLefe0DvEUK8uQCWT3YltT7bA1I9I9/LNZ/0gNmKaRkDAgI0DOnMBVPxwYWJePj3+mxz/R13xG4EoEoFoYax6ffOY6SlFfkZRtmO3TcRsrl279qJKM75BSnhOyqyPUTxsTOOusWpjKLUunLXvhfcvXv6sEZeaAiAP7PALUHFfZ1NkLr/aY9SrgrBa6+CGHgQDHDZSc9mKsb79N1Zlv16xaNdNfsdLH3bbokWkb3yQ7FjAWkVmnspmQs65pS545YMkdH5hNL5T+4mVADo5T0mixbiyAlUleriddAgjJs6DvfQRKtYiJExwwJ3v5j1I/AOR01rrekf1dUirbmmfNFW18vtlNSuTpt8xWfqoEexVD1QAIcZCtXM9PKyIFIzbnO6eNDhJQgKy3M4JhbYl4pXiVuF+c6kBeWJra5A89VvpcxeNJkbMORZkU2JUXzLbtMVsmcJM6yPwqdED4bmWK4C3WMILQOY5d0UtR606rgzPS03KYzdgxBuiAePQvvmGTdnJP2Xoe1Ftzq0AL5OBxsyd2KukjZqcXa8/52n5AeYyiBAfzJoAoYq/rkhbDEFVknWrJf9zIGXUbWqGbb7eIN8hg9HzJDg9XbfRls/sE6qFndSz0BIxqLRE4AKiAjTPNfvflMZFNACkpzAISqlfURjWmpSpITKLojDEBnACwSodizX6zX5eb3SvZIXBV3iqtQfjniULFXpJFtnJbgBhTLYwBSPXk3+4We4UdYNFhK9BB2a/YUwOT6Rx0jl1ODv+6wNYtbufL/TYBrMiUM8EFABhZAohMaR+bWEeixzHSq4yesVPsgm5q7KVumSeHBCC+sGFfO1/omwBizCY2eyAkTBV5TnBOhZ08e5foGTu1+/+NdXySOL4AARjI/bhsAZhHgA4KCQEYwlk7gKwVQV1r7MEBhU+X6PHv6xrWgA8zEqVa8rJj6EAByFeDjJH8YqCiVBx2O/ZASOeoqM/xgz17YXzRFferd7jh07vYUsHL54KgBMEQ/lZ8Wsy7R9beGrKlAkXWNO5FOviixC+gRsRLxbyj7s/f32IMLdfIq+cSLZky56vlPxAIALHG2IOjc8DFgFw6QBQllXlQTPL4xxdfq6Jk3FRBAhVboGncQOlvFpMtALyKbPZMXaIrMnqvrp8tl1qK/ogLIYsJA74JYEU7q7IgI7KBPCNA8gsG5w7Aq+RzpOuKgAHooJBXIsA5+9FqAujlBhztgLz8rJEhARgXyZ2yjkOkA6Qj6LyKDlaqJsIH+2AHh2wCKGcBhw5Kw8YYPQxAB1R06qBw6uAAwxh/SAfn1ZQqUtEf+4tAmwCmiVUrshCQKq2FHBgSHc69Su6oVXrmgGINYOiKADVtIk8WWQQZAa6vFcWm0mo/H29l3IURYAjAmPcKY4IgCd4q0Tm7LXP8sK8IEJ1TsYKtyTb+q9M/0B2368euAK7Qc1LRGYw+2HBO/LeYn1lOHtAleh+7dF1xj4+vJInnxLgB0JU3mqQTDeK/ux/rlWso/+fBDV9BjssNTf8AmPnhttjsZCIAAAAASUVORK5CYII=';
-var close_img = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAA5ElEQVR42tRTQYoEIQwsl/2Bl3gQoY9eBKEf5kvyG8G7h4Z+S38gIu5lp5lZ2R7YPm1BDhZJSFWiGmPgDj5wE7cbfD4/mBkAHprUj9yTTyn9OsGIMSLG+Fxwxc8SiAi9d4QQHskjhIDeO4jorQcq5wwiQmsN3nt479FaAxEh5zxJmyZIKalSClprL1FKQUpJXZr4DBH52xqZeRhjICKw1sJaCxGBMQbMPN41GFpriAicc6i1otYK5xxEBFrraQuThGVZAADbtp2amXms6woAOI7j0gO17/t5MN+HNfEvBf//M30NAKe7aRqUOIlfAAAAAElFTkSuQmCC';
-
-var osd = function(){
- var navbar, newElement;
-
- var createApiUrl = function(url){
- return host + api + "?url=" + escape(url)
- };
-
- var iframe = create('iframe', {
- 'src': createApiUrl(document.location.href),
- 'frameborder': 0,
- 'scrolling': 'no'
- });
-
- var popup = create('div', {
- 'id': 'cp_popup'
- });
-
- var onclick = function(){
-
- // Try and get imdb url
- try {
- var regex = new RegExp(/tt(\d{7})/);
- var imdb_id = document.body.innerHTML.match(regex)[0];
- if (imdb_id)
- iframe.setAttribute('src', createApiUrl('http://imdb.com/title/'+imdb_id+'/'))
- }
- catch(e){}
-
- popup.innerHTML = '';
- popup.setAttribute('class', 'opened');
- popup.appendChild(create('a', {
- 'innerHTML': '
',
- 'id': 'close_button',
- 'onclick': function(){
- popup.innerHTML = '';
- popup.appendChild(add_button);
- popup.setAttribute('class', '');
- }
- }));
- popup.appendChild(iframe)
- }
-
- var add_button = create('a', {
- 'innerHTML': '
',
- 'id': 'add_to',
- 'onclick': onclick
- });
- popup.appendChild(add_button);
-
- document.body.parentNode.insertBefore(popup, document.body);
-
- // Auto fold open
- if(document.body.getAttribute('cp_auto_open'))
- onclick()
-};
-
-var setVersion = function(){
- document.body.setAttribute('data-userscript_version', version)
-};
-
-if(document.location.href.indexOf(host) == -1)
- osd();
-else
- setVersion();
-
-}
\ No newline at end of file
diff --git a/couchpotato/core/plugins/userscript/template.js_tmpl b/couchpotato/core/plugins/userscript/template.js_tmpl
new file mode 100644
index 0000000000..25e184202d
--- /dev/null
+++ b/couchpotato/core/plugins/userscript/template.js_tmpl
@@ -0,0 +1,147 @@
+// ==UserScript==
+//
+// If you can read this, you need to enable or install the Greasemonkey add-on for firefox
+// If you are using Chrome, download this file and drag it to the extensions tab
+// Other browsers, use the bookmarklet
+//
+// @name CouchPotato UserScript
+// @description Add movies like a real CouchPotato
+// @grant none
+// @version {{version}}
+
+// @match {{host}}/*
+{% for include in includes %}
+// @match {{include}}{% end %}
+{% for exclude in excludes %}
+// @exclude {{exclude}}{% end %}
+// @exclude {{host}}{{api.rstrip('/')}}*
+
+// ==/UserScript==
+
+{% autoescape None %}
+if (window.top == window.self){ // Only run on top window
+
+var version = {{version}},
+ host = '{{host}}',
+ api = '{{api}}';
+
+var create = function() {
+ var A, B;
+ switch (arguments.length) {
+ case 1:
+ A = document.createTextNode(arguments[0]);
+ break;
+ default:
+ A = document.createElement(arguments[0]);
+ B = arguments[1];
+
+ for ( var b in B) {
+ if (b.indexOf("on") == 0){
+ A.addEventListener(b.substring(2), B[b], false);
+ }
+ else if (",style,accesskey,id,name,src,href,which".indexOf(","
+ + b.toLowerCase()) != -1){
+ A.setAttribute(b, B[b]);
+ }
+ else{
+ A[b] = B[b];
+ }
+ }
+ for ( var i = 2, len = arguments.length; i < len; ++i){
+ A.appendChild(arguments[i]);
+ }
+ }
+ return A;
+}
+
+var addStyle = function(css) {
+ var head = document.getElementsByTagName('head')[0],
+ style = document.createElement('style');
+ if (!head)
+ return;
+
+ style.type = 'text/css';
+ style.textContent = css;
+ head.appendChild(style);
+}
+
+// Styles
+addStyle('\
+ #cp_popup { font-family: "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif; -moz-border-radius: 6px 0px 0px 6px; -webkit-border-radius: 6px 0px 0px 6px; border-radius: 6px 0px 0px 6px; -moz-box-shadow: 0 0 20px rgba(0,0,0,0.5); -webkit-box-shadow: 0 0 20px rgba(0,0,0,0.5); box-shadow: 0 0 20px rgba(0,0,0,0.5); position:fixed; z-index:20000; bottom:0; right:0; font-size:15px; margin: 20px 0; display: block; background:#FFF; } \
+ #cp_popup.opened { width: 492px; } \
+ #cp_popup a#add_to { cursor:pointer; text-align:center; text-decoration:none; color: #000; display:block; padding:5px 0 5px 5px; } \
+ #cp_popup a#close_button { cursor:pointer; float: right; padding:120px 10px 10px; } \
+ #cp_popup a img { vertical-align: middle; } \
+ #cp_popup a:hover { color:#000; } \
+ #cp_popup iframe{ background:#FFF; margin:6px 0 2px 6px; height:140px; width:450px; overflow:hidden; border:none; } \
+');
+
+var cp_icon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAADHmlDQ1BJQ0MgUHJvZmlsZQAAeAGFVN9r01AU/tplnbDhizpnEQk+aJFuZFN0Q5y2a1e6zVrqNrchSJumbVyaxiTtfrAH2YtvOsV38Qc++QcM2YNve5INxhRh+KyIIkz2IrOemzRNJ1MDufe73/nuOSfn5F6g+XFa0xQvDxRVU0/FwvzE5BTf8gFeHEMr/GhNi4YWSiZHQA/Tsnnvs/MOHsZsdO5v36v+Y9WalQwR8BwgvpQ1xCLhWaBpXNR0E+DWie+dMTXCzUxzWKcECR9nOG9jgeGMjSOWZjQ1QJoJwgfFQjpLuEA4mGng8w3YzoEU5CcmqZIuizyrRVIv5WRFsgz28B9zg/JfsKiU6Zut5xCNbZoZTtF8it4fOX1wjOYA1cE/Xxi9QbidcFg246M1fkLNJK4RJr3n7nRpmO1lmpdZKRIlHCS8YlSuM2xp5gsDiZrm0+30UJKwnzS/NDNZ8+PtUJUE6zHF9fZLRvS6vdfbkZMH4zU+pynWf0D+vff1corleZLw67QejdX0W5I6Vtvb5M2mI8PEd1E/A0hCgo4cZCjgkUIMYZpjxKr4TBYZIkqk0ml0VHmyONY7KJOW7RxHeMlfDrheFvVbsrj24Pue3SXXjrwVhcW3o9hR7bWB6bqyE5obf3VhpaNu4Te55ZsbbasLCFH+iuWxSF5lyk+CUdd1NuaQU5f8dQvPMpTuJXYSWAy6rPBe+CpsCk+FF8KXv9TIzt6tEcuAcSw+q55TzcbsJdJM0utkuL+K9ULGGPmQMUNanb4kTZyKOfLaUAsnBneC6+biXC/XB567zF3h+rkIrS5yI47CF/VFfCHwvjO+Pl+3b4hhp9u+02TrozFa67vTkbqisXqUj9sn9j2OqhMZsrG+sX5WCCu0omNqSrN0TwADJW1Ol/MFk+8RhAt8iK4tiY+rYleQTysKb5kMXpcMSa9I2S6wO4/tA7ZT1l3maV9zOfMqcOkb/cPrLjdVBl4ZwNFzLhegM3XkCbB8XizrFdsfPJ63gJE722OtPW1huos+VqvbdC5bHgG7D6vVn8+q1d3n5H8LeKP8BqkjCtbCoV8yAAAACXBIWXMAAAsTAAALEwEAmpwYAAABZGlUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIgogICAgICAgICAgICB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iPgogICAgICAgICA8eG1wOkNyZWF0b3JUb29sPkFkb2JlIEltYWdlUmVhZHk8L3htcDpDcmVhdG9yVG9vbD4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+Chvleg4AAAdrSURBVFgJzZfPb1VVEMfn3PfaUgotVIpi+a3BWETFRIkYEzTRtRv8BxSiCRp1JStkBXGhC42J7Ay4wGrcqHHhAjfEaNSoESOoVQIWBIGW/qB9797r93Pem8d9zwe4KJFJpnPOnDkz35k559zXkOe5XS8KFsKW3VbC/8CQ5cNbjWAxYG7/LXC4XgABdzUQIYREsbNrFee6AAy7FXxXnt25N6wWgBdL8+1oeaH9Uh6wP5Zutj8/6c/HrwXM18s+mEu5xSyRv8yCbe5cbM9nM2bphHjcqidO2OmN88KZ8iI79NUT9pI6nquaFKrtWbsuAC8uEzRRKNtawGWzNqPwnVKVbdYGBX0wndHfOjhsr0RkOue0cLR2EZKSrUu6ItBS0mFBnCdAFGn8ZQy81TiLbasX7aLRHP859IqluAwlu41aClTQmDkyqYP+DZst62vVZtyO5rzF8faqIptfD92h21YE9SgHINFrj0yIJzSxY+0AtermvsW7axWZWGTLdAaXxgrSXpUiqMXSlfKqxmYjgDmk97EVVHE+ZxX0R3n9UKzPrACs1vPSJTB6DmugGQlkyCp2LpmykxHIkasDnJN3sN2jvHF/2FZeYPuyaUtVolIdRqrLUapO2A/fPWX3cDmu9sSQQNsK7tYrPxS7UCy22XDzNM4Wb9ctfDuvbHotrKv22gMdK+2nLx63b8rdNiQwRgX9/Omu5sk8OZ6wkQjua9XzPcuGn5RFO+eK8K8KDuuebc3zeAvb4LmiSlWcv+Gg/T6vywYU9nRWtR69dAsaG2oXpFLqsY6p47b3++35zsbaVQZNAPeF0LE9zysHensfzi5VdiRZVglpzkUMmaXp16aGiXhxVZzYNWWSp7dYuetU3/ljz409evQx21jWJYg/EYJMhNxPmb68aqmFypiNJKkdXpLa1Noxs01vylxXhhz844ykSo0Wq63lXQJ3sK/v/uzixUNKPWGDX/M+jZeLz4oXidkIT4ovncL5mA2+EezMUJ5dWKUE9KHLefe0DvEUK8uQCWT3YltT7bA1I9I9/LNZ/0gNmKaRkDAgI0DOnMBVPxwYWJePj3+mxz/R13xG4EoEoFoYax6ffOY6SlFfkZRtmO3TcRsrl279qJKM75BSnhOyqyPUTxsTOOusWpjKLUunLXvhfcvXv6sEZeaAiAP7PALUHFfZ1NkLr/aY9SrgrBa6+CGHgQDHDZSc9mKsb79N1Zlv16xaNdNfsdLH3bbokWkb3yQ7FjAWkVmnspmQs65pS545YMkdH5hNL5T+4mVADo5T0mixbiyAlUleriddAgjJs6DvfQRKtYiJExwwJ3v5j1I/AOR01rrekf1dUirbmmfNFW18vtlNSuTpt8xWfqoEexVD1QAIcZCtXM9PKyIFIzbnO6eNDhJQgKy3M4JhbYl4pXiVuF+c6kBeWJra5A89VvpcxeNJkbMORZkU2JUXzLbtMVsmcJM6yPwqdED4bmWK4C3WMILQOY5d0UtR606rgzPS03KYzdgxBuiAePQvvmGTdnJP2Xoe1Ftzq0AL5OBxsyd2KukjZqcXa8/52n5AeYyiBAfzJoAoYq/rkhbDEFVknWrJf9zIGXUbWqGbb7eIN8hg9HzJDg9XbfRls/sE6qFndSz0BIxqLRE4AKiAjTPNfvflMZFNACkpzAISqlfURjWmpSpITKLojDEBnACwSodizX6zX5eb3SvZIXBV3iqtQfjniULFXpJFtnJbgBhTLYwBSPXk3+4We4UdYNFhK9BB2a/YUwOT6Rx0jl1ODv+6wNYtbufL/TYBrMiUM8EFABhZAohMaR+bWEeixzHSq4yesVPsgm5q7KVumSeHBCC+sGFfO1/omwBizCY2eyAkTBV5TnBOhZ08e5foGTu1+/+NdXySOL4AARjI/bhsAZhHgA4KCQEYwlk7gKwVQV1r7MEBhU+X6PHv6xrWgA8zEqVa8rJj6EAByFeDjJH8YqCiVBx2O/ZASOeoqM/xgz17YXzRFferd7jh07vYUsHL54KgBMEQ/lZ8Wsy7R9beGrKlAkXWNO5FOviixC+gRsRLxbyj7s/f32IMLdfIq+cSLZky56vlPxAIALHG2IOjc8DFgFw6QBQllXlQTPL4xxdfq6Jk3FRBAhVboGncQOlvFpMtALyKbPZMXaIrMnqvrp8tl1qK/ogLIYsJA74JYEU7q7IgI7KBPCNA8gsG5w7Aq+RzpOuKgAHooJBXIsA5+9FqAujlBhztgLz8rJEhARgXyZ2yjkOkA6Qj6LyKDlaqJsIH+2AHh2wCKGcBhw5Kw8YYPQxAB1R06qBw6uAAwxh/SAfn1ZQqUtEf+4tAmwCmiVUrshCQKq2FHBgSHc69Su6oVXrmgGINYOiKADVtIk8WWQQZAa6vFcWm0mo/H29l3IURYAjAmPcKY4IgCd4q0Tm7LXP8sK8IEJ1TsYKtyTb+q9M/0B2368euAK7Qc1LRGYw+2HBO/LeYn1lOHtAleh+7dF1xj4+vJInnxLgB0JU3mqQTDeK/ux/rlWso/+fBDV9BjssNTf8AmPnhttjsZCIAAAAASUVORK5CYII=';
+var close_img = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+SX8VGAAAA5ElEQVR42tRTQYoEIQwsl/2Bl3gQoY9eBKEf5kvyG8G7h4Z+S38gIu5lp5lZ2R7YPm1BDhZJSFWiGmPgDj5wE7cbfD4/mBkAHprUj9yTTyn9OsGIMSLG+Fxwxc8SiAi9d4QQHskjhIDeO4jorQcq5wwiQmsN3nt479FaAxEh5zxJmyZIKalSClprL1FKQUpJXZr4DBH52xqZeRhjICKw1sJaCxGBMQbMPN41GFpriAicc6i1otYK5xxEBFrraQuThGVZAADbtp2amXms6woAOI7j0gO17/t5MN+HNfEvBf//M30NAKe7aRqUOIlfAAAAAElFTkSuQmCC';
+
+var osd = function(){
+ var navbar, newElement;
+
+ var createApiUrl = function(url){
+ return host + api + "?url=" + escape(url)
+ };
+
+ var iframe = create('iframe', {
+ 'src': createApiUrl(document.location.href),
+ 'frameborder': 0,
+ 'scrolling': 'no'
+ });
+
+ var popup = create('div', {
+ 'id': 'cp_popup'
+ });
+
+ var onclick = function(){
+
+ // Try and get imdb url
+ try {
+ var regex = new RegExp(/tt(\d{7})/);
+ var imdb_id = document.body.innerHTML.match(regex)[0];
+ if (imdb_id)
+ iframe.setAttribute('src', createApiUrl('http://imdb.com/title/'+imdb_id+'/'))
+ }
+ catch(e){}
+
+ popup.innerHTML = '';
+ popup.setAttribute('class', 'opened');
+ popup.appendChild(create('a', {
+ 'innerHTML': '',
+ 'id': 'close_button',
+ 'onclick': function(){
+ popup.innerHTML = '';
+ popup.appendChild(add_button);
+ popup.setAttribute('class', '');
+ }
+ }));
+ popup.appendChild(iframe)
+ }
+
+ var add_button = create('a', {
+ 'innerHTML': '',
+ 'id': 'add_to',
+ 'onclick': onclick
+ });
+ popup.appendChild(add_button);
+
+ document.body.parentNode.insertBefore(popup, document.body);
+
+ // Auto fold open
+ if(document.body.getAttribute('cp_auto_open'))
+ onclick()
+};
+
+var setVersion = function(){
+ document.body.setAttribute('data-userscript_version', version)
+};
+
+if(document.location.href.indexOf(host) == -1)
+ osd();
+else
+ setVersion();
+
+}
diff --git a/couchpotato/core/plugins/v1importer/__init__.py b/couchpotato/core/plugins/v1importer/__init__.py
deleted file mode 100644
index 40c1434b4c..0000000000
--- a/couchpotato/core/plugins/v1importer/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import V1Importer
-
-def start():
- return V1Importer()
-
-config = []
diff --git a/couchpotato/core/plugins/v1importer/form.html b/couchpotato/core/plugins/v1importer/form.html
deleted file mode 100644
index e27d1c7228..0000000000
--- a/couchpotato/core/plugins/v1importer/form.html
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {% if message: %}
- {{ message }}
- {% else: %}
-
- {% endif %}
-
-
\ No newline at end of file
diff --git a/couchpotato/core/plugins/v1importer/main.py b/couchpotato/core/plugins/v1importer/main.py
deleted file mode 100644
index 08f8ba986f..0000000000
--- a/couchpotato/core/plugins/v1importer/main.py
+++ /dev/null
@@ -1,56 +0,0 @@
-from couchpotato.api import addApiView
-from couchpotato.core.event import fireEventAsync
-from couchpotato.core.helpers.variable import getImdb
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.environment import Env
-from flask.globals import request
-from flask.helpers import url_for
-import os
-
-log = CPLog(__name__)
-
-
-class V1Importer(Plugin):
-
- def __init__(self):
- addApiView('v1.import', self.fromOld, methods = ['GET', 'POST'])
-
- def fromOld(self):
-
- if request.method != 'POST':
- return self.renderTemplate(__file__, 'form.html', url_for = url_for)
-
- file = request.files['old_db']
-
- uploaded_file = os.path.join(Env.get('cache_dir'), 'v1_database.db')
-
- if os.path.isfile(uploaded_file):
- os.remove(uploaded_file)
-
- file.save(uploaded_file)
-
- try:
- import sqlite3
- conn = sqlite3.connect(uploaded_file)
-
- wanted = []
-
- t = ('want',)
- cur = conn.execute('SELECT status, imdb FROM Movie WHERE status=?', t)
- for row in cur:
- status, imdb = row
- if getImdb(imdb):
- wanted.append(imdb)
- conn.close()
-
- wanted = set(wanted)
- for imdb in wanted:
- fireEventAsync('movie.add', {'identifier': imdb}, search_after = False)
-
- message = 'Successfully imported %s movie(s)' % len(wanted)
- except Exception, e:
- message = 'Failed: %s' % e
-
- return self.renderTemplate(__file__, 'form.html', url_for = url_for, message = message)
-
diff --git a/couchpotato/core/plugins/wizard/__init__.py b/couchpotato/core/plugins/wizard/__init__.py
index 78876470ee..7a272b44d0 100644
--- a/couchpotato/core/plugins/wizard/__init__.py
+++ b/couchpotato/core/plugins/wizard/__init__.py
@@ -1,6 +1,7 @@
from .main import Wizard
-def start():
+
+def autoload():
return Wizard()
config = [{
diff --git a/couchpotato/core/plugins/wizard/static/wizard.css b/couchpotato/core/plugins/wizard/static/wizard.css
deleted file mode 100644
index 8d50d9de08..0000000000
--- a/couchpotato/core/plugins/wizard/static/wizard.css
+++ /dev/null
@@ -1,88 +0,0 @@
-.page.wizard .uniForm {
- width: 80%;
- margin: 0 auto 30px;
-}
-
-.page.wizard h1 {
- padding: 10px 30px;
- margin: 0;
- display: block;
- font-size: 30px;
- margin-top: 80px;
-}
-
-.page.wizard .description {
- padding: 10px 30px;
- font-size: 18px;
- display: block;
-}
-
-.page.wizard .tab_wrapper {
- background: #5c697b;
- padding: 10px 0;
- font-size: 18px;
- position: fixed;
- top: 0;
- margin: 0;
- width: 100%;
- min-width: 960px;
- left: 0;
- z-index: 2;
- box-shadow: 0 0 50px rgba(0,0,0,0.55);
-}
-
- .page.wizard .tab_wrapper .tabs {
- text-align: center;
- padding: 0;
- margin: 0;
- display: block;
- }
-
- .page.wizard .tabs li {
- display: inline-block;
- }
- .page.wizard .tabs li a {
- padding: 20px 10px;
- }
-
- .page.wizard .tab_wrapper .pointer {
- border-right: 10px solid transparent;
- border-left: 10px solid transparent;
- border-top: 10px solid #5c697b;
- display: block;
- position: absolute;
- top: 44px;
- }
-
-.page.wizard .tab_content {
- margin: 20px 0 160px;
-}
-
-.page.wizard form > div {
- min-height: 300px;
-}
-.page.wizard .wgroup_finish {
- height: 300px;
-}
- .page.wizard .wgroup_finish h1 {
- text-align: center;
- }
- .page.wizard .wgroup_finish .wizard_support,
- .page.wizard .wgroup_finish .description {
- font-size: 25px;
- line-height: 120%;
- margin: 20px 0;
- text-align: center;
- }
-
- .page.wizard .button.green {
- padding: 20px;
- font-size: 25px;
- margin: 10px 30px 80px;
- display: block;
- text-align: center;
- }
-
-.page.wizard .tab_nzb_providers {
- margin: 20px 0 0 0;
-}
diff --git a/couchpotato/core/plugins/wizard/static/wizard.js b/couchpotato/core/plugins/wizard/static/wizard.js
index eb41cb591c..49080c741d 100644
--- a/couchpotato/core/plugins/wizard/static/wizard.js
+++ b/couchpotato/core/plugins/wizard/static/wizard.js
@@ -1,263 +1,200 @@
-Page.Wizard = new Class({
-
- Extends: Page.Settings,
-
- name: 'wizard',
- has_tab: false,
- wizard_only: true,
-
- headers: {
- 'welcome': {
- 'title': 'Welcome to the new CouchPotato',
- 'description': 'To get started, fill in each of the following settings as much as you can.
Maybe first start with importing your movies from the previous CouchPotato', - 'content': new Element('div', { - 'styles': { - 'margin': '0 0 0 30px' - } - }).adopt( - new Element('div', { - 'html': 'Select the data.db. It should be in your CouchPotato root directory.' - }), - self.import_iframe = new Element('iframe', { - 'styles': { - 'height': 40, - 'width': 300, - 'border': 0, - 'overflow': 'hidden' - } - }) - ), - 'event': function(){ - self.import_iframe.set('src', Api.createUrl('v1.import')) - } - }, - 'general': { - 'title': 'General', - 'description': 'If you want to access CP from outside your local network, you better secure it a bit with a username & password.' - }, - 'downloaders': { - 'title': 'What download apps are you using?', - 'description': 'CP needs an external download app to work with. Choose one below. For more downloaders check settings after you have filled in the wizard. If your download app isn\'t in the list, use the default Blackhole.' - }, - 'providers': { - 'title': 'Are you registered at any of these sites?', - 'description': 'CP uses these sites to search for movies. A few free are enabled by default, but it\'s always better to have a few more. Check settings for the full list of available providers.' - }, - 'renamer': { - 'title': 'Move & rename the movies after downloading?', - 'description': 'The coolest part of CP is that it can move and organize your downloaded movies automagically. Check settings and you can even download trailers, subtitles and other data when it has finished downloading. It\'s awesome!' - }, - 'automation': { - 'title': 'Easily add movies to your wanted list!', - 'description': 'You can easily add movies from your favorite movie site, like IMDB, Rotten Tomatoes, Apple Trailers and more. Just install the userscript or drag the bookmarklet to your browsers bookmarks.' + - '
Once installed, just click the bookmarklet on a movie page and watch the magic happen ;)', - 'content': function(){ - return App.createUserscriptButtons().setStyles({ - 'background-image': "url('"+Api.createUrl('static/userscript/userscript.png')+"')" - }) - } - }, - 'finish': { - 'title': 'Finishing Up', - 'description': 'Are you done? Did you fill in everything as much as possible?' + - '
Be sure to check the settings to see what more CP can do!
' + - '
Once installed, just click the bookmarklet on a movie page and watch the magic happen ;)', + 'content': function(){ + return App.createUserscriptButtons(); + } + }, + 'finish': { + 'title': 'Finishing Up', + 'description': 'Are you done? Did you fill in everything as much as possible?' + + '
Be sure to check the settings to see what more CP can do!
' + + '[0-9\.]+.[GMB]+)', info.text)
-
- def extra_check(item):
- parts = re.search('available:.(?P\d+)./.(?P\d+)', info.text)
- total = tryInt(parts.group('total'))
- parts = tryInt(parts.group('parts'))
-
- if (total / parts) < 0.95 or ((total / parts) >= 0.95 and not 'par2' in info.text.lower()):
- log.info2('Wrong: \'%s\', not complete: %s out of %s', (item['name'], parts, total))
- return False
-
- if 'requires password' in info.text.lower():
- log.info2('Wrong: \'%s\', passworded', (item['name']))
- return False
-
- return True
-
- results.append({
- 'id': nzb_id,
- 'name': title.text,
- 'age': tryInt(re.search('(?P\d+d)', row.find_all('td')[-1:][0].text).group('size')[:-1]),
- 'size': self.parseSize(size_match.group('size')),
- 'url': self.urls['download'] % nzb_id,
- 'detail_url': self.urls['detail'] % info.find('a')['href'],
- 'extra_check': extra_check
- })
-
- except:
- log.error('Failed to parse HTML response from BinSearch: %s', traceback.format_exc())
-
- def download(self, url = '', nzb_id = ''):
-
- params = {'action': 'nzb'}
- params[nzb_id] = 'on'
-
- try:
- return self.urlopen(url, params = params, show_error = False)
- except:
- log.error('Failed getting nzb from %s: %s', (self.getName(), traceback.format_exc()))
-
- return 'try_next'
-
diff --git a/couchpotato/core/providers/nzb/ftdworld/__init__.py b/couchpotato/core/providers/nzb/ftdworld/__init__.py
deleted file mode 100644
index ca60ac4dcc..0000000000
--- a/couchpotato/core/providers/nzb/ftdworld/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from .main import FTDWorld
-
-def start():
- return FTDWorld()
-
-config = [{
- 'name': 'ftdworld',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'nzb_providers',
- 'name': 'FTDWorld',
- 'description': 'Free provider, less accurate. See FTDWorld',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- },
- {
- 'name': 'username',
- 'default': '',
- },
- {
- 'name': 'password',
- 'default': '',
- 'type': 'password',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/nzb/ftdworld/main.py b/couchpotato/core/providers/nzb/ftdworld/main.py
deleted file mode 100644
index bd2a3ee281..0000000000
--- a/couchpotato/core/providers/nzb/ftdworld/main.py
+++ /dev/null
@@ -1,81 +0,0 @@
-from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.nzb.base import NZBProvider
-from couchpotato.environment import Env
-from dateutil.parser import parse
-import json
-import traceback
-
-log = CPLog(__name__)
-
-
-class FTDWorld(NZBProvider):
-
- urls = {
- 'search': 'http://ftdworld.net/api/index.php?%s',
- 'detail': 'http://ftdworld.net/spotinfo.php?id=%s',
- 'download': 'http://ftdworld.net/cgi-bin/nzbdown.pl?fileID=%s',
- 'login': 'http://ftdworld.net/api/login.php',
- }
-
- http_time_between_calls = 3 #seconds
-
- cat_ids = [
- ([4, 11], ['dvdr']),
- ([1], ['cam', 'ts', 'dvdrip', 'tc', 'r5', 'scr', 'brrip']),
- ([7, 10, 13, 14], ['bd50', '720p', '1080p']),
- ]
- cat_backup_id = 1
-
- def _searchOnTitle(self, title, movie, quality, results):
-
- q = '"%s" %s' % (title, movie['library']['year'])
-
- params = tryUrlencode({
- 'ctitle': q,
- 'customQuery': 'usr',
- 'cage': Env.setting('retention', 'nzb'),
- 'csizemin': quality.get('size_min'),
- 'csizemax': quality.get('size_max'),
- 'ccategory': 14,
- 'ctype': ','.join([str(x) for x in self.getCatId(quality['identifier'])]),
- })
-
- data = self.getJsonData(self.urls['search'] % params, opener = self.login_opener)
-
- if data:
- try:
-
- if data.get('numRes') == 0:
- return
-
- for item in data.get('data'):
-
- nzb_id = tryInt(item.get('id'))
- results.append({
- 'id': nzb_id,
- 'name': toUnicode(item.get('Title')),
- 'age': self.calculateAge(tryInt(item.get('Created'))),
- 'size': item.get('Size', 0),
- 'url': self.urls['download'] % nzb_id,
- 'download': self.loginDownload,
- 'detail_url': self.urls['detail'] % nzb_id,
- 'score': (tryInt(item.get('webPlus', 0)) - tryInt(item.get('webMin', 0))) * 3,
- })
-
- except:
- log.error('Failed to parse HTML response from FTDWorld: %s', traceback.format_exc())
-
- def getLoginParams(self):
- return tryUrlencode({
- 'userlogin': self.conf('username'),
- 'passlogin': self.conf('password'),
- 'submit': 'Log In',
- })
-
- def loginSuccess(self, output):
- try:
- return json.loads(output).get('goodToGo', False)
- except:
- return False
diff --git a/couchpotato/core/providers/nzb/newznab/__init__.py b/couchpotato/core/providers/nzb/newznab/__init__.py
deleted file mode 100644
index 9047d20035..0000000000
--- a/couchpotato/core/providers/nzb/newznab/__init__.py
+++ /dev/null
@@ -1,44 +0,0 @@
-from .main import Newznab
-
-def start():
- return Newznab()
-
-config = [{
- 'name': 'newznab',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'nzb_providers',
- 'name': 'newznab',
- 'order': 10,
- 'description': 'Enable NewzNab providers such as NZB.su, \
- NZBs.org, DOGnzb.cr, \
- Spotweb or NZBGeek',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- },
- {
- 'name': 'use',
- 'default': '0,0,0,0'
- },
- {
- 'name': 'host',
- 'default': 'nzb.su,dognzb.cr,nzbs.org,https://index.nzbgeek.info',
- 'description': 'The hostname of your newznab provider',
- },
- {
- 'name': 'api_key',
- 'default': ',,,',
- 'label': 'Api Key',
- 'description': 'Can be found on your profile page',
- 'type': 'combined',
- 'combine': ['use', 'host', 'api_key'],
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/nzb/newznab/main.py b/couchpotato/core/providers/nzb/newznab/main.py
deleted file mode 100644
index 414e711293..0000000000
--- a/couchpotato/core/providers/nzb/newznab/main.py
+++ /dev/null
@@ -1,152 +0,0 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.helpers.variable import cleanHost, splitString
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.base import ResultList
-from couchpotato.core.providers.nzb.base import NZBProvider
-from couchpotato.environment import Env
-from dateutil.parser import parse
-from urllib2 import HTTPError
-from urlparse import urlparse
-import time
-import traceback
-
-log = CPLog(__name__)
-
-
-class Newznab(NZBProvider, RSS):
-
- urls = {
- 'download': 'get&id=%s',
- 'detail': 'details&id=%s',
- 'search': 'movie',
- }
-
- limits_reached = {}
-
- http_time_between_calls = 1 # Seconds
-
- def search(self, movie, quality):
- hosts = self.getHosts()
-
- results = ResultList(self, movie, quality, imdb_results = True)
-
- for host in hosts:
- if self.isDisabled(host):
- continue
-
- self._searchOnHost(host, movie, quality, results)
-
- return results
-
- def _searchOnHost(self, host, movie, quality, results):
-
- arguments = tryUrlencode({
- 'imdbid': movie['library']['identifier'].replace('tt', ''),
- 'apikey': host['api_key'],
- 'extended': 1
- })
- url = '%s&%s' % (self.getUrl(host['host'], self.urls['search']), arguments)
-
- nzbs = self.getRSSData(url, cache_timeout = 1800, headers = {'User-Agent': Env.getIdentifier()})
-
- for nzb in nzbs:
-
- date = None
- for item in nzb:
- if item.attrib.get('name') == 'usenetdate':
- date = item.attrib.get('value')
- break
-
- if not date:
- date = self.getTextElement(nzb, 'pubDate')
-
- nzb_id = self.getTextElement(nzb, 'guid').split('/')[-1:].pop()
- name = self.getTextElement(nzb, 'title')
-
- if not name:
- continue
-
- results.append({
- 'id': nzb_id,
- 'provider_extra': urlparse(host['host']).hostname or host['host'],
- 'name': self.getTextElement(nzb, 'title'),
- 'age': self.calculateAge(int(time.mktime(parse(date).timetuple()))),
- 'size': int(self.getElement(nzb, 'enclosure').attrib['length']) / 1024 / 1024,
- 'url': (self.getUrl(host['host'], self.urls['download']) % tryUrlencode(nzb_id)) + self.getApiExt(host),
- 'detail_url': '%sdetails/%s' % (cleanHost(host['host']), tryUrlencode(nzb_id)),
- 'content': self.getTextElement(nzb, 'description'),
- })
-
- def getHosts(self):
-
- uses = splitString(str(self.conf('use')))
- hosts = splitString(self.conf('host'))
- api_keys = splitString(self.conf('api_key'))
-
- list = []
- for nr in range(len(hosts)):
- list.append({
- 'use': uses[nr],
- 'host': hosts[nr],
- 'api_key': api_keys[nr]
- })
-
- return list
-
- def belongsTo(self, url, provider = None):
-
- hosts = self.getHosts()
-
- for host in hosts:
- result = super(Newznab, self).belongsTo(url, host = host['host'], provider = provider)
- if result:
- return result
-
- def getUrl(self, host, type):
- if '?page=newznabapi' in host:
- return cleanHost(host)[:-1] + '&t=' + type
-
- return cleanHost(host) + 'api?t=' + type
-
- def isDisabled(self, host = None):
- return not self.isEnabled(host)
-
- def isEnabled(self, host = None):
-
- # Return true if at least one is enabled and no host is given
- if host is None:
- for host in self.getHosts():
- if self.isEnabled(host):
- return True
- return False
-
- return NZBProvider.isEnabled(self) and host['host'] and host['api_key'] and int(host['use'])
-
- def getApiExt(self, host):
- return '&apikey=%s' % host['api_key']
-
- def download(self, url = '', nzb_id = ''):
- host = urlparse(url).hostname
-
- if self.limits_reached.get(host):
- # Try again in 3 hours
- if self.limits_reached[host] > time.time() - 10800:
- return 'try_next'
-
- try:
- data = self.urlopen(url, show_error = False)
- self.limits_reached[host] = False
- return data
- except HTTPError, e:
- if e.code == 503:
- response = e.read().lower()
- if 'maximum api' in response or 'download limit' in response:
- if not self.limits_reached.get(host):
- log.error('Limit reached for newznab provider: %s', host)
- self.limits_reached[host] = time.time()
- return 'try_next'
-
- log.error('Failed download from %s: %s', (host, traceback.format_exc()))
-
- return 'try_next'
diff --git a/couchpotato/core/providers/nzb/nzbclub/__init__.py b/couchpotato/core/providers/nzb/nzbclub/__init__.py
deleted file mode 100644
index 7859fe9c46..0000000000
--- a/couchpotato/core/providers/nzb/nzbclub/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from .main import NZBClub
-
-def start():
- return NZBClub()
-
-config = [{
- 'name': 'nzbclub',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'nzb_providers',
- 'name': 'NZBClub',
- 'description': 'Free provider, less accurate. See NZBClub',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/nzb/nzbclub/main.py b/couchpotato/core/providers/nzb/nzbclub/main.py
deleted file mode 100644
index 59382dfdc2..0000000000
--- a/couchpotato/core/providers/nzb/nzbclub/main.py
+++ /dev/null
@@ -1,80 +0,0 @@
-from bs4 import BeautifulSoup
-from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.nzb.base import NZBProvider
-from dateutil.parser import parse
-import time
-
-log = CPLog(__name__)
-
-
-class NZBClub(NZBProvider, RSS):
-
- urls = {
- 'search': 'http://www.nzbclub.com/nzbfeed.aspx?%s',
- }
-
- http_time_between_calls = 4 #seconds
-
- def _searchOnTitle(self, title, movie, quality, results):
-
- q = '"%s %s"' % (title, movie['library']['year'])
-
- params = tryUrlencode({
- 'q': q,
- 'ig': 1,
- 'rpp': 200,
- 'st': 5,
- 'sp': 1,
- 'ns': 1,
- })
-
- nzbs = self.getRSSData(self.urls['search'] % params)
-
- for nzb in nzbs:
-
- nzbclub_id = tryInt(self.getTextElement(nzb, "link").split('/nzb_view/')[1].split('/')[0])
- enclosure = self.getElement(nzb, "enclosure").attrib
- size = enclosure['length']
- date = self.getTextElement(nzb, "pubDate")
-
- def extra_check(item):
- full_description = self.getCache('nzbclub.%s' % nzbclub_id, item['detail_url'], cache_timeout = 25920000)
-
- for ignored in ['ARCHIVE inside ARCHIVE', 'Incomplete', 'repair impossible']:
- if ignored in full_description:
- log.info('Wrong: Seems to be passworded or corrupted files: %s', item['name'])
- return False
-
- return True
-
- results.append({
- 'id': nzbclub_id,
- 'name': toUnicode(self.getTextElement(nzb, "title")),
- 'age': self.calculateAge(int(time.mktime(parse(date).timetuple()))),
- 'size': tryInt(size) / 1024 / 1024,
- 'url': enclosure['url'].replace(' ', '_'),
- 'detail_url': self.getTextElement(nzb, "link"),
- 'get_more_info': self.getMoreInfo,
- 'extra_check': extra_check
- })
-
- def getMoreInfo(self, item):
- full_description = self.getCache('nzbclub.%s' % item['id'], item['detail_url'], cache_timeout = 25920000)
- html = BeautifulSoup(full_description)
- nfo_pre = html.find('pre', attrs = {'class':'nfo'})
- description = toUnicode(nfo_pre.text) if nfo_pre else ''
-
- item['description'] = description
- return item
-
- def extraCheck(self, item):
- full_description = self.getCache('nzbclub.%s' % item['id'], item['detail_url'], cache_timeout = 25920000)
-
- if 'ARCHIVE inside ARCHIVE' in full_description:
- log.info('Wrong: Seems to be passworded files: %s', item['name'])
- return False
-
- return True
diff --git a/couchpotato/core/providers/nzb/nzbindex/__init__.py b/couchpotato/core/providers/nzb/nzbindex/__init__.py
deleted file mode 100644
index 29eb0d38bb..0000000000
--- a/couchpotato/core/providers/nzb/nzbindex/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from .main import NzbIndex
-
-def start():
- return NzbIndex()
-
-config = [{
- 'name': 'nzbindex',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'nzb_providers',
- 'name': 'nzbindex',
- 'description': 'Free provider, less accurate. See NZBIndex',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- 'default': True,
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/nzb/nzbindex/main.py b/couchpotato/core/providers/nzb/nzbindex/main.py
deleted file mode 100644
index 3643f55b1e..0000000000
--- a/couchpotato/core/providers/nzb/nzbindex/main.py
+++ /dev/null
@@ -1,79 +0,0 @@
-from bs4 import BeautifulSoup
-from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.nzb.base import NZBProvider
-from couchpotato.environment import Env
-from dateutil.parser import parse
-import re
-import time
-
-log = CPLog(__name__)
-
-
-class NzbIndex(NZBProvider, RSS):
-
- urls = {
- 'download': 'https://www.nzbindex.com/download/',
- 'search': 'https://www.nzbindex.com/rss/?%s',
- }
-
- http_time_between_calls = 1 # Seconds
-
- def _searchOnTitle(self, title, movie, quality, results):
-
- q = '"%s %s"' % (title, movie['library']['year'])
- arguments = tryUrlencode({
- 'q': q,
- 'age': Env.setting('retention', 'nzb'),
- 'sort': 'agedesc',
- 'minsize': quality.get('size_min'),
- 'maxsize': quality.get('size_max'),
- 'rating': 1,
- 'max': 250,
- 'more': 1,
- 'complete': 1,
- })
-
- nzbs = self.getRSSData(self.urls['search'] % arguments)
-
- for nzb in nzbs:
-
- enclosure = self.getElement(nzb, 'enclosure').attrib
- nzbindex_id = int(self.getTextElement(nzb, "link").split('/')[4])
-
- try:
- description = self.getTextElement(nzb, "description")
- except:
- description = ''
-
- def extra_check(item):
- if '#c20000' in item['description'].lower():
- log.info('Wrong: Seems to be passworded: %s', item['name'])
- return False
-
- return True
-
- results.append({
- 'id': nzbindex_id,
- 'name': self.getTextElement(nzb, "title"),
- 'age': self.calculateAge(int(time.mktime(parse(self.getTextElement(nzb, "pubDate")).timetuple()))),
- 'size': tryInt(enclosure['length']) / 1024 / 1024,
- 'url': enclosure['url'],
- 'detail_url': enclosure['url'].replace('/download/', '/release/'),
- 'description': description,
- 'get_more_info': self.getMoreInfo,
- 'extra_check': extra_check,
- })
-
- def getMoreInfo(self, item):
- try:
- if '/nfo/' in item['description'].lower():
- nfo_url = re.search('href=\"(?P.+)\" ', item['description']).group('nfo')
- full_description = self.getCache('nzbindex.%s' % item['id'], url = nfo_url, cache_timeout = 25920000)
- html = BeautifulSoup(full_description)
- item['description'] = toUnicode(html.find('pre', attrs = {'id':'nfo0'}).text)
- except:
- pass
-
diff --git a/couchpotato/core/providers/nzb/nzbsrus/__init__.py b/couchpotato/core/providers/nzb/nzbsrus/__init__.py
deleted file mode 100644
index 3a04278475..0000000000
--- a/couchpotato/core/providers/nzb/nzbsrus/__init__.py
+++ /dev/null
@@ -1,41 +0,0 @@
-from .main import Nzbsrus
-
-def start():
- return Nzbsrus()
-
-config = [{
- 'name': 'nzbsrus',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'nzb_providers',
- 'name': 'nzbsrus',
- 'label': 'Nzbsrus',
- 'description': 'See NZBsRus. You need a VIP account!',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- },
- {
- 'name': 'userid',
- 'label': 'User ID',
- },
- {
- 'name': 'api_key',
- 'default': '',
- 'label': 'Api Key',
- },
- {
- 'name': 'english_only',
- 'default': 1,
- 'type': 'bool',
- 'label': 'English only',
- 'description': 'Only search for English spoken movies on Nzbsrus',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/nzb/nzbsrus/main.py b/couchpotato/core/providers/nzb/nzbsrus/main.py
deleted file mode 100644
index d52212a7c8..0000000000
--- a/couchpotato/core/providers/nzb/nzbsrus/main.py
+++ /dev/null
@@ -1,62 +0,0 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.nzb.base import NZBProvider
-from couchpotato.environment import Env
-import time
-
-log = CPLog(__name__)
-
-class Nzbsrus(NZBProvider, RSS):
-
- urls = {
- 'download': 'https://www.nzbsrus.com/nzbdownload_rss.php/%s',
- 'detail': 'https://www.nzbsrus.com/nzbdetails.php?id=%s',
- 'search': 'https://www.nzbsrus.com/api.php?extended=1&xml=1&listname={date,grabs}',
- }
-
- cat_ids = [
- ([90, 45, 51], ['720p', '1080p', 'brrip', 'bd50', 'dvdr']),
- ([48, 51], ['cam', 'ts', 'dvdrip', 'tc', 'r5', 'scr']),
- ]
- cat_backup_id = 240
-
- def _search(self, movie, quality, results):
-
- cat_id_string = '&'.join(['c%s=1' % x for x in self.getCatId(quality.get('identifier'))])
- arguments = tryUrlencode({
- 'searchtext': 'imdb:' + movie['library']['identifier'][2:],
- 'uid': self.conf('userid'),
- 'key': self.conf('api_key'),
- 'age': Env.setting('retention', section = 'nzb'),
-
- })
-
- # check for english_only
- if self.conf('english_only'):
- arguments += '&lang0=1&lang3=1&lang1=1'
-
- url = '%s&%s&%s' % (self.urls['search'], arguments , cat_id_string)
- nzbs = self.getRSSData(url, item_path = 'results/result', cache_timeout = 1800, headers = {'User-Agent': Env.getIdentifier()})
-
- for nzb in nzbs:
-
- title = self.getTextElement(nzb, 'name')
- if 'error' in title.lower(): continue
-
- nzb_id = self.getTextElement(nzb, 'id')
- size = int(round(int(self.getTextElement(nzb, 'size')) / 1048576))
- age = int(round((time.time() - int(self.getTextElement(nzb, 'postdate'))) / 86400))
-
- results.append({
- 'id': nzb_id,
- 'name': title,
- 'age': age,
- 'size': size,
- 'url': self.urls['download'] % nzb_id + self.getApiExt() + self.getTextElement(nzb, 'key'),
- 'detail_url': self.urls['detail'] % nzb_id,
- 'description': self.getTextElement(nzb, 'addtext'),
- })
-
- def getApiExt(self):
- return '/%s/' % (self.conf('userid'))
diff --git a/couchpotato/core/providers/nzb/nzbx/__init__.py b/couchpotato/core/providers/nzb/nzbx/__init__.py
deleted file mode 100644
index 9ce9226b46..0000000000
--- a/couchpotato/core/providers/nzb/nzbx/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from .main import Nzbx
-
-def start():
- return Nzbx()
-
-config = [{
- 'name': 'nzbx',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'nzb_providers',
- 'name': 'nzbX',
- 'description': 'Free provider. See nzbX',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- 'default': True,
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/nzb/nzbx/main.py b/couchpotato/core/providers/nzb/nzbx/main.py
deleted file mode 100644
index ec7fbfe2c6..0000000000
--- a/couchpotato/core/providers/nzb/nzbx/main.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.nzb.base import NZBProvider
-from couchpotato.environment import Env
-
-log = CPLog(__name__)
-
-
-class Nzbx(NZBProvider):
-
- urls = {
- 'search': 'https://nzbx.co/api/search?%s',
- 'details': 'https://nzbx.co/api/details?guid=%s',
- }
-
- http_time_between_calls = 1 # Seconds
-
- def _search(self, movie, quality, results):
-
- # Get nbzs
- arguments = tryUrlencode({
- 'q': movie['library']['identifier'].replace('tt', ''),
- 'sf': quality.get('size_min'),
- })
- nzbs = self.getJsonData(self.urls['search'] % arguments, headers = {'User-Agent': Env.getIdentifier()})
-
- for nzb in nzbs:
-
- results.append({
- 'id': nzb['guid'],
- 'url': nzb['nzb'],
- 'detail_url': self.urls['details'] % nzb['guid'],
- 'name': nzb['name'],
- 'age': self.calculateAge(int(nzb['postdate'])),
- 'size': tryInt(nzb['size']) / 1024 / 1024,
- 'score': 5 if nzb['votes']['upvotes'] > nzb['votes']['downvotes'] else 0
- })
diff --git a/couchpotato/core/providers/nzb/omgwtfnzbs/__init__.py b/couchpotato/core/providers/nzb/omgwtfnzbs/__init__.py
deleted file mode 100644
index 287ced49bf..0000000000
--- a/couchpotato/core/providers/nzb/omgwtfnzbs/__init__.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from .main import OMGWTFNZBs
-
-def start():
- return OMGWTFNZBs()
-
-config = [{
- 'name': 'omgwtfnzbs',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'nzb_providers',
- 'name': 'OMGWTFNZBs',
- 'description': 'See OMGWTFNZBs',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- },
- {
- 'name': 'username',
- 'default': '',
- },
- {
- 'name': 'api_key',
- 'label': 'Api Key',
- 'default': '',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/nzb/omgwtfnzbs/main.py b/couchpotato/core/providers/nzb/omgwtfnzbs/main.py
deleted file mode 100644
index 0a18b8f4b8..0000000000
--- a/couchpotato/core/providers/nzb/omgwtfnzbs/main.py
+++ /dev/null
@@ -1,61 +0,0 @@
-from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.nzb.base import NZBProvider
-from dateutil.parser import parse
-from urlparse import urlparse, parse_qs
-import time
-
-log = CPLog(__name__)
-
-
-class OMGWTFNZBs(NZBProvider, RSS):
-
- urls = {
- 'search': 'http://rss.omgwtfnzbs.org/rss-search.php?%s',
- }
-
- http_time_between_calls = 1 #seconds
-
- cat_ids = [
- ([15], ['dvdrip']),
- ([15, 16], ['brrip']),
- ([16], ['720p', '1080p', 'bd50']),
- ([17], ['dvdr']),
- ]
- cat_backup_id = 'movie'
-
- def search(self, movie, quality):
-
- if quality['identifier'] in fireEvent('quality.pre_releases', single = True):
- return []
-
- return super(OMGWTFNZBs, self).search(movie, quality)
-
- def _searchOnTitle(self, title, movie, quality, results):
-
- q = '%s %s' % (title, movie['library']['year'])
- params = tryUrlencode({
- 'search': q,
- 'catid': ','.join([str(x) for x in self.getCatId(quality['identifier'])]),
- 'user': self.conf('username', default = ''),
- 'api': self.conf('api_key', default = ''),
- })
-
- nzbs = self.getRSSData(self.urls['search'] % params)
-
- for nzb in nzbs:
-
- enclosure = self.getElement(nzb, 'enclosure').attrib
-
- results.append({
- 'id': parse_qs(urlparse(self.getTextElement(nzb, 'link')).query).get('id')[0],
- 'name': toUnicode(self.getTextElement(nzb, 'title')),
- 'age': self.calculateAge(int(time.mktime(parse(self.getTextElement(nzb, 'pubDate')).timetuple()))),
- 'size': tryInt(enclosure['length']) / 1024 / 1024,
- 'url': enclosure['url'],
- 'detail_url': self.getTextElement(nzb, 'link'),
- 'description': self.getTextElement(nzb, 'description')
- })
diff --git a/couchpotato/core/providers/torrent/__init__.py b/couchpotato/core/providers/torrent/__init__.py
deleted file mode 100644
index 191e132e0f..0000000000
--- a/couchpotato/core/providers/torrent/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-config = {
- 'name': 'torrent_providers',
- 'groups': [
- {
- 'label': 'Torrent',
- 'description': 'Providers searching torrent sites for new releases',
- 'wizard': True,
- 'type': 'list',
- 'name': 'torrent_providers',
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'options': [],
- },
- ],
-}
diff --git a/couchpotato/core/providers/torrent/base.py b/couchpotato/core/providers/torrent/base.py
deleted file mode 100644
index 453954c920..0000000000
--- a/couchpotato/core/providers/torrent/base.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from couchpotato.core.helpers.variable import getImdb, md5
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.base import YarrProvider
-
-log = CPLog(__name__)
-
-
-class TorrentProvider(YarrProvider):
-
- type = 'torrent'
-
- def imdbMatch(self, url, imdbId):
- if getImdb(url) == imdbId:
- return True
-
- if url[:4] == 'http':
- try:
- cache_key = md5(url)
- data = self.getCache(cache_key, url)
- except IOError:
- log.error('Failed to open %s.', url)
- return False
-
- return getImdb(data) == imdbId
-
- return False
-
-class TorrentMagnetProvider(TorrentProvider):
-
- type = 'torrent_magnet'
-
- download = None
diff --git a/couchpotato/core/providers/torrent/iptorrents/__init__.py b/couchpotato/core/providers/torrent/iptorrents/__init__.py
deleted file mode 100644
index bca8ce6914..0000000000
--- a/couchpotato/core/providers/torrent/iptorrents/__init__.py
+++ /dev/null
@@ -1,40 +0,0 @@
-from .main import IPTorrents
-
-def start():
- return IPTorrents()
-
-config = [{
- 'name': 'iptorrents',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'torrent_providers',
- 'name': 'IPTorrents',
- 'description': 'See IPTorrents',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- 'default': False,
- },
- {
- 'name': 'username',
- 'default': '',
- },
- {
- 'name': 'password',
- 'default': '',
- 'type': 'password',
- },
- {
- 'name': 'freeleech',
- 'default': 0,
- 'type': 'bool',
- 'description': 'Only search for [FreeLeech] torrents.',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/torrent/iptorrents/main.py b/couchpotato/core/providers/torrent/iptorrents/main.py
deleted file mode 100644
index 75dc6f12af..0000000000
--- a/couchpotato/core/providers/torrent/iptorrents/main.py
+++ /dev/null
@@ -1,83 +0,0 @@
-from bs4 import BeautifulSoup
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.torrent.base import TorrentProvider
-import traceback
-
-
-log = CPLog(__name__)
-
-
-class IPTorrents(TorrentProvider):
-
- urls = {
- 'test' : 'http://www.iptorrents.com/',
- 'base_url' : 'http://www.iptorrents.com',
- 'login' : 'http://www.iptorrents.com/torrents/',
- 'search' : 'http://www.iptorrents.com/torrents/?l%d=1%s&q=%s&qf=ti',
- }
-
- cat_ids = [
- ([48], ['720p', '1080p', 'bd50']),
- ([72], ['cam', 'ts', 'tc', 'r5', 'scr']),
- ([7], ['dvdrip', 'brrip']),
- ([6], ['dvdr']),
- ]
-
- http_time_between_calls = 1 #seconds
- cat_backup_id = None
-
- def _searchOnTitle(self, title, movie, quality, results):
-
- freeleech = '' if not self.conf('freeleech') else '&free=on'
-
- url = self.urls['search'] % (self.getCatId(quality['identifier'])[0], freeleech, tryUrlencode('%s %s' % (title.replace(':', ''), movie['library']['year'])))
- data = self.getHTMLData(url, opener = self.login_opener)
-
- if data:
- html = BeautifulSoup(data)
-
- try:
- result_table = html.find('table', attrs = {'class' : 'torrents'})
-
- if not result_table or 'nothing found!' in data.lower():
- return
-
- entries = result_table.find_all('tr')
-
- for result in entries[1:]:
-
- torrent = result.find_all('td')[1].find('a')
-
- torrent_id = torrent['href'].replace('/details.php?id=', '')
- torrent_name = torrent.string
- torrent_download_url = self.urls['base_url'] + (result.find_all('td')[3].find('a'))['href'].replace(' ', '.')
- torrent_details_url = self.urls['base_url'] + torrent['href']
- torrent_size = self.parseSize(result.find_all('td')[5].string)
- torrent_seeders = tryInt(result.find('td', attrs = {'class' : 'ac t_seeders'}).string)
- torrent_leechers = tryInt(result.find('td', attrs = {'class' : 'ac t_leechers'}).string)
-
- results.append({
- 'id': torrent_id,
- 'name': torrent_name,
- 'url': torrent_download_url,
- 'detail_url': torrent_details_url,
- 'download': self.loginDownload,
- 'size': torrent_size,
- 'seeders': torrent_seeders,
- 'leechers': torrent_leechers,
- })
-
- except:
- log.error('Failed to parsing %s: %s', (self.getName(), traceback.format_exc()))
-
- def loginSuccess(self, output):
- return 'don\'t have an account' not in output.lower()
-
- def getLoginParams(self):
- return tryUrlencode({
- 'username': self.conf('username'),
- 'password': self.conf('password'),
- 'login': 'submit',
- })
diff --git a/couchpotato/core/providers/torrent/kickasstorrents/__init__.py b/couchpotato/core/providers/torrent/kickasstorrents/__init__.py
deleted file mode 100644
index 8ddb1f4a15..0000000000
--- a/couchpotato/core/providers/torrent/kickasstorrents/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from .main import KickAssTorrents
-
-def start():
- return KickAssTorrents()
-
-config = [{
- 'name': 'kickasstorrents',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'torrent_providers',
- 'name': 'KickAssTorrents',
- 'description': 'See KickAssTorrents',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- 'default': True,
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/torrent/kickasstorrents/main.py b/couchpotato/core/providers/torrent/kickasstorrents/main.py
deleted file mode 100644
index d9980d84ad..0000000000
--- a/couchpotato/core/providers/torrent/kickasstorrents/main.py
+++ /dev/null
@@ -1,102 +0,0 @@
-from bs4 import BeautifulSoup
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.torrent.base import TorrentMagnetProvider
-import re
-import traceback
-
-log = CPLog(__name__)
-
-
-class KickAssTorrents(TorrentMagnetProvider):
-
- urls = {
- 'test': 'https://kat.ph/',
- 'detail': 'https://kat.ph/%s',
- 'search': 'https://kat.ph/%s-i%s/',
- }
-
- cat_ids = [
- (['cam'], ['cam']),
- (['telesync'], ['ts', 'tc']),
- (['screener', 'tvrip'], ['screener']),
- (['x264', '720p', '1080p', 'blu-ray', 'hdrip'], ['bd50', '1080p', '720p', 'brrip']),
- (['dvdrip'], ['dvdrip']),
- (['dvd'], ['dvdr']),
- ]
-
- http_time_between_calls = 1 #seconds
- cat_backup_id = None
-
- def _search(self, movie, quality, results):
-
- data = self.getHTMLData(self.urls['search'] % ('m', movie['library']['identifier'].replace('tt', '')))
-
- if data:
-
- cat_ids = self.getCatId(quality['identifier'])
- table_order = ['name', 'size', None, 'age', 'seeds', 'leechers']
-
- try:
- html = BeautifulSoup(data)
- resultdiv = html.find('div', attrs = {'class':'tabs'})
- for result in resultdiv.find_all('div', recursive = False):
- if result.get('id').lower() not in cat_ids:
- continue
-
- try:
- for temp in result.find_all('tr'):
- if temp['class'] is 'firstr' or not temp.get('id'):
- continue
-
- new = {}
-
- nr = 0
- for td in temp.find_all('td'):
- column_name = table_order[nr]
- if column_name:
-
- if column_name is 'name':
- link = td.find('div', {'class': 'torrentname'}).find_all('a')[1]
- new['id'] = temp.get('id')[-8:]
- new['name'] = link.text
- new['url'] = td.find('a', 'imagnet')['href']
- new['detail_url'] = self.urls['detail'] % link['href'][1:]
- new['score'] = 20 if td.find('a', 'iverif') else 0
- elif column_name is 'size':
- new['size'] = self.parseSize(td.text)
- elif column_name is 'age':
- new['age'] = self.ageToDays(td.text)
- elif column_name is 'seeds':
- new['seeders'] = tryInt(td.text)
- elif column_name is 'leechers':
- new['leechers'] = tryInt(td.text)
-
- nr += 1
-
- results.append(new)
- except:
- log.error('Failed parsing KickAssTorrents: %s', traceback.format_exc())
-
- except AttributeError:
- log.debug('No search results found.')
-
- def ageToDays(self, age_str):
- age = 0
- age_str = age_str.replace(' ', ' ')
-
- regex = '(\d*.?\d+).(sec|hour|day|week|month|year)+'
- matches = re.findall(regex, age_str)
- for match in matches:
- nr, size = match
- mult = 1
- if size == 'week':
- mult = 7
- elif size == 'month':
- mult = 30.5
- elif size == 'year':
- mult = 365
-
- age += tryInt(nr) * mult
-
- return tryInt(age)
diff --git a/couchpotato/core/providers/torrent/passthepopcorn/__init__.py b/couchpotato/core/providers/torrent/passthepopcorn/__init__.py
deleted file mode 100644
index 06be7a890f..0000000000
--- a/couchpotato/core/providers/torrent/passthepopcorn/__init__.py
+++ /dev/null
@@ -1,44 +0,0 @@
-from main import PassThePopcorn
-
-def start():
- return PassThePopcorn()
-
-config = [{
- 'name': 'passthepopcorn',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'torrent_providers',
- 'name': 'PassThePopcorn',
- 'description': 'See PassThePopcorn.me',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- 'default': False
- },
- {
- 'name': 'domain',
- 'advanced': True,
- 'label': 'Proxy server',
- 'description': 'Domain for requests (HTTPS only!), keep empty to use default (tls.passthepopcorn.me).',
- },
- {
- 'name': 'username',
- 'default': '',
- },
- {
- 'name': 'password',
- 'default': '',
- 'type': 'password',
- },
- {
- 'name': 'passkey',
- 'default': '',
- }
- ],
-}
- ]
-}]
diff --git a/couchpotato/core/providers/torrent/passthepopcorn/main.py b/couchpotato/core/providers/torrent/passthepopcorn/main.py
deleted file mode 100644
index 9abe51fbdc..0000000000
--- a/couchpotato/core/providers/torrent/passthepopcorn/main.py
+++ /dev/null
@@ -1,229 +0,0 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.variable import getTitle, tryInt, mergeDicts
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.torrent.base import TorrentProvider
-from dateutil.parser import parse
-import cookielib
-import htmlentitydefs
-import json
-import re
-import time
-import traceback
-import urllib2
-
-log = CPLog(__name__)
-
-
-class PassThePopcorn(TorrentProvider):
-
- urls = {
- 'domain': 'https://tls.passthepopcorn.me',
- 'detail': 'https://tls.passthepopcorn.me/torrents.php?torrentid=%s',
- 'torrent': 'https://tls.passthepopcorn.me/torrents.php',
- 'login': 'https://tls.passthepopcorn.me/ajax.php?action=login',
- 'search': 'https://tls.passthepopcorn.me/search/%s/0/7/%d'
- }
-
- quality_search_params = {
- 'bd50': {'media': 'Blu-ray', 'format': 'BD50'},
- '1080p': {'resolution': '1080p'},
- '720p': {'resolution': '720p'},
- 'brrip': {'media': 'Blu-ray'},
- 'dvdr': {'resolution': 'anysd'},
- 'dvdrip': {'media': 'DVD'},
- 'scr': {'media': 'DVD-Screener'},
- 'r5': {'media': 'R5'},
- 'tc': {'media': 'TC'},
- 'ts': {'media': 'TS'},
- 'cam': {'media': 'CAM'}
- }
-
- post_search_filters = {
- 'bd50': {'Codec': ['BD50']},
- '1080p': {'Resolution': ['1080p']},
- '720p': {'Resolution': ['720p']},
- 'brrip': {'Source': ['Blu-ray'], 'Quality': ['High Definition'], 'Container': ['!ISO']},
- 'dvdr': {'Codec': ['DVD5', 'DVD9']},
- 'dvdrip': {'Source': ['DVD'], 'Codec': ['!DVD5', '!DVD9']},
- 'scr': {'Source': ['DVD-Screener']},
- 'r5': {'Source': ['R5']},
- 'tc': {'Source': ['TC']},
- 'ts': {'Source': ['TS']},
- 'cam': {'Source': ['CAM']}
- }
-
- class NotLoggedInHTTPError(urllib2.HTTPError):
- def __init__(self, url, code, msg, headers, fp):
- urllib2.HTTPError.__init__(self, url, code, msg, headers, fp)
-
- class PTPHTTPRedirectHandler(urllib2.HTTPRedirectHandler):
- def http_error_302(self, req, fp, code, msg, headers):
- log.debug("302 detected; redirected to %s" % headers['Location'])
- if (headers['Location'] != 'login.php'):
- return urllib2.HTTPRedirectHandler.http_error_302(self, req, fp, code, msg, headers)
- else:
- raise PassThePopcorn.NotLoggedInHTTPError(req.get_full_url(), code, msg, headers, fp)
-
- def _search(self, movie, quality, results):
-
- movie_title = getTitle(movie['library'])
- quality_id = quality['identifier']
-
- params = mergeDicts(self.quality_search_params[quality_id].copy(), {
- 'order_by': 'relevance',
- 'order_way': 'descending',
- 'searchstr': movie['library']['identifier']
- })
-
- # Do login for the cookies
- if not self.login_opener and not self.login():
- return
-
- try:
- url = '%s?json=noredirect&%s' % (self.urls['torrent'], tryUrlencode(params))
- txt = self.urlopen(url, opener = self.login_opener)
- res = json.loads(txt)
- except:
- log.error('Search on PassThePopcorn.me (%s) failed (could not decode JSON)' % params)
- return
-
- try:
- if not 'Movies' in res:
- return
-
- authkey = res['AuthKey']
- passkey = res['PassKey']
-
- for ptpmovie in res['Movies']:
- if not 'Torrents' in ptpmovie:
- log.debug('Movie %s (%s) has NO torrents' % (ptpmovie['Title'], ptpmovie['Year']))
- continue
-
- log.debug('Movie %s (%s) has %d torrents' % (ptpmovie['Title'], ptpmovie['Year'], len(ptpmovie['Torrents'])))
- for torrent in ptpmovie['Torrents']:
- torrent_id = tryInt(torrent['Id'])
- torrentdesc = '%s %s %s' % (torrent['Resolution'], torrent['Source'], torrent['Codec'])
-
- if 'GoldenPopcorn' in torrent and torrent['GoldenPopcorn']:
- torrentdesc += ' HQ'
- if 'Scene' in torrent and torrent['Scene']:
- torrentdesc += ' Scene'
- if 'RemasterTitle' in torrent and torrent['RemasterTitle']:
- torrentdesc += self.htmlToASCII(' %s' % torrent['RemasterTitle'])
-
- torrentdesc += ' (%s)' % quality_id
- torrent_name = re.sub('[^A-Za-z0-9\-_ \(\).]+', '', '%s (%s) - %s' % (movie_title, ptpmovie['Year'], torrentdesc))
-
- def extra_check(item):
- return self.torrentMeetsQualitySpec(item, type)
-
- results.append({
- 'id': torrent_id,
- 'name': torrent_name,
- 'url': '%s?action=download&id=%d&authkey=%s&torrent_pass=%s' % (self.urls['torrent'], torrent_id, authkey, passkey),
- 'detail_url': self.urls['detail'] % torrent_id,
- 'date': tryInt(time.mktime(parse(torrent['UploadTime']).timetuple())),
- 'size': tryInt(torrent['Size']) / (1024 * 1024),
- 'seeders': tryInt(torrent['Seeders']),
- 'leechers': tryInt(torrent['Leechers']),
- 'score': 50 if torrent['GoldenPopcorn'] else 0,
- 'extra_check': extra_check,
- 'download': self.loginDownload,
- })
-
- except:
- log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
-
- def login(self):
-
- cookieprocessor = urllib2.HTTPCookieProcessor(cookielib.CookieJar())
- opener = urllib2.build_opener(cookieprocessor, PassThePopcorn.PTPHTTPRedirectHandler())
- opener.addheaders = [
- ('User-Agent', 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.1 (KHTML, like Gecko) Chrome/21.0.1180.75 Safari/537.1'),
- ('Accept', 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8'),
- ('Accept-Language', 'en-gb,en;q=0.5'),
- ('Accept-Charset', 'ISO-8859-1,utf-8;q=0.7,*;q=0.7'),
- ('Keep-Alive', '115'),
- ('Connection', 'keep-alive'),
- ('Cache-Control', 'max-age=0'),
- ]
-
- try:
- response = opener.open(self.urls['login'], self.getLoginParams())
- except urllib2.URLError as e:
- log.error('Login to PassThePopcorn failed: %s' % e)
- return False
-
- if response.getcode() == 200:
- log.debug('Login HTTP status 200; seems successful')
- self.login_opener = opener
- return True
- else:
- log.error('Login to PassThePopcorn failed: returned code %d' % response.getcode())
- return False
-
- def torrentMeetsQualitySpec(self, torrent, quality):
-
- if not quality in self.post_search_filters:
- return True
-
- for field, specs in self.post_search_filters[quality].items():
- matches_one = False
- seen_one = False
-
- if not field in torrent:
- log.debug('Torrent with ID %s has no field "%s"; cannot apply post-search-filter for quality "%s"' % (torrent['Id'], field, quality))
- continue
-
- for spec in specs:
- if len(spec) > 0 and spec[0] == '!':
- # a negative rule; if the field matches, return False
- if torrent[field] == spec[1:]:
- return False
- else:
- # a positive rule; if any of the possible positive values match the field, return True
- seen_one = True
- if torrent[field] == spec:
- matches_one = True
-
- if seen_one and not matches_one:
- return False
-
- return True
-
- def htmlToUnicode(self, text):
- def fixup(m):
- text = m.group(0)
- if text[:2] == "&#":
- # character reference
- try:
- if text[:3] == "&#x":
- return unichr(int(text[3:-1], 16))
- else:
- return unichr(int(text[2:-1]))
- except ValueError:
- pass
- else:
- # named entity
- try:
- text = unichr(htmlentitydefs.name2codepoint[text[1:-1]])
- except KeyError:
- pass
- return text # leave as is
- return re.sub("&#?\w+;", fixup, u'%s' % text)
-
- def unicodeToASCII(self, text):
- import unicodedata
- return ''.join(c for c in unicodedata.normalize('NFKD', text) if unicodedata.category(c) != 'Mn')
-
- def htmlToASCII(self, text):
- return self.unicodeToASCII(self.htmlToUnicode(text))
-
- def getLoginParams(self):
- return tryUrlencode({
- 'username': self.conf('username'),
- 'password': self.conf('password'),
- 'passkey': self.conf('passkey'),
- 'keeplogged': '1',
- 'login': 'Login'
- })
diff --git a/couchpotato/core/providers/torrent/publichd/__init__.py b/couchpotato/core/providers/torrent/publichd/__init__.py
deleted file mode 100644
index 2c356e20e9..0000000000
--- a/couchpotato/core/providers/torrent/publichd/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from .main import PublicHD
-
-def start():
- return PublicHD()
-
-config = [{
- 'name': 'publichd',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'torrent_providers',
- 'name': 'PublicHD',
- 'description': 'Public Torrent site with only HD content. See PublicHD',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- 'default': True,
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/torrent/publichd/main.py b/couchpotato/core/providers/torrent/publichd/main.py
deleted file mode 100644
index 2043f8c426..0000000000
--- a/couchpotato/core/providers/torrent/publichd/main.py
+++ /dev/null
@@ -1,76 +0,0 @@
-from bs4 import BeautifulSoup
-from couchpotato.core.helpers.encoding import tryUrlencode, toUnicode
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.torrent.base import TorrentMagnetProvider
-from urlparse import parse_qs
-import re
-import traceback
-
-log = CPLog(__name__)
-
-
-class PublicHD(TorrentMagnetProvider):
-
- urls = {
- 'test': 'https://publichd.se',
- 'detail': 'https://publichd.se/index.php?page=torrent-details&id=%s',
- 'search': 'https://publichd.se/index.php',
- }
- http_time_between_calls = 0
-
- def search(self, movie, quality):
-
- if not quality.get('hd', False):
- return []
-
- return super(PublicHD, self).search(movie, quality)
-
- def _searchOnTitle(self, title, movie, quality, results):
-
- params = tryUrlencode({
- 'page':'torrents',
- 'search': '%s %s' % (title, movie['library']['year']),
- 'active': 1,
- })
-
- data = self.getHTMLData('%s?%s' % (self.urls['search'], params))
-
- if data:
-
- try:
- soup = BeautifulSoup(data)
-
- results_table = soup.find('table', attrs = {'id': 'bgtorrlist2'})
- entries = results_table.find_all('tr')
-
- for result in entries[2:len(entries) - 1]:
- info_url = result.find(href = re.compile('torrent-details'))
- download = result.find(href = re.compile('magnet:'))
-
- if info_url and download:
-
- url = parse_qs(info_url['href'])
-
- results.append({
- 'id': url['id'][0],
- 'name': info_url.string,
- 'url': download['href'],
- 'detail_url': self.urls['detail'] % url['id'][0],
- 'size': self.parseSize(result.find_all('td')[7].string),
- 'seeders': tryInt(result.find_all('td')[4].string),
- 'leechers': tryInt(result.find_all('td')[5].string),
- 'get_more_info': self.getMoreInfo
- })
-
- except:
- log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
-
- def getMoreInfo(self, item):
- full_description = self.getCache('publichd.%s' % item['id'], item['detail_url'], cache_timeout = 25920000)
- html = BeautifulSoup(full_description)
- nfo_pre = html.find('div', attrs = {'id':'torrmain'})
- description = toUnicode(nfo_pre.text) if nfo_pre else ''
-
- item['description'] = description
- return item
diff --git a/couchpotato/core/providers/torrent/sceneaccess/__init__.py b/couchpotato/core/providers/torrent/sceneaccess/__init__.py
deleted file mode 100644
index e12bf8bd50..0000000000
--- a/couchpotato/core/providers/torrent/sceneaccess/__init__.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from .main import SceneAccess
-
-def start():
- return SceneAccess()
-
-config = [{
- 'name': 'sceneaccess',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'torrent_providers',
- 'name': 'SceneAccess',
- 'description': 'See SceneAccess',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- 'default': False,
- },
- {
- 'name': 'username',
- 'default': '',
- },
- {
- 'name': 'password',
- 'default': '',
- 'type': 'password',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/torrent/sceneaccess/main.py b/couchpotato/core/providers/torrent/sceneaccess/main.py
deleted file mode 100644
index 904bafb98b..0000000000
--- a/couchpotato/core/providers/torrent/sceneaccess/main.py
+++ /dev/null
@@ -1,93 +0,0 @@
-from bs4 import BeautifulSoup
-from couchpotato.core.helpers.encoding import tryUrlencode, toUnicode
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.torrent.base import TorrentProvider
-import traceback
-
-log = CPLog(__name__)
-
-
-class SceneAccess(TorrentProvider):
-
- urls = {
- 'test': 'https://www.sceneaccess.eu/',
- 'login' : 'https://www.sceneaccess.eu/login',
- 'detail': 'https://www.sceneaccess.eu/details?id=%s',
- 'search': 'https://www.sceneaccess.eu/browse?method=2&c%d=%d',
- 'download': 'https://www.sceneaccess.eu/%s',
- }
-
- cat_ids = [
- ([22], ['720p', '1080p']),
- ([7], ['cam', 'ts', 'dvdrip', 'tc', 'r5', 'scr', 'brrip']),
- ([8], ['dvdr']),
- ]
-
- http_time_between_calls = 1 #seconds
-
- def _search(self, movie, quality, results):
-
- url = self.urls['search'] % (
- self.getCatId(quality['identifier'])[0],
- self.getCatId(quality['identifier'])[0]
- )
-
- arguments = tryUrlencode({
- 'search': movie['library']['identifier'],
- 'method': 1,
- })
- url = "%s&%s" % (url, arguments)
-
- # Do login for the cookies
- if not self.login_opener and not self.login():
- return
-
- data = self.getHTMLData(url, opener = self.login_opener)
-
- if data:
- html = BeautifulSoup(data)
-
- try:
- resultsTable = html.find('table', attrs = {'id' : 'torrents-table'})
- if resultsTable is None:
- return
-
- entries = resultsTable.find_all('tr', attrs = {'class' : 'tt_row'})
- for result in entries:
-
- link = result.find('td', attrs = {'class' : 'ttr_name'}).find('a')
- url = result.find('td', attrs = {'class' : 'td_dl'}).find('a')
- leechers = result.find('td', attrs = {'class' : 'ttr_leechers'}).find('a')
- torrent_id = link['href'].replace('details?id=', '')
-
- results.append({
- 'id': torrent_id,
- 'name': link['title'],
- 'url': self.urls['download'] % url['href'],
- 'detail_url': self.urls['detail'] % torrent_id,
- 'size': self.parseSize(result.find('td', attrs = {'class' : 'ttr_size'}).contents[0]),
- 'seeders': tryInt(result.find('td', attrs = {'class' : 'ttr_seeders'}).find('a').string),
- 'leechers': tryInt(leechers.string) if leechers else 0,
- 'download': self.loginDownload,
- 'get_more_info': self.getMoreInfo,
- })
-
- except:
- log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
-
- def getLoginParams(self):
- return tryUrlencode({
- 'username': self.conf('username'),
- 'password': self.conf('password'),
- 'submit': 'come on in',
- })
-
- def getMoreInfo(self, item):
- full_description = self.getCache('sceneaccess.%s' % item['id'], item['detail_url'], cache_timeout = 25920000)
- html = BeautifulSoup(full_description)
- nfo_pre = html.find('div', attrs = {'id':'details_table'})
- description = toUnicode(nfo_pre.text) if nfo_pre else ''
-
- item['description'] = description
- return item
diff --git a/couchpotato/core/providers/torrent/scenehd/__init__.py b/couchpotato/core/providers/torrent/scenehd/__init__.py
deleted file mode 100644
index 10c5e385f7..0000000000
--- a/couchpotato/core/providers/torrent/scenehd/__init__.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from .main import SceneHD
-
-def start():
- return SceneHD()
-
-config = [{
- 'name': 'scenehd',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'torrent_providers',
- 'name': 'SceneHD',
- 'description': 'See SceneHD',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- 'default': False,
- },
- {
- 'name': 'username',
- 'default': '',
- },
- {
- 'name': 'password',
- 'default': '',
- 'type': 'password',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/torrent/scenehd/main.py b/couchpotato/core/providers/torrent/scenehd/main.py
deleted file mode 100644
index 93897c67e2..0000000000
--- a/couchpotato/core/providers/torrent/scenehd/main.py
+++ /dev/null
@@ -1,77 +0,0 @@
-from bs4 import BeautifulSoup
-from couchpotato.core.helpers.encoding import simplifyString, tryUrlencode
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.torrent.base import TorrentProvider
-import traceback
-
-log = CPLog(__name__)
-
-
-class SceneHD(TorrentProvider):
-
- urls = {
- 'test': 'https://scenehd.org/',
- 'login' : 'https://scenehd.org/takelogin.php',
- 'detail': 'https://scenehd.org/details.php?id=%s',
- 'search': 'https://scenehd.org/browse.php?ajax',
- 'download': 'https://scenehd.org/download.php?id=%s',
- }
-
- http_time_between_calls = 1 #seconds
-
- def _searchOnTitle(self, title, movie, quality, results):
-
- q = '"%s %s"' % (simplifyString(title), movie['library']['year'])
- arguments = tryUrlencode({
- 'search': q,
- })
- url = "%s&%s" % (self.urls['search'], arguments)
-
- # Cookie login
- if not self.login_opener and not self.login():
- return
-
- data = self.getHTMLData(url, opener = self.login_opener)
-
- if data:
- html = BeautifulSoup(data)
-
- try:
- resultsTable = html.find_all('table')[6]
- entries = resultsTable.find_all('tr')
- for result in entries[1:]:
-
- all_cells = result.find_all('td')
-
- detail_link = all_cells[2].find('a')
- details = detail_link['href']
- torrent_id = details.replace('details.php?id=', '')
-
- leechers = all_cells[11].find('a')
- if leechers:
- leechers = leechers.string
- else:
- leechers = all_cells[11].string
-
- results.append({
- 'id': torrent_id,
- 'name': detail_link['title'],
- 'size': self.parseSize(all_cells[7].string),
- 'seeders': tryInt(all_cells[10].find('a').string),
- 'leechers': tryInt(leechers),
- 'url': self.urls['download'] % torrent_id,
- 'download': self.loginDownload,
- 'description': all_cells[1].find('a')['href'],
- })
-
- except:
- log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
-
-
- def getLoginParams(self, params):
- return tryUrlencode({
- 'username': self.conf('username'),
- 'password': self.conf('password'),
- 'ssl': 'yes',
- })
diff --git a/couchpotato/core/providers/torrent/thepiratebay/__init__.py b/couchpotato/core/providers/torrent/thepiratebay/__init__.py
deleted file mode 100644
index 38169084e9..0000000000
--- a/couchpotato/core/providers/torrent/thepiratebay/__init__.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from main import ThePirateBay
-
-def start():
- return ThePirateBay()
-
-config = [{
- 'name': 'thepiratebay',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'torrent_providers',
- 'name': 'ThePirateBay',
- 'description': 'The world\'s largest bittorrent tracker. See ThePirateBay',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- 'default': True
- },
- {
- 'name': 'domain',
- 'advanced': True,
- 'label': 'Proxy server',
- 'description': 'Domain for requests, keep empty to let CouchPotato pick.',
- }
- ],
- }
- ]
-}]
diff --git a/couchpotato/core/providers/torrent/thepiratebay/main.py b/couchpotato/core/providers/torrent/thepiratebay/main.py
deleted file mode 100644
index 1e47a710dd..0000000000
--- a/couchpotato/core/providers/torrent/thepiratebay/main.py
+++ /dev/null
@@ -1,146 +0,0 @@
-from bs4 import BeautifulSoup
-from couchpotato.core.helpers.encoding import toUnicode, tryUrlencode
-from couchpotato.core.helpers.variable import tryInt, cleanHost
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.torrent.base import TorrentMagnetProvider
-from couchpotato.environment import Env
-import re
-import time
-import traceback
-
-log = CPLog(__name__)
-
-
-class ThePirateBay(TorrentMagnetProvider):
-
- urls = {
- 'detail': '%s/torrent/%s',
- 'search': '%s/search/%s/%s/7/%d'
- }
-
- cat_ids = [
- ([207], ['720p', '1080p']),
- ([201], ['cam', 'ts', 'dvdrip', 'tc', 'r5', 'scr', 'brrip']),
- ([202], ['dvdr'])
- ]
-
- cat_backup_id = 200
- disable_provider = False
- http_time_between_calls = 0
-
- proxy_list = [
- 'https://thepiratebay.se',
- 'https://tpb.ipredator.se',
- 'https://depiraatbaai.be',
- 'https://piratereverse.info',
- 'https://tpb.pirateparty.org.uk',
- 'https://argumentomteemigreren.nl',
- 'https://livepirate.com/',
- 'https://www.getpirate.com/',
- ]
-
- def __init__(self):
- self.domain = self.conf('domain')
- super(ThePirateBay, self).__init__()
-
- def _searchOnTitle(self, title, movie, quality, results):
-
- page = 0
- total_pages = 1
-
- while page < total_pages:
-
- search_url = self.urls['search'] % (self.getDomain(), tryUrlencode('"%s %s"' % (title, movie['library']['year'])), page, self.getCatId(quality['identifier'])[0])
- page += 1
-
- data = self.getHTMLData(search_url)
-
- if data:
- try:
- soup = BeautifulSoup(data)
- results_table = soup.find('table', attrs = {'id': 'searchResult'})
-
- if not results_table:
- return
-
- try:
- total_pages = len(soup.find('div', attrs = {'align': 'center'}).find_all('a'))
- except:
- pass
-
- entries = results_table.find_all('tr')
- for result in entries[2:]:
- link = result.find(href = re.compile('torrent\/\d+\/'))
- download = result.find(href = re.compile('magnet:'))
-
- try:
- size = re.search('Size (?P.+),', unicode(result.select('font.detDesc')[0])).group('size')
- except:
- continue
-
- if link and download:
-
- def extra_score(item):
- trusted = (0, 10)[result.find('img', alt = re.compile('Trusted')) != None]
- vip = (0, 20)[result.find('img', alt = re.compile('VIP')) != None]
- confirmed = (0, 30)[result.find('img', alt = re.compile('Helpers')) != None]
- moderated = (0, 50)[result.find('img', alt = re.compile('Moderator')) != None]
-
- return confirmed + trusted + vip + moderated
-
- results.append({
- 'id': re.search('/(?P\d+)/', link['href']).group('id'),
- 'name': link.string,
- 'url': download['href'],
- 'detail_url': self.getDomain(link['href']),
- 'size': self.parseSize(size),
- 'seeders': tryInt(result.find_all('td')[2].string),
- 'leechers': tryInt(result.find_all('td')[3].string),
- 'extra_score': extra_score,
- 'get_more_info': self.getMoreInfo
- })
-
- except:
- log.error('Failed getting results from %s: %s', (self.getName(), traceback.format_exc()))
-
-
- def isEnabled(self):
- return super(ThePirateBay, self).isEnabled() and self.getDomain()
-
- def getDomain(self, url = ''):
-
- if not self.domain:
- for proxy in self.proxy_list:
-
- prop_name = 'tpb_proxy.%s' % proxy
- last_check = float(Env.prop(prop_name, default = 0))
- if last_check > time.time() - 1209600:
- continue
-
- data = ''
- try:
- data = self.urlopen(proxy, timeout = 3, show_error = False)
- except:
- log.debug('Failed tpb proxy %s', proxy)
-
- if 'title="Pirate Search"' in data:
- log.debug('Using proxy: %s', proxy)
- self.domain = proxy
- break
-
- Env.prop(prop_name, time.time())
-
- if not self.domain:
- log.error('No TPB proxies left, please add one in settings, or let us know which one to add on the forum.')
- return None
-
- return cleanHost(self.domain).rstrip('/') + url
-
- def getMoreInfo(self, item):
- full_description = self.getCache('tpb.%s' % item['id'], item['detail_url'], cache_timeout = 25920000)
- html = BeautifulSoup(full_description)
- nfo_pre = html.find('div', attrs = {'class':'nfo'})
- description = toUnicode(nfo_pre.text) if nfo_pre else ''
-
- item['description'] = description
- return item
diff --git a/couchpotato/core/providers/torrent/torrentday/__init__.py b/couchpotato/core/providers/torrent/torrentday/__init__.py
deleted file mode 100644
index 1a4d3c7f63..0000000000
--- a/couchpotato/core/providers/torrent/torrentday/__init__.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from .main import TorrentDay
-
-def start():
- return TorrentDay()
-
-config = [{
- 'name': 'torrentday',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'torrent_providers',
- 'name': 'TorrentDay',
- 'description': 'See TorrentDay',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- 'default': False,
- },
- {
- 'name': 'username',
- 'default': '',
- },
- {
- 'name': 'password',
- 'default': '',
- 'type': 'password',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/torrent/torrentday/main.py b/couchpotato/core/providers/torrent/torrentday/main.py
deleted file mode 100644
index 5e207c1e2a..0000000000
--- a/couchpotato/core/providers/torrent/torrentday/main.py
+++ /dev/null
@@ -1,64 +0,0 @@
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.torrent.base import TorrentProvider
-
-log = CPLog(__name__)
-
-
-class TorrentDay(TorrentProvider):
-
- urls = {
- 'test': 'http://www.td.af/',
- 'login' : 'http://www.td.af/torrents/',
- 'detail': 'http://www.td.af/details.php?id=%s',
- 'search': 'http://www.td.af/V3/API/API.php',
- 'download': 'http://www.td.af/download.php/%s/%s',
- }
-
- cat_ids = [
- ([11], ['720p', '1080p']),
- ([1, 21, 25], ['cam', 'ts', 'dvdrip', 'tc', 'r5', 'scr', 'brrip']),
- ([3], ['dvdr']),
- ([5], ['bd50']),
- ]
-
- http_time_between_calls = 1 #seconds
-
- def _searchOnTitle(self, title, movie, quality, results):
-
- q = '"%s %s"' % (title, movie['library']['year'])
-
- params = {
- '/browse.php?': None,
- 'cata': 'yes',
- 'jxt': 8,
- 'jxw': 'b',
- 'search': q,
- }
-
- data = self.getJsonData(self.urls['search'], params = params, opener = self.login_opener)
- try: torrents = data.get('Fs', [])[0].get('Cn', {}).get('torrents', [])
- except: return
-
- for torrent in torrents:
- results.append({
- 'id': torrent['id'],
- 'name': torrent['name'],
- 'url': self.urls['download'] % (torrent['id'], torrent['fname']),
- 'detail_url': self.urls['detail'] % torrent['id'],
- 'size': self.parseSize(torrent.get('size')),
- 'seeders': tryInt(torrent.get('seed')),
- 'leechers': tryInt(torrent.get('leech')),
- 'download': self.loginDownload,
- })
-
- def getLoginParams(self):
- return tryUrlencode({
- 'username': self.conf('username'),
- 'password': self.conf('password'),
- 'submit': 'submit',
- })
-
- def loginSuccess(self, output):
- return 'Password not correct' not in output
diff --git a/couchpotato/core/providers/torrent/torrentleech/__init__.py b/couchpotato/core/providers/torrent/torrentleech/__init__.py
deleted file mode 100644
index d96ac06481..0000000000
--- a/couchpotato/core/providers/torrent/torrentleech/__init__.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from .main import TorrentLeech
-
-def start():
- return TorrentLeech()
-
-config = [{
- 'name': 'torrentleech',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'torrent_providers',
- 'name': 'TorrentLeech',
- 'description': 'See TorrentLeech',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- 'default': False,
- },
- {
- 'name': 'username',
- 'default': '',
- },
- {
- 'name': 'password',
- 'default': '',
- 'type': 'password',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/torrent/torrentleech/main.py b/couchpotato/core/providers/torrent/torrentleech/main.py
deleted file mode 100644
index 6de18fbdf3..0000000000
--- a/couchpotato/core/providers/torrent/torrentleech/main.py
+++ /dev/null
@@ -1,76 +0,0 @@
-from bs4 import BeautifulSoup
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.torrent.base import TorrentProvider
-import traceback
-
-
-log = CPLog(__name__)
-
-
-class TorrentLeech(TorrentProvider):
-
- urls = {
- 'test' : 'http://www.torrentleech.org/',
- 'login' : 'http://www.torrentleech.org/user/account/login/',
- 'detail' : 'http://www.torrentleech.org/torrent/%s',
- 'search' : 'http://www.torrentleech.org/torrents/browse/index/query/%s/categories/%d',
- 'download' : 'http://www.torrentleech.org%s',
- }
-
- cat_ids = [
- ([13], ['720p', '1080p']),
- ([8], ['cam']),
- ([9], ['ts', 'tc']),
- ([10], ['r5', 'scr']),
- ([11], ['dvdrip']),
- ([14], ['brrip']),
- ([12], ['dvdr']),
- ]
-
- http_time_between_calls = 1 #seconds
- cat_backup_id = None
-
- def _searchOnTitle(self, title, movie, quality, results):
-
- url = self.urls['search'] % (tryUrlencode('%s %s' % (title.replace(':', ''), movie['library']['year'])), self.getCatId(quality['identifier'])[0])
- data = self.getHTMLData(url, opener = self.login_opener)
-
- if data:
- html = BeautifulSoup(data)
-
- try:
- result_table = html.find('table', attrs = {'id' : 'torrenttable'})
- if not result_table:
- return
-
- entries = result_table.find_all('tr')
-
- for result in entries[1:]:
-
- link = result.find('td', attrs = {'class' : 'name'}).find('a')
- url = result.find('td', attrs = {'class' : 'quickdownload'}).find('a')
- details = result.find('td', attrs = {'class' : 'name'}).find('a')
-
- results.append({
- 'id': link['href'].replace('/torrent/', ''),
- 'name': link.string,
- 'url': self.urls['download'] % url['href'],
- 'detail_url': self.urls['download'] % details['href'],
- 'download': self.loginDownload,
- 'size': self.parseSize(result.find_all('td')[4].string),
- 'seeders': tryInt(result.find('td', attrs = {'class' : 'seeders'}).string),
- 'leechers': tryInt(result.find('td', attrs = {'class' : 'leechers'}).string),
- })
-
- except:
- log.error('Failed to parsing %s: %s', (self.getName(), traceback.format_exc()))
-
- def getLoginParams(self):
- return tryUrlencode({
- 'username': self.conf('username'),
- 'password': self.conf('password'),
- 'remember_me': 'on',
- 'login': 'submit',
- })
diff --git a/couchpotato/core/providers/trailer/base.py b/couchpotato/core/providers/trailer/base.py
deleted file mode 100644
index 338ca9b329..0000000000
--- a/couchpotato/core/providers/trailer/base.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from couchpotato.core.event import addEvent
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.base import Provider
-
-log = CPLog(__name__)
-
-
-class TrailerProvider(Provider):
-
- type = 'trailer'
-
- def __init__(self):
- addEvent('trailer.search', self.search)
diff --git a/couchpotato/core/providers/trailer/hdtrailers/__init__.py b/couchpotato/core/providers/trailer/hdtrailers/__init__.py
deleted file mode 100644
index 016db7a261..0000000000
--- a/couchpotato/core/providers/trailer/hdtrailers/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import HDTrailers
-
-def start():
- return HDTrailers()
-
-config = []
diff --git a/couchpotato/core/providers/trailer/hdtrailers/main.py b/couchpotato/core/providers/trailer/hdtrailers/main.py
deleted file mode 100644
index 320a5835ec..0000000000
--- a/couchpotato/core/providers/trailer/hdtrailers/main.py
+++ /dev/null
@@ -1,124 +0,0 @@
-from bs4 import SoupStrainer, BeautifulSoup
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.variable import mergeDicts, getTitle
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.trailer.base import TrailerProvider
-from string import digits, ascii_letters
-from urllib2 import HTTPError
-import re
-
-log = CPLog(__name__)
-
-
-class HDTrailers(TrailerProvider):
-
- urls = {
- 'api': 'http://www.hd-trailers.net/movie/%s/',
- 'backup': 'http://www.hd-trailers.net/blog/',
- }
- providers = ['apple.ico', 'yahoo.ico', 'moviefone.ico', 'myspace.ico', 'favicon.ico']
-
- def search(self, group):
-
- movie_name = getTitle(group['library'])
-
- url = self.urls['api'] % self.movieUrlName(movie_name)
- try:
- data = self.getCache('hdtrailers.%s' % group['library']['identifier'], url, show_error = False)
- except HTTPError:
- log.debug('No page found for: %s', movie_name)
- data = None
-
- result_data = {'480p':[], '720p':[], '1080p':[]}
-
- if not data:
- return result_data
-
- did_alternative = False
- for provider in self.providers:
- results = self.findByProvider(data, provider)
-
- # Find alternative
- if results.get('404') and not did_alternative:
- results = self.findViaAlternative(group)
- did_alternative = True
-
- result_data = mergeDicts(result_data, results)
-
- return result_data
-
- def findViaAlternative(self, group):
- results = {'480p':[], '720p':[], '1080p':[]}
-
- movie_name = getTitle(group['library'])
-
- url = "%s?%s" % (self.urls['backup'], tryUrlencode({'s':movie_name}))
- try:
- data = self.getCache('hdtrailers.alt.%s' % group['library']['identifier'], url, show_error = False)
- except HTTPError:
- log.debug('No alternative page found for: %s', movie_name)
- data = None
-
- if not data:
- return results
-
- try:
- tables = SoupStrainer('div')
- html = BeautifulSoup(data, parse_only = tables)
- result_table = html.find_all('h2', text = re.compile(movie_name))
-
- for h2 in result_table:
- if 'trailer' in h2.lower():
- parent = h2.parent.parent.parent
- trailerLinks = parent.find_all('a', text = re.compile('480p|720p|1080p'))
- try:
- for trailer in trailerLinks:
- results[trailer].insert(0, trailer.parent['href'])
- except:
- pass
-
- except AttributeError:
- log.debug('No trailers found in via alternative.')
-
- return results
-
- def findByProvider(self, data, provider):
-
- results = {'480p':[], '720p':[], '1080p':[]}
- try:
- tables = SoupStrainer('table')
- html = BeautifulSoup(data, parse_only = tables)
- result_table = html.find('table', attrs = {'class':'bottomTable'})
-
-
- for tr in result_table.find_all('tr'):
- trtext = str(tr).lower()
- if 'clips' in trtext:
- break
- if 'trailer' in trtext and not 'clip' in trtext and provider in trtext:
- nr = 0
- if 'trailer' not in tr.find('span', 'standardTrailerName').text.lower():
- continue
- resolutions = tr.find_all('td', attrs = {'class':'bottomTableResolution'})
- for res in resolutions:
- results[str(res.a.contents[0])].insert(0, res.a['href'])
- nr += 1
-
- return results
-
- except AttributeError:
- log.debug('No trailers found in provider %s.', provider)
- results['404'] = True
-
- return results
-
- def movieUrlName(self, string):
- safe_chars = ascii_letters + digits + ' '
- r = ''.join([char if char in safe_chars else ' ' for char in string])
- name = re.sub('\s+' , '-', r).lower()
-
- try:
- int(name)
- return '-' + name
- except:
- return name
diff --git a/couchpotato/core/providers/userscript/allocine/__init__.py b/couchpotato/core/providers/userscript/allocine/__init__.py
deleted file mode 100644
index e451996f22..0000000000
--- a/couchpotato/core/providers/userscript/allocine/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import AlloCine
-
-def start():
- return AlloCine()
-
-config = []
diff --git a/couchpotato/core/providers/userscript/allocine/main.py b/couchpotato/core/providers/userscript/allocine/main.py
deleted file mode 100644
index 8cc889eee5..0000000000
--- a/couchpotato/core/providers/userscript/allocine/main.py
+++ /dev/null
@@ -1,35 +0,0 @@
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.userscript.base import UserscriptBase
-import traceback
-
-log = CPLog(__name__)
-
-
-class AlloCine(UserscriptBase):
-
- includes = ['http://www.allocine.fr/film/*']
-
- def getMovie(self, url):
-
- if not 'fichefilm_gen_cfilm' in url:
- return 'Url isn\'t from a movie'
-
- try:
- data = self.getUrl(url)
- except:
- return
-
- name = None
- year = None
-
- try:
- start = data.find('')
- end = data.find(' ', start)
- page_title = data[start + len(''):end].strip().split('-')
-
- name = page_title[0].strip()
- year = page_title[1].strip()[-4:]
- return self.search(name, year)
- except:
- log.error('Failed parsing page for title and year: %s', traceback.format_exc())
-
diff --git a/couchpotato/core/providers/userscript/appletrailers/__init__.py b/couchpotato/core/providers/userscript/appletrailers/__init__.py
deleted file mode 100644
index e8078f470b..0000000000
--- a/couchpotato/core/providers/userscript/appletrailers/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import AppleTrailers
-
-def start():
- return AppleTrailers()
-
-config = []
diff --git a/couchpotato/core/providers/userscript/appletrailers/main.py b/couchpotato/core/providers/userscript/appletrailers/main.py
deleted file mode 100644
index 693065d104..0000000000
--- a/couchpotato/core/providers/userscript/appletrailers/main.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from couchpotato.core.providers.userscript.base import UserscriptBase
-import re
-
-
-class AppleTrailers(UserscriptBase):
-
- includes = ['http://trailers.apple.com/trailers/*']
-
- def getMovie(self, url):
-
- try:
- data = self.getUrl(url)
- except:
- return
-
- name = re.search("trailerTitle.*=.*\'(?P<name>.*)\';", data)
- name = name.group('name').decode('string_escape')
-
- date = re.search("releaseDate.*=.*\'(?P<date>.*)\';", data)
- year = date.group('date')[:4]
-
- return self.search(name, year)
diff --git a/couchpotato/core/providers/userscript/base.py b/couchpotato/core/providers/userscript/base.py
deleted file mode 100644
index 571b76c002..0000000000
--- a/couchpotato/core/providers/userscript/base.py
+++ /dev/null
@@ -1,66 +0,0 @@
-from couchpotato.core.event import addEvent, fireEvent
-from couchpotato.core.helpers.encoding import simplifyString
-from couchpotato.core.helpers.variable import getImdb, md5
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from urlparse import urlparse
-
-log = CPLog(__name__)
-
-
-class UserscriptBase(Plugin):
-
- version = 1
-
- includes = []
- excludes = []
-
- def __init__(self):
- addEvent('userscript.get_includes', self.getInclude)
- addEvent('userscript.get_excludes', self.getExclude)
- addEvent('userscript.get_provider_version', self.getVersion)
- addEvent('userscript.get_movie_via_url', self.belongsTo)
-
- def search(self, name, year = None):
- result = fireEvent('movie.search', q = '%s %s' % (name, year), limit = 1, merge = True)
-
- if len(result) > 0:
- movie = fireEvent('movie.info', identifier = result[0].get('imdb'), merge = True)
- return movie
- else:
- return None
-
- def belongsTo(self, url):
-
- host = urlparse(url).hostname
- host_split = host.split('.')
- if len(host_split) > 2:
- host = host[len(host_split[0]):]
-
- for include in self.includes:
- if host in include:
- return self.getMovie(url)
-
- return
-
- def getUrl(self, url):
- return self.getCache(md5(simplifyString(url)), url = url)
-
- def getMovie(self, url):
- try:
- data = self.getUrl(url)
- except:
- data = ''
- return self.getInfo(getImdb(data))
-
- def getInfo(self, identifier):
- return fireEvent('movie.info', identifier = identifier, merge = True)
-
- def getInclude(self):
- return self.includes
-
- def getExclude(self):
- return self.excludes
-
- def getVersion(self):
- return self.version
diff --git a/couchpotato/core/providers/userscript/filmweb/__init__.py b/couchpotato/core/providers/userscript/filmweb/__init__.py
deleted file mode 100644
index 8ead54d65d..0000000000
--- a/couchpotato/core/providers/userscript/filmweb/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import Filmweb
-
-def start():
- return Filmweb()
-
-config = []
diff --git a/couchpotato/core/providers/userscript/filmweb/main.py b/couchpotato/core/providers/userscript/filmweb/main.py
deleted file mode 100644
index 5e6adbe131..0000000000
--- a/couchpotato/core/providers/userscript/filmweb/main.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from couchpotato.core.providers.userscript.base import UserscriptBase
-import re
-
-
-class Filmweb(UserscriptBase):
-
- includes = ['http://www.filmweb.pl/*']
-
- def getMovie(self, url):
-
- cookie = {'Cookie': 'welcomeScreen=welcome_screen'}
-
- try:
- data = self.urlopen(url, headers = cookie)
- except:
- return
-
- name = re.search("<h2.*?class=\"text-large caption\">(?P<name>[^<]+)</h2>", data)
-
- if name is None:
- name = re.search("<a.*?property=\"v:name\".*?>(?P<name>[^<]+)</a>", data)
-
- name = name.group('name').decode('string_escape')
-
- year = re.search("<span.*?id=filmYear.*?>\((?P<year>[^\)]+)\).*?</span>", data)
- year = year.group('year')
-
- return self.search(name, year)
diff --git a/couchpotato/core/providers/userscript/imdb/__init__.py b/couchpotato/core/providers/userscript/imdb/__init__.py
deleted file mode 100644
index f10505da7d..0000000000
--- a/couchpotato/core/providers/userscript/imdb/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import IMDB
-
-def start():
- return IMDB()
-
-config = []
diff --git a/couchpotato/core/providers/userscript/imdb/main.py b/couchpotato/core/providers/userscript/imdb/main.py
deleted file mode 100644
index 24278b1a5a..0000000000
--- a/couchpotato/core/providers/userscript/imdb/main.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.variable import getImdb
-from couchpotato.core.providers.userscript.base import UserscriptBase
-
-
-class IMDB(UserscriptBase):
-
- includes = ['*://*.imdb.com/title/tt*', '*://imdb.com/title/tt*']
-
- def getMovie(self, url):
- return fireEvent('movie.info', identifier = getImdb(url), merge = True)
diff --git a/couchpotato/core/providers/userscript/letterboxd/__init__.py b/couchpotato/core/providers/userscript/letterboxd/__init__.py
deleted file mode 100644
index c8c17977e4..0000000000
--- a/couchpotato/core/providers/userscript/letterboxd/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import Letterboxd
-
-def start():
- return Letterboxd()
-
-config = []
diff --git a/couchpotato/core/providers/userscript/letterboxd/main.py b/couchpotato/core/providers/userscript/letterboxd/main.py
deleted file mode 100644
index c0d91d79b9..0000000000
--- a/couchpotato/core/providers/userscript/letterboxd/main.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from couchpotato.core.providers.userscript.base import UserscriptBase
-
-
-class Letterboxd(UserscriptBase):
-
- includes = ['*://letterboxd.com/film/*']
diff --git a/couchpotato/core/providers/userscript/moviemeter/__init__.py b/couchpotato/core/providers/userscript/moviemeter/__init__.py
deleted file mode 100644
index 5e3813c413..0000000000
--- a/couchpotato/core/providers/userscript/moviemeter/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import MovieMeter
-
-def start():
- return MovieMeter()
-
-config = []
diff --git a/couchpotato/core/providers/userscript/moviemeter/main.py b/couchpotato/core/providers/userscript/moviemeter/main.py
deleted file mode 100644
index 3593d432f1..0000000000
--- a/couchpotato/core/providers/userscript/moviemeter/main.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from couchpotato.core.providers.userscript.base import UserscriptBase
-
-
-class MovieMeter(UserscriptBase):
-
- includes = ['http://*.moviemeter.nl/film/*', 'http://moviemeter.nl/film/*']
diff --git a/couchpotato/core/providers/userscript/moviesio/__init__.py b/couchpotato/core/providers/userscript/moviesio/__init__.py
deleted file mode 100644
index 473f847db3..0000000000
--- a/couchpotato/core/providers/userscript/moviesio/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import MoviesIO
-
-def start():
- return MoviesIO()
-
-config = []
diff --git a/couchpotato/core/providers/userscript/moviesio/main.py b/couchpotato/core/providers/userscript/moviesio/main.py
deleted file mode 100644
index 5dab618380..0000000000
--- a/couchpotato/core/providers/userscript/moviesio/main.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from couchpotato.core.providers.userscript.base import UserscriptBase
-
-
-class MoviesIO(UserscriptBase):
-
- includes = ['*://movies.io/m/*']
diff --git a/couchpotato/core/providers/userscript/rottentomatoes/__init__.py b/couchpotato/core/providers/userscript/rottentomatoes/__init__.py
deleted file mode 100644
index ee8266ebdd..0000000000
--- a/couchpotato/core/providers/userscript/rottentomatoes/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import RottenTomatoes
-
-def start():
- return RottenTomatoes()
-
-config = []
diff --git a/couchpotato/core/providers/userscript/rottentomatoes/main.py b/couchpotato/core/providers/userscript/rottentomatoes/main.py
deleted file mode 100644
index 0b16a441ca..0000000000
--- a/couchpotato/core/providers/userscript/rottentomatoes/main.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.userscript.base import UserscriptBase
-import re
-import traceback
-
-log = CPLog(__name__)
-
-
-class RottenTomatoes(UserscriptBase):
-
- includes = ['*://www.rottentomatoes.com/m/*/']
- excludes = ['*://www.rottentomatoes.com/m/*/*/']
-
- version = 2
-
- def getMovie(self, url):
-
- try:
- data = self.getUrl(url)
- except:
- return
-
- try:
- name = None
- year = None
- metas = re.findall("property=\"(video:release_date|og:title)\" content=\"([^\"]*)\"", data)
-
- for meta in metas:
- mname, mvalue = meta
- if mname == 'og:title':
- name = mvalue.decode('unicode_escape')
- elif mname == 'video:release_date':
- year = mvalue[:4]
-
- if name and year:
- return self.search(name, year)
-
- except:
- log.error('Failed parsing page for title and year: %s', traceback.format_exc())
diff --git a/couchpotato/core/providers/userscript/sharethe/__init__.py b/couchpotato/core/providers/userscript/sharethe/__init__.py
deleted file mode 100644
index 7661f76117..0000000000
--- a/couchpotato/core/providers/userscript/sharethe/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import ShareThe
-
-def start():
- return ShareThe()
-
-config = []
diff --git a/couchpotato/core/providers/userscript/sharethe/main.py b/couchpotato/core/providers/userscript/sharethe/main.py
deleted file mode 100644
index d22b67ebe2..0000000000
--- a/couchpotato/core/providers/userscript/sharethe/main.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from couchpotato.core.providers.userscript.base import UserscriptBase
-
-
-class ShareThe(UserscriptBase):
-
- includes = ['http://*.sharethe.tv/movies/*', 'http://sharethe.tv/movies/*']
diff --git a/couchpotato/core/providers/userscript/tmdb/__init__.py b/couchpotato/core/providers/userscript/tmdb/__init__.py
deleted file mode 100644
index be33372c41..0000000000
--- a/couchpotato/core/providers/userscript/tmdb/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import TMDB
-
-def start():
- return TMDB()
-
-config = []
diff --git a/couchpotato/core/providers/userscript/tmdb/main.py b/couchpotato/core/providers/userscript/tmdb/main.py
deleted file mode 100644
index 6205851ef6..0000000000
--- a/couchpotato/core/providers/userscript/tmdb/main.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from couchpotato.core.event import fireEvent
-from couchpotato.core.providers.userscript.base import UserscriptBase
-import re
-
-
-class TMDB(UserscriptBase):
-
- includes = ['http://www.themoviedb.org/movie/*']
-
- def getMovie(self, url):
- match = re.search('(?P<id>\d+)', url)
- movie = fireEvent('movie.info_by_tmdb', id = match.group('id'), merge = True)
-
- if movie['imdb']:
- return self.getInfo(movie['imdb'])
-
diff --git a/couchpotato/core/providers/userscript/trakt/__init__.py b/couchpotato/core/providers/userscript/trakt/__init__.py
deleted file mode 100644
index ff67c1ecf2..0000000000
--- a/couchpotato/core/providers/userscript/trakt/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import Trakt
-
-def start():
- return Trakt()
-
-config = []
diff --git a/couchpotato/core/providers/userscript/trakt/main.py b/couchpotato/core/providers/userscript/trakt/main.py
deleted file mode 100644
index 43e06deefa..0000000000
--- a/couchpotato/core/providers/userscript/trakt/main.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from couchpotato.core.providers.userscript.base import UserscriptBase
-
-
-class Trakt(UserscriptBase):
-
- includes = ['http://trakt.tv/movie/*', 'http://*.trakt.tv/movie/*']
- excludes = ['http://trakt.tv/movie/*/*', 'http://*.trakt.tv/movie/*/*']
diff --git a/couchpotato/core/providers/userscript/whiwa/__init__.py b/couchpotato/core/providers/userscript/whiwa/__init__.py
deleted file mode 100644
index 6577ae33b7..0000000000
--- a/couchpotato/core/providers/userscript/whiwa/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import WHiWA
-
-def start():
- return WHiWA()
-
-config = []
diff --git a/couchpotato/core/providers/userscript/whiwa/main.py b/couchpotato/core/providers/userscript/whiwa/main.py
deleted file mode 100644
index 40ffa2a943..0000000000
--- a/couchpotato/core/providers/userscript/whiwa/main.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from couchpotato.core.providers.userscript.base import UserscriptBase
-
-
-class WHiWA(UserscriptBase):
-
- includes = ['http://whiwa.net/stats/movie/*']
diff --git a/couchpotato/core/providers/userscript/youteather/__init__.py b/couchpotato/core/providers/userscript/youteather/__init__.py
deleted file mode 100644
index a07bf56b45..0000000000
--- a/couchpotato/core/providers/userscript/youteather/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import YouTheater
-
-def start():
- return YouTheater()
-
-config = []
diff --git a/couchpotato/core/providers/userscript/youteather/main.py b/couchpotato/core/providers/userscript/youteather/main.py
deleted file mode 100644
index 3efd36867c..0000000000
--- a/couchpotato/core/providers/userscript/youteather/main.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from couchpotato.core.providers.userscript.base import UserscriptBase
-import re
-
-class YouTheater(UserscriptBase):
- id_re = re.compile("view\.php\?id=(\d+)")
- includes = ['http://www.youtheater.com/view.php?id=*', 'http://youtheater.com/view.php?id=*',
- 'http://www.sratim.co.il/view.php?id=*', 'http://sratim.co.il/view.php?id=*']
-
- def getMovie(self, url):
- id = self.id_re.findall(url)[0]
- url = 'http://www.youtheater.com/view.php?id=%s' % id
- return super(YouTheater, self).getMovie(url)
diff --git a/couchpotato/core/settings.py b/couchpotato/core/settings.py
new file mode 100644
index 0000000000..ffc142ae55
--- /dev/null
+++ b/couchpotato/core/settings.py
@@ -0,0 +1,272 @@
+from __future__ import with_statement
+import ConfigParser
+from hashlib import md5
+
+from CodernityDB.hash_index import HashIndex
+from couchpotato.api import addApiView
+from couchpotato.core.event import addEvent, fireEvent
+from couchpotato.core.helpers.encoding import toUnicode
+from couchpotato.core.helpers.variable import mergeDicts, tryInt, tryFloat
+
+
+class Settings(object):
+
+ options = {}
+ types = {}
+
+ def __init__(self):
+
+ addApiView('settings', self.view, docs = {
+ 'desc': 'Return the options and its values of settings.conf. Including the default values and group ordering used on the settings page.',
+ 'return': {'type': 'object', 'example': """{
+ // objects like in __init__.py of plugin
+ "options": {
+ "moovee" : {
+ "groups" : [{
+ "description" : "SD movies only",
+ "name" : "#alt.binaries.moovee",
+ "options" : [{
+ "default" : false,
+ "name" : "enabled",
+ "type" : "enabler"
+ }],
+ "tab" : "providers"
+ }],
+ "name" : "moovee"
+ }
+ },
+ // object structured like settings.conf
+ "values": {
+ "moovee": {
+ "enabled": false
+ }
+ }
+}"""}
+ })
+
+ addApiView('settings.save', self.saveView, docs = {
+ 'desc': 'Save setting to config file (settings.conf)',
+ 'params': {
+ 'section': {'desc': 'The section name in settings.conf'},
+ 'name': {'desc': 'The option name'},
+ 'value': {'desc': 'The value you want to save'},
+ }
+ })
+
+ addEvent('database.setup', self.databaseSetup)
+
+ self.file = None
+ self.p = None
+ self.log = None
+
+ def setFile(self, config_file):
+ self.file = config_file
+
+ self.p = ConfigParser.RawConfigParser()
+ self.p.read(config_file)
+
+ from couchpotato.core.logger import CPLog
+ self.log = CPLog(__name__)
+
+ self.connectEvents()
+
+ def databaseSetup(self):
+ fireEvent('database.setup_index', 'property', PropertyIndex)
+
+ def parser(self):
+ return self.p
+
+ def sections(self):
+ return self.p.sections()
+
+ def connectEvents(self):
+ addEvent('settings.options', self.addOptions)
+ addEvent('settings.register', self.registerDefaults)
+ addEvent('settings.save', self.save)
+
+ def registerDefaults(self, section_name, options = None, save = True):
+ if not options: options = {}
+
+ self.addSection(section_name)
+
+ for option_name, option in options.items():
+ self.setDefault(section_name, option_name, option.get('default', ''))
+
+ # Migrate old settings from old location to the new location
+ if option.get('migrate_from'):
+ if self.p.has_option(option.get('migrate_from'), option_name):
+ previous_value = self.p.get(option.get('migrate_from'), option_name)
+ self.p.set(section_name, option_name, previous_value)
+ self.p.remove_option(option.get('migrate_from'), option_name)
+
+ if option.get('type'):
+ self.setType(section_name, option_name, option.get('type'))
+
+ if save:
+ self.save()
+
+ def set(self, section, option, value):
+ return self.p.set(section, option, value)
+
+ def get(self, option = '', section = 'core', default = None, type = None):
+ try:
+
+ try: type = self.types[section][option]
+ except: type = 'unicode' if not type else type
+
+ if hasattr(self, 'get%s' % type.capitalize()):
+ return getattr(self, 'get%s' % type.capitalize())(section, option)
+ else:
+ return self.getUnicode(section, option)
+
+ except:
+ return default
+
+ def delete(self, option = '', section = 'core'):
+ self.p.remove_option(section, option)
+ self.save()
+
+ def getEnabler(self, section, option):
+ return self.getBool(section, option)
+
+ def getBool(self, section, option):
+ try:
+ return self.p.getboolean(section, option)
+ except:
+ return self.p.get(section, option) == 1
+
+ def getInt(self, section, option):
+ try:
+ return self.p.getint(section, option)
+ except:
+ return tryInt(self.p.get(section, option))
+
+ def getFloat(self, section, option):
+ try:
+ return self.p.getfloat(section, option)
+ except:
+ return tryFloat(self.p.get(section, option))
+
+ def getUnicode(self, section, option):
+ value = self.p.get(section, option).decode('unicode_escape')
+ return toUnicode(value).strip()
+
+ def getValues(self):
+ values = {}
+ for section in self.sections():
+ values[section] = {}
+ for option in self.p.items(section):
+ (option_name, option_value) = option
+
+ is_password = False
+ try: is_password = self.types[section][option_name] == 'password'
+ except: pass
+
+ values[section][option_name] = self.get(option_name, section)
+ if is_password and values[section][option_name]:
+ values[section][option_name] = len(values[section][option_name]) * '*'
+
+ return values
+
+ def save(self):
+ with open(self.file, 'wb') as configfile:
+ self.p.write(configfile)
+
+ self.log.debug('Saved settings')
+
+ def addSection(self, section):
+ if not self.p.has_section(section):
+ self.p.add_section(section)
+
+ def setDefault(self, section, option, value):
+ if not self.p.has_option(section, option):
+ self.p.set(section, option, value)
+
+ def setType(self, section, option, type):
+ if not self.types.get(section):
+ self.types[section] = {}
+
+ self.types[section][option] = type
+
+ def addOptions(self, section_name, options):
+
+ if not self.options.get(section_name):
+ self.options[section_name] = options
+ else:
+ self.options[section_name] = mergeDicts(self.options[section_name], options)
+
+ def getOptions(self):
+ return self.options
+
+ def view(self, **kwargs):
+ return {
+ 'options': self.getOptions(),
+ 'values': self.getValues()
+ }
+
+ def saveView(self, **kwargs):
+
+ section = kwargs.get('section')
+ option = kwargs.get('name')
+ value = kwargs.get('value')
+
+ # See if a value handler is attached, use that as value
+ new_value = fireEvent('setting.save.%s.%s' % (section, option), value, single = True)
+
+ self.set(section, option, (new_value if new_value else value).encode('unicode_escape'))
+ self.save()
+
+ # After save (for re-interval etc)
+ fireEvent('setting.save.%s.%s.after' % (section, option), single = True)
+ fireEvent('setting.save.%s.*.after' % section, single = True)
+
+ return {
+ 'success': True,
+ }
+
+ def getProperty(self, identifier):
+ from couchpotato import get_db
+
+ db = get_db()
+ prop = None
+ try:
+ propert = db.get('property', identifier, with_doc = True)
+ prop = propert['doc']['value']
+ except:
+ pass # self.log.debug('Property "%s" doesn\'t exist: %s', (identifier, traceback.format_exc(0)))
+
+ return prop
+
+ def setProperty(self, identifier, value = ''):
+ from couchpotato import get_db
+
+ db = get_db()
+
+ try:
+ p = db.get('property', identifier, with_doc = True)
+ p['doc'].update({
+ 'identifier': identifier,
+ 'value': toUnicode(value),
+ })
+ db.update(p['doc'])
+ except:
+ db.insert({
+ '_t': 'property',
+ 'identifier': identifier,
+ 'value': toUnicode(value),
+ })
+
+
+class PropertyIndex(HashIndex):
+ _version = 1
+
+ def __init__(self, *args, **kwargs):
+ kwargs['key_format'] = '32s'
+ super(PropertyIndex, self).__init__(*args, **kwargs)
+
+ def make_key(self, key):
+ return md5(key).hexdigest()
+
+ def make_key_value(self, data):
+ if data.get('_t') == 'property':
+ return md5(data['identifier']).hexdigest(), None
diff --git a/couchpotato/core/settings/__init__.py b/couchpotato/core/settings/__init__.py
deleted file mode 100644
index 00f77a647f..0000000000
--- a/couchpotato/core/settings/__init__.py
+++ /dev/null
@@ -1,222 +0,0 @@
-from __future__ import with_statement
-from couchpotato.api import addApiView
-from couchpotato.core.event import addEvent, fireEvent
-from couchpotato.core.helpers.encoding import isInt, toUnicode
-from couchpotato.core.helpers.request import getParams, jsonified
-from couchpotato.core.helpers.variable import mergeDicts, tryInt
-from couchpotato.core.settings.model import Properties
-import ConfigParser
-import os.path
-import time
-import traceback
-
-
-class Settings(object):
-
- options = {}
- types = {}
-
- def __init__(self):
-
- addApiView('settings', self.view, docs = {
- 'desc': 'Return the options and its values of settings.conf. Including the default values and group ordering used on the settings page.',
- 'return': {'type': 'object', 'example': """{
- // objects like in __init__.py of plugin
- "options": {
- "moovee" : {
- "groups" : [{
- "description" : "SD movies only",
- "name" : "#alt.binaries.moovee",
- "options" : [{
- "default" : false,
- "name" : "enabled",
- "type" : "enabler"
- }],
- "tab" : "providers"
- }],
- "name" : "moovee"
- }
- },
- // object structured like settings.conf
- "values": {
- "moovee": {
- "enabled": false
- }
- }
-}"""}
- })
- addApiView('settings.save', self.saveView, docs = {
- 'desc': 'Save setting to config file (settings.conf)',
- 'params': {
- 'section': {'desc': 'The section name in settings.conf'},
- 'option': {'desc': 'The option name'},
- 'value': {'desc': 'The value you want to save'},
- }
- })
-
- def setFile(self, config_file):
- self.file = config_file
-
- self.p = ConfigParser.RawConfigParser()
- self.p.read(config_file)
-
- from couchpotato.core.logger import CPLog
- self.log = CPLog(__name__)
-
- self.connectEvents()
-
- def parser(self):
- return self.p
-
- def sections(self):
- return self.p.sections()
-
- def connectEvents(self):
- addEvent('settings.options', self.addOptions)
- addEvent('settings.register', self.registerDefaults)
- addEvent('settings.save', self.save)
-
- def registerDefaults(self, section_name, options = {}, save = True):
- self.addSection(section_name)
- for option_name, option in options.iteritems():
- self.setDefault(section_name, option_name, option.get('default', ''))
-
- if option.get('type'):
- self.setType(section_name, option_name, option.get('type'))
-
- if save:
- self.save(self)
-
- def set(self, section, option, value):
- return self.p.set(section, option, value)
-
- def get(self, option = '', section = 'core', default = None, type = None):
- try:
-
- try: type = self.types[section][option]
- except: type = 'unicode' if not type else type
-
- if hasattr(self, 'get%s' % type.capitalize()):
- return getattr(self, 'get%s' % type.capitalize())(section, option)
- else:
- return self.getUnicode(section, option)
-
- except:
- return default
-
- def getEnabler(self, section, option):
- return self.getBool(section, option)
-
- def getBool(self, section, option):
- try:
- return self.p.getboolean(section, option)
- except:
- return self.p.get(section, option) == 1
-
- def getInt(self, section, option):
- try:
- return self.p.getint(section, option)
- except:
- return tryInt(self.p.get(section, option))
-
- def getFloat(self, section, option):
- try:
- return self.p.getfloat(section, option)
- except:
- return tryInt(self.p.get(section, option))
-
- def getUnicode(self, section, option):
- value = self.p.get(section, option).decode('unicode_escape')
- return toUnicode(value).strip()
-
- def getValues(self):
- values = {}
- for section in self.sections():
- values[section] = {}
- for option in self.p.items(section):
- (option_name, option_value) = option
- values[section][option_name] = self.get(option_name, section)
- return values
-
- def save(self):
- with open(self.file, 'wb') as configfile:
- self.p.write(configfile)
-
- self.log.debug('Saved settings')
-
- def addSection(self, section):
- if not self.p.has_section(section):
- self.p.add_section(section)
-
- def setDefault(self, section, option, value):
- if not self.p.has_option(section, option):
- self.p.set(section, option, value)
-
- def setType(self, section, option, type):
- if not self.types.get(section):
- self.types[section] = {}
-
- self.types[section][option] = type
-
- def addOptions(self, section_name, options):
-
- if not self.options.get(section_name):
- self.options[section_name] = options
- else:
- self.options[section_name] = mergeDicts(self.options[section_name], options)
-
- def getOptions(self):
- return self.options
-
-
- def view(self):
- return jsonified({
- 'options': self.getOptions(),
- 'values': self.getValues()
- })
-
- def saveView(self):
-
- params = getParams()
-
- section = params.get('section')
- option = params.get('name')
- value = params.get('value')
-
- # See if a value handler is attached, use that as value
- new_value = fireEvent('setting.save.%s.%s' % (section, option), value, single = True)
-
- self.set(section, option, (new_value if new_value else value).encode('unicode_escape'))
- self.save()
-
- return jsonified({
- 'success': True,
- })
-
- def getProperty(self, identifier):
- from couchpotato import get_session
-
- db = get_session()
- prop = None
- try:
- propert = db.query(Properties).filter_by(identifier = identifier).first()
- prop = propert.value
- except:
- pass
-
- return prop
-
- def setProperty(self, identifier, value = ''):
- from couchpotato import get_session
-
- db = get_session()
-
- p = db.query(Properties).filter_by(identifier = identifier).first()
- if not p:
- p = Properties()
- db.add(p)
-
- p.identifier = identifier
- p.value = toUnicode(value)
-
- db.commit()
diff --git a/couchpotato/core/settings/model.py b/couchpotato/core/settings/model.py
deleted file mode 100644
index 64117fb48d..0000000000
--- a/couchpotato/core/settings/model.py
+++ /dev/null
@@ -1,262 +0,0 @@
-from couchpotato.core.helpers.encoding import toUnicode
-from elixir.entity import Entity
-from elixir.fields import Field
-from elixir.options import options_defaults, using_options
-from elixir.relationships import ManyToMany, OneToMany, ManyToOne
-from sqlalchemy.types import Integer, Unicode, UnicodeText, Boolean, String, \
- TypeDecorator
-import json
-import time
-
-options_defaults["shortnames"] = True
-
-# We would like to be able to create this schema in a specific database at
-# will, so we can test it easily.
-# Make elixir not bind to any session to make this possible.
-#
-# http://elixir.ematia.de/trac/wiki/Recipes/MultipleDatabasesOneMetadata
-__session__ = None
-
-class SetEncoder(json.JSONEncoder):
- def default(self, obj):
- if isinstance(obj, set):
- return list(obj)
- return json.JSONEncoder.default(self, obj)
-
-
-class JsonType(TypeDecorator):
- impl = UnicodeText
-
- def process_bind_param(self, value, dialect):
- try:
- return toUnicode(json.dumps(value, cls = SetEncoder))
- except:
- try:
- return toUnicode(json.dumps(value, cls = SetEncoder, encoding = 'latin-1'))
- except:
- raise
-
- def process_result_value(self, value, dialect):
- return json.loads(value if value else '{}')
-
-
-class Movie(Entity):
- """Movie Resource a movie could have multiple releases
- The files belonging to the movie object are global for the whole movie
- such as trailers, nfo, thumbnails"""
-
- last_edit = Field(Integer, default = lambda: int(time.time()))
-
- library = ManyToOne('Library', cascade = 'delete, delete-orphan', single_parent = True)
- status = ManyToOne('Status')
- profile = ManyToOne('Profile')
- releases = OneToMany('Release', cascade = 'all, delete-orphan')
- files = ManyToMany('File', cascade = 'all, delete-orphan', single_parent = True)
-
-
-class Library(Entity):
- """"""
-
- year = Field(Integer)
- identifier = Field(String(20), index = True)
-
- plot = Field(UnicodeText)
- tagline = Field(UnicodeText(255))
- info = Field(JsonType)
-
- status = ManyToOne('Status')
- movies = OneToMany('Movie', cascade = 'all, delete-orphan')
- titles = OneToMany('LibraryTitle', cascade = 'all, delete-orphan')
- files = ManyToMany('File', cascade = 'all, delete-orphan', single_parent = True)
-
-
-class LibraryTitle(Entity):
- """"""
- using_options(order_by = '-default')
-
- title = Field(Unicode)
- simple_title = Field(Unicode, index = True)
- default = Field(Boolean, index = True)
-
- language = OneToMany('Language')
- libraries = ManyToOne('Library')
-
-
-class Language(Entity):
- """"""
-
- identifier = Field(String(20), index = True)
- label = Field(Unicode)
-
- titles = ManyToOne('LibraryTitle')
-
-
-class Release(Entity):
- """Logically groups all files that belong to a certain release, such as
- parts of a movie, subtitles."""
-
- identifier = Field(String(100), index = True)
-
- movie = ManyToOne('Movie')
- status = ManyToOne('Status')
- quality = ManyToOne('Quality')
- files = ManyToMany('File')
- info = OneToMany('ReleaseInfo', cascade = 'all, delete-orphan')
-
- def to_dict(self, deep = {}, exclude = []):
- orig_dict = super(Release, self).to_dict(deep = deep, exclude = exclude)
-
- new_info = {}
- for info in orig_dict.get('info', []):
-
- value = info['value']
- try: value = int(info['value'])
- except: pass
-
- new_info[info['identifier']] = value
-
- orig_dict['info'] = new_info
-
- return orig_dict
-
-
-class ReleaseInfo(Entity):
- """Properties that can be bound to a file for off-line usage"""
-
- identifier = Field(String(50), index = True)
- value = Field(Unicode(255), nullable = False)
-
- release = ManyToOne('Release')
-
-
-class Status(Entity):
- """The status of a release, such as Downloaded, Deleted, Wanted etc"""
-
- identifier = Field(String(20), unique = True)
- label = Field(Unicode(20))
-
- releases = OneToMany('Release')
- movies = OneToMany('Movie')
-
-
-class Quality(Entity):
- """Quality name of a release, DVD, 720P, DVD-Rip etc"""
- using_options(order_by = 'order')
-
- identifier = Field(String(20), unique = True)
- label = Field(Unicode(20))
- order = Field(Integer, index = True)
-
- size_min = Field(Integer)
- size_max = Field(Integer)
-
- releases = OneToMany('Release')
- profile_types = OneToMany('ProfileType')
-
-
-class Profile(Entity):
- """"""
- using_options(order_by = 'order')
-
- label = Field(Unicode(50))
- order = Field(Integer, index = True)
- core = Field(Boolean)
- hide = Field(Boolean)
-
- movie = OneToMany('Movie')
- types = OneToMany('ProfileType', cascade = 'all, delete-orphan')
-
-
-class ProfileType(Entity):
- """"""
- using_options(order_by = 'order')
-
- order = Field(Integer, index = True)
- finish = Field(Boolean)
- wait_for = Field(Integer)
-
- quality = ManyToOne('Quality')
- profile = ManyToOne('Profile')
-
-
-class File(Entity):
- """File that belongs to a release."""
-
- path = Field(Unicode(255), nullable = False, unique = True)
- part = Field(Integer, default = 1)
- available = Field(Boolean)
-
- type = ManyToOne('FileType')
- properties = OneToMany('FileProperty')
-
- history = OneToMany('RenameHistory')
- movie = ManyToMany('Movie')
- release = ManyToMany('Release')
- library = ManyToMany('Library')
-
-
-class FileType(Entity):
- """Types could be trailer, subtitle, movie, partial movie etc."""
-
- identifier = Field(String(20), unique = True)
- type = Field(Unicode(20))
- name = Field(Unicode(50), nullable = False)
-
- files = OneToMany('File')
-
-
-class FileProperty(Entity):
- """Properties that can be bound to a file for off-line usage"""
-
- identifier = Field(String(20), index = True)
- value = Field(Unicode(255), nullable = False)
-
- file = ManyToOne('File')
-
-
-class RenameHistory(Entity):
- """Remembers from where to where files have been moved."""
-
- old = Field(Unicode(255))
- new = Field(Unicode(255))
-
- file = ManyToOne('File')
-
-
-class Notification(Entity):
- using_options(order_by = 'added')
-
- added = Field(Integer, default = lambda: int(time.time()))
- read = Field(Boolean, default = False)
- message = Field(Unicode(255))
- data = Field(JsonType)
-
-
-class Folder(Entity):
- """Renamer destination folders."""
-
- path = Field(Unicode(255))
- label = Field(Unicode(255))
-
-
-class Properties(Entity):
-
- identifier = Field(String(50), index = True)
- value = Field(Unicode(255), nullable = False)
-
-
-def setup():
- """Setup the database and create the tables that don't exists yet"""
- from elixir import setup_all, create_all
- from couchpotato.environment import Env
-
- engine = Env.getEngine()
-
- setup_all()
- create_all(engine)
-
- try:
- engine.execute("PRAGMA journal_mode = WAL")
- engine.execute("PRAGMA temp_store = MEMORY")
- except:
- pass
diff --git a/couchpotato/environment.py b/couchpotato/environment.py
index bd637ad219..1000d4892a 100644
--- a/couchpotato/environment.py
+++ b/couchpotato/environment.py
@@ -1,20 +1,23 @@
+import os
+
+from couchpotato.core.database import Database
from couchpotato.core.event import fireEvent, addEvent
+from couchpotato.core.helpers.encoding import toUnicode
from couchpotato.core.loader import Loader
from couchpotato.core.settings import Settings
-from sqlalchemy.engine import create_engine
-from sqlalchemy.orm import scoped_session
-from sqlalchemy.orm.session import sessionmaker
-import os
+
class Env(object):
_appname = 'CouchPotato'
''' Environment variables '''
+ _app = None
_encoding = 'UTF-8'
_debug = False
_dev = False
_settings = Settings()
+ _database = Database()
_loader = Loader()
_cache = None
_options = None
@@ -22,13 +25,13 @@ class Env(object):
_quiet = False
_daemonized = False
_desktop = None
- _session = None
+ _http_opener = None
''' Data paths and directories '''
_app_dir = ""
_data_dir = ""
_cache_dir = ""
- _db_path = ""
+ _db = ""
_log_path = ""
@staticmethod
@@ -36,8 +39,11 @@ def doDebug():
return Env._debug
@staticmethod
- def get(attr):
- return getattr(Env, '_' + attr)
+ def get(attr, unicode = False):
+ if unicode:
+ return toUnicode(getattr(Env, '_' + attr))
+ else:
+ return getattr(Env, '_' + attr)
@staticmethod
def all():
@@ -51,32 +57,17 @@ def all():
def set(attr, value):
return setattr(Env, '_' + attr, value)
- @staticmethod
- def getSession(engine = None):
- existing_session = Env.get('session')
- if existing_session:
- return existing_session
-
- engine = Env.getEngine()
- session = scoped_session(sessionmaker(bind = engine))
- Env.set('session', session)
-
- return session
-
- @staticmethod
- def getEngine():
- return create_engine(Env.get('db_path'), echo = False, pool_recycle = 30)
-
@staticmethod
def setting(attr, section = 'core', value = None, default = '', type = None):
s = Env.get('settings')
# Return setting
- if value == None:
+ if value is None:
return s.get(attr, default = default, section = section, type = type)
# Set setting
+ s.addSection(section)
s.set(section, attr, value)
s.save()
@@ -85,7 +76,7 @@ def setting(attr, section = 'core', value = None, default = '', type = None):
@staticmethod
def prop(identifier, value = None, default = None):
s = Env.get('settings')
- if value == None:
+ if value is None:
v = s.getProperty(identifier)
return v if v else default
diff --git a/couchpotato/runner.py b/couchpotato/runner.py
index de5384853d..95bc48c20d 100644
--- a/couchpotato/runner.py
+++ b/couchpotato/runner.py
@@ -1,22 +1,31 @@
-from argparse import ArgumentParser
-from couchpotato import web
-from couchpotato.api import api, NonBlockHandler
-from couchpotato.core.event import fireEventAsync, fireEvent
-from couchpotato.core.helpers.variable import getDataDir, tryInt
from logging import handlers
-from tornado.httpserver import HTTPServer
-from tornado.web import Application, FallbackHandler
-from tornado.wsgi import WSGIContainer
-from werkzeug.contrib.cache import FileSystemCache
+from uuid import uuid4
import locale
import logging
import os.path
-import shutil
import sys
import time
+import traceback
import warnings
+import re
+import tarfile
+import shutil
+
+from CodernityDB.database_super_thread_safe import SuperThreadSafeDatabase
+from argparse import ArgumentParser
+from cache import FileSystemCache
+from couchpotato import KeyHandler, LoginHandler, LogoutHandler
+from couchpotato.api import NonBlockHandler, ApiHandler
+from couchpotato.core.event import fireEventAsync, fireEvent
+from couchpotato.core.helpers.encoding import sp
+from couchpotato.core.helpers.variable import getDataDir, tryInt, getFreeSpace
+import requests
+from requests.packages.urllib3 import disable_warnings
+from tornado.httpserver import HTTPServer
+from tornado.web import Application, StaticFileHandler, RedirectHandler
-def getOptions(base_path, args):
+
+def getOptions(args):
# Options
parser = ArgumentParser(prog = 'CouchPotato.py')
@@ -50,6 +59,7 @@ def getOptions(base_path, args):
return options
+
# Tornado monkey patch logging..
def _log(status_code, request):
@@ -75,46 +85,84 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
if not encoding or encoding in ('ANSI_X3.4-1968', 'US-ASCII', 'ASCII'):
encoding = 'UTF-8'
+ Env.set('encoding', encoding)
+
# Do db stuff
- db_path = os.path.join(data_dir, 'couchpotato.db')
-
- # Backup before start and cleanup old databases
- new_backup = os.path.join(data_dir, 'db_backup', str(int(time.time())))
-
- # Create path and copy
- if not os.path.isdir(new_backup): os.makedirs(new_backup)
- src_files = [options.config_file, db_path, db_path + '-shm', db_path + '-wal']
- for src_file in src_files:
- if os.path.isfile(src_file):
- shutil.copy2(src_file, os.path.join(new_backup, os.path.basename(src_file)))
-
- # Remove older backups, keep backups 3 days or at least 3
- backups = []
- for directory in os.listdir(os.path.dirname(new_backup)):
- backup = os.path.join(os.path.dirname(new_backup), directory)
- if os.path.isdir(backup):
- backups.append(backup)
-
- total_backups = len(backups)
- for backup in backups:
- if total_backups > 3:
- if tryInt(os.path.basename(backup)) < time.time() - 259200:
- for src_file in src_files:
- b_file = os.path.join(backup, os.path.basename(src_file))
- if os.path.isfile(b_file):
- os.remove(b_file)
- os.rmdir(backup)
- total_backups -= 1
+ db_path = sp(os.path.join(data_dir, 'database'))
+ old_db_path = os.path.join(data_dir, 'couchpotato.db')
+
+ # Remove database folder if both exists
+ if os.path.isdir(db_path) and os.path.isfile(old_db_path):
+ db = SuperThreadSafeDatabase(db_path)
+ db.open()
+ db.destroy()
+
+ # Check if database exists
+ db = SuperThreadSafeDatabase(db_path)
+ db_exists = db.exists()
+ if db_exists:
+
+ # Backup before start and cleanup old backups
+ backup_path = sp(os.path.join(data_dir, 'db_backup'))
+ backup_count = 5
+ existing_backups = []
+ if not os.path.isdir(backup_path): os.makedirs(backup_path)
+
+ for root, dirs, files in os.walk(backup_path):
+ # Only consider files being a direct child of the backup_path
+ if root == backup_path:
+ for backup_file in sorted(files):
+ ints = re.findall('\d+', backup_file)
+
+ # Delete non zip files
+ if len(ints) != 1:
+ try: os.remove(os.path.join(root, backup_file))
+ except: pass
+ else:
+ existing_backups.append((int(ints[0]), backup_file))
+ else:
+ # Delete stray directories.
+ shutil.rmtree(root)
+
+ # Remove all but the last 5
+ for eb in existing_backups[:-backup_count]:
+ os.remove(os.path.join(backup_path, eb[1]))
+
+ # Create new backup
+ new_backup = sp(os.path.join(backup_path, '%s.tar.gz' % int(time.time())))
+ zipf = tarfile.open(new_backup, 'w:gz')
+ for root, dirs, files in os.walk(db_path):
+ for zfilename in files:
+ zipf.add(os.path.join(root, zfilename), arcname = 'database/%s' % os.path.join(root[len(db_path) + 1:], zfilename))
+ zipf.close()
+
+ # Open last
+ db.open()
+
+ else:
+ db.create()
+
+ # Force creation of cachedir
+ log_dir = sp(log_dir)
+ cache_dir = sp(os.path.join(data_dir, 'cache'))
+ python_cache = sp(os.path.join(cache_dir, 'python'))
+
+ if not os.path.exists(cache_dir):
+ os.mkdir(cache_dir)
+ if not os.path.exists(python_cache):
+ os.mkdir(python_cache)
+ session = requests.Session()
+ session.max_redirects = 5
# Register environment settings
- Env.set('encoding', encoding)
- Env.set('app_dir', base_path)
- Env.set('data_dir', data_dir)
- Env.set('log_path', os.path.join(log_dir, 'CouchPotato.log'))
- Env.set('db_path', 'sqlite:///' + db_path)
- Env.set('cache_dir', os.path.join(data_dir, 'cache'))
- Env.set('cache', FileSystemCache(os.path.join(Env.get('cache_dir'), 'python')))
+ Env.set('app_dir', sp(base_path))
+ Env.set('data_dir', sp(data_dir))
+ Env.set('log_path', sp(os.path.join(log_dir, 'CouchPotato.log')))
+ Env.set('db', db)
+ Env.set('http_opener', session)
+ Env.set('cache_dir', cache_dir)
+ Env.set('cache', FileSystemCache(python_cache))
Env.set('console_log', options.console_log)
Env.set('quiet', options.quiet)
Env.set('desktop', desktop)
@@ -131,12 +179,15 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
Env.set('dev', development)
# Disable logging for some modules
- for logger_name in ['enzyme', 'guessit', 'subliminal', 'apscheduler']:
+ for logger_name in ['enzyme', 'guessit', 'subliminal', 'apscheduler', 'tornado', 'requests']:
logging.getLogger(logger_name).setLevel(logging.ERROR)
- for logger_name in ['gntp', 'migrate']:
+ for logger_name in ['gntp']:
logging.getLogger(logger_name).setLevel(logging.WARNING)
+ # Disable SSL warning
+ disable_warnings()
+
# Use reloader
reloader = debug is True and development and not Env.get('desktop') and not options.daemon
@@ -154,108 +205,127 @@ def runCouchPotato(options, base_path, args, data_dir = None, log_dir = None, En
logger.addHandler(hdlr)
# To file
- hdlr2 = handlers.RotatingFileHandler(Env.get('log_path'), 'a', 500000, 10)
+ hdlr2 = handlers.RotatingFileHandler(Env.get('log_path'), 'a', 500000, 10, encoding = Env.get('encoding'))
hdlr2.setFormatter(formatter)
logger.addHandler(hdlr2)
# Start logging & enable colors
+ # noinspection PyUnresolvedReferences
import color_logs
from couchpotato.core.logger import CPLog
log = CPLog(__name__)
log.debug('Started with options %s', options)
+ # Check available space
+ try:
+ total_space, available_space = getFreeSpace(data_dir)
+ if available_space < 100:
+ log.error('Shutting down as CP needs some space to work. You\'ll get corrupted data otherwise. Only %sMB left', available_space)
+ return
+ except:
+ log.error('Failed getting diskspace: %s', traceback.format_exc())
+
def customwarn(message, category, filename, lineno, file = None, line = None):
log.warning('%s %s %s line:%s', (category, message, filename, lineno))
warnings.showwarning = customwarn
- # Check if database exists
- db = Env.get('db_path')
- db_exists = os.path.isfile(db_path)
-
- # Load configs & plugins
- loader = Env.get('loader')
- loader.preload(root = base_path)
- loader.run()
-
- # Load migrations
- if db_exists:
-
- from migrate.versioning.api import version_control, db_version, version, upgrade
- repo = os.path.join(base_path, 'couchpotato', 'core', 'migration')
-
- latest_db_version = version(repo)
- try:
- current_db_version = db_version(db, repo)
- except:
- version_control(db, repo, version = latest_db_version)
- current_db_version = db_version(db, repo)
-
- if current_db_version < latest_db_version and not development:
- log.info('Doing database upgrade. From %d to %d', (current_db_version, latest_db_version))
- upgrade(db, repo)
-
- # Configure Database
- from couchpotato.core.settings.model import setup
- setup()
-
- # Fill database with needed stuff
- if not db_exists:
- fireEvent('app.initialize', in_order = True)
-
# Create app
- from couchpotato import app
+ from couchpotato import WebHandler
+ web_base = ('/' + Env.setting('url_base').lstrip('/') + '/') if Env.setting('url_base') else '/'
+ Env.set('web_base', web_base)
+
api_key = Env.setting('api_key')
- url_base = '/' + Env.setting('url_base').lstrip('/') if Env.setting('url_base') else ''
+ if not api_key:
+ api_key = uuid4().hex
+ Env.setting('api_key', value = api_key)
+
+ api_base = r'%sapi/%s/' % (web_base, api_key)
+ Env.set('api_base', api_base)
# Basic config
- app.secret_key = api_key
host = Env.setting('host', default = '0.0.0.0')
- # app.debug = development
+ host6 = Env.setting('host6', default = '::')
+
config = {
'use_reloader': reloader,
- 'port': tryInt(Env.setting('port', default = 5000)),
+ 'port': tryInt(Env.setting('port', default = 5050)),
'host': host if host and len(host) > 0 else '0.0.0.0',
+ 'host6': host6 if host6 and len(host6) > 0 else '::',
'ssl_cert': Env.setting('ssl_cert', default = None),
'ssl_key': Env.setting('ssl_key', default = None),
}
- # Static path
- app.static_folder = os.path.join(base_path, 'couchpotato', 'static')
- web.add_url_rule('api/%s/static/<path:filename>' % api_key,
- endpoint = 'static',
- view_func = app.send_static_file)
+ # Load the app
+ application = Application(
+ [],
+ log_function = lambda x: None,
+ debug = config['use_reloader'],
+ gzip = True,
+ cookie_secret = api_key,
+ login_url = '%slogin/' % web_base,
+ )
+ Env.set('app', application)
+
+ # Request handlers
+ application.add_handlers(".*$", [
+ (r'%snonblock/(.*)(/?)' % api_base, NonBlockHandler),
+
+ # API handlers
+ (r'%s(.*)(/?)' % api_base, ApiHandler), # Main API handler
+ (r'%sgetkey(/?)' % web_base, KeyHandler), # Get API key
+ (r'%s' % api_base, RedirectHandler, {"url": web_base + 'docs/'}), # API docs
+
+ # Login handlers
+ (r'%slogin(/?)' % web_base, LoginHandler),
+ (r'%slogout(/?)' % web_base, LogoutHandler),
+
+ # Catch all webhandlers
+ (r'%s(.*)(/?)' % web_base, WebHandler),
+ (r'(.*)', WebHandler),
+ ])
+
+ # Static paths
+ static_path = '%sstatic/' % web_base
+ for dir_name in ['fonts', 'images', 'scripts', 'style']:
+ application.add_handlers(".*$", [
+ ('%s%s/(.*)' % (static_path, dir_name), StaticFileHandler, {'path': sp(os.path.join(base_path, 'couchpotato', 'static', dir_name))})
+ ])
+ Env.set('static_path', static_path)
- # Register modules
- app.register_blueprint(web, url_prefix = '%s/' % url_base)
- app.register_blueprint(api, url_prefix = '%s/api/%s/' % (url_base, api_key))
+ # Load configs & plugins
+ loader = Env.get('loader')
+ loader.preload(root = sp(base_path))
+ loader.run()
+
+ # Fill database with needed stuff
+ fireEvent('database.setup')
+ if not db_exists:
+ fireEvent('app.initialize', in_order = True)
+ fireEvent('app.migrate')
+
+ # Go go go!
+ from tornado.ioloop import IOLoop
+ from tornado.autoreload import add_reload_hook
+ loop = IOLoop.current()
+
+ # Reload hook
+ def reload_hook():
+ fireEvent('app.shutdown')
+ add_reload_hook(reload_hook)
# Some logging and fire load event
try: log.info('Starting server on port %(port)s', config)
except: pass
fireEventAsync('app.load')
- # Go go go!
- from tornado.ioloop import IOLoop
- web_container = WSGIContainer(app)
- web_container._log = _log
- loop = IOLoop.instance()
-
- application = Application([
- (r'%s/api/%s/nonblock/(.*)/' % (url_base, api_key), NonBlockHandler),
- (r'.*', FallbackHandler, dict(fallback = web_container)),
- ],
- log_function = lambda x : None,
- debug = config['use_reloader'],
- gzip = True,
- )
-
+ ssl_options = None
if config['ssl_cert'] and config['ssl_key']:
- server = HTTPServer(application, no_keep_alive = True, ssl_options = {
- "certfile": config['ssl_cert'],
- "keyfile": config['ssl_key'],
- })
- else:
- server = HTTPServer(application, no_keep_alive = True)
+ ssl_options = {
+ 'certfile': config['ssl_cert'],
+ 'keyfile': config['ssl_key'],
+ }
+
+ server = HTTPServer(application, no_keep_alive = True, ssl_options = ssl_options)
try_restart = True
restart_tries = 5
@@ -263,12 +333,21 @@ def customwarn(message, category, filename, lineno, file = None, line = None):
while try_restart:
try:
server.listen(config['port'], config['host'])
+
+ if Env.setting('ipv6', default = False):
+ try: server.listen(config['port'], config['host6'])
+ except: log.info2('Tried to bind to IPV6 but failed')
+
loop.start()
- except Exception, e:
+ server.close_all_connections()
+ server.stop()
+ loop.close(all_fds = True)
+ except Exception as e:
+ log.error('Failed starting: %s', traceback.format_exc())
try:
nr, msg = e
if nr == 48:
- log.info('Already in use, try %s more time after few seconds', restart_tries)
+ log.info('Port (%s) needed for CouchPotato is already in use, try %s more time after few seconds', (config.get('port'), restart_tries))
time.sleep(1)
restart_tries -= 1
@@ -276,6 +355,8 @@ def customwarn(message, category, filename, lineno, file = None, line = None):
continue
else:
return
+ except ValueError:
+ return
except:
pass
diff --git a/couchpotato/static/fonts/Lobster-webfont.eot b/couchpotato/static/fonts/Lobster-webfont.eot
new file mode 100755
index 0000000000..bf219fff86
Binary files /dev/null and b/couchpotato/static/fonts/Lobster-webfont.eot differ
diff --git a/couchpotato/static/fonts/Lobster-webfont.svg b/couchpotato/static/fonts/Lobster-webfont.svg
new file mode 100755
index 0000000000..5ea8bc565b
--- /dev/null
+++ b/couchpotato/static/fonts/Lobster-webfont.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="lobster_14regular" horiz-adv-x="2048" >
+<font-face units-per-em="2048" ascent="1638" descent="-410" />
+<missing-glyph horiz-adv-x="444" />
+<glyph />
+<glyph />
+<glyph unicode="
" />
+<glyph unicode=" " horiz-adv-x="444" />
+<glyph unicode=" " horiz-adv-x="444" />
+<glyph unicode=" " horiz-adv-x="444" />
+<glyph unicode="C" horiz-adv-x="1017" d="M39 471q0 83 11 176t37 197.5t64 202t96.5 187t129.5 156.5t168.5 106.5t208.5 39.5q75 0 135.5 -15t107.5 -47t73 -85.5t26 -126.5q0 -87 -35 -138t-109 -51q-70 0 -116 53q37 19 65.5 75t28.5 114q0 55 -30 90t-95 35q-108 0 -208.5 -152t-159 -374t-58.5 -431 q0 -59 6.5 -105.5t23.5 -87.5t44.5 -68t70.5 -42.5t101 -15.5q119 0 223.5 54.5t175.5 150.5l47 -21q-39 -98 -110 -174.5t-154 -119.5t-164.5 -65t-155.5 -22q-232 0 -340 116.5t-108 387.5z" />
+<glyph unicode="P" horiz-adv-x="1173" d="M12 1004q0 132 108 256.5t275 200t336 75.5q122 0 216.5 -33t151.5 -90t86 -128t29 -152q0 -99 -41.5 -196t-115 -176t-187.5 -128t-247 -49h-11l-125 -584h-294l278 1303l303 40l-145 -684q75 6 143 55t114 121t73.5 159t27.5 169q0 123 -63 201t-191 78 q-249 0 -389.5 -132.5t-140.5 -365.5q0 -46 6.5 -76t14 -44.5t7.5 -18.5q-110 0 -164.5 46t-54.5 153z" />
+<glyph unicode="a" horiz-adv-x="1077" d="M-27 317q0 71 14.5 149.5t42.5 159t73.5 153.5t101.5 130t132.5 91t162.5 34q84 0 125 -28.5t41 -75.5v-15l22 109h295l-147 -696q-9 -40 -9 -66q0 -88 84 -88q56 0 98 54t68 139h86q-133 -379 -411 -379q-87 0 -139.5 48.5t-61.5 139.5q-126 -188 -305 -188 q-43 0 -82 10.5t-74 35t-61 62t-41 94t-15 127.5zM276 346q0 -56 10 -91.5t28.5 -48.5t31.5 -16.5t33 -3.5q49 0 101 49t69 132l98 462q0 26 -20 52t-64 26q-62 0 -118 -60t-91.5 -148.5t-56.5 -183t-21 -169.5z" />
+<glyph unicode="c" horiz-adv-x="786" d="M-27 313q0 54 8.5 115.5t28.5 133t49 138.5t74 130t99.5 109.5t130 74.5t161.5 28q125 0 176.5 -53t51.5 -135q0 -72 -31 -110.5t-78 -38.5q-35 0 -72 24q25 70 25 121q0 84 -57 84q-61 0 -124 -103.5t-101 -244t-38 -254.5q0 -100 35 -136t113 -36q77 0 144.5 29.5 t113 69.5t104.5 108h70q-236 -379 -563 -379q-151 0 -235.5 79t-84.5 246z" />
+<glyph unicode="h" horiz-adv-x="1034" d="M-78 0l297 1393l303 41l-110 -516q100 114 239 114q104 0 166 -56.5t62 -174.5q0 -89 -49.5 -283.5t-49.5 -245.5q0 -86 82 -86q61 0 96.5 43t75.5 138h86q-33 -97 -73.5 -168t-78.5 -110.5t-81.5 -63t-76.5 -30.5t-71 -7q-124 0 -182.5 66.5t-58.5 164.5q0 71 46 264 t46 258q0 105 -76 105q-53 0 -98.5 -63t-57.5 -117l-141 -666h-295z" />
+<glyph unicode="o" horiz-adv-x="899" d="M-29 315q0 53 8.5 114.5t29 132.5t50 138.5t75.5 130t102 109t132.5 74.5t163.5 28q263 0 263 -327q8 -4 22 -4q66 0 155 36.5t161 86.5l18 -56q-58 -62 -153.5 -106.5t-209.5 -63.5q-24 -280 -160.5 -448t-328.5 -168q-152 0 -240 78t-88 245zM276 342 q0 -99 22.5 -132.5t82.5 -33.5q75 0 143.5 122.5t93.5 303.5q-55 13 -55 86q0 83 64 111q-3 65 -20.5 92t-57.5 27q-68 0 -133.5 -103t-102.5 -236.5t-37 -236.5z" />
+<glyph unicode="t" horiz-adv-x="546" d="M-16 233q0 56 16 134l123 575h-68l17 82h67l62 283l303 41l-70 -324h123l-16 -82h-123l-131 -614q-8 -36 -8 -66q0 -42 19.5 -59t63.5 -17q59 0 110 51.5t75 129.5h86q-33 -95 -79 -167t-90.5 -111t-95.5 -63t-88.5 -31t-76.5 -7q-98 0 -158.5 61t-60.5 184z" />
+<glyph unicode="u" horiz-adv-x="1034" d="M-16 233q0 56 16 134l139 657h295l-147 -696q-6 -30 -6 -58q0 -84 61 -84q109 0 164 181l139 657h295l-147 -696q-9 -40 -9 -66q0 -42 20 -59t64 -17q57 0 99 49.5t67 131.5h86q-133 -379 -411 -379q-88 0 -141 49.5t-62 144.5q-118 -194 -303 -194q-98 0 -158.5 61 t-60.5 184z" />
+<glyph unicode=" " horiz-adv-x="768" />
+<glyph unicode=" " horiz-adv-x="1536" />
+<glyph unicode=" " horiz-adv-x="768" />
+<glyph unicode=" " horiz-adv-x="1536" />
+<glyph unicode=" " horiz-adv-x="512" />
+<glyph unicode=" " horiz-adv-x="384" />
+<glyph unicode=" " horiz-adv-x="256" />
+<glyph unicode=" " horiz-adv-x="256" />
+<glyph unicode=" " horiz-adv-x="192" />
+<glyph unicode=" " horiz-adv-x="307" />
+<glyph unicode=" " horiz-adv-x="85" />
+<glyph unicode=" " horiz-adv-x="307" />
+<glyph unicode=" " horiz-adv-x="384" />
+<glyph unicode="◼" horiz-adv-x="1140" d="M0 0v1140h1140v-1140h-1140z" />
+</font>
+</defs></svg>
\ No newline at end of file
diff --git a/couchpotato/static/fonts/Lobster-webfont.ttf b/couchpotato/static/fonts/Lobster-webfont.ttf
new file mode 100755
index 0000000000..6661b92f56
Binary files /dev/null and b/couchpotato/static/fonts/Lobster-webfont.ttf differ
diff --git a/couchpotato/static/fonts/Lobster-webfont.woff b/couchpotato/static/fonts/Lobster-webfont.woff
new file mode 100755
index 0000000000..69b19660a6
Binary files /dev/null and b/couchpotato/static/fonts/Lobster-webfont.woff differ
diff --git a/couchpotato/static/fonts/Lobster-webfont.woff2 b/couchpotato/static/fonts/Lobster-webfont.woff2
new file mode 100644
index 0000000000..67014bef71
Binary files /dev/null and b/couchpotato/static/fonts/Lobster-webfont.woff2 differ
diff --git a/couchpotato/static/fonts/OpenSans-Bold-webfont.eot b/couchpotato/static/fonts/OpenSans-Bold-webfont.eot
new file mode 100755
index 0000000000..e1c7674430
Binary files /dev/null and b/couchpotato/static/fonts/OpenSans-Bold-webfont.eot differ
diff --git a/couchpotato/static/fonts/OpenSans-Bold-webfont.svg b/couchpotato/static/fonts/OpenSans-Bold-webfont.svg
new file mode 100755
index 0000000000..364b368678
--- /dev/null
+++ b/couchpotato/static/fonts/OpenSans-Bold-webfont.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG webfont generated by Font Squirrel.
+Copyright : Digitized data copyright 20102011 Google Corporation
+Foundry : Ascender Corporation
+Foundry URL : httpwwwascendercorpcom
+</metadata>
+<defs>
+<font id="OpenSansBold" horiz-adv-x="1169" >
+<font-face units-per-em="2048" ascent="1638" descent="-410" />
+<missing-glyph horiz-adv-x="532" />
+<glyph unicode=" " horiz-adv-x="532" />
+<glyph unicode=" " horiz-adv-x="532" />
+<glyph unicode=" " horiz-adv-x="532" />
+<glyph unicode="!" horiz-adv-x="586" d="M117 143q0 84 45 127t131 43q83 0 128.5 -44t45.5 -126q0 -79 -46 -124.5t-128 -45.5q-84 0 -130 44.5t-46 125.5zM121 1462h346l-51 -977h-244z" />
+<glyph unicode=""" horiz-adv-x="967" d="M133 1462h279l-41 -528h-197zM555 1462h279l-41 -528h-197z" />
+<glyph unicode="#" horiz-adv-x="1323" d="M45 406v206h277l47 232h-252v209h289l77 407h219l-77 -407h198l78 407h215l-78 -407h240v-209h-279l-47 -232h258v-206h-297l-77 -406h-220l78 406h-194l-76 -406h-215l74 406h-238zM539 612h196l47 232h-196z" />
+<glyph unicode="$" d="M88 1049q0 145 113.5 238.5t316.5 113.5v153h137v-149q229 -10 414 -92l-94 -234q-156 64 -320 78v-295q195 -75 277.5 -130t121 -121t38.5 -154q0 -159 -115 -255.5t-322 -115.5v-205h-137v201q-244 5 -428 86v264q87 -43 209.5 -76t218.5 -39v310l-67 26 q-198 78 -280.5 169.5t-82.5 226.5zM389 1049q0 -44 30.5 -72.5t98.5 -58.5v235q-129 -19 -129 -104zM655 324q136 23 136 118q0 42 -34 71t-102 60v-249z" />
+<glyph unicode="%" horiz-adv-x="1845" d="M63 1026q0 457 345 457q169 0 259.5 -118.5t90.5 -338.5q0 -230 -89 -345.5t-261 -115.5q-165 0 -255 118.5t-90 342.5zM315 1024q0 -127 22.5 -189.5t72.5 -62.5q96 0 96 252q0 250 -96 250q-50 0 -72.5 -61.5t-22.5 -188.5zM395 0l811 1462h240l-811 -1462h-240z M1087 442q0 457 345 457q169 0 259.5 -118.5t90.5 -338.5q0 -229 -89 -344.5t-261 -115.5q-165 0 -255 118.5t-90 341.5zM1339 440q0 -127 22.5 -189.5t72.5 -62.5q96 0 96 252q0 250 -96 250q-50 0 -72.5 -61.5t-22.5 -188.5z" />
+<glyph unicode="&" horiz-adv-x="1536" d="M82 395q0 137 60.5 233.5t207.5 180.5q-75 86 -109 164.5t-34 171.5q0 152 116.5 245t311.5 93q186 0 297.5 -86.5t111.5 -231.5q0 -119 -69 -217.5t-223 -187.5l284 -277q71 117 123 301h318q-36 -135 -99 -263.5t-143 -227.5l301 -293h-377l-115 113 q-191 -133 -432 -133q-244 0 -387 112t-143 303zM403 424q0 -86 64.5 -137t165.5 -51q126 0 227 61l-332 330q-58 -44 -91.5 -92t-33.5 -111zM489 1124q0 -88 95 -194q86 48 132 94.5t46 108.5q0 53 -36 83.5t-93 30.5q-67 0 -105.5 -32t-38.5 -91z" />
+<glyph unicode="'" horiz-adv-x="545" d="M133 1462h279l-41 -528h-197z" />
+<glyph unicode="(" horiz-adv-x="694" d="M82 561q0 265 77.5 496t223.5 405h250q-141 -193 -213 -424t-72 -475q0 -245 73.5 -473.5t209.5 -413.5h-248q-147 170 -224 397t-77 488z" />
+<glyph unicode=")" horiz-adv-x="694" d="M61 1462h250q147 -175 224 -406.5t77 -494.5t-77.5 -490t-223.5 -395h-248q135 184 209 412.5t74 474.5q0 244 -72 475t-213 424z" />
+<glyph unicode="*" horiz-adv-x="1116" d="M63 1042l39 250l365 -104l-41 368h262l-41 -368l373 104l33 -252l-340 -24l223 -297l-227 -121l-156 313l-137 -311l-236 119l221 297z" />
+<glyph unicode="+" d="M88 612v219h387v390h219v-390h387v-219h-387v-385h-219v385h-387z" />
+<glyph unicode="," horiz-adv-x="594" d="M63 -264q65 266 101 502h280l15 -23q-52 -202 -176 -479h-220z" />
+<glyph unicode="-" horiz-adv-x="659" d="M61 424v250h537v-250h-537z" />
+<glyph unicode="." horiz-adv-x="584" d="M117 143q0 84 45 127t131 43q83 0 128.5 -44t45.5 -126q0 -79 -46 -124.5t-128 -45.5q-84 0 -130 44.5t-46 125.5z" />
+<glyph unicode="/" horiz-adv-x="846" d="M14 0l545 1462h277l-545 -1462h-277z" />
+<glyph unicode="0" d="M74 731q0 387 125 570.5t385 183.5q253 0 382.5 -192t129.5 -562q0 -383 -125.5 -567t-386.5 -184q-253 0 -381.5 190t-128.5 561zM381 731q0 -269 46.5 -385.5t156.5 -116.5q108 0 156 118t48 384q0 269 -48.5 386.5t-155.5 117.5q-109 0 -156 -117.5t-47 -386.5z" />
+<glyph unicode="1" d="M121 1087l471 375h254v-1462h-309v846l3 139l5 152q-77 -77 -107 -101l-168 -135z" />
+<glyph unicode="2" d="M78 1274q108 92 179 130t155 58.5t188 20.5q137 0 242 -50t163 -140t58 -206q0 -101 -35.5 -189.5t-110 -181.5t-262.5 -265l-188 -177v-14h637v-260h-1022v215l367 371q163 167 213 231.5t72 119.5t22 114q0 88 -48.5 131t-129.5 43q-85 0 -165 -39t-167 -111z" />
+<glyph unicode="3" d="M78 59v263q85 -43 187 -70t202 -27q153 0 226 52t73 167q0 103 -84 146t-268 43h-111v237h113q170 0 248.5 44.5t78.5 152.5q0 166 -208 166q-72 0 -146.5 -24t-165.5 -83l-143 213q200 144 477 144q227 0 358.5 -92t131.5 -256q0 -137 -83 -233t-233 -132v-6 q177 -22 268 -107.5t91 -230.5q0 -211 -153 -328.5t-437 -117.5q-238 0 -422 79z" />
+<glyph unicode="4" d="M35 303v215l641 944h285v-919h176v-240h-176v-303h-302v303h-624zM307 543h352v248q0 62 5 180t8 137h-8q-37 -82 -89 -160z" />
+<glyph unicode="5" d="M100 59v267q79 -42 184 -68.5t199 -26.5q283 0 283 232q0 221 -293 221q-53 0 -117 -10.5t-104 -22.5l-123 66l55 745h793v-262h-522l-27 -287l35 7q61 14 151 14q212 0 337.5 -119t125.5 -326q0 -245 -151 -377t-432 -132q-244 0 -394 79z" />
+<glyph unicode="6" d="M72 621q0 434 183.5 646t549.5 212q125 0 196 -15v-247q-89 20 -176 20q-159 0 -259.5 -48t-150.5 -142t-59 -267h13q99 170 317 170q196 0 307 -123t111 -340q0 -234 -132 -370.5t-366 -136.5q-162 0 -282.5 75t-186 219t-65.5 347zM379 510q0 -119 62.5 -201t158.5 -82 q99 0 152 66.5t53 189.5q0 107 -49.5 168.5t-149.5 61.5q-94 0 -160.5 -61t-66.5 -142z" />
+<glyph unicode="7" d="M55 1200v260h1049v-194l-553 -1266h-324l549 1200h-721z" />
+<glyph unicode="8" d="M72 371q0 125 66.5 222t213.5 171q-125 79 -180 169t-55 197q0 157 130 254t339 97q210 0 338.5 -95.5t128.5 -257.5q0 -112 -62 -199.5t-200 -156.5q164 -88 235.5 -183.5t71.5 -209.5q0 -180 -141 -289.5t-371 -109.5q-240 0 -377 102t-137 289zM358 389q0 -86 60 -134 t164 -48q115 0 172 49.5t57 130.5q0 67 -56.5 125.5t-183.5 124.5q-213 -98 -213 -248zM408 1106q0 -60 38.5 -107.5t139.5 -97.5q98 46 137 94t39 111q0 69 -50 109t-128 40q-79 0 -127.5 -40.5t-48.5 -108.5z" />
+<glyph unicode="9" d="M66 971q0 235 133.5 371.5t363.5 136.5q162 0 283.5 -76t186.5 -220.5t65 -344.5q0 -432 -182 -645t-551 -213q-130 0 -197 14v248q84 -21 176 -21q155 0 255 45.5t153 143t61 268.5h-12q-58 -94 -134 -132t-190 -38q-191 0 -301 122.5t-110 340.5zM365 975 q0 -106 49 -168t149 -62q94 0 161 61.5t67 141.5q0 119 -62.5 201t-159.5 82q-96 0 -150 -66t-54 -190z" />
+<glyph unicode=":" horiz-adv-x="584" d="M117 143q0 84 45 127t131 43q83 0 128.5 -44t45.5 -126q0 -79 -46 -124.5t-128 -45.5q-84 0 -130 44.5t-46 125.5zM117 969q0 84 45 127t131 43q83 0 128.5 -44t45.5 -126q0 -81 -46.5 -125.5t-127.5 -44.5q-84 0 -130 44t-46 126z" />
+<glyph unicode=";" horiz-adv-x="594" d="M63 -264q65 266 101 502h280l15 -23q-52 -202 -176 -479h-220zM117 969q0 84 45 127t131 43q83 0 128.5 -44t45.5 -126q0 -81 -46.5 -125.5t-127.5 -44.5q-84 0 -130 44t-46 126z" />
+<glyph unicode="<" d="M88 641v143l993 496v-240l-684 -317l684 -281v-239z" />
+<glyph unicode="=" d="M88 418v219h993v-219h-993zM88 805v219h993v-219h-993z" />
+<glyph unicode=">" d="M88 203v239l684 281l-684 317v240l993 -496v-143z" />
+<glyph unicode="?" horiz-adv-x="977" d="M6 1358q223 125 473 125q206 0 327.5 -99t121.5 -264q0 -110 -50 -190t-190 -180q-96 -71 -121.5 -108t-25.5 -97v-60h-265v74q0 96 41 167t150 151q105 75 138.5 122t33.5 105q0 65 -48 99t-134 34q-150 0 -342 -98zM244 143q0 84 45 127t131 43q83 0 128.5 -44 t45.5 -126q0 -79 -46 -124.5t-128 -45.5q-84 0 -130 44.5t-46 125.5z" />
+<glyph unicode="@" horiz-adv-x="1837" d="M102 602q0 247 108.5 448.5t309 316t461.5 114.5q220 0 393 -90t267 -256t94 -383q0 -144 -46 -263.5t-130 -187.5t-195 -68q-74 0 -131 35.5t-82 93.5h-16q-108 -129 -275 -129q-177 0 -279 106.5t-102 291.5q0 211 134 340t350 129q86 0 189.5 -16.5t170.5 -39.5 l-23 -489q0 -139 76 -139q64 0 102 93.5t38 244.5q0 161 -67 284.5t-188.5 188.5t-277.5 65q-202 0 -351 -83t-228.5 -239.5t-79.5 -361.5q0 -276 147.5 -423.5t427.5 -147.5q106 0 233 23.5t250 68.5v-192q-214 -91 -475 -91q-380 0 -592.5 200t-212.5 556zM711 627 q0 -211 172 -211q90 0 137 63.5t57 206.5l13 221q-51 11 -115 11q-125 0 -194.5 -78t-69.5 -213z" />
+<glyph unicode="A" horiz-adv-x="1413" d="M0 0l516 1468h379l518 -1468h-334l-106 348h-533l-106 -348h-334zM518 608h381q-147 473 -165.5 535t-26.5 98q-33 -128 -189 -633z" />
+<glyph unicode="B" horiz-adv-x="1376" d="M184 0v1462h455q311 0 451.5 -88.5t140.5 -281.5q0 -131 -61.5 -215t-163.5 -101v-10q139 -31 200.5 -116t61.5 -226q0 -200 -144.5 -312t-392.5 -112h-547zM494 256h202q128 0 189 49t61 150q0 182 -260 182h-192v-381zM494 883h180q126 0 182.5 39t56.5 129 q0 84 -61.5 120.5t-194.5 36.5h-163v-325z" />
+<glyph unicode="C" horiz-adv-x="1305" d="M119 729q0 228 83 399.5t238.5 263t364.5 91.5q213 0 428 -103l-100 -252q-82 39 -165 68t-163 29q-175 0 -271 -131.5t-96 -366.5q0 -489 367 -489q154 0 373 77v-260q-180 -75 -402 -75q-319 0 -488 193.5t-169 555.5z" />
+<glyph unicode="D" horiz-adv-x="1516" d="M184 0v1462h459q358 0 556 -189t198 -528q0 -361 -205.5 -553t-593.5 -192h-414zM494 256h133q448 0 448 481q0 471 -416 471h-165v-952z" />
+<glyph unicode="E" horiz-adv-x="1147" d="M184 0v1462h842v-254h-532v-321h495v-254h-495v-377h532v-256h-842z" />
+<glyph unicode="F" horiz-adv-x="1124" d="M184 0v1462h838v-254h-533v-377h496v-253h-496v-578h-305z" />
+<glyph unicode="G" horiz-adv-x="1483" d="M119 733q0 354 202.5 552t561.5 198q225 0 434 -90l-103 -248q-160 80 -333 80q-201 0 -322 -135t-121 -363q0 -238 97.5 -363.5t283.5 -125.5q97 0 197 20v305h-277v258h580v-758q-141 -46 -265.5 -64.5t-254.5 -18.5q-331 0 -505.5 194.5t-174.5 558.5z" />
+<glyph unicode="H" horiz-adv-x="1567" d="M184 0v1462h310v-573h579v573h309v-1462h-309v631h-579v-631h-310z" />
+<glyph unicode="I" horiz-adv-x="678" d="M184 0v1462h310v-1462h-310z" />
+<glyph unicode="J" horiz-adv-x="678" d="M-152 -150q80 -20 146 -20q102 0 146 63.5t44 198.5v1370h310v-1368q0 -256 -117 -390t-346 -134q-105 0 -183 22v258z" />
+<glyph unicode="K" horiz-adv-x="1360" d="M184 0v1462h310v-669l122 172l396 497h344l-510 -647l514 -815h-352l-383 616l-131 -94v-522h-310z" />
+<glyph unicode="L" horiz-adv-x="1157" d="M184 0v1462h310v-1206h593v-256h-903z" />
+<glyph unicode="M" horiz-adv-x="1931" d="M184 0v1462h422l346 -1118h6l367 1118h422v-1462h-289v692q0 49 1.5 113t13.5 340h-9l-377 -1145h-284l-352 1147h-9q19 -350 19 -467v-680h-277z" />
+<glyph unicode="N" horiz-adv-x="1665" d="M184 0v1462h391l635 -1095h7q-15 285 -15 403v692h279v-1462h-394l-636 1106h-9q19 -293 19 -418v-688h-277z" />
+<glyph unicode="O" horiz-adv-x="1630" d="M119 735q0 365 180.5 557.5t517.5 192.5t515.5 -194t178.5 -558q0 -363 -180 -558t-516 -195t-516 195t-180 560zM444 733q0 -245 93 -369t278 -124q371 0 371 493q0 494 -369 494q-185 0 -279 -124.5t-94 -369.5z" />
+<glyph unicode="P" horiz-adv-x="1286" d="M184 0v1462h467q266 0 404.5 -114.5t138.5 -341.5q0 -236 -147.5 -361t-419.5 -125h-133v-520h-310zM494 774h102q143 0 214 56.5t71 164.5q0 109 -59.5 161t-186.5 52h-141v-434z" />
+<glyph unicode="Q" horiz-adv-x="1630" d="M119 735q0 365 180.5 557.5t517.5 192.5t515.5 -194t178.5 -558q0 -258 -91.5 -432.5t-268.5 -255.5l352 -393h-397l-268 328h-23q-336 0 -516 195t-180 560zM444 733q0 -245 93 -369t278 -124q371 0 371 493q0 494 -369 494q-185 0 -279 -124.5t-94 -369.5z" />
+<glyph unicode="R" horiz-adv-x="1352" d="M184 0v1462h426q298 0 441 -108.5t143 -329.5q0 -129 -71 -229.5t-201 -157.5q330 -493 430 -637h-344l-349 561h-165v-561h-310zM494 813h100q147 0 217 49t70 154q0 104 -71.5 148t-221.5 44h-94v-395z" />
+<glyph unicode="S" horiz-adv-x="1128" d="M94 68v288q148 -66 250.5 -93t187.5 -27q102 0 156.5 39t54.5 116q0 43 -24 76.5t-70.5 64.5t-189.5 99q-134 63 -201 121t-107 135t-40 180q0 194 131.5 305t363.5 111q114 0 217.5 -27t216.5 -76l-100 -241q-117 48 -193.5 67t-150.5 19q-88 0 -135 -41t-47 -107 q0 -41 19 -71.5t60.5 -59t196.5 -102.5q205 -98 281 -196.5t76 -241.5q0 -198 -142.5 -312t-396.5 -114q-234 0 -414 88z" />
+<glyph unicode="T" horiz-adv-x="1186" d="M41 1204v258h1104v-258h-397v-1204h-310v1204h-397z" />
+<glyph unicode="U" horiz-adv-x="1548" d="M174 520v942h309v-895q0 -169 68 -248t225 -79q152 0 220.5 79.5t68.5 249.5v893h309v-946q0 -162 -72.5 -284t-209.5 -187t-324 -65q-282 0 -438 144.5t-156 395.5z" />
+<glyph unicode="V" horiz-adv-x="1331" d="M0 1462h313l275 -870q23 -77 47.5 -179.5t30.5 -142.5q11 92 75 322l277 870h313l-497 -1462h-338z" />
+<glyph unicode="W" horiz-adv-x="1980" d="M0 1462h305l187 -798q49 -221 71 -383q6 57 27.5 176.5t40.5 185.5l213 819h293l213 -819q14 -55 35 -168t32 -194q10 78 32 194.5t40 188.5l186 798h305l-372 -1462h-353l-198 768q-11 41 -37.5 169.5t-30.5 172.5q-6 -54 -30 -173.5t-37 -170.5l-197 -766h-352z" />
+<glyph unicode="X" horiz-adv-x="1366" d="M0 0l485 754l-454 708h342l315 -526l309 526h334l-459 -725l494 -737h-354l-340 553l-340 -553h-332z" />
+<glyph unicode="Y" horiz-adv-x="1278" d="M0 1462h336l303 -602l305 602h334l-485 -893v-569h-308v559z" />
+<glyph unicode="Z" horiz-adv-x="1186" d="M49 0v201l701 1005h-682v256h1050v-200l-700 -1006h719v-256h-1088z" />
+<glyph unicode="[" horiz-adv-x="678" d="M143 -324v1786h484v-211h-224v-1364h224v-211h-484z" />
+<glyph unicode="\" horiz-adv-x="846" d="M12 1462h277l545 -1462h-277z" />
+<glyph unicode="]" horiz-adv-x="678" d="M51 -113h223v1364h-223v211h484v-1786h-484v211z" />
+<glyph unicode="^" horiz-adv-x="1090" d="M8 520l438 950h144l495 -950h-239l-322 643l-280 -643h-236z" />
+<glyph unicode="_" horiz-adv-x="842" d="M-4 -184h850v-140h-850v140z" />
+<glyph unicode="`" horiz-adv-x="1243" d="M332 1548v21h342q63 -101 235 -301v-27h-202q-63 44 -185 142.5t-190 164.5z" />
+<glyph unicode="a" horiz-adv-x="1237" d="M86 334q0 178 124.5 262.5t375.5 93.5l194 6v49q0 170 -174 170q-134 0 -315 -81l-101 206q193 101 428 101q225 0 345 -98t120 -298v-745h-213l-59 152h-8q-77 -97 -158.5 -134.5t-212.5 -37.5q-161 0 -253.5 92t-92.5 262zM399 332q0 -129 148 -129q106 0 169.5 61 t63.5 162v92l-118 -4q-133 -4 -198 -48t-65 -134z" />
+<glyph unicode="b" horiz-adv-x="1296" d="M160 0v1556h305v-362q0 -69 -12 -221h12q107 166 317 166q198 0 310 -154.5t112 -423.5q0 -277 -115.5 -429t-314.5 -152q-197 0 -309 143h-21l-51 -123h-233zM465 563q0 -180 53.5 -258t169.5 -78q94 0 149.5 86.5t55.5 251.5t-56 247.5t-153 82.5q-113 0 -165 -69.5 t-54 -229.5v-33z" />
+<glyph unicode="c" horiz-adv-x="1053" d="M92 553q0 285 142 435.5t407 150.5q194 0 348 -76l-90 -236q-72 29 -134 47.5t-124 18.5q-238 0 -238 -338q0 -328 238 -328q88 0 163 23.5t150 73.5v-261q-74 -47 -149.5 -65t-190.5 -18q-522 0 -522 573z" />
+<glyph unicode="d" horiz-adv-x="1296" d="M92 557q0 275 114.5 428.5t315.5 153.5q211 0 322 -164h10q-23 125 -23 223v358h306v-1556h-234l-59 145h-13q-104 -165 -317 -165q-197 0 -309.5 153t-112.5 424zM401 553q0 -165 57 -247.5t163 -82.5q117 0 171.5 68t59.5 231v33q0 180 -55.5 258t-180.5 78 q-102 0 -158.5 -86.5t-56.5 -251.5z" />
+<glyph unicode="e" horiz-adv-x="1210" d="M92 551q0 281 140.5 434.5t388.5 153.5q237 0 369 -135t132 -373v-148h-721q5 -130 77 -203t202 -73q101 0 191 21t188 67v-236q-80 -40 -171 -59.5t-222 -19.5q-270 0 -422 149t-152 422zM408 686h428q-2 113 -59 174.5t-154 61.5t-152 -61.5t-63 -174.5z" />
+<glyph unicode="f" horiz-adv-x="793" d="M41 889v147l168 82v82q0 191 94 279t301 88q158 0 281 -47l-78 -224q-92 29 -170 29q-65 0 -94 -38.5t-29 -98.5v-70h264v-229h-264v-889h-305v889h-168z" />
+<glyph unicode="g" horiz-adv-x="1157" d="M6 -182q0 101 63 169t185 97q-47 20 -82 65.5t-35 96.5q0 64 37 106.5t107 83.5q-88 38 -139.5 122t-51.5 198q0 183 119 283t340 100q47 0 111.5 -8.5t82.5 -12.5h390v-155l-175 -45q48 -75 48 -168q0 -180 -125.5 -280.5t-348.5 -100.5l-55 3l-45 5q-47 -36 -47 -80 q0 -66 168 -66h190q184 0 280.5 -79t96.5 -232q0 -196 -163.5 -304t-469.5 -108q-234 0 -357.5 81.5t-123.5 228.5zM270 -158q0 -63 60.5 -99t169.5 -36q164 0 257 45t93 123q0 63 -55 87t-170 24h-158q-84 0 -140.5 -39.5t-56.5 -104.5zM381 752q0 -91 41.5 -144t126.5 -53 q86 0 126 53t40 144q0 202 -166 202q-168 0 -168 -202z" />
+<glyph unicode="h" horiz-adv-x="1346" d="M160 0v1556h305v-317q0 -37 -7 -174l-7 -90h16q102 164 324 164q197 0 299 -106t102 -304v-729h-305v653q0 242 -180 242q-128 0 -185 -87t-57 -282v-526h-305z" />
+<glyph unicode="i" horiz-adv-x="625" d="M147 1407q0 149 166 149t166 -149q0 -71 -41.5 -110.5t-124.5 -39.5q-166 0 -166 150zM160 0v1118h305v-1118h-305z" />
+<glyph unicode="j" horiz-adv-x="625" d="M-131 -227q70 -19 143 -19q77 0 112.5 43t35.5 127v1194h305v-1239q0 -178 -103 -274.5t-292 -96.5q-117 0 -201 25v240zM147 1407q0 149 166 149t166 -149q0 -71 -41.5 -110.5t-124.5 -39.5q-166 0 -166 150z" />
+<glyph unicode="k" horiz-adv-x="1270" d="M160 0v1556h305v-694l-16 -254h4l133 170l313 340h344l-444 -485l471 -633h-352l-322 453l-131 -105v-348h-305z" />
+<glyph unicode="l" horiz-adv-x="625" d="M160 0v1556h305v-1556h-305z" />
+<glyph unicode="m" horiz-adv-x="2011" d="M160 0v1118h233l41 -143h17q45 77 130 120.5t195 43.5q251 0 340 -164h27q45 78 132.5 121t197.5 43q190 0 287.5 -97.5t97.5 -312.5v-729h-306v653q0 121 -40.5 181.5t-127.5 60.5q-112 0 -167.5 -80t-55.5 -254v-561h-305v653q0 121 -40.5 181.5t-127.5 60.5 q-117 0 -170 -86t-53 -283v-526h-305z" />
+<glyph unicode="n" horiz-adv-x="1346" d="M160 0v1118h233l41 -143h17q51 81 140.5 122.5t203.5 41.5q195 0 296 -105.5t101 -304.5v-729h-305v653q0 121 -43 181.5t-137 60.5q-128 0 -185 -85.5t-57 -283.5v-526h-305z" />
+<glyph unicode="o" horiz-adv-x="1268" d="M92 561q0 274 143 426t402 152q161 0 284 -70t189 -201t66 -307q0 -273 -144 -427t-401 -154q-161 0 -284 70.5t-189 202.5t-66 308zM403 561q0 -166 54.5 -251t177.5 -85q122 0 175.5 84.5t53.5 251.5q0 166 -54 249t-177 83q-122 0 -176 -82.5t-54 -249.5z" />
+<glyph unicode="p" horiz-adv-x="1296" d="M160 -492v1610h248l43 -145h14q107 166 317 166q198 0 310 -153t112 -425q0 -179 -52.5 -311t-149.5 -201t-228 -69q-197 0 -309 143h-16q16 -140 16 -162v-453h-305zM465 563q0 -180 53.5 -258t169.5 -78q205 0 205 338q0 165 -50.5 247.5t-158.5 82.5 q-113 0 -165 -69.5t-54 -229.5v-33z" />
+<glyph unicode="q" horiz-adv-x="1296" d="M92 557q0 274 114.5 428t313.5 154q106 0 185 -40t139 -124h8l27 143h258v-1610h-306v469q0 61 13 168h-13q-49 -81 -130 -123t-187 -42q-198 0 -310 152.5t-112 424.5zM403 553q0 -168 53.5 -251t166.5 -83q116 0 170 66.5t59 232.5v37q0 180 -55.5 258t-178.5 78 q-215 0 -215 -338z" />
+<glyph unicode="r" horiz-adv-x="930" d="M160 0v1118h231l45 -188h15q52 94 140.5 151.5t192.5 57.5q62 0 103 -9l-23 -286q-37 10 -90 10q-146 0 -227.5 -75t-81.5 -210v-569h-305z" />
+<glyph unicode="s" horiz-adv-x="1018" d="M92 827q0 149 115.5 230.5t327.5 81.5q202 0 393 -88l-92 -220q-84 36 -157 59t-149 23q-135 0 -135 -73q0 -41 43.5 -71t190.5 -89q131 -53 192 -99t90 -106t29 -143q0 -172 -119.5 -262t-357.5 -90q-122 0 -208 16.5t-161 48.5v252q85 -40 191.5 -67t187.5 -27 q166 0 166 96q0 36 -22 58.5t-76 51t-144 66.5q-129 54 -189.5 100t-88 105.5t-27.5 146.5z" />
+<glyph unicode="t" horiz-adv-x="889" d="M47 889v129l168 102l88 236h195v-238h313v-229h-313v-539q0 -65 36.5 -96t96.5 -31q80 0 192 35v-227q-114 -51 -280 -51q-183 0 -266.5 92.5t-83.5 277.5v539h-146z" />
+<glyph unicode="u" horiz-adv-x="1346" d="M154 389v729h305v-653q0 -121 43 -181.5t137 -60.5q128 0 185 85.5t57 283.5v526h305v-1118h-234l-41 143h-16q-49 -78 -139 -120.5t-205 -42.5q-197 0 -297 105.5t-100 303.5z" />
+<glyph unicode="v" horiz-adv-x="1165" d="M0 1118h319l216 -637q36 -121 45 -229h6q5 96 45 229l215 637h319l-426 -1118h-313z" />
+<glyph unicode="w" horiz-adv-x="1753" d="M20 1118h304l129 -495q31 -133 63 -367h6q4 76 35 241l16 85l138 536h336l131 -536q4 -22 12.5 -65t16.5 -91.5t14.5 -95t7.5 -74.5h6q9 72 32 197.5t33 169.5l134 495h299l-322 -1118h-332l-86 391l-116 494h-7l-204 -885h-328z" />
+<glyph unicode="x" horiz-adv-x="1184" d="M10 0l379 571l-360 547h346l217 -356l219 356h346l-364 -547l381 -571h-347l-235 383l-236 -383h-346z" />
+<glyph unicode="y" horiz-adv-x="1165" d="M0 1118h334l211 -629q27 -82 37 -194h6q11 103 43 194l207 629h327l-473 -1261q-65 -175 -185.5 -262t-281.5 -87q-79 0 -155 17v242q55 -13 120 -13q81 0 141.5 49.5t94.5 149.5l18 55z" />
+<glyph unicode="z" horiz-adv-x="999" d="M55 0v180l518 705h-487v233h834v-198l-504 -687h522v-233h-883z" />
+<glyph unicode="{" horiz-adv-x="807" d="M31 449v239q126 0 191 44t65 126v8v318q0 153 97 215.5t341 62.5v-225q-99 -3 -136.5 -38t-37.5 -103v-299q-6 -188 -234 -222v-12q234 -35 234 -212v-9v-299q0 -68 37 -103t137 -38v-226q-244 0 -341 62.5t-97 216.5v315q0 87 -65.5 133t-190.5 46z" />
+<glyph unicode="|" horiz-adv-x="1128" d="M455 -465v2015h219v-2015h-219z" />
+<glyph unicode="}" horiz-adv-x="807" d="M82 -98q99 2 136.5 36t37.5 105v299v11q0 86 59 139.5t174 70.5v12q-227 34 -233 222v299q0 70 -37 104t-137 37v225q167 0 262 -26.5t135.5 -84t40.5 -167.5v-318v-10q0 -84 61.5 -126t194.5 -42v-239q-125 0 -190.5 -41t-65.5 -138v-315q0 -112 -41 -169t-135.5 -83.5 t-261.5 -26.5v226z" />
+<glyph unicode="~" d="M88 551v231q103 109 256 109q73 0 137.5 -16t139.5 -48q129 -55 227 -55q53 0 116 32t117 89v-231q-101 -109 -256 -109q-66 0 -126 13t-150 50q-131 56 -227 56q-55 0 -117.5 -33.5t-116.5 -87.5z" />
+<glyph unicode="¢" d="M143 741q0 261 104.5 403t315.5 173v166h178v-158q166 -9 299 -74l-90 -235q-72 29 -134 47t-124 18q-121 0 -179 -83.5t-58 -254.5q0 -327 237 -327q82 0 148 15.5t166 60.5v-254q-127 -61 -265 -70v-188h-178v196q-420 59 -420 565z" />
+<glyph unicode="£" d="M82 0v248q103 44 141.5 101t38.5 157v145h-178v219h178v195q0 201 114.5 309.5t323.5 108.5q195 0 390 -82l-93 -230q-157 64 -272 64q-78 0 -120 -44.5t-42 -127.5v-193h375v-219h-375v-143q0 -170 -151 -248h718v-260h-1048z" />
+<glyph unicode="¥" d="M6 1462h316l262 -602l264 602h313l-383 -747h195v-178h-246v-138h246v-178h-246v-221h-287v221h-247v178h247v138h-247v178h190z" />
+<glyph unicode="©" horiz-adv-x="1704" d="M100 731q0 200 100 375t275 276t377 101q200 0 375 -100t276 -275t101 -377q0 -197 -97 -370t-272 -277t-383 -104q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM242 731q0 -164 82 -305.5t224 -223t304 -81.5q164 0 305.5 82t223 224t81.5 304q0 164 -82 305.5t-224 223 t-304 81.5q-164 0 -305.5 -82t-223 -224t-81.5 -304zM461 733q0 220 110.5 342.5t309.5 122.5q149 0 305 -78l-74 -168q-113 58 -217 58q-97 0 -150 -74t-53 -205q0 -280 203 -280q57 0 123 15t123 44v-191q-120 -57 -252 -57q-204 0 -316 125t-112 346z" />
+<glyph unicode="" horiz-adv-x="659" d="M61 424v250h537v-250h-537z" />
+<glyph unicode="®" horiz-adv-x="1704" d="M100 731q0 200 100 375t275 276t377 101q200 0 375 -100t276 -275t101 -377q0 -197 -97 -370t-272 -277t-383 -104q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM242 731q0 -164 82 -305.5t224 -223t304 -81.5q164 0 305.5 82t223 224t81.5 304q0 164 -82 305.5t-224 223 t-304 81.5q-164 0 -305.5 -82t-223 -224t-81.5 -304zM543 272v916h264q181 0 265.5 -70t84.5 -213q0 -170 -143 -233l237 -400h-254l-178 338h-47v-338h-229zM772 778h31q66 0 94.5 28.5t28.5 94.5q0 65 -28 92t-97 27h-29v-242z" />
+<glyph unicode="´" horiz-adv-x="1243" d="M332 1241v27q172 200 235 301h342v-21q-52 -52 -177.5 -154.5t-196.5 -152.5h-203z" />
+<glyph unicode=" " horiz-adv-x="784" />
+<glyph unicode=" " horiz-adv-x="1569" />
+<glyph unicode=" " horiz-adv-x="784" />
+<glyph unicode=" " horiz-adv-x="1569" />
+<glyph unicode=" " horiz-adv-x="523" />
+<glyph unicode=" " horiz-adv-x="392" />
+<glyph unicode=" " horiz-adv-x="261" />
+<glyph unicode=" " horiz-adv-x="261" />
+<glyph unicode=" " horiz-adv-x="196" />
+<glyph unicode=" " horiz-adv-x="313" />
+<glyph unicode=" " horiz-adv-x="87" />
+<glyph unicode="‐" horiz-adv-x="659" d="M61 424v250h537v-250h-537z" />
+<glyph unicode="‑" horiz-adv-x="659" d="M61 424v250h537v-250h-537z" />
+<glyph unicode="‒" horiz-adv-x="659" d="M61 424v250h537v-250h-537z" />
+<glyph unicode="–" horiz-adv-x="1024" d="M82 436v230h860v-230h-860z" />
+<glyph unicode="—" horiz-adv-x="2048" d="M82 436v230h1884v-230h-1884z" />
+<glyph unicode="‘" horiz-adv-x="444" d="M25 983q22 91 72.5 228.5t103.5 250.5h219q-66 -267 -101 -501h-280z" />
+<glyph unicode="’" horiz-adv-x="444" d="M25 961q69 296 100 501h281l14 -22q-50 -197 -176 -479h-219z" />
+<glyph unicode="“" horiz-adv-x="911" d="M25 983q22 91 72.5 228.5t103.5 250.5h219q-66 -267 -101 -501h-280zM492 983q22 91 72.5 228.5t103.5 250.5h219q-66 -267 -101 -501h-280z" />
+<glyph unicode="”" horiz-adv-x="911" d="M25 961q69 296 100 501h281l14 -22q-50 -197 -176 -479h-219zM492 961q69 296 100 501h280l15 -22q-50 -197 -176 -479h-219z" />
+<glyph unicode="•" horiz-adv-x="770" d="M98 748q0 154 74 235.5t213 81.5q137 0 212 -82t75 -235q0 -152 -75.5 -235t-211.5 -83q-138 0 -212.5 83t-74.5 235z" />
+<glyph unicode="…" horiz-adv-x="1751" d="M117 143q0 84 45 127t131 43q83 0 128.5 -44t45.5 -126q0 -79 -46 -124.5t-128 -45.5q-84 0 -130 44.5t-46 125.5zM700 143q0 84 45 127t132 43q83 0 128.5 -44t45.5 -126q0 -79 -46 -124.5t-128 -45.5q-85 0 -131 44.5t-46 125.5zM1284 143q0 84 45 127t131 43 q83 0 128.5 -44t45.5 -126q0 -79 -46 -124.5t-128 -45.5q-84 0 -130 44.5t-46 125.5z" />
+<glyph unicode=" " horiz-adv-x="313" />
+<glyph unicode=" " horiz-adv-x="392" />
+<glyph unicode="€" d="M66 481v178h118q-4 23 -4 62l2 53h-116v176h133q37 242 199 382.5t405 140.5q188 0 352 -82l-98 -232q-69 31 -129 48.5t-125 17.5q-122 0 -201 -70.5t-102 -204.5h403v-176h-418l-2 -35v-47l2 -33h355v-178h-338q51 -243 321 -243q143 0 275 57v-256q-116 -59 -293 -59 q-245 0 -403 133t-199 368h-137z" />
+<glyph unicode="™" horiz-adv-x="1534" d="M16 1313v149h564v-149h-199v-572h-168v572h-197zM625 741v721h247l160 -510l170 510h240v-721h-168v408l4 121h-6l-174 -529h-142l-165 529h-7l4 -111v-418h-163z" />
+<glyph unicode="" horiz-adv-x="1120" d="M0 1120h1120v-1120h-1120v1120z" />
+</font>
+</defs></svg>
\ No newline at end of file
diff --git a/couchpotato/static/fonts/OpenSans-Bold-webfont.ttf b/couchpotato/static/fonts/OpenSans-Bold-webfont.ttf
new file mode 100755
index 0000000000..2d94f0629d
Binary files /dev/null and b/couchpotato/static/fonts/OpenSans-Bold-webfont.ttf differ
diff --git a/couchpotato/static/fonts/OpenSans-Bold-webfont.woff b/couchpotato/static/fonts/OpenSans-Bold-webfont.woff
new file mode 100755
index 0000000000..cd86852d0a
Binary files /dev/null and b/couchpotato/static/fonts/OpenSans-Bold-webfont.woff differ
diff --git a/couchpotato/static/fonts/OpenSans-BoldItalic-webfont.eot b/couchpotato/static/fonts/OpenSans-BoldItalic-webfont.eot
new file mode 100755
index 0000000000..f44ac9a331
Binary files /dev/null and b/couchpotato/static/fonts/OpenSans-BoldItalic-webfont.eot differ
diff --git a/couchpotato/static/fonts/OpenSans-BoldItalic-webfont.svg b/couchpotato/static/fonts/OpenSans-BoldItalic-webfont.svg
new file mode 100755
index 0000000000..8392240a1d
--- /dev/null
+++ b/couchpotato/static/fonts/OpenSans-BoldItalic-webfont.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG webfont generated by Font Squirrel.
+Copyright : Digitized data copyright 20102011 Google Corporation
+Foundry : Ascender Corporation
+Foundry URL : httpwwwascendercorpcom
+</metadata>
+<defs>
+<font id="OpenSansBoldItalic" horiz-adv-x="1128" >
+<font-face units-per-em="2048" ascent="1638" descent="-410" />
+<missing-glyph horiz-adv-x="532" />
+<glyph unicode=" " horiz-adv-x="532" />
+<glyph unicode=" " horiz-adv-x="532" />
+<glyph unicode=" " horiz-adv-x="532" />
+<glyph unicode="!" horiz-adv-x="586" d="M25 115q0 90 53.5 144t150.5 54q68 0 109 -38t41 -107q0 -87 -55 -141t-144 -54q-73 0 -114 37.5t-41 104.5zM150 485l157 977h340l-256 -977h-241z" />
+<glyph unicode=""" horiz-adv-x="928" d="M201 934l71 528h277l-152 -528h-196zM604 934l74 528h276l-151 -528h-199z" />
+<glyph unicode="#" horiz-adv-x="1323" d="M41 408l18 206h277l70 232h-252l18 209h289l119 407h217l-117 -407h199l116 407h215l-116 -407h239l-18 -209h-279l-69 -232h258l-19 -206h-297l-116 -408h-220l117 408h-194l-115 -408h-215l113 408h-238zM553 614h197l69 232h-196z" />
+<glyph unicode="$" d="M51 168v266q198 -107 404 -117l71 322q-163 61 -241 151t-78 214q0 173 127 279.5t350 121.5l35 151h139l-33 -151q166 -22 295 -90l-106 -232q-132 65 -242 74l-63 -299q131 -51 195 -99.5t97 -113t33 -149.5q0 -184 -125.5 -291.5t-367.5 -124.5l-39 -199h-140l44 201 q-209 12 -355 86zM502 1022q0 -79 80 -111l51 246q-62 -7 -96.5 -41t-34.5 -94zM594 322q63 9 102 45t39 98q0 46 -24.5 75.5t-59.5 43.5z" />
+<glyph unicode="%" horiz-adv-x="1753" d="M115 885q0 169 55.5 311.5t148.5 214.5t216 72q137 0 211.5 -80t74.5 -238q0 -166 -56 -310t-151 -217t-217 -73q-139 0 -210.5 83.5t-71.5 236.5zM231 0l1088 1462h235l-1083 -1462h-240zM360 868q0 -96 56 -96q65 0 112 131t47 275q0 96 -57 96q-63 0 -110.5 -128.5 t-47.5 -277.5zM973 283q0 177 53 322.5t148 219.5t219 74q137 0 211.5 -78.5t74.5 -230.5q0 -167 -54 -313.5t-148 -220.5t-215 -74q-144 0 -216.5 78.5t-72.5 222.5zM1219 285q0 -97 55 -97q41 0 77 55t59.5 154.5t23.5 196.5q0 96 -58 96q-39 0 -75 -56t-59 -154t-23 -195 z" />
+<glyph unicode="&" horiz-adv-x="1450" d="M68 358q0 145 78.5 248.5t273.5 200.5q-76 130 -76 258q0 195 117.5 307.5t316.5 112.5q169 0 266 -82.5t97 -224.5q0 -280 -365 -426l195 -263q44 57 80.5 121.5t78.5 173.5h300q-133 -313 -310 -497l205 -287h-350l-72 98q-175 -118 -403 -118q-209 0 -320.5 97.5 t-111.5 280.5zM383 387q0 -65 45.5 -108t116.5 -43q115 0 221 59l-225 328q-88 -51 -123 -104.5t-35 -131.5zM621 1085q0 -46 12 -92t29 -73q113 59 155.5 111t42.5 112q0 57 -30 82.5t-70 25.5q-66 0 -102.5 -46.5t-36.5 -119.5z" />
+<glyph unicode="'" horiz-adv-x="522" d="M201 934l71 528h277l-152 -528h-196z" />
+<glyph unicode="(" horiz-adv-x="694" d="M74 281q0 339 122.5 626.5t381.5 554.5h262q-255 -278 -377.5 -573.5t-122.5 -618.5q0 -308 117 -594h-234q-149 266 -149 605z" />
+<glyph unicode=")" horiz-adv-x="694" d="M-147 -324q499 545 499 1192q0 307 -116 594h233q149 -264 149 -604q0 -342 -124 -630.5t-379 -551.5h-262z" />
+<glyph unicode="*" horiz-adv-x="1116" d="M172 1141l86 237l338 -174l33 369l256 -51l-113 -353l387 29l-18 -254l-338 43l160 -336l-246 -73l-90 337l-197 -278l-207 164l275 248z" />
+<glyph unicode="+" d="M109 612v219h366v369h219v-369h367v-219h-367v-364h-219v364h-366z" />
+<glyph unicode="," horiz-adv-x="569" d="M-102 -264q74 167 194 502h285l8 -23q-118 -255 -262 -479h-225z" />
+<glyph unicode="-" horiz-adv-x="659" d="M41 424l53 250h524l-53 -250h-524z" />
+<glyph unicode="." horiz-adv-x="584" d="M25 115q0 90 53.5 144t150.5 54q68 0 109 -38t41 -107q0 -87 -55 -141t-144 -54q-73 0 -114 37.5t-41 104.5z" />
+<glyph unicode="/" horiz-adv-x="862" d="M-90 0l809 1462h295l-809 -1462h-295z" />
+<glyph unicode="0" d="M66 467q0 297 84 537t228 360.5t333 120.5q399 0 399 -473q0 -470 -168.5 -751t-472.5 -281q-198 0 -300.5 122t-102.5 365zM369 461q0 -115 27.5 -173.5t97.5 -58.5q81 0 150.5 106t116 301t46.5 386q0 111 -30.5 162t-92.5 51q-80 0 -149.5 -104t-117.5 -302t-48 -368z " />
+<glyph unicode="1" d="M182 1114l566 348h249l-309 -1462h-305l180 829q35 152 76 287q-9 -8 -61.5 -47t-262.5 -170z" />
+<glyph unicode="2" d="M-49 0l43 213l477 424q180 159 248.5 254.5t68.5 179.5q0 75 -41 114.5t-110 39.5q-66 0 -135.5 -33.5t-171.5 -118.5l-146 203q132 112 252 159.5t250 47.5q190 0 301 -98t111 -259q0 -107 -41 -201t-122.5 -188t-266.5 -245l-269 -222v-10h568l-54 -260h-962z" />
+<glyph unicode="3" d="M14 59v267q84 -50 182 -75.5t191 -25.5q158 0 243 63.5t85 176.5q0 172 -258 172h-138l46 221h73q167 0 263 62t96 172q0 67 -43 104t-121 37q-134 0 -287 -100l-127 204q124 81 232.5 113.5t246.5 32.5q190 0 298 -90.5t108 -243.5q0 -156 -94.5 -262t-261.5 -135v-4 q131 -26 198.5 -106.5t67.5 -201.5q0 -133 -74 -238t-212 -163.5t-327 -58.5q-239 0 -387 79z" />
+<glyph unicode="4" d="M-25 303l48 234l770 925h311l-195 -919h170l-51 -240h-170l-63 -303h-293l63 303h-590zM305 543h311l58 248q12 58 40 164t42 141h-6q-35 -63 -132 -181z" />
+<glyph unicode="5" d="M27 61v269q174 -99 352 -99q154 0 241 71t87 194q0 94 -57.5 141t-166.5 47q-102 0 -213 -33l-104 78l207 733h755l-55 -262h-489l-88 -293q72 15 127 15q183 0 289 -103t106 -287q0 -167 -71.5 -292t-208.5 -192.5t-330 -67.5q-117 0 -218.5 23t-162.5 58z" />
+<glyph unicode="6" d="M88 469q0 202 61 395.5t167.5 335t256.5 213.5t357 72q125 0 223 -27l-51 -246q-84 25 -191 25q-194 0 -313.5 -108t-185.5 -345h4q115 166 311 166q157 0 242.5 -97t85.5 -273q0 -169 -71 -313.5t-190.5 -215.5t-277.5 -71q-212 0 -320 127t-108 362zM383 422 q0 -91 40 -143t107 -52q99 0 161.5 94t62.5 236q0 71 -33.5 113.5t-102.5 42.5q-60 0 -114.5 -35.5t-87.5 -95.5t-33 -160z" />
+<glyph unicode="7" d="M78 0l737 1202h-629l56 260h975l-41 -194l-752 -1268h-346z" />
+<glyph unicode="8" d="M55 350q0 298 348 426q-165 132 -165 299q0 119 58 212.5t168 145.5t257 52q123 0 215.5 -42t141 -118t48.5 -174q0 -134 -80.5 -233.5t-230.5 -151.5q217 -141 217 -365q0 -122 -63.5 -218.5t-181 -149.5t-273.5 -53q-214 0 -336.5 100t-122.5 270zM352 383 q0 -81 50 -128.5t135 -47.5q93 0 147.5 53.5t54.5 138.5q0 73 -36.5 131.5t-120.5 112.5q-116 -45 -173 -107t-57 -153zM528 1094q0 -132 123 -201q185 72 185 221q0 68 -39.5 107t-102.5 39q-76 0 -121 -46.5t-45 -119.5z" />
+<glyph unicode="9" d="M86 12v256q111 -41 227 -41q121 0 207.5 49t144 138.5t99.5 257.5h-4q-111 -158 -295 -158q-163 0 -252.5 103.5t-89.5 285.5q0 166 73 305.5t196 208t286 68.5q203 0 308.5 -123t105.5 -361q0 -280 -99 -533t-264 -370.5t-403 -117.5q-128 0 -240 32zM424 928 q0 -87 37.5 -131.5t105.5 -44.5q60 0 111.5 36.5t82 100t30.5 158.5q0 84 -35.5 137t-110.5 53q-65 0 -115.5 -42t-78 -114t-27.5 -153z" />
+<glyph unicode=":" horiz-adv-x="584" d="M25 115q0 90 53.5 144t150.5 54q68 0 109 -38t41 -107q0 -87 -55 -141t-144 -54q-73 0 -114 37.5t-41 104.5zM207 940q0 92 55.5 145.5t149.5 53.5q68 0 108.5 -38.5t40.5 -107.5q0 -86 -54.5 -140t-144.5 -54q-72 0 -113.5 36.5t-41.5 104.5z" />
+<glyph unicode=";" horiz-adv-x="584" d="M-102 -264q74 167 194 502h285l8 -23q-118 -255 -262 -479h-225zM207 940q0 92 55.5 145.5t149.5 53.5q68 0 108.5 -38.5t40.5 -107.5q0 -86 -54.5 -140t-144.5 -54q-72 0 -113.5 36.5t-41.5 104.5z" />
+<glyph unicode="<" d="M109 641v143l952 496v-240l-643 -317l643 -281v-239z" />
+<glyph unicode="=" d="M109 418v219h952v-219h-952zM109 807v217h952v-217h-952z" />
+<glyph unicode=">" d="M109 203v239l643 281l-643 317v240l952 -496v-143z" />
+<glyph unicode="?" horiz-adv-x="940" d="M166 115q0 91 55 144.5t150 53.5q68 0 108.5 -38t40.5 -107q0 -87 -55 -141t-143 -54q-74 0 -115 38t-41 104zM178 1358q230 125 445 125q177 0 280 -87.5t103 -244.5q0 -83 -28.5 -149.5t-82.5 -123t-190 -147.5q-64 -43 -96.5 -73t-52.5 -64.5t-38 -108.5h-258l14 78 q19 103 73.5 177t172.5 155q124 84 157.5 127t33.5 96q0 119 -133 119q-50 0 -106.5 -16t-201.5 -84z" />
+<glyph unicode="@" horiz-adv-x="1753" d="M92 500q0 279 120.5 497t343 341.5t497.5 123.5q318 0 499 -163.5t181 -458.5q0 -173 -64 -321t-177.5 -231t-254.5 -83q-88 0 -144.5 38.5t-72.5 108.5h-6q-50 -77 -113 -112t-147 -35q-127 0 -198 79.5t-71 229.5q0 147 67.5 276.5t187.5 205t268 75.5q185 0 327 -55 l-106 -420q-11 -44 -19 -76.5t-8 -64.5q0 -68 58 -68q66 0 124 64t92.5 171t34.5 214q0 213 -123.5 325.5t-359.5 112.5q-203 0 -366.5 -94t-255 -266t-91.5 -392q0 -243 134 -380.5t376 -137.5q117 0 219.5 20t221.5 66v-186q-230 -90 -465 -90q-217 0 -378 85.5 t-246 241.5t-85 359zM713 526q0 -65 24.5 -102t69.5 -37q141 0 213 270l57 222q-36 10 -82 10q-82 0 -145.5 -51.5t-100 -137t-36.5 -174.5z" />
+<glyph unicode="A" horiz-adv-x="1286" d="M-123 0l766 1468h373l147 -1468h-297l-24 348h-473l-172 -348h-320zM494 608h333l-26 350q-10 131 -10 253v36q-44 -120 -109 -254z" />
+<glyph unicode="B" horiz-adv-x="1270" d="M53 0l309 1462h426q229 0 346 -81.5t117 -243.5q0 -150 -83 -247.5t-236 -129.5v-6q100 -26 159.5 -96.5t59.5 -180.5q0 -229 -153 -353t-423 -124h-522zM412 256h180q117 0 183.5 58t66.5 161q0 162 -183 162h-165zM545 883h149q121 0 181.5 48.5t60.5 139.5 q0 137 -170 137h-152z" />
+<glyph unicode="C" horiz-adv-x="1253" d="M123 553q0 262 104 482.5t278 335t400 114.5q125 0 222 -22.5t208 -82.5l-118 -250q-106 59 -175 78t-137 19q-132 0 -237.5 -81t-169.5 -238.5t-64 -338.5q0 -167 68.5 -248t218.5 -81q146 0 338 77v-260q-199 -77 -400 -77q-254 0 -395 149.5t-141 423.5z" />
+<glyph unicode="D" horiz-adv-x="1386" d="M53 0l309 1462h396q270 0 417.5 -143t147.5 -410q0 -280 -98 -486.5t-283.5 -314.5t-437.5 -108h-451zM412 256h106q148 0 258 76t172 223.5t62 337.5q0 154 -72.5 234.5t-208.5 80.5h-115z" />
+<glyph unicode="E" horiz-adv-x="1110" d="M53 0l309 1462h818l-54 -254h-512l-67 -321h477l-55 -254h-477l-80 -377h512l-54 -256h-817z" />
+<glyph unicode="F" horiz-adv-x="1087" d="M53 0l309 1462h814l-54 -254h-508l-79 -377h473l-56 -253h-473l-121 -578h-305z" />
+<glyph unicode="G" horiz-adv-x="1413" d="M123 549q0 268 107 484.5t301 334t448 117.5q218 0 410 -99l-115 -251q-74 40 -148 64t-161 24q-153 0 -273.5 -83t-189 -236.5t-68.5 -330.5q0 -172 72.5 -252.5t222.5 -80.5q76 0 170 24l66 299h-267l56 258h563l-162 -762q-134 -46 -248.5 -62.5t-242.5 -16.5 q-259 0 -400 147t-141 422z" />
+<glyph unicode="H" horiz-adv-x="1434" d="M53 0l309 1462h306l-121 -573h471l121 573h305l-309 -1462h-306l134 631h-471l-134 -631h-305z" />
+<glyph unicode="I" horiz-adv-x="659" d="M53 0l312 1462h305l-312 -1462h-305z" />
+<glyph unicode="J" horiz-adv-x="678" d="M-322 -150q88 -20 164 -20q99 0 160.5 60.5t89.5 191.5l293 1380h305l-303 -1423q-52 -245 -175.5 -357t-346.5 -112q-94 0 -187 27v253z" />
+<glyph unicode="K" horiz-adv-x="1255" d="M53 0l309 1462h306l-152 -702l158 205l409 497h361l-594 -700l291 -762h-338l-211 592l-125 -70l-109 -522h-305z" />
+<glyph unicode="L" horiz-adv-x="1061" d="M53 0l309 1462h306l-256 -1206h512l-54 -256h-817z" />
+<glyph unicode="M" horiz-adv-x="1802" d="M53 0l309 1462h404l68 -1093h4l551 1093h423l-309 -1462h-280l145 692q53 247 105 441h-5l-569 -1133h-281l-61 1133h-4q-11 -88 -38 -231t-187 -902h-275z" />
+<glyph unicode="N" horiz-adv-x="1546" d="M53 0l309 1462h357l340 -1077h4q12 76 39 217t180 860h274l-309 -1462h-342l-356 1106h-6l-4 -32q-32 -216 -66 -386l-145 -688h-275z" />
+<glyph unicode="O" horiz-adv-x="1495" d="M123 537q0 265 99 487.5t273 341.5t402 119q255 0 395 -144t140 -403q0 -283 -99 -506.5t-271 -337.5t-396 -114q-256 0 -399.5 147.5t-143.5 409.5zM434 537q0 -147 66.5 -222t187.5 -75t220.5 87t155.5 246t56 357q0 142 -65 219.5t-183 77.5q-121 0 -222 -91.5 t-158.5 -251.5t-57.5 -347z" />
+<glyph unicode="P" horiz-adv-x="1188" d="M53 0l309 1462h338q242 0 366 -106.5t124 -319.5q0 -241 -169.5 -378.5t-467.5 -137.5h-86l-109 -520h-305zM522 774h56q142 0 223.5 69t81.5 185q0 180 -195 180h-74z" />
+<glyph unicode="Q" horiz-adv-x="1495" d="M123 537q0 265 99 487.5t273 341.5t402 119q255 0 395 -144t140 -403q0 -316 -122.5 -555.5t-334.5 -337.5l254 -393h-359l-178 328h-26q-256 0 -399.5 147.5t-143.5 409.5zM434 537q0 -147 66.5 -222t187.5 -75t220.5 87t155.5 246t56 357q0 142 -65 219.5t-183 77.5 q-121 0 -222 -91.5t-158.5 -251.5t-57.5 -347z" />
+<glyph unicode="R" horiz-adv-x="1247" d="M53 0l309 1462h359q237 0 356 -102t119 -299q0 -158 -83 -271.5t-239 -168.5l261 -621h-332l-207 561h-119l-119 -561h-305zM530 813h78q131 0 204 57t73 174q0 82 -47.5 123t-149.5 41h-74z" />
+<glyph unicode="S" horiz-adv-x="1085" d="M41 70v274q193 -108 358 -108q112 0 175 42.5t63 116.5q0 43 -13.5 75.5t-38.5 60.5t-124 102q-138 99 -194 196t-56 209q0 129 62 230.5t176.5 158t263.5 56.5q217 0 397 -99l-109 -233q-156 74 -288 74q-83 0 -136 -45t-53 -119q0 -61 33 -106.5t148 -120.5 q121 -80 181 -176.5t60 -225.5q0 -209 -148 -330.5t-401 -121.5q-221 0 -356 90z" />
+<glyph unicode="T" horiz-adv-x="1087" d="M168 1204l55 258h1010l-55 -258h-353l-254 -1204h-305l254 1204h-352z" />
+<glyph unicode="U" horiz-adv-x="1415" d="M141 401q0 72 15 138l196 923h305l-194 -919q-17 -74 -17 -125q0 -178 189 -178q123 0 195 76.5t104 228.5l194 917h306l-201 -946q-57 -266 -218 -401t-419 -135q-212 0 -333.5 113.5t-121.5 307.5z" />
+<glyph unicode="V" horiz-adv-x="1208" d="M184 1462h295l51 -880q4 -45 4 -133q-2 -103 -6 -150h7q78 221 110 283l432 880h316l-748 -1462h-334z" />
+<glyph unicode="W" horiz-adv-x="1831" d="M184 1462h287l6 -798q0 -52 -4 -173t-10 -174h6q22 64 67 180.5t60 145.5l369 819h270l21 -873q0 -146 -9 -272h6q43 129 131 349l330 796h309l-647 -1462h-346l-22 721l-2 139q0 88 4 158h-4q-46 -146 -115 -299l-324 -719h-338z" />
+<glyph unicode="X" horiz-adv-x="1241" d="M-117 0l576 764l-238 698h320l153 -518l363 518h344l-545 -725l268 -737h-331l-172 543l-396 -543h-342z" />
+<glyph unicode="Y" horiz-adv-x="1155" d="M186 1462h312l129 -592l374 592h342l-618 -903l-119 -559h-303l119 559z" />
+<glyph unicode="Z" horiz-adv-x="1098" d="M-61 0l38 201l777 1005h-543l53 256h936l-41 -202l-782 -1004h596l-53 -256h-981z" />
+<glyph unicode="[" horiz-adv-x="678" d="M-37 -324l381 1786h473l-45 -211h-215l-291 -1364h215l-45 -211h-473z" />
+<glyph unicode="\" horiz-adv-x="862" d="M221 1462h260l224 -1462h-267z" />
+<glyph unicode="]" horiz-adv-x="678" d="M-137 -324l45 211h213l291 1364h-215l45 211h473l-381 -1786h-471z" />
+<glyph unicode="^" horiz-adv-x="1081" d="M20 520l619 950h147l277 -950h-223l-174 633l-402 -633h-244z" />
+<glyph unicode="_" horiz-adv-x="819" d="M-186 -324l30 140h822l-31 -140h-821z" />
+<glyph unicode="`" horiz-adv-x="1135" d="M508 1548v21h311q36 -148 115 -303v-25h-184q-71 69 -138.5 153.5t-103.5 153.5z" />
+<glyph unicode="a" horiz-adv-x="1217" d="M90 385q0 198 72 377.5t189 278t257 98.5q97 0 167.5 -42t109.5 -122h8l57 143h232l-238 -1118h-229l14 145h-4q-134 -165 -319 -165q-147 0 -231.5 106.5t-84.5 298.5zM395 399q0 -88 33.5 -132t95.5 -44q69 0 133 67t103 181.5t39 259.5q0 71 -38.5 117.5t-101.5 46.5 q-68 0 -129.5 -72t-98 -190t-36.5 -234z" />
+<glyph unicode="b" horiz-adv-x="1219" d="M37 0l330 1556h301l-62 -288q-41 -182 -84 -299h8q78 98 142.5 134t140.5 36q146 0 230.5 -108t84.5 -298t-68 -367.5t-187 -281.5t-263 -104q-194 0 -276 163h-8l-58 -143h-231zM420 399q0 -80 37 -128t102 -48q67 0 128 69t98.5 189.5t37.5 237.5q0 176 -131 176 q-68 0 -130 -65t-102 -180.5t-40 -250.5z" />
+<glyph unicode="c" horiz-adv-x="989" d="M90 391q0 212 74.5 385.5t209.5 268t308 94.5q182 0 328 -72l-92 -229q-54 23 -106 40t-118 17q-85 0 -153.5 -64t-107 -175.5t-38.5 -239.5q0 -96 45.5 -144.5t126.5 -48.5q76 0 141 23.5t134 58.5v-246q-152 -79 -336 -79q-201 0 -308.5 107.5t-107.5 303.5z" />
+<glyph unicode="d" horiz-adv-x="1217" d="M90 387q0 196 71.5 374.5t188.5 278t258 99.5q82 0 141.5 -37t112.5 -127h8l2 28q6 110 25 195l76 358h301l-330 -1556h-229l14 145h-4q-71 -87 -148.5 -126t-170.5 -39q-147 0 -231.5 107t-84.5 300zM395 399q0 -176 137 -176q66 0 128.5 68.5t100.5 182.5t38 245 q0 80 -37.5 128t-102.5 48q-68 0 -129.5 -72t-98 -190t-36.5 -234z" />
+<glyph unicode="e" horiz-adv-x="1141" d="M90 412q0 207 82.5 377.5t223.5 260t319 89.5q177 0 276 -81.5t99 -223.5q0 -187 -167 -288.5t-477 -101.5h-51l-2 -21v-20q0 -91 51.5 -143.5t147.5 -52.5q87 0 158 19t172 67v-227q-172 -86 -390 -86q-210 0 -326 113t-116 319zM428 647h45q155 0 241.5 48.5 t86.5 131.5q0 95 -105 95q-88 0 -166 -80t-102 -195z" />
+<glyph unicode="f" horiz-adv-x="764" d="M-219 -225q61 -21 115 -21q61 0 107 40t65 130l204 965h-163l30 145l183 84l18 84q41 190 138.5 277.5t273.5 87.5q131 0 235 -49l-80 -224q-69 31 -133 31q-57 0 -92 -40t-47 -105l-12 -62h219l-49 -229h-220l-215 -1010q-77 -371 -403 -371q-104 0 -174 25v242z" />
+<glyph unicode="g" horiz-adv-x="1108" d="M-115 -209q0 102 68.5 175.5t214.5 121.5q-74 47 -74 133q0 71 44.5 122.5t146.5 98.5q-65 49 -96 112t-31 153q0 199 125.5 315.5t341.5 116.5q83 0 166 -23h395l-35 -166l-174 -41q16 -52 16 -118q0 -195 -121 -308.5t-329 -113.5q-59 0 -99 10q-84 -27 -84 -78 q0 -34 30 -49t89 -23l137 -18q163 -21 237.5 -84.5t74.5 -183.5q0 -211 -156 -323t-446 -112q-208 0 -324.5 75.5t-116.5 207.5zM150 -172q0 -115 194 -115q151 0 228 45t77 127q0 39 -32.5 60t-137.5 35l-114 14q-106 -14 -160.5 -57t-54.5 -109zM442 680q0 -119 103 -119 q75 0 121.5 76.5t46.5 193.5t-99 117q-77 0 -124.5 -76.5t-47.5 -191.5z" />
+<glyph unicode="h" horiz-adv-x="1237" d="M37 0l330 1556h301q-39 -181 -60 -278t-86 -309h8q62 77 138 123.5t176 46.5q138 0 213.5 -83.5t75.5 -238.5q0 -73 -23 -180l-133 -637h-301l137 653q16 68 16 119q0 123 -108 123q-92 0 -167 -114t-118 -318l-98 -463h-301z" />
+<glyph unicode="i" horiz-adv-x="608" d="M37 0l237 1118h301l-237 -1118h-301zM322 1380q0 87 47.5 131.5t134.5 44.5q73 0 111 -31t38 -89q0 -80 -44 -129.5t-136 -49.5q-151 0 -151 123z" />
+<glyph unicode="j" horiz-adv-x="608" d="M-264 -225q61 -21 114 -21q137 0 173 170l253 1194h302l-265 -1239q-77 -371 -403 -371q-104 0 -174 25v242zM324 1380q0 87 47.5 131.5t134.5 44.5q73 0 111 -31t38 -89q0 -80 -44 -129.5t-136 -49.5q-151 0 -151 123z" />
+<glyph unicode="k" horiz-adv-x="1163" d="M37 0l330 1556h301l-148 -694q-8 -41 -29 -117l-28 -102h4l453 475h344l-498 -504l285 -614h-336l-183 420l-120 -72l-74 -348h-301z" />
+<glyph unicode="l" horiz-adv-x="608" d="M37 0l330 1556h301l-330 -1556h-301z" />
+<glyph unicode="m" horiz-adv-x="1853" d="M37 0l237 1118h230l-21 -207h6q146 228 355 228q219 0 262 -228h6q68 110 160.5 169t197.5 59q136 0 207.5 -85t71.5 -237q0 -76 -23 -180l-133 -637h-301l138 653q16 68 16 119q0 123 -98 123q-92 0 -166.5 -112t-118.5 -318l-96 -465h-301l137 653q16 68 16 119 q0 123 -98 123q-92 0 -167 -114t-118 -318l-98 -463h-301z" />
+<glyph unicode="n" horiz-adv-x="1237" d="M37 0l237 1118h230l-21 -207h6q146 228 355 228q138 0 213.5 -83.5t75.5 -238.5q0 -73 -23 -180l-133 -637h-301l137 653q16 68 16 119q0 123 -108 123q-92 0 -167 -114t-118 -318l-98 -463h-301z" />
+<glyph unicode="o" horiz-adv-x="1198" d="M90 410q0 213 71.5 379.5t206.5 258t316 91.5q196 0 310 -118t114 -325q0 -211 -70.5 -374t-203.5 -252.5t-316 -89.5q-195 0 -311.5 117.5t-116.5 312.5zM393 410q0 -185 150 -185q75 0 135 61.5t93.5 171t33.5 238.5q0 197 -143 197q-75 0 -134.5 -61t-97 -179 t-37.5 -243z" />
+<glyph unicode="p" horiz-adv-x="1219" d="M-68 -492l342 1610h230l-17 -170h9q138 191 317 191q146 0 230.5 -107.5t84.5 -300.5q0 -191 -68.5 -367.5t-187.5 -280t-262 -103.5q-83 0 -143 37t-111 126h-8q-12 -159 -43 -295l-72 -340h-301zM420 399q0 -80 37 -128t102 -48q67 0 128 69t98.5 189.5t37.5 237.5 q0 176 -131 176q-68 0 -131.5 -67.5t-102 -180t-38.5 -248.5z" />
+<glyph unicode="q" horiz-adv-x="1217" d="M90 385q0 198 72 377.5t189 278t257 98.5q86 0 152.5 -37.5t124.5 -126.5h8l57 143h232l-342 -1610h-301q47 218 73 337.5t84 304.5h-8q-72 -94 -143 -132t-154 -38q-88 0 -156 47.5t-106.5 138.5t-38.5 219zM395 399q0 -88 36.5 -132t103.5 -44q64 0 127.5 70t100 181 t36.5 245q0 80 -37.5 128t-102.5 48q-68 0 -129.5 -72t-98 -190t-36.5 -234z" />
+<glyph unicode="r" horiz-adv-x="862" d="M37 0l237 1118h230l-21 -207h6q147 228 353 228q59 0 96 -11l-66 -290q-45 16 -100 16q-116 0 -203.5 -91.5t-124.5 -262.5l-106 -500h-301z" />
+<glyph unicode="s" horiz-adv-x="969" d="M23 45v248q157 -90 319 -90q80 0 131 32.5t51 88.5q0 43 -37 77t-131 86q-121 68 -169 135.5t-48 159.5q0 170 110.5 263.5t315.5 93.5q201 0 363 -95l-99 -215q-140 84 -258 84q-57 0 -92 -25.5t-35 -68.5q0 -39 32 -68.5t120 -74.5q123 -63 178 -137t55 -170 q0 -188 -124.5 -288.5t-346.5 -100.5q-107 0 -186.5 15t-148.5 50z" />
+<glyph unicode="t" horiz-adv-x="840" d="M94 889l29 147l196 84l132 236h194l-49 -238h283l-50 -229h-282l-115 -539q-6 -30 -6 -53q0 -74 88 -74q65 0 162 35v-225q-111 -53 -266 -53q-150 0 -220.5 63t-70.5 195q0 50 12 112l115 539h-152z" />
+<glyph unicode="u" horiz-adv-x="1237" d="M111 301q0 93 24 213l127 604h301l-137 -653q-16 -68 -16 -119q0 -123 108 -123q92 0 167 114t118 318l98 463h301l-237 -1118h-230l21 207h-6q-145 -227 -355 -227q-138 0 -211 82.5t-73 238.5z" />
+<glyph unicode="v" horiz-adv-x="1049" d="M102 1118h295l45 -586q7 -133 7 -231h6q55 153 92 223l297 594h323l-604 -1118h-323z" />
+<glyph unicode="w" horiz-adv-x="1614" d="M125 1118h281l4 -495l-4 -167l-7 -171h4q6 20 14 41.5t51 136.5t46 119l231 536h328v-536q0 -142 -10 -297h6l28 80q73 208 95 258l219 495h307l-530 -1118h-330l-6 520q0 155 10 340h-6q-62 -178 -123 -319l-233 -541h-324z" />
+<glyph unicode="x" horiz-adv-x="1087" d="M-100 0l479 573l-225 545h321l115 -334l244 334h354l-467 -561l244 -557h-326l-125 342l-264 -342h-350z" />
+<glyph unicode="y" horiz-adv-x="1063" d="M-141 -233q68 -13 116 -13q84 0 147.5 48t117.5 149l26 49l-164 1118h295l56 -518q14 -122 14 -293h6q20 51 44 119.5t65 153.5l260 538h327l-680 -1278q-177 -332 -483 -332q-90 0 -147 19v240z" />
+<glyph unicode="z" horiz-adv-x="932" d="M-47 0l35 180l575 705h-397l51 233h750l-43 -200l-566 -685h439l-49 -233h-795z" />
+<glyph unicode="{" horiz-adv-x="727" d="M-8 459l45 229q122 0 192.5 41.5t92.5 138.5l61 285q38 170 131 239.5t270 69.5h84l-49 -225q-90 -2 -130.5 -34.5t-55.5 -106.5l-66 -297q-45 -207 -276 -236v-8q85 -26 126.5 -82.5t41.5 -134.5q0 -44 -15 -113l-36 -178q-7 -28 -7 -51q0 -54 33.5 -74t91.5 -20v-226 h-53q-167 0 -253.5 63.5t-86.5 184.5q0 57 14 125l39 184q15 69 15 86q0 140 -209 140z" />
+<glyph unicode="|" d="M455 -465v2015h219v-2015h-219z" />
+<glyph unicode="}" horiz-adv-x="727" d="M-100 -98q93 3 137 35.5t59 105.5l66 297q25 111 95 166t181 69v9q-168 51 -168 217q0 43 15 112l37 179q6 30 6 51q0 54 -36.5 74t-109.5 20l41 225h33q340 0 340 -248q0 -56 -14 -124l-39 -185q-15 -69 -15 -86q0 -139 209 -139l-45 -229q-122 0 -192.5 -42t-91.5 -139 l-62 -284q-37 -170 -130.5 -240t-270.5 -70h-45v226z" />
+<glyph unicode="~" d="M109 551v231q101 109 256 109q64 0 117 -14t139 -50q64 -27 111 -41t95 -14q51 0 112 30.5t122 90.5v-231q-103 -109 -256 -109q-59 0 -109 11.5t-147 51.5q-89 38 -127 47t-80 9q-54 0 -116.5 -33t-116.5 -88z" />
+<glyph unicode="¢" d="M164 584q0 193 62.5 355t178 262.5t267.5 123.5l33 158h188l-35 -158q118 -14 225 -65l-92 -230q-53 23 -105 40t-118 17q-133 0 -216 -143t-83 -336q0 -96 45 -144t127 -48q75 0 140 23.5t134 58.5v-246q-136 -71 -299 -80l-41 -192h-188l49 210q-134 36 -203 136 t-69 258z" />
+<glyph unicode="£" d="M-12 0l49 246q196 48 244 264l22 104h-192l45 220h192l49 247q41 197 162 300.5t313 103.5q195 0 369 -86l-113 -232q-141 68 -237 68q-75 0 -123 -39.5t-68 -132.5l-47 -229h299l-45 -220h-299l-18 -84q-42 -195 -209 -270h655l-55 -260h-993z" />
+<glyph unicode="¥" d="M88 221l37 178h252l29 138h-252l39 178h196l-192 747h297l114 -590l371 590h311l-506 -747h203l-39 -178h-252l-28 -138h252l-37 -178h-252l-47 -221h-291l47 221h-252z" />
+<glyph unicode="©" horiz-adv-x="1704" d="M125 731q0 200 100 375t275 276t377 101q199 0 373.5 -99t276 -275.5t101.5 -377.5q0 -199 -98.5 -373t-272.5 -276t-380 -102q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM266 731q0 -164 81.5 -305t224 -223t305.5 -82q167 0 308 83t221.5 223.5t80.5 303.5 t-80.5 303.5t-222 223.5t-307.5 83q-164 0 -306.5 -82.5t-223.5 -223.5t-81 -304zM485 721q0 225 117.5 351t325.5 126q142 0 284 -72l-75 -174q-114 58 -205 58q-111 0 -163 -73t-52 -214q0 -134 55.5 -203t159.5 -69q43 0 108.5 15.5t124.5 43.5v-191q-131 -57 -262 -57 q-196 0 -307 122.5t-111 336.5z" />
+<glyph unicode="" horiz-adv-x="659" d="M41 424l53 250h524l-53 -250h-524z" />
+<glyph unicode="®" horiz-adv-x="1704" d="M125 731q0 200 100 375t275 276t377 101q199 0 373.5 -99t276 -275.5t101.5 -377.5q0 -199 -98.5 -373t-272.5 -276t-380 -102q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM266 731q0 -164 81.5 -305t224 -223t305.5 -82q167 0 308 83t221.5 223.5t80.5 303.5 t-80.5 303.5t-222 223.5t-307.5 83q-164 0 -306.5 -82.5t-223.5 -223.5t-81 -304zM571 293v874h308q173 0 265.5 -67.5t92.5 -200.5q0 -86 -44 -149.5t-130 -96.5l197 -360h-254l-138 297h-67v-297h-230zM801 758h51q72 0 113 31t41 92q0 59 -35.5 88.5t-116.5 29.5h-53 v-241z" />
+<glyph unicode="´" horiz-adv-x="1135" d="M483 1241v25q79 88 222 303h335v-17q-46 -56 -154 -152.5t-194 -158.5h-209z" />
+<glyph unicode=" " horiz-adv-x="786" />
+<glyph unicode=" " horiz-adv-x="1573" />
+<glyph unicode=" " horiz-adv-x="786" />
+<glyph unicode=" " horiz-adv-x="1573" />
+<glyph unicode=" " horiz-adv-x="524" />
+<glyph unicode=" " horiz-adv-x="393" />
+<glyph unicode=" " horiz-adv-x="262" />
+<glyph unicode=" " horiz-adv-x="262" />
+<glyph unicode=" " horiz-adv-x="196" />
+<glyph unicode=" " horiz-adv-x="314" />
+<glyph unicode=" " horiz-adv-x="87" />
+<glyph unicode="‐" horiz-adv-x="659" d="M41 424l53 250h524l-53 -250h-524z" />
+<glyph unicode="‑" horiz-adv-x="659" d="M41 424l53 250h524l-53 -250h-524z" />
+<glyph unicode="‒" horiz-adv-x="659" d="M41 424l53 250h524l-53 -250h-524z" />
+<glyph unicode="–" horiz-adv-x="983" d="M41 436l49 230h852l-49 -230h-852z" />
+<glyph unicode="—" horiz-adv-x="1966" d="M41 436l49 230h1835l-49 -230h-1835z" />
+<glyph unicode="‘" horiz-adv-x="440" d="M115 983q103 227 262 479h225q-91 -213 -194 -501h-285z" />
+<glyph unicode="’" horiz-adv-x="440" d="M106 961q89 206 195 501h285l8 -22q-103 -227 -262 -479h-226z" />
+<glyph unicode="“" horiz-adv-x="887" d="M115 983q103 227 262 479h225q-91 -213 -194 -501h-285zM561 983q103 227 262 479h226q-97 -227 -195 -501h-285z" />
+<glyph unicode="”" horiz-adv-x="887" d="M106 961q89 206 195 501h285l8 -22q-103 -227 -262 -479h-226zM553 961q23 53 46.5 111t148.5 390h284l8 -22q-103 -227 -262 -479h-225z" />
+<glyph unicode="•" horiz-adv-x="739" d="M104 686q0 106 42.5 194t120 136.5t182.5 48.5q120 0 182.5 -67t62.5 -191q0 -177 -91.5 -277t-248.5 -100q-117 0 -183.5 67t-66.5 189z" />
+<glyph unicode="…" horiz-adv-x="1706" d="M25 115q0 90 53.5 144t150.5 54q68 0 109 -38t41 -107q0 -87 -55 -141t-144 -54q-73 0 -114 37.5t-41 104.5zM586 115q0 90 53.5 144t150.5 54q68 0 109 -38t41 -107q0 -87 -55 -141t-144 -54q-73 0 -114 37.5t-41 104.5zM1147 115q0 90 53.5 144t150.5 54q68 0 109 -38 t41 -107q0 -87 -55 -141t-144 -54q-73 0 -114 37.5t-41 104.5z" />
+<glyph unicode=" " horiz-adv-x="314" />
+<glyph unicode=" " horiz-adv-x="393" />
+<glyph unicode="€" d="M41 481l37 178h127q9 67 22 115h-125l39 176h135q87 252 250.5 393.5t374.5 141.5q100 0 179 -23t165 -80l-125 -223q-87 49 -131 63.5t-90 14.5q-97 0 -176 -74.5t-135 -212.5h348l-39 -176h-360q-11 -34 -25 -115h299l-37 -178h-280q0 -120 44.5 -181.5t147.5 -61.5 q133 0 283 63v-258q-126 -63 -330 -63q-446 0 -446 501h-152z" />
+<glyph unicode="™" horiz-adv-x="1534" d="M106 1313v149h564v-149h-199v-572h-168v572h-197zM715 741v721h248l159 -510l170 510h240v-721h-168v408l4 121h-6l-174 -529h-141l-166 529h-7l5 -111v-418h-164z" />
+<glyph unicode="" horiz-adv-x="1120" d="M0 1120h1120v-1120h-1120v1120z" />
+</font>
+</defs></svg>
\ No newline at end of file
diff --git a/couchpotato/static/fonts/OpenSans-BoldItalic-webfont.ttf b/couchpotato/static/fonts/OpenSans-BoldItalic-webfont.ttf
new file mode 100755
index 0000000000..f74e0e3ca7
Binary files /dev/null and b/couchpotato/static/fonts/OpenSans-BoldItalic-webfont.ttf differ
diff --git a/couchpotato/static/fonts/OpenSans-BoldItalic-webfont.woff b/couchpotato/static/fonts/OpenSans-BoldItalic-webfont.woff
new file mode 100755
index 0000000000..f3248c1142
Binary files /dev/null and b/couchpotato/static/fonts/OpenSans-BoldItalic-webfont.woff differ
diff --git a/couchpotato/static/fonts/OpenSans-Italic-webfont.eot b/couchpotato/static/fonts/OpenSans-Italic-webfont.eot
new file mode 100755
index 0000000000..277c1899cd
Binary files /dev/null and b/couchpotato/static/fonts/OpenSans-Italic-webfont.eot differ
diff --git a/couchpotato/static/fonts/OpenSans-Italic-webfont.svg b/couchpotato/static/fonts/OpenSans-Italic-webfont.svg
new file mode 100755
index 0000000000..29c7497fed
--- /dev/null
+++ b/couchpotato/static/fonts/OpenSans-Italic-webfont.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG webfont generated by Font Squirrel.
+Copyright : Digitized data copyright 20102011 Google Corporation
+Foundry : Ascender Corporation
+Foundry URL : httpwwwascendercorpcom
+</metadata>
+<defs>
+<font id="OpenSansItalic" horiz-adv-x="1128" >
+<font-face units-per-em="2048" ascent="1638" descent="-410" />
+<missing-glyph horiz-adv-x="532" />
+<glyph unicode=" " horiz-adv-x="532" />
+<glyph unicode=" " horiz-adv-x="532" />
+<glyph unicode=" " horiz-adv-x="532" />
+<glyph unicode="!" horiz-adv-x="530" d="M43 78q0 76 39.5 120t107.5 44q45 0 73 -27.5t28 -81.5q0 -68 -39 -115t-105 -47q-49 0 -76.5 28t-27.5 79zM172 403q49 307 176 1059h207l-274 -1059h-109z" />
+<glyph unicode=""" horiz-adv-x="791" d="M225 934l72 528h188l-153 -528h-107zM573 934l72 528h189l-154 -528h-107z" />
+<glyph unicode="#" horiz-adv-x="1323" d="M63 430l13 129h284l101 340h-277l13 127h301l123 436h139l-125 -436h305l127 436h133l-125 -436h264l-12 -127h-291l-98 -340h285l-13 -129h-309l-125 -430h-139l129 430h-303l-127 -430h-133l121 430h-261zM500 559h303l96 340h-303z" />
+<glyph unicode="$" d="M72 176v154q82 -41 175.5 -63.5t166.5 -22.5l98 452q-139 49 -201.5 123.5t-62.5 188.5q0 159 108 255t299 113l39 176h133l-39 -178q159 -12 283 -76l-63 -135q-121 63 -248 72l-94 -440q149 -55 212.5 -125t63.5 -178q0 -162 -112.5 -263t-309.5 -123l-49 -225h-133 l49 223q-195 14 -315 72zM401 1010q0 -53 34.5 -97.5t107.5 -70.5l84 393q-108 -11 -167 -69t-59 -156zM549 250q107 13 170 75t63 154q0 54 -33 96t-114 74z" />
+<glyph unicode="%" horiz-adv-x="1624" d="M168 860q0 166 50.5 318.5t136.5 228.5t200 76q116 0 176 -72t60 -205q0 -108 -32 -237.5t-82.5 -217.5t-120.5 -137t-157 -49q-109 0 -170 75t-61 220zM231 0l1086 1462h151l-1085 -1462h-152zM307 864q0 -172 107 -172q52 0 94 39.5t73.5 114t50.5 175t19 171.5 q0 166 -108 166q-66 0 -119 -63t-85 -187.5t-32 -243.5zM909 274q0 166 50.5 318.5t136.5 228.5t200 76q116 0 176 -71.5t60 -204.5q0 -107 -31.5 -236t-82 -217.5t-121 -138t-156.5 -49.5q-110 0 -171 74.5t-61 219.5zM1049 279q0 -173 106 -173q65 0 117 65t86.5 198.5 t34.5 236.5q0 166 -109 166q-67 0 -119.5 -64.5t-84 -188.5t-31.5 -240z" />
+<glyph unicode="&" horiz-adv-x="1372" d="M66 342q0 148 90 257.5t303 211.5q-103 165 -103 309q0 164 106 264.5t281 100.5q149 0 236.5 -79t87.5 -212q0 -78 -32.5 -137t-87.5 -108t-127.5 -90t-153.5 -83l278 -389q127 110 199 295h168q-101 -236 -283 -412l203 -270h-201l-117 166q-120 -100 -230 -143 t-247 -43q-168 0 -269 96t-101 266zM229 354q0 -106 66.5 -170.5t175.5 -64.5q87 0 168 33t195 124l-306 433q-128 -67 -184 -116t-85.5 -107.5t-29.5 -131.5zM516 1118q0 -120 82 -235q139 71 191 110t83 85t31 104q0 77 -42.5 121.5t-123.5 44.5q-105 0 -163 -60t-58 -170 z" />
+<glyph unicode="'" horiz-adv-x="444" d="M225 934l72 528h188l-153 -528h-107z" />
+<glyph unicode="(" horiz-adv-x="584" d="M82 272q0 339 120 627t384 563h157q-246 -270 -371.5 -570t-125.5 -618q0 -339 114 -598h-131q-147 266 -147 596z" />
+<glyph unicode=")" horiz-adv-x="584" d="M-160 -324q496 551 496 1188q0 341 -113 598h131q146 -269 146 -598q0 -341 -121.5 -629.5t-382.5 -558.5h-156z" />
+<glyph unicode="*" horiz-adv-x="1130" d="M215 1194l55 154l371 -185l41 400l172 -35l-123 -383l422 18l-8 -157l-393 47l180 -383l-166 -52l-113 406l-258 -344l-116 121l309 284z" />
+<glyph unicode="+" d="M127 651v142h389v391h141v-391h390v-142h-390v-387h-141v387h-389z" />
+<glyph unicode="," horiz-adv-x="492" d="M-100 -264q126 286 204 502h187l8 -23q-113 -235 -270 -479h-129z" />
+<glyph unicode="-" horiz-adv-x="639" d="M55 469l35 158h479l-34 -158h-480z" />
+<glyph unicode="." horiz-adv-x="518" d="M43 74q0 77 40.5 122.5t111.5 45.5q43 0 69.5 -26t26.5 -79q0 -71 -40 -118.5t-108 -47.5q-46 0 -73 26t-27 77z" />
+<glyph unicode="/" horiz-adv-x="717" d="M-94 0l813 1462h174l-813 -1462h-174z" />
+<glyph unicode="0" d="M121 477q0 270 82 514.5t216.5 369t307.5 124.5q365 0 365 -471q0 -295 -78.5 -539t-214 -369.5t-314.5 -125.5q-176 0 -270 127.5t-94 369.5zM293 479q0 -172 50 -264t161 -92q115 0 209 114t150.5 328t56.5 453q0 323 -203 323q-113 0 -209 -115.5t-155.5 -323 t-59.5 -423.5z" />
+<glyph unicode="1" d="M303 1178l449 284h149l-313 -1462h-172l196 913q59 261 88 359q-50 -53 -139 -111l-178 -110z" />
+<glyph unicode="2" d="M12 0l31 147l465 420q102 93 176.5 163.5t123 133t72 124t23.5 136.5q0 99 -60 157t-163 58q-77 0 -150.5 -28.5t-162.5 -96.5l-82 115q191 154 413 154q176 0 278.5 -88.5t102.5 -243.5q0 -111 -39.5 -204t-131 -197t-294.5 -281l-352 -307v-8h678l-29 -154h-899z" />
+<glyph unicode="3" d="M47 59v164q94 -49 199 -75.5t190 -26.5q162 0 252 79.5t90 217.5q0 131 -79 198.5t-220 67.5h-131l31 143h139q165 0 274 87t109 227q0 92 -58 146t-157 54q-80 0 -157 -27t-175 -93l-80 118q195 144 424 144q179 0 277 -87t98 -237q0 -156 -101 -264.5t-280 -140.5v-9 q124 -23 195 -106.5t71 -208.5q0 -133 -62 -234.5t-181 -158.5t-283 -57q-210 0 -385 79z" />
+<glyph unicode="4" d="M16 334l29 158l834 978h196l-207 -983h232l-33 -153h-233l-72 -334h-164l74 334h-656zM219 487h486q46 220 78 373t116 445h-8q-17 -29 -66.5 -96.5t-72.5 -96.5z" />
+<glyph unicode="5" d="M80 59v164q164 -102 334 -102q191 0 298 96t107 268q0 126 -73.5 199.5t-204.5 73.5q-48 0 -97 -6.5t-139 -30.5l-74 57l197 684h668l-33 -153h-522l-127 -439q87 23 184 23q182 0 289.5 -104.5t107.5 -282.5q0 -161 -73 -283t-204 -182.5t-308 -60.5q-193 0 -330 79z " />
+<glyph unicode="6" d="M133 424q0 209 60.5 415t163.5 351.5t246 219t327 73.5q111 0 184 -23l-35 -145q-68 22 -170 22q-212 0 -356.5 -149t-212.5 -443h8q59 79 146.5 126t193.5 47q154 0 244 -98.5t90 -270.5q0 -161 -66.5 -294.5t-180.5 -204t-261 -70.5q-182 0 -281.5 115t-99.5 329z M299 416q0 -137 60.5 -216t172.5 -79q94 0 167.5 54t114 149t40.5 208q0 248 -221 248q-66 0 -128 -28.5t-110 -76t-72 -104.5t-24 -155z" />
+<glyph unicode="7" d="M174 0l768 1313h-719l31 149h891l-27 -139l-764 -1323h-180z" />
+<glyph unicode="8" d="M96 346q0 148 95 256t296 184q-95 69 -135.5 144.5t-40.5 171.5q0 111 54.5 198.5t153.5 136t222 48.5q174 0 271.5 -86.5t97.5 -235.5q0 -129 -78 -225t-266 -176q127 -78 180 -165t53 -202q0 -122 -60 -217.5t-172.5 -146.5t-264.5 -51q-190 0 -298 98.5t-108 267.5z M270 354q0 -107 69 -170t181 -63q139 0 222 74t83 196q0 99 -52 174t-165 135q-185 -60 -261.5 -143.5t-76.5 -202.5zM479 1100q0 -82 39 -144t127 -116q161 60 228 131.5t67 173.5q0 90 -57.5 143t-153.5 53q-114 0 -182 -65.5t-68 -175.5z" />
+<glyph unicode="9" d="M98 14v158q134 -47 246 -47q202 0 327 141t189 441h-10q-51 -75 -132.5 -118.5t-180.5 -43.5q-169 0 -261 98.5t-92 288.5q0 153 64.5 280.5t180 199t259.5 71.5q180 0 279.5 -114.5t99.5 -334.5q0 -194 -56 -406.5t-147.5 -360t-221.5 -217.5t-302 -70q-136 0 -242 34z M350 938q0 -124 54.5 -190t162.5 -66q76 0 140 28.5t108.5 81.5t65 114t20.5 151q0 131 -59 207.5t-160 76.5q-150 0 -241 -113t-91 -290z" />
+<glyph unicode=":" horiz-adv-x="518" d="M43 74q0 77 40.5 122.5t111.5 45.5q43 0 69.5 -26t26.5 -79q0 -71 -40 -118.5t-108 -47.5q-46 0 -73 26t-27 77zM203 956q0 77 40 122.5t111 45.5q97 0 97 -104q0 -73 -41.5 -119.5t-106.5 -46.5q-46 0 -73 26.5t-27 75.5z" />
+<glyph unicode=";" horiz-adv-x="518" d="M-100 -264q126 286 204 502h187l8 -23q-113 -235 -270 -479h-129zM203 956q0 77 40 122.5t111 45.5q97 0 97 -104q0 -73 -41.5 -119.5t-106.5 -46.5q-46 0 -73 26.5t-27 75.5z" />
+<glyph unicode="<" d="M121 664v98l919 479v-149l-747 -371l747 -328v-151z" />
+<glyph unicode="=" d="M127 444v142h920v-142h-920zM127 858v139h920v-139h-920z" />
+<glyph unicode=">" d="M121 242v151l745 328l-745 371v149l919 -479v-98z" />
+<glyph unicode="?" horiz-adv-x="874" d="M158 74q0 77 40 122.5t111 45.5q44 0 70.5 -26t26.5 -79q0 -73 -41.5 -119.5t-106.5 -46.5q-46 0 -73 26t-27 77zM197 1382q92 51 192 76t182 25q167 0 259 -84t92 -238q0 -123 -65.5 -226.5t-225.5 -223.5q-125 -91 -169 -147.5t-67 -160.5h-135q22 130 72.5 213.5 t165.5 174.5q128 100 168 144t63 94t23 112q0 93 -51.5 143.5t-147.5 50.5q-81 0 -155 -25.5t-140 -56.5z" />
+<glyph unicode="@" horiz-adv-x="1735" d="M111 504q0 261 126.5 485.5t343.5 347.5t486 123q191 0 329 -75.5t210.5 -213.5t72.5 -319q0 -179 -55 -324t-155 -227t-222 -82q-197 0 -213 184h-8q-111 -184 -291 -184q-115 0 -180.5 75.5t-65.5 209.5q0 157 68 284t188.5 199t260.5 72q65 0 127.5 -12t150.5 -48 q-64 -242 -98 -368t-31 -172q0 -117 102 -117q78 0 141.5 67t100.5 183.5t37 243.5q0 239 -128 367t-370 128q-228 0 -406.5 -107t-277 -295.5t-98.5 -416.5q0 -270 143.5 -418.5t409.5 -148.5q197 0 420 86v-127q-219 -90 -443 -90q-314 0 -494.5 184.5t-180.5 505.5z M639 518q0 -93 33 -134.5t98 -41.5q187 0 272 315l70 258q-63 23 -127 23q-94 0 -174 -55t-126 -153t-46 -212z" />
+<glyph unicode="A" horiz-adv-x="1137" d="M-117 0l799 1462h174l184 -1462h-170l-57 465h-496l-245 -465h-189zM401 621h394l-35 299q-24 179 -29 350q-37 -88 -80.5 -175t-249.5 -474z" />
+<glyph unicode="B" horiz-adv-x="1225" d="M86 0l309 1462h375q432 0 432 -336q0 -141 -87 -238t-245 -126v-10q115 -32 176.5 -110.5t61.5 -188.5q0 -212 -152 -332.5t-407 -120.5h-463zM287 145h266q181 0 278 80.5t97 227.5q0 116 -74.5 177.5t-214.5 61.5h-236zM434 836h248q156 0 249 73t93 199 q0 104 -66.5 155.5t-209.5 51.5h-211z" />
+<glyph unicode="C" horiz-adv-x="1198" d="M150 537q0 261 105.5 485.5t283.5 342.5t403 118q197 0 348 -80l-69 -141q-138 69 -279 69q-174 0 -311.5 -97t-218 -284.5t-80.5 -408.5q0 -187 97.5 -298.5t268.5 -111.5q139 0 322 57v-149q-86 -31 -164 -45t-188 -14q-242 0 -380 149.5t-138 407.5z" />
+<glyph unicode="D" horiz-adv-x="1364" d="M86 0l309 1462h342q276 0 419.5 -149.5t143.5 -435.5q0 -261 -105 -461t-300 -308t-457 -108h-352zM287 147h162q202 0 355 91.5t234.5 258.5t81.5 382t-103 325.5t-302 110.5h-178z" />
+<glyph unicode="E" horiz-adv-x="1047" d="M86 0l309 1462h735l-32 -153h-566l-98 -469h527l-29 -152h-529l-114 -536h565l-33 -152h-735z" />
+<glyph unicode="F" horiz-adv-x="967" d="M86 0l309 1462h735l-30 -153h-568l-110 -533h528l-32 -153h-529l-131 -623h-172z" />
+<glyph unicode="G" horiz-adv-x="1386" d="M150 528q0 269 101.5 489.5t281.5 343t399 122.5q117 0 219.5 -20t206.5 -64l-66 -152q-77 34 -165.5 59t-194.5 25q-169 0 -307.5 -101.5t-215.5 -283.5t-77 -407q0 -190 102.5 -299t286.5 -109q154 0 260 39l96 444h-289l33 152h459l-154 -711q-216 -75 -419 -75 q-264 0 -410.5 144.5t-146.5 403.5z" />
+<glyph unicode="H" horiz-adv-x="1389" d="M86 0l309 1462h170l-131 -622h660l133 622h168l-310 -1462h-167l143 688h-660l-145 -688h-170z" />
+<glyph unicode="I" horiz-adv-x="559" d="M86 0l311 1462h168l-311 -1462h-168z" />
+<glyph unicode="J" horiz-adv-x="547" d="M-319 -360l6 147q69 -20 145 -20q100 0 165.5 62.5t90.5 182.5l307 1450h170l-309 -1468q-79 -379 -422 -379q-105 0 -153 25z" />
+<glyph unicode="K" horiz-adv-x="1141" d="M86 0l309 1462h170l-151 -710l700 710h209l-639 -637l350 -825h-186q-72 181 -146.5 359.5t-146.5 361.5l-174 -131l-125 -590h-170z" />
+<glyph unicode="L" horiz-adv-x="971" d="M86 0l309 1462h170l-276 -1308h565l-33 -154h-735z" />
+<glyph unicode="M" horiz-adv-x="1714" d="M84 0l309 1462h244l149 -1204h9l659 1204h266l-303 -1462h-174q126 590 193 905.5t94 392.5h-6l-717 -1298h-131l-166 1296h-8q-7 -72 -28.5 -197.5t-37.5 -199.5l-190 -899h-162z" />
+<glyph unicode="N" horiz-adv-x="1438" d="M84 0l309 1462h180l459 -1220h6q30 224 72 405l174 815h164l-309 -1462h-181l-460 1223h-6q-32 -221 -74 -418l-172 -805h-162z" />
+<glyph unicode="O" horiz-adv-x="1475" d="M150 549q0 264 96 482t263.5 336t377.5 118q244 0 384 -154t140 -424q0 -269 -88 -481.5t-252 -329t-379 -116.5q-256 0 -399 149.5t-143 419.5zM332 553q0 -199 98 -310.5t266 -111.5q152 0 272.5 97.5t190.5 279.5t70 403q0 199 -94 310.5t-261 111.5q-157 0 -281 -101 t-192.5 -281t-68.5 -398z" />
+<glyph unicode="P" horiz-adv-x="1159" d="M86 0l309 1462h330q214 0 324 -94.5t110 -282.5q0 -248 -164 -379t-481 -131h-135l-123 -575h-170zM410 721h133q216 0 328 91t112 267q0 125 -69.5 180.5t-213.5 55.5h-163z" />
+<glyph unicode="Q" horiz-adv-x="1475" d="M150 549q0 264 96 482t263.5 336t377.5 118q244 0 384 -154t140 -424q0 -333 -139 -576t-375 -321l274 -358h-219l-227 330l-17 -2h-16q-256 0 -399 149.5t-143 419.5zM332 553q0 -199 98 -310.5t266 -111.5q158 0 279 100t187.5 280.5t66.5 399.5q0 199 -94 310.5 t-261 111.5q-157 0 -281 -101t-192.5 -281t-68.5 -398z" />
+<glyph unicode="R" horiz-adv-x="1165" d="M86 0l309 1462h320q446 0 446 -366q0 -348 -368 -449l239 -647h-186l-209 608h-252l-129 -608h-170zM416 754h168q193 0 297 85t104 244q0 121 -67.5 175.5t-219.5 54.5h-166q-102 -494 -116 -559z" />
+<glyph unicode="S" horiz-adv-x="1028" d="M39 43v170q162 -84 340 -84q162 0 257 75.5t95 207.5q0 78 -52.5 137.5t-195.5 140.5q-151 85 -209.5 170t-58.5 201q0 187 132 304.5t347 117.5q99 0 184.5 -19t180.5 -65l-66 -150q-66 38 -148 60t-151 22q-134 0 -215.5 -69.5t-81.5 -188.5q0 -54 17 -92.5t54 -72.5 t142 -95q147 -88 198.5 -138t78 -110.5t26.5 -140.5q0 -211 -140.5 -327.5t-395.5 -116.5q-106 0 -186.5 14.5t-151.5 48.5z" />
+<glyph unicode="T" horiz-adv-x="1020" d="M186 1311l33 151h985l-30 -151h-408l-279 -1311h-172l277 1311h-406z" />
+<glyph unicode="U" horiz-adv-x="1384" d="M164 383q0 81 24 201l189 878h170l-191 -891q-22 -106 -22 -188q0 -117 73 -184.5t218 -67.5q172 0 267.5 87.5t139.5 289.5l205 954h170l-205 -966q-55 -263 -197.5 -389.5t-388.5 -126.5q-230 0 -341 104t-111 299z" />
+<glyph unicode="V" horiz-adv-x="1122" d="M188 1462h170l97 -930q20 -196 20 -335h4q61 144 162 338l479 927h191l-781 -1462h-180z" />
+<glyph unicode="W" horiz-adv-x="1745" d="M223 1462h170l31 -901l2 -88q0 -98 -10 -258h6q89 243 156 383l405 864h178l43 -860q9 -153 9 -304l-1 -83h9q75 224 131 354l387 893h182l-664 -1462h-170l-49 965q-8 136 -8 282h-6q-25 -72 -61 -154.5t-504 -1092.5h-174z" />
+<glyph unicode="X" horiz-adv-x="1063" d="M-104 0l596 776l-263 686h172l203 -563l443 563h186l-555 -694l278 -768h-180l-213 641l-481 -641h-186z" />
+<glyph unicode="Y" horiz-adv-x="1030" d="M188 1462h170l179 -747l489 747h193l-627 -921l-113 -541h-172l119 549z" />
+<glyph unicode="Z" horiz-adv-x="1087" d="M-16 0l28 137l924 1170h-655l32 155h858l-26 -139l-924 -1169h697l-33 -154h-901z" />
+<glyph unicode="[" horiz-adv-x="586" d="M-16 -324l381 1786h387l-31 -141h-227l-318 -1503h227l-32 -142h-387z" />
+<glyph unicode="\" horiz-adv-x="717" d="M221 1462h154l217 -1462h-154z" />
+<glyph unicode="]" horiz-adv-x="586" d="M-150 -324l31 142h225l320 1503h-227l30 141h389l-380 -1786h-388z" />
+<glyph unicode="^" horiz-adv-x="1059" d="M53 553l598 920h109l266 -920h-145l-201 747l-467 -747h-160z" />
+<glyph unicode="_" horiz-adv-x="807" d="M-188 -324l30 140h811l-30 -140h-811z" />
+<glyph unicode="`" horiz-adv-x="1135" d="M575 1548v21h181q43 -136 147 -303v-25h-104q-61 61 -128.5 154t-95.5 153z" />
+<glyph unicode="a" horiz-adv-x="1157" d="M98 350q0 208 71 386t196 279t274 101q92 0 164 -49.5t112 -142.5h11l67 172h127l-233 -1096h-133l26 209h-8q-179 -229 -377 -229q-139 0 -218 99t-79 271zM270 346q0 -114 47 -170.5t132 -56.5q97 0 193 92.5t156 241t60 297.5q0 103 -56 164t-147 61 q-104 0 -193.5 -86t-140.5 -233t-51 -310z" />
+<glyph unicode="b" horiz-adv-x="1182" d="M59 0l330 1556h168q-51 -242 -78.5 -370.5t-75.5 -300.5h9q93 118 183.5 173.5t186.5 55.5q141 0 220 -99t79 -272q0 -209 -68.5 -386.5t-191 -277t-276.5 -99.5q-97 0 -170.5 51t-110.5 139h-10l-70 -170h-125zM319 346q0 -110 55.5 -168.5t160.5 -58.5q99 0 184.5 81 t137.5 230.5t52 317.5q0 227 -178 227q-96 0 -195.5 -95t-158 -239t-58.5 -295z" />
+<glyph unicode="c" horiz-adv-x="922" d="M98 389q0 200 74 369t204.5 263.5t293.5 94.5q137 0 268 -51l-47 -141q-120 51 -219 51q-112 0 -204.5 -76.5t-145 -213t-52.5 -296.5q0 -128 66.5 -199t183.5 -71q72 0 136 20t126 47v-143q-124 -63 -276 -63q-194 0 -301 107t-107 302z" />
+<glyph unicode="d" horiz-adv-x="1182" d="M98 350q0 214 72 392t194.5 275t274.5 97q194 0 281 -190h10q17 155 45 274l78 358h166l-330 -1556h-139l22 209h-8q-101 -125 -189 -177t-182 -52q-139 0 -217 98t-78 272zM270 346q0 -227 179 -227q94 0 194 93.5t158.5 239t58.5 296.5q0 111 -54 169t-157 58 q-101 0 -187.5 -82.5t-139 -232t-52.5 -314.5z" />
+<glyph unicode="e" horiz-adv-x="1010" d="M98 391q0 188 74.5 360.5t197.5 268.5t271 96q153 0 230 -66.5t77 -185.5q0 -180 -166 -282.5t-475 -102.5h-33l-4 -80q0 -131 61.5 -204.5t190.5 -73.5q63 0 129.5 18t165.5 66v-146q-94 -44 -166 -61.5t-159 -17.5q-184 0 -289 109t-105 302zM299 618h12 q228 0 349.5 59.5t121.5 172.5q0 53 -36.5 88t-114.5 35q-103 0 -193.5 -94t-138.5 -261z" />
+<glyph unicode="f" horiz-adv-x="641" d="M-229 -330q64 -22 112 -22q76 0 117 62t66 177l227 1082h-193l13 67l206 66l23 100q46 200 127.5 282.5t241.5 82.5q40 0 98 -11.5t90 -25.5l-43 -129q-76 29 -137 29q-87 0 -133.5 -48.5t-75.5 -177.5l-25 -108h238l-25 -127h-237l-232 -1098q-39 -189 -120 -276 t-213 -87q-69 0 -125 21v141z" />
+<glyph unicode="g" horiz-adv-x="1026" d="M-127 -211q0 105 72 182t233 131q-78 41 -78 121q0 69 51 118.5t142 92.5q-63 32 -103 94.5t-40 145.5q0 194 119.5 318t305.5 124q78 0 154 -20h371l-25 -107l-211 -24q41 -62 41 -158q0 -191 -116.5 -304.5t-311.5 -113.5q-55 0 -84 8q-139 -53 -139 -131 q0 -41 33 -54.5t96 -21.5l117 -14q181 -22 262.5 -88t81.5 -194q0 -184 -146 -285t-411 -101q-194 0 -304 73.5t-110 207.5zM35 -195q0 -77 65 -122t193 -45q182 0 284.5 63.5t102.5 179.5q0 62 -54 98t-184 50l-159 16q-120 -25 -184 -88t-64 -152zM313 680 q0 -85 45 -129.5t125 -44.5q79 0 138 42t90.5 115.5t31.5 159.5q0 82 -44 125t-126 43q-78 0 -136.5 -40.5t-91 -113t-32.5 -157.5z" />
+<glyph unicode="h" horiz-adv-x="1182" d="M59 0l330 1556h168q-18 -82 -34.5 -159t-34 -156.5t-38 -166.5t-47.5 -189h11q94 123 185.5 176t191.5 53q131 0 202.5 -72t71.5 -204q0 -62 -23 -166q-39 -193 -145 -672h-168l148 692q18 94 18 135q0 148 -147 148q-89 0 -173.5 -59t-149 -171.5t-97.5 -271.5 l-101 -473h-168z" />
+<glyph unicode="i" horiz-adv-x="520" d="M59 0l234 1096h168l-234 -1096h-168zM340 1376q0 56 32 91.5t83 35.5q88 0 88 -90q0 -55 -33.5 -93t-77.5 -38q-40 0 -66 24.5t-26 69.5z" />
+<glyph unicode="j" horiz-adv-x="520" d="M-258 -330q61 -22 119 -22q125 0 168 205l264 1243h166l-266 -1258q-36 -171 -114.5 -250.5t-213.5 -79.5q-69 0 -123 21v141zM340 1376q0 56 32 91.5t83 35.5q86 0 86 -90q0 -55 -33.5 -93t-77.5 -38q-38 0 -64 24.5t-26 69.5z" />
+<glyph unicode="k" horiz-adv-x="999" d="M57 0l330 1556h170l-129 -602q-57 -266 -102 -395h4l526 537h201l-469 -467l295 -629h-187l-235 524l-152 -123l-82 -401h-170z" />
+<glyph unicode="l" horiz-adv-x="520" d="M57 0l332 1556h168l-332 -1556h-168z" />
+<glyph unicode="m" horiz-adv-x="1786" d="M59 0l234 1096h139l-22 -203h10q87 119 173.5 171t178.5 52q113 0 174 -65t72 -181h8q86 125 183 185.5t196 60.5q127 0 196.5 -68t69.5 -198q0 -68 -22 -178l-144 -672h-170l148 692q20 104 20 146q0 62 -34.5 99.5t-108.5 37.5q-81 0 -160 -58t-138.5 -164.5 t-90.5 -252.5l-107 -500h-168l148 692q18 94 18 135q0 70 -31 109t-106 39q-84 0 -163.5 -60t-140 -171.5t-93.5 -268.5l-101 -475h-168z" />
+<glyph unicode="n" horiz-adv-x="1182" d="M59 0l234 1096h139l-22 -203h10q96 122 185.5 172.5t185.5 50.5q127 0 200.5 -69.5t73.5 -194.5q0 -79 -23 -180l-143 -672h-170l148 692q20 104 20 144q0 63 -35.5 101t-113.5 38q-89 0 -173.5 -60t-149 -171t-97.5 -269l-101 -475h-168z" />
+<glyph unicode="o" horiz-adv-x="1149" d="M98 406q0 190 73 357.5t197 257t275 89.5q190 0 300 -112.5t110 -309.5q0 -188 -72 -355t-195 -258t-278 -91q-192 0 -301 113t-109 309zM270 397q0 -131 63.5 -202.5t182.5 -71.5q104 0 187 73t129.5 207.5t46.5 307.5q0 115 -62.5 186.5t-169.5 71.5q-109 0 -195.5 -74 t-134 -205.5t-47.5 -292.5z" />
+<glyph unicode="p" horiz-adv-x="1182" d="M-43 -492l336 1588h139l-26 -209h8q179 227 372 227q137 0 216 -97.5t79 -273.5q0 -212 -69 -389t-191 -275.5t-276 -98.5q-97 0 -170 50t-113 140h-10l-4 -38q-3 -25 -10.5 -70t-114.5 -554h-166zM319 346q0 -110 55.5 -168.5t160.5 -58.5q99 0 184.5 81t137.5 230.5 t52 317.5q0 227 -178 227q-96 0 -195.5 -95t-158 -239t-58.5 -295z" />
+<glyph unicode="q" horiz-adv-x="1182" d="M98 350q0 212 72.5 392t196 277t274.5 97q94 0 165.5 -50.5t108.5 -141.5h13l67 172h125l-336 -1588h-166l101 480q9 45 57 221h-8q-95 -121 -185 -175t-186 -54q-140 0 -219.5 97.5t-79.5 272.5zM270 346q0 -227 179 -227q92 0 190 92t158.5 237t60.5 300 q0 105 -54.5 166t-152.5 61q-101 0 -189 -84.5t-140 -233t-52 -311.5z" />
+<glyph unicode="r" horiz-adv-x="811" d="M59 0l234 1096h139l-22 -203h10q72 95 119 136.5t98.5 64t114.5 22.5q69 0 120 -14l-36 -150q-53 13 -105 13q-91 0 -170.5 -60t-139 -166.5t-87.5 -236.5l-107 -502h-168z" />
+<glyph unicode="s" horiz-adv-x="877" d="M8 49v158q70 -42 151 -65t150 -23q126 0 190 50t64 128q0 57 -35 96t-151 107q-130 73 -184 143t-54 166q0 138 101 222.5t266 84.5q171 0 330 -74l-54 -137l-56 25q-101 43 -220 43q-93 0 -146 -43.5t-53 -112.5q0 -56 35.5 -96t146.5 -103q107 -60 153.5 -103 t69.5 -92.5t23 -111.5q0 -156 -110.5 -243.5t-311.5 -87.5q-169 0 -305 69z" />
+<glyph unicode="t" horiz-adv-x="664" d="M90 969l14 73l185 78l125 228h98l-55 -252h274l-26 -127h-273l-129 -604q-18 -87 -18 -132q0 -56 29 -86t81 -30q55 0 144 26v-129q-34 -14 -84 -24t-80 -10q-125 0 -191.5 59.5t-66.5 177.5q0 66 18 150l127 602h-172z" />
+<glyph unicode="u" horiz-adv-x="1182" d="M113 248q0 62 22 172l146 676h170l-150 -695q-18 -89 -18 -139q0 -143 147 -143q88 0 173 60t150 172t99 270l100 475h166l-231 -1096h-139l22 203h-12q-98 -125 -187 -174t-184 -49q-128 0 -201 69.5t-73 198.5z" />
+<glyph unicode="v" horiz-adv-x="946" d="M98 1096h168l64 -613q24 -258 24 -362h6q127 275 179 371l325 604h178l-591 -1096h-228z" />
+<glyph unicode="w" horiz-adv-x="1468" d="M117 1096h164l18 -594v-88q0 -147 -8 -269h6q47 124 137 322l295 629h182l37 -594q6 -168 6 -262v-53l-2 -42h6q28 86 83 218.5t323 732.5h178l-506 -1096h-205l-32 602q-4 94 -4 172v156h-9l-50 -118l-83 -189l-291 -623h-202z" />
+<glyph unicode="x" horiz-adv-x="979" d="M-74 0l475 565l-239 531h170l174 -412l330 412h194l-455 -539l252 -557h-168l-192 434l-346 -434h-195z" />
+<glyph unicode="y" horiz-adv-x="946" d="M-197 -336q63 -18 131 -18q82 0 140.5 50.5t113.5 149.5l76 136l-166 1114h168l74 -545q10 -69 19.5 -203.5t9.5 -216.5h6q35 87 87 200t77 156l325 609h178l-696 -1282q-93 -172 -184 -239t-219 -67q-72 0 -140 21v135z" />
+<glyph unicode="z" horiz-adv-x="909" d="M-29 0l23 117l694 854h-479l27 125h657l-29 -140l-680 -831h531l-25 -125h-719z" />
+<glyph unicode="{" horiz-adv-x="715" d="M27 514l32 143q118 0 189.5 43.5t93.5 147.5l68 326q34 160 117.5 224t254.5 64h33l-31 -141q-105 0 -151 -36.5t-66 -123.5l-71 -321q-28 -123 -91 -184t-167 -78v-5q151 -41 151 -213q0 -59 -18 -131l-47 -211q-15 -58 -15 -98q0 -53 36.5 -77.5t119.5 -24.5v-142h-23 q-141 0 -216.5 52.5t-75.5 171.5q0 52 20 141q33 146 51.5 227.5t14.5 102.5q0 143 -209 143z" />
+<glyph unicode="|" d="M541 -496v2052h139v-2052h-139z" />
+<glyph unicode="}" horiz-adv-x="715" d="M-74 -182q115 0 167 36t71 123l72 322q25 117 88 179.5t170 80.5v6q-150 42 -150 211q0 59 18 131l50 213q14 65 14 99q0 53 -40.5 77.5t-139.5 24.5l28 141h11q144 0 220.5 -52.5t76.5 -170.5q0 -48 -21 -141l-49 -219q-16 -68 -16 -111q0 -143 209 -143l-33 -144 q-119 0 -190 -43t-93 -147l-67 -326q-36 -164 -119 -226.5t-264 -62.5h-13v142z" />
+<glyph unicode="~" d="M115 592v151q98 109 243 109q69 0 127 -14.5t144 -51.5q64 -27 112.5 -41t98.5 -14q55 0 119.5 33t115.5 88v-150q-100 -110 -244 -110q-72 0 -135 16.5t-135 48.5q-75 32 -120 44t-93 12q-54 0 -118.5 -34.5t-114.5 -86.5z" />
+<glyph unicode="¢" d="M225 590q0 185 63.5 344t178.5 258.5t260 120.5l35 170h123l-37 -168q119 -9 217 -49l-47 -142q-109 52 -219 52q-112 0 -204.5 -76.5t-145 -213t-52.5 -296.5q0 -125 66 -198t184 -73q72 0 136 20t126 48v-143q-123 -62 -286 -66l-41 -198h-125l43 215 q-132 34 -203.5 137.5t-71.5 257.5z" />
+<glyph unicode="£" d="M-23 0l27 141q205 46 258 289l47 221h-200l26 127h201l76 350q75 353 430 353q184 0 336 -86l-66 -133q-146 79 -278 79q-213 0 -263 -237l-69 -326h370l-26 -127h-371l-47 -219q-22 -98 -66 -166.5t-124 -111.5h725l-33 -154h-953z" />
+<glyph unicode="¥" d="M127 266l29 133h290l33 160h-291l29 133h225l-202 770h163l179 -747l491 747h187l-533 -770h231l-28 -133h-297l-33 -160h297l-29 -133h-295l-57 -266h-154l56 266h-291z" />
+<glyph unicode="©" horiz-adv-x="1704" d="M139 731q0 200 100 375t275 276t377 101q197 0 370 -97t277 -272t104 -383q0 -204 -100.5 -376.5t-273 -273.5t-377.5 -101q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM244 731q0 -173 87 -323.5t237.5 -237t322.5 -86.5q174 0 323 87t236.5 235.5t87.5 324.5 q0 174 -87 323t-235.5 236.5t-324.5 87.5q-174 0 -323 -87t-236.5 -235.5t-87.5 -324.5zM520 733q0 208 110 330.5t300 122.5q130 0 248 -60l-60 -120q-106 53 -190 53q-125 0 -191.5 -87t-66.5 -241q0 -169 65 -249.5t193 -80.5q82 0 211 43v-122q-66 -28 -113 -38 t-104 -10q-192 0 -297 119.5t-105 339.5z" />
+<glyph unicode="" horiz-adv-x="639" d="M55 469l35 158h479l-34 -158h-480z" />
+<glyph unicode="®" horiz-adv-x="1704" d="M139 731q0 200 100 375t275 276t377 101q197 0 370 -97t277 -272t104 -383q0 -204 -100.5 -376.5t-273 -273.5t-377.5 -101q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM244 731q0 -173 87 -323.5t237.5 -237t322.5 -86.5q174 0 323 87t236.5 235.5t87.5 324.5 q0 174 -87 323t-235.5 236.5t-324.5 87.5q-174 0 -323 -87t-236.5 -235.5t-87.5 -324.5zM645 291v880h229q163 0 241.5 -63t78.5 -193q0 -78 -47.5 -141t-132.5 -98l227 -385h-149l-207 352h-113v-352h-127zM772 762h92q195 0 195 149q0 76 -47.5 107t-149.5 31h-90v-287z " />
+<glyph unicode="´" horiz-adv-x="1135" d="M532 1241v27q56 60 125.5 151.5t106.5 149.5h190v-21q-38 -49 -140 -151t-177 -156h-105z" />
+<glyph unicode=" " horiz-adv-x="784" />
+<glyph unicode=" " horiz-adv-x="1569" />
+<glyph unicode=" " horiz-adv-x="784" />
+<glyph unicode=" " horiz-adv-x="1569" />
+<glyph unicode=" " horiz-adv-x="523" />
+<glyph unicode=" " horiz-adv-x="392" />
+<glyph unicode=" " horiz-adv-x="261" />
+<glyph unicode=" " horiz-adv-x="261" />
+<glyph unicode=" " horiz-adv-x="196" />
+<glyph unicode=" " horiz-adv-x="313" />
+<glyph unicode=" " horiz-adv-x="87" />
+<glyph unicode="‐" horiz-adv-x="639" d="M55 469l35 158h479l-34 -158h-480z" />
+<glyph unicode="‑" horiz-adv-x="639" d="M55 469l35 158h479l-34 -158h-480z" />
+<glyph unicode="‒" horiz-adv-x="639" d="M55 469l35 158h479l-34 -158h-480z" />
+<glyph unicode="–" horiz-adv-x="983" d="M55 469l35 160h823l-34 -160h-824z" />
+<glyph unicode="—" horiz-adv-x="1966" d="M55 469l35 160h1806l-34 -160h-1807z" />
+<glyph unicode="‘" horiz-adv-x="348" d="M123 983q98 211 270 479h127q-147 -345 -203 -501h-188z" />
+<glyph unicode="’" horiz-adv-x="348" d="M125 961q134 298 203 501h188l8 -22q-40 -91 -111 -218.5t-159 -260.5h-129z" />
+<glyph unicode="“" horiz-adv-x="719" d="M123 983q98 211 270 479h127q-147 -345 -203 -501h-188zM492 983q80 181 272 479h127q-162 -379 -203 -501h-188z" />
+<glyph unicode="”" horiz-adv-x="719" d="M125 961q134 298 203 501h188l8 -22q-40 -91 -111 -218.5t-159 -260.5h-129zM494 961q57 126 115.5 272.5t86.5 228.5h189l10 -22q-94 -206 -274 -479h-127z" />
+<glyph unicode="•" horiz-adv-x="774" d="M199 684q0 145 73.5 231t198.5 86q92 0 139 -49t47 -141q0 -141 -74 -230t-202 -89q-89 0 -135.5 49.5t-46.5 142.5z" />
+<glyph unicode="…" horiz-adv-x="1563" d="M563 74q0 77 40.5 122.5t111.5 45.5q43 0 69.5 -26t26.5 -79q0 -71 -40 -118.5t-108 -47.5q-46 0 -73 26t-27 77zM1085 74q0 77 40.5 122.5t111.5 45.5q43 0 69.5 -26t26.5 -79q0 -71 -40 -118.5t-108 -47.5q-46 0 -73 26t-27 77zM43 74q0 77 40.5 122.5t111.5 45.5 q43 0 69.5 -26t26.5 -79q0 -71 -40 -118.5t-108 -47.5q-46 0 -73 26t-27 77z" />
+<glyph unicode=" " horiz-adv-x="313" />
+<glyph unicode=" " horiz-adv-x="392" />
+<glyph unicode="€" d="M63 504l27 131h154q8 80 30 164h-151l27 133h159q97 267 259.5 408t369.5 141q89 0 160 -21.5t141 -70.5l-80 -138q-113 78 -231 78q-140 0 -254 -99t-189 -298h426l-26 -133h-441q-21 -65 -32 -164h381l-29 -131h-361q0 -373 297 -373q123 0 256 55v-147 q-127 -59 -278 -59q-212 0 -328.5 133.5t-116.5 378.5v12h-170z" />
+<glyph unicode="™" horiz-adv-x="1534" d="M121 1358v104h516v-104h-199v-617h-121v617h-196zM705 741v721h180l182 -557l193 557h170v-721h-121v430q0 73 4 121h-6l-197 -551h-96l-189 551h-6q4 -52 4 -121v-430h-118z" />
+<glyph unicode="" horiz-adv-x="1095" d="M0 1095h1095v-1095h-1095v1095z" />
+</font>
+</defs></svg>
\ No newline at end of file
diff --git a/couchpotato/static/fonts/OpenSans-Italic-webfont.ttf b/couchpotato/static/fonts/OpenSans-Italic-webfont.ttf
new file mode 100755
index 0000000000..63f187e984
Binary files /dev/null and b/couchpotato/static/fonts/OpenSans-Italic-webfont.ttf differ
diff --git a/couchpotato/static/fonts/OpenSans-Italic-webfont.woff b/couchpotato/static/fonts/OpenSans-Italic-webfont.woff
new file mode 100755
index 0000000000..469a29bbfb
Binary files /dev/null and b/couchpotato/static/fonts/OpenSans-Italic-webfont.woff differ
diff --git a/couchpotato/static/fonts/OpenSans-Light-webfont.eot b/couchpotato/static/fonts/OpenSans-Light-webfont.eot
new file mode 100644
index 0000000000..14868406aa
Binary files /dev/null and b/couchpotato/static/fonts/OpenSans-Light-webfont.eot differ
diff --git a/couchpotato/static/fonts/OpenSans-Light-webfont.svg b/couchpotato/static/fonts/OpenSans-Light-webfont.svg
new file mode 100644
index 0000000000..11a472ca8a
--- /dev/null
+++ b/couchpotato/static/fonts/OpenSans-Light-webfont.svg
@@ -0,0 +1,1831 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="open_sanslight" horiz-adv-x="1169" >
+<font-face units-per-em="2048" ascent="1638" descent="-410" />
+<missing-glyph horiz-adv-x="532" />
+<glyph unicode="fi" horiz-adv-x="1077" d="M29 0zM586 1001h-256v-1001h-99v1001h-202v58l202 37v84q0 200 73.5 293.5t240.5 93.5q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-101h256v-86zM895 0h-99v1087h99v-1087zM782 1389q0 96 63 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71 t-48.5 -26q-63 0 -63 97z" />
+<glyph unicode="fl" horiz-adv-x="1077" d="M29 0zM586 1001h-256v-1001h-99v1001h-202v58l202 37v84q0 200 73.5 293.5t240.5 93.5q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-101h256v-86zM895 0h-99v1556h99v-1556z" />
+<glyph unicode="ffi" horiz-adv-x="1692" d="M29 0zM586 1001h-256v-1001h-99v1001h-202v58l202 37v84q0 200 73.5 293.5t240.5 93.5q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-101h256v-86zM1200 1001h-256v-1001h-99v1001h-202v58l202 37v84q0 200 73.5 293.5t240.5 93.5 q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-101h256v-86zM1510 0h-99v1087h99v-1087zM1397 1389q0 96 63 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-63 0 -63 97z" />
+<glyph unicode="ffl" horiz-adv-x="1692" d="M29 0zM586 1001h-256v-1001h-99v1001h-202v58l202 37v84q0 200 73.5 293.5t240.5 93.5q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-101h256v-86zM1200 1001h-256v-1001h-99v1001h-202v58l202 37v84q0 200 73.5 293.5t240.5 93.5 q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-101h256v-86zM1510 0h-99v1556h99v-1556z" />
+<glyph horiz-adv-x="2048" />
+<glyph horiz-adv-x="2048" />
+<glyph unicode="
" horiz-adv-x="1044" />
+<glyph unicode=" " horiz-adv-x="532" />
+<glyph unicode=" " horiz-adv-x="532" />
+<glyph unicode=" " horiz-adv-x="532" />
+<glyph unicode="!" horiz-adv-x="492" d="M276 377h-61l-29 1085h119zM164 78q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98z" />
+<glyph unicode=""" horiz-adv-x="723" d="M260 1462l-33 -528h-61l-33 528h127zM590 1462l-33 -528h-61l-33 528h127z" />
+<glyph unicode="#" horiz-adv-x="1323" d="M967 928l-76 -398h303v-79h-320l-86 -451h-90l88 451h-360l-86 -451h-88l86 451h-283v79h299l76 398h-297v80h311l86 454h91l-89 -454h365l88 454h86l-88 -454h285v-80h-301zM440 530h363l78 398h-363z" />
+<glyph unicode="$" d="M991 440q0 -133 -99 -217t-274 -106v-236h-81v232q-92 2 -200.5 22.5t-172.5 50.5v103q75 -36 179.5 -61t193.5 -25v508q-145 44 -215 88t-102 104t-32 146q0 124 94.5 208.5t254.5 104.5v192h81v-190q197 -9 351 -72l-33 -90q-141 62 -318 72v-486q213 -66 293 -144 t80 -204zM881 444q0 85 -63 140.5t-200 95.5v-471q122 13 192.5 75t70.5 160zM297 1049q0 -86 57 -141t183 -93v453q-119 -16 -179.5 -76t-60.5 -143z" />
+<glyph unicode="%" horiz-adv-x="1653" d="M211 1026q0 -186 45 -279.5t141 -93.5q193 0 193 373q0 184 -49.5 276.5t-143.5 92.5q-96 0 -141 -92.5t-45 -276.5zM688 1026q0 -226 -75 -343.5t-216 -117.5q-133 0 -208.5 120.5t-75.5 340.5q0 223 72 340t212 117q139 0 215 -120.5t76 -336.5zM1063 438 q0 -185 45 -277.5t141 -92.5q193 0 193 370q0 369 -193 369q-96 0 -141 -91.5t-45 -277.5zM1540 438q0 -226 -74 -343.5t-215 -117.5q-136 0 -211 121.5t-75 339.5q0 225 73.5 341t212.5 116q137 0 213 -120t76 -337zM1280 1462l-811 -1462h-96l811 1462h96z" />
+<glyph unicode="&" horiz-adv-x="1460" d="M123 371q0 138 73.5 235t274.5 205l-75 82q-66 71 -98 139t-32 142q0 143 95.5 227t256.5 84q155 0 245.5 -81t90.5 -224q0 -105 -70 -192.5t-253 -194.5l452 -457q61 72 104 157t75 201h96q-63 -246 -209 -426l266 -268h-135l-193 197q-92 -90 -164 -131.5t-157.5 -63.5 t-194.5 -22q-209 0 -328.5 103t-119.5 288zM578 70q128 0 234.5 43.5t209.5 146.5l-483 485q-136 -72 -196.5 -122.5t-88 -109.5t-27.5 -138q0 -143 93 -224t258 -81zM373 1176q0 -79 40 -146t152 -174q159 85 221 159t62 169q0 94 -62 152.5t-168 58.5q-114 0 -179.5 -58 t-65.5 -161z" />
+<glyph unicode="'" horiz-adv-x="393" d="M260 1462l-33 -528h-61l-33 528h127z" />
+<glyph unicode="(" horiz-adv-x="557" d="M82 561q0 265 77.5 496t223.5 405h113q-148 -182 -227 -412.5t-79 -486.5q0 -483 304 -887h-111q-147 170 -224 397t-77 488z" />
+<glyph unicode=")" horiz-adv-x="557" d="M475 561q0 -263 -77.5 -490t-223.5 -395h-111q304 404 304 887q0 257 -79 487.5t-227 411.5h113q147 -175 224 -406.5t77 -494.5z" />
+<glyph unicode="*" horiz-adv-x="1128" d="M631 1556l-37 -405l405 104l21 -131l-395 -39l247 -340l-124 -71l-191 379l-180 -379l-125 71l242 340l-390 39l19 131l401 -104l-39 405h146z" />
+<glyph unicode="+" d="M625 764h434v-82h-434v-432h-82v432h-432v82h432v434h82v-434z" />
+<glyph unicode="," horiz-adv-x="440" d="M295 238l12 -21q-75 -265 -174 -481h-65q77 275 110 502h117z" />
+<glyph unicode="-" horiz-adv-x="659" d="M92 512v82h475v-82h-475z" />
+<glyph unicode="." horiz-adv-x="487" d="M162 78q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98z" />
+<glyph unicode="/" horiz-adv-x="698" d="M674 1462l-545 -1462h-104l544 1462h105z" />
+<glyph unicode="0" d="M1055 735q0 -385 -117.5 -570t-355.5 -185q-229 0 -348 190.5t-119 564.5q0 382 115.5 566t351.5 184q231 0 352 -190.5t121 -559.5zM223 735q0 -340 89 -502.5t270 -162.5q189 0 275.5 168t86.5 497q0 324 -86.5 492t-275.5 168t-274 -168t-85 -492z" />
+<glyph unicode="1" d="M682 0h-98v1065q0 145 12 301q-15 -15 -31 -29t-309 -243l-57 71l397 297h86v-1462z" />
+<glyph unicode="2" d="M1028 0h-915v88l389 406q164 170 230 260t97 172t31 172q0 131 -86 213t-223 82q-183 0 -350 -133l-54 69q183 154 406 154q191 0 300.5 -102t109.5 -281q0 -145 -73.5 -280.5t-268.5 -334.5l-375 -385v-4h782v-96z" />
+<glyph unicode="3" d="M979 1118q0 -136 -85.5 -229t-229.5 -119v-6q176 -22 268 -112t92 -242q0 -205 -139.5 -317.5t-401.5 -112.5q-223 0 -389 83v99q84 -44 188.5 -69t196.5 -25q221 0 332 89.5t111 252.5q0 145 -113.5 223t-333.5 78h-158v96h160q182 0 288.5 86.5t106.5 234.5 q0 122 -86.5 195.5t-226.5 73.5q-109 0 -199 -30.5t-202 -104.5l-49 67q85 71 205 112.5t243 41.5q202 0 312 -95.5t110 -269.5z" />
+<glyph unicode="4" d="M1141 373h-252v-373h-94v373h-752v67l725 1030h121v-1011h252v-86zM795 459v418q0 302 14 507h-8q-20 -37 -123 -188l-516 -737h633z" />
+<glyph unicode="5" d="M537 879q234 0 368.5 -113t134.5 -311q0 -225 -140 -350t-386 -125q-109 0 -207 21.5t-164 61.5v103q108 -55 192 -76.5t179 -21.5q192 0 308 101.5t116 274.5q0 163 -113 256t-307 93q-130 0 -272 -39l-60 39l58 669h704v-96h-610l-45 -516q156 29 244 29z" />
+<glyph unicode="6" d="M131 623q0 285 77.5 479.5t220 288.5t343.5 94q94 0 172 -23v-88q-73 27 -176 27q-247 0 -384.5 -178t-154.5 -518h13q76 98 174 148t207 50q205 0 320.5 -117t115.5 -323q0 -224 -121.5 -353.5t-327.5 -129.5q-222 0 -350.5 169.5t-128.5 473.5zM610 68q164 0 255 103 t91 294q0 168 -90 262t-245 94q-102 0 -189.5 -45t-139.5 -119.5t-52 -152.5q0 -111 49.5 -213.5t134 -162.5t186.5 -60z" />
+<glyph unicode="7" d="M334 0l602 1366h-827v96h946v-73l-604 -1389h-117z" />
+<glyph unicode="8" d="M582 1487q186 0 299.5 -95t113.5 -257q0 -112 -70.5 -198t-228.5 -159q192 -79 270 -173t78 -228q0 -181 -126.5 -289t-339.5 -108q-221 0 -339 101t-118 294q0 131 83 230t257 169q-161 76 -227 160.5t-66 202.5q0 105 53 184.5t148.5 122.5t212.5 43zM223 360 q0 -138 93.5 -214t261.5 -76q164 0 264 80.5t100 218.5q0 124 -78.5 201.5t-302.5 162.5q-184 -71 -261 -157t-77 -216zM580 1397q-141 0 -226.5 -69.5t-85.5 -190.5q0 -70 31.5 -123.5t91 -97t199.5 -101.5q163 63 234 139t71 183q0 120 -84.5 190t-230.5 70z" />
+<glyph unicode="9" d="M1036 842q0 -288 -75.5 -482t-220 -287t-349.5 -93q-104 0 -192 26v86q43 -14 103.5 -21.5t92.5 -7.5q247 0 387 178.5t156 520.5h-12q-73 -96 -174 -147.5t-211 -51.5q-203 0 -316.5 112t-113.5 318q0 220 124.5 356t323.5 136q144 0 252 -75.5t166.5 -221.5t58.5 -346z M559 1397q-158 0 -252 -106.5t-94 -291.5q0 -174 87 -264t249 -90q101 0 188.5 45t139 119.5t51.5 151.5q0 117 -46.5 219t-130 159.5t-192.5 57.5z" />
+<glyph unicode=":" horiz-adv-x="487" d="M162 78q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98zM162 971q0 98 80 98q82 0 82 -98q0 -53 -23.5 -76t-58.5 -23q-34 0 -57 23t-23 76z" />
+<glyph unicode=";" horiz-adv-x="487" d="M303 238l12 -21q-75 -265 -174 -481h-65q29 97 62 245.5t48 256.5h117zM162 971q0 98 80 98q82 0 82 -98q0 -53 -23.5 -76t-58.5 -23q-34 0 -57 23t-23 76z" />
+<glyph unicode="<" d="M1059 266l-948 416v61l948 474v-95l-823 -405l823 -355v-96z" />
+<glyph unicode="=" d="M111 885v82h948v-82h-948zM111 477v82h948v-82h-948z" />
+<glyph unicode=">" d="M111 362l823 355l-823 405v95l948 -474v-61l-948 -416v96z" />
+<glyph unicode="?" horiz-adv-x="862" d="M293 377v37q0 123 37.5 201t138.5 167l91 79q72 61 103 121t31 138q0 127 -83.5 202t-219.5 75q-79 0 -148 -17.5t-149 -56.5l-37 80q110 48 184.5 64t153.5 16q183 0 288 -98.5t105 -270.5q0 -68 -18 -119t-50.5 -94.5t-78.5 -84t-102 -87.5q-64 -54 -98.5 -98.5 t-50 -93.5t-15.5 -146v-14h-82zM260 78q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98z" />
+<glyph unicode="@" horiz-adv-x="1815" d="M1702 725q0 -228 -90.5 -366t-245.5 -138q-89 0 -144.5 54t-64.5 147h-4q-43 -100 -124 -150.5t-189 -50.5q-148 0 -229 96.5t-81 270.5q0 202 120.5 330.5t314.5 128.5q138 0 286 -41l-22 -464v-30q0 -104 35 -156.5t116 -52.5q103 0 168.5 116.5t65.5 303.5 q0 194 -79 340t-225.5 224.5t-334.5 78.5q-230 0 -405.5 -99.5t-270 -281.5t-94.5 -418q0 -322 167 -497.5t474 -175.5q93 0 188.5 18t231.5 70v-99q-203 -80 -414 -80q-349 0 -544 200.5t-195 557.5q0 256 108.5 460.5t307 317.5t448.5 113q215 0 380.5 -89t255 -254.5 t89.5 -383.5zM633 590q0 -143 55 -215t174 -72q255 0 273 346l16 291q-79 27 -193 27q-149 0 -237 -102.5t-88 -274.5z" />
+<glyph unicode="A" horiz-adv-x="1229" d="M911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174z" />
+<glyph unicode="B" horiz-adv-x="1284" d="M207 1462h401q271 0 398 -92t127 -278q0 -127 -77.5 -211.5t-226.5 -108.5v-6q175 -26 257.5 -110.5t82.5 -235.5q0 -202 -134 -311t-380 -109h-448v1462zM309 811h322q206 0 299.5 68.5t93.5 214.5t-105.5 212t-314.5 66h-295v-561zM309 721v-631h344q406 0 406 330 q0 301 -428 301h-322z" />
+<glyph unicode="C" horiz-adv-x="1272" d="M831 1391q-275 0 -433 -176t-158 -482q0 -313 149 -486t426 -173q184 0 338 47v-90q-145 -51 -362 -51q-308 0 -485 199t-177 556q0 223 84.5 393t243 262.5t368.5 92.5q214 0 383 -80l-41 -92q-160 80 -336 80z" />
+<glyph unicode="D" horiz-adv-x="1446" d="M1317 745q0 -368 -193 -556.5t-567 -188.5h-350v1462h395q350 0 532.5 -183t182.5 -534zM1206 741q0 314 -159.5 472.5t-468.5 158.5h-269v-1282h242q655 0 655 651z" />
+<glyph unicode="E" horiz-adv-x="1130" d="M1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94z" />
+<glyph unicode="F" horiz-adv-x="1028" d="M309 0h-102v1462h801v-94h-699v-620h660v-95h-660v-653z" />
+<glyph unicode="G" horiz-adv-x="1481" d="M782 737h539v-667q-212 -90 -477 -90q-346 0 -530.5 195.5t-184.5 553.5q0 223 91.5 395.5t262 266.5t391.5 94q239 0 429 -88l-41 -92q-190 88 -394 88q-289 0 -458.5 -178.5t-169.5 -481.5q0 -330 161 -496.5t473 -166.5q202 0 343 57v514h-435v96z" />
+<glyph unicode="H" horiz-adv-x="1473" d="M1266 0h-103v719h-854v-719h-102v1462h102v-649h854v649h103v-1462z" />
+<glyph unicode="I" horiz-adv-x="516" d="M207 0v1462h102v-1462h-102z" />
+<glyph unicode="J" horiz-adv-x="506" d="M-33 -369q-92 0 -151 27v88q78 -20 149 -20q242 0 242 264v1472h102v-1462q0 -369 -342 -369z" />
+<glyph unicode="K" horiz-adv-x="1190" d="M1190 0h-125l-561 772l-195 -172v-600h-102v1462h102v-760l162 162l573 598h130l-599 -618z" />
+<glyph unicode="L" horiz-adv-x="1051" d="M207 0v1462h102v-1366h697v-96h-799z" />
+<glyph unicode="M" horiz-adv-x="1767" d="M850 0l-545 1350h-8q8 -124 8 -254v-1096h-98v1462h158l518 -1286h6l518 1286h154v-1462h-103v1108q0 116 12 240h-8l-547 -1348h-65z" />
+<glyph unicode="N" horiz-adv-x="1477" d="M1270 0h-103l-866 1298h-8q12 -232 12 -350v-948h-98v1462h102l865 -1296h6q-9 180 -9 342v954h99v-1462z" />
+<glyph unicode="O" horiz-adv-x="1565" d="M1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483z" />
+<glyph unicode="P" horiz-adv-x="1198" d="M1087 1042q0 -212 -144 -325t-408 -113h-226v-604h-102v1462h358q522 0 522 -420zM309 692h201q247 0 357 81.5t110 264.5q0 169 -104 250.5t-322 81.5h-242v-678z" />
+<glyph unicode="Q" horiz-adv-x="1565" d="M1436 733q0 -294 -126 -486.5t-349 -246.5l333 -348h-166l-282 330l-33 -2h-31q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5 t-401.5 168.5q-261 0 -402.5 -170t-141.5 -483z" />
+<glyph unicode="R" horiz-adv-x="1217" d="M309 637v-637h-102v1462h348q272 0 402 -100.5t130 -302.5q0 -147 -77.5 -248t-235.5 -145l397 -666h-122l-377 637h-363zM309 725h279q185 0 287 82.5t102 243.5q0 167 -100 243t-326 76h-242v-645z" />
+<glyph unicode="S" horiz-adv-x="1116" d="M1014 377q0 -183 -134.5 -290t-357.5 -107q-268 0 -411 59v102q158 -67 403 -67q180 0 285.5 82.5t105.5 216.5q0 83 -35 137.5t-114 99.5t-232 97q-224 77 -309.5 166.5t-85.5 238.5q0 164 128.5 267.5t330.5 103.5q206 0 387 -78l-37 -88q-182 76 -348 76 q-162 0 -258 -75t-96 -204q0 -81 29.5 -133t96.5 -93.5t230 -99.5q171 -59 257 -114.5t125.5 -126t39.5 -170.5z" />
+<glyph unicode="T" horiz-adv-x="1073" d="M588 0h-103v1366h-475v96h1053v-96h-475v-1366z" />
+<glyph unicode="U" horiz-adv-x="1473" d="M1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102z" />
+<glyph unicode="V" horiz-adv-x="1182" d="M1071 1462h111l-547 -1462h-90l-545 1462h109l368 -995q84 -225 113 -338q20 75 79 233z" />
+<glyph unicode="W" horiz-adv-x="1827" d="M1372 0h-84l-321 1128q-40 139 -60 228q-16 -87 -45.5 -200t-322.5 -1156h-86l-402 1462h107l256 -942q15 -57 28 -105.5t23.5 -91t19 -82t15.5 -79.5q24 136 102 413l250 887h113l293 -1018q51 -176 73 -284q13 72 33.5 153t308.5 1149h103z" />
+<glyph unicode="X" horiz-adv-x="1102" d="M1102 0h-117l-432 682l-440 -682h-113l492 762l-447 700h115l395 -626l401 626h109l-453 -698z" />
+<glyph unicode="Y" horiz-adv-x="1081" d="M543 662l428 800h110l-487 -897v-565h-105v557l-489 905h117z" />
+<glyph unicode="Z" horiz-adv-x="1180" d="M1098 0h-1016v76l856 1290h-817v96h954v-76l-858 -1290h881v-96z" />
+<glyph unicode="[" horiz-adv-x="653" d="M602 -324h-428v1786h428v-94h-330v-1597h330v-95z" />
+<glyph unicode="\" horiz-adv-x="698" d="M127 1462l547 -1462h-103l-546 1462h102z" />
+<glyph unicode="]" horiz-adv-x="653" d="M51 -229h330v1597h-330v94h428v-1786h-428v95z" />
+<glyph unicode="^" d="M88 561l465 912h68l460 -912h-100l-395 791l-398 -791h-100z" />
+<glyph unicode="_" horiz-adv-x="842" d="M846 -266h-850v82h850v-82z" />
+<glyph unicode="`" horiz-adv-x="1182" d="M776 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
+<glyph unicode="a" horiz-adv-x="1085" d="M842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5z" />
+<glyph unicode="b" horiz-adv-x="1219" d="M641 1108q228 0 343.5 -143.5t115.5 -419.5q0 -271 -121.5 -418t-341.5 -147q-116 0 -209 48t-147 136h-9l-28 -164h-62v1556h99v-391q0 -88 -4 -162l-3 -85h7q62 98 149.5 144t210.5 46zM639 1018q-192 0 -275 -110t-83 -363v-17q0 -246 86.5 -353t269.5 -107 q178 0 268 124.5t90 354.5q0 471 -356 471z" />
+<glyph unicode="c" horiz-adv-x="973" d="M616 -20q-233 0 -365 147t-132 410q0 270 137 420.5t375 150.5q141 0 270 -49l-27 -88q-141 47 -245 47q-200 0 -303 -123.5t-103 -355.5q0 -220 103 -344.5t288 -124.5q148 0 275 53v-92q-104 -51 -273 -51z" />
+<glyph unicode="d" horiz-adv-x="1219" d="M580 1108q118 0 204 -43t154 -147h6q-6 126 -6 247v391h98v-1556h-65l-25 166h-8q-124 -186 -356 -186q-225 0 -344 140t-119 408q0 282 118 431t343 149zM580 1018q-178 0 -267.5 -125t-89.5 -363q0 -462 359 -462q184 0 270 107t86 353v17q0 252 -84.5 362.5 t-273.5 110.5z" />
+<glyph unicode="e" horiz-adv-x="1124" d="M621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5z" />
+<glyph unicode="f" horiz-adv-x="614" d="M586 1001h-256v-1001h-99v1001h-202v58l202 37v84q0 200 73.5 293.5t240.5 93.5q90 0 180 -27l-23 -86q-80 25 -159 25q-116 0 -164.5 -68.5t-48.5 -222.5v-101h256v-86z" />
+<glyph unicode="g" horiz-adv-x="1071" d="M1030 1087v-69l-225 -14q90 -112 90 -246q0 -157 -104.5 -254.5t-280.5 -97.5q-74 0 -104 6q-59 -31 -90 -73t-31 -89q0 -52 39.5 -76t132.5 -24h190q177 0 271 -71.5t94 -211.5q0 -172 -139.5 -265.5t-397.5 -93.5q-205 0 -317.5 79t-112.5 220q0 112 69.5 186 t188.5 101q-49 21 -78.5 59.5t-29.5 88.5q0 109 139 192q-95 39 -148 122.5t-53 191.5q0 163 103.5 261.5t279.5 98.5q107 0 166 -21h348zM150 -184q0 -224 333 -224q428 0 428 273q0 98 -67 142t-217 44h-178q-299 0 -299 -235zM233 748q0 -126 76.5 -195.5t204.5 -69.5 q136 0 208.5 69t72.5 200q0 139 -74.5 208.5t-208.5 69.5q-130 0 -204.5 -74.5t-74.5 -207.5z" />
+<glyph unicode="h" horiz-adv-x="1208" d="M940 0v705q0 164 -69 238.5t-214 74.5q-195 0 -285.5 -98.5t-90.5 -319.5v-600h-99v1556h99v-495l-5 -139h7q61 98 154 142t231 44q370 0 370 -397v-711h-98z" />
+<glyph unicode="i" horiz-adv-x="463" d="M281 0h-99v1087h99v-1087zM168 1389q0 96 63 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-63 0 -63 97z" />
+<glyph unicode="j" horiz-adv-x="463" d="M37 -492q-80 0 -135 25v86q69 -20 129 -20q151 0 151 176v1312h99v-1298q0 -135 -63.5 -208t-180.5 -73zM168 1389q0 96 63 96q31 0 48.5 -25t17.5 -71q0 -45 -17.5 -71t-48.5 -26q-63 0 -63 97z" />
+<glyph unicode="k" horiz-adv-x="991" d="M279 477l555 610h120l-428 -464l465 -623h-119l-413 549l-178 -162v-387h-99v1556h99v-780l-7 -299h5z" />
+<glyph unicode="l" horiz-adv-x="463" d="M281 0h-99v1556h99v-1556z" />
+<glyph unicode="m" horiz-adv-x="1808" d="M1540 0v713q0 159 -62 232t-190 73q-167 0 -247 -92t-80 -289v-637h-101v743q0 275 -252 275q-171 0 -249 -99.5t-78 -318.5v-600h-99v1087h82l21 -149h6q45 81 128 125.5t183 44.5q257 0 330 -193h4q53 93 142.5 143t203.5 50q178 0 267 -95t89 -302v-711h-98z" />
+<glyph unicode="n" horiz-adv-x="1208" d="M940 0v705q0 164 -69 238.5t-214 74.5q-195 0 -285.5 -98.5t-90.5 -319.5v-600h-99v1087h84l19 -149h6q106 170 377 170q370 0 370 -397v-711h-98z" />
+<glyph unicode="o" horiz-adv-x="1200" d="M1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5t-97.5 -349.5z " />
+<glyph unicode="p" horiz-adv-x="1219" d="M647 -20q-251 0 -366 188h-7l3 -84q4 -74 4 -162v-414h-99v1579h84l19 -155h6q112 176 358 176q220 0 335.5 -144.5t115.5 -420.5q0 -268 -121.5 -415.5t-331.5 -147.5zM645 68q167 0 258.5 124t91.5 347q0 479 -346 479q-190 0 -279 -104.5t-89 -340.5v-32 q0 -255 85.5 -364t278.5 -109z" />
+<glyph unicode="q" horiz-adv-x="1219" d="M569 -20q-214 0 -332 142t-118 410q0 275 118 425.5t338 150.5q236 0 353 -174h6l18 153h84v-1579h-98v414q0 122 6 248h-6q-118 -190 -369 -190zM571 68q198 0 282.5 109t84.5 366v12q0 245 -85 354t-271 109q-176 0 -267.5 -124t-91.5 -364q0 -229 89.5 -345.5 t258.5 -116.5z" />
+<glyph unicode="r" horiz-adv-x="797" d="M610 1108q69 0 148 -14l-19 -95q-68 17 -141 17q-139 0 -228 -118t-89 -298v-600h-99v1087h84l10 -196h7q67 120 143 168.5t184 48.5z" />
+<glyph unicode="s" horiz-adv-x="954" d="M856 283q0 -146 -111 -224.5t-315 -78.5q-218 0 -346 67v107q164 -82 346 -82q161 0 244.5 53.5t83.5 142.5q0 82 -66.5 138t-218.5 110q-163 59 -229 101.5t-99.5 96t-33.5 130.5q0 122 102.5 193t286.5 71q176 0 334 -66l-37 -90q-160 66 -297 66q-133 0 -211 -44 t-78 -122q0 -85 60.5 -136t236.5 -114q147 -53 214 -95.5t100.5 -96.5t33.5 -127z" />
+<glyph unicode="t" horiz-adv-x="686" d="M469 68q94 0 164 16v-80q-72 -24 -166 -24q-144 0 -212.5 77t-68.5 242v702h-161v58l161 45l50 246h51v-263h319v-86h-319v-688q0 -125 44 -185t138 -60z" />
+<glyph unicode="u" horiz-adv-x="1208" d="M268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98z" />
+<glyph unicode="v" horiz-adv-x="940" d="M420 0l-420 1087h102l281 -739q56 -142 84 -248h6q41 136 84 250l281 737h102l-420 -1087h-100z" />
+<glyph unicode="w" horiz-adv-x="1481" d="M1051 0l-238 727q-23 74 -59 217h-6l-21 -74l-45 -145l-242 -725h-98l-311 1087h106l174 -630q61 -234 80 -344h6q59 234 86 311l224 663h90l213 -661q72 -235 88 -311h6q8 65 80 348l166 624h100l-295 -1087h-104z" />
+<glyph unicode="x" horiz-adv-x="1020" d="M449 559l-379 528h114l324 -458l321 458h109l-373 -528l400 -559h-115l-342 485l-344 -485h-109z" />
+<glyph unicode="y" horiz-adv-x="940" d="M0 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5z" />
+<glyph unicode="z" horiz-adv-x="944" d="M858 0h-776v63l645 936h-598v88h727v-63l-649 -936h651v-88z" />
+<glyph unicode="{" horiz-adv-x="723" d="M389 -27q0 -102 59.5 -152.5t202.5 -53.5v-91q-195 0 -277.5 75t-82.5 231v337q0 205 -230 209v80q122 2 176 51t54 148v350q0 299 360 305v-90q-138 -5 -200 -58t-62 -157v-305q0 -130 -44 -194t-142 -85v-8q97 -20 141.5 -83.5t44.5 -186.5v-322z" />
+<glyph unicode="|" horiz-adv-x="1108" d="M508 1561h92v-2067h-92v2067z" />
+<glyph unicode="}" horiz-adv-x="723" d="M334 295q0 123 44.5 186.5t141.5 83.5v8q-97 20 -141.5 84t-44.5 195v305q0 103 -61.5 156.5t-200.5 58.5v90q174 0 267 -77.5t93 -227.5v-350q0 -100 54.5 -148.5t175.5 -50.5v-80q-230 -4 -230 -209v-337q0 -155 -82.5 -230.5t-277.5 -75.5v91q141 2 201.5 52.5 t60.5 153.5v322z" />
+<glyph unicode="~" d="M334 745q-49 0 -108 -30.5t-115 -89.5v94q108 110 233 110q61 0 115 -13.5t155 -57.5q126 -58 220 -58q56 0 109.5 30.5t115.5 94.5v-96q-48 -49 -104.5 -81t-129.5 -32q-116 0 -270 72q-124 57 -221 57z" />
+<glyph unicode="¡" horiz-adv-x="492" d="M215 711h61l29 -1086h-119zM166 1010q0 98 80 98q82 0 82 -98q0 -53 -23.5 -76t-58.5 -23q-34 0 -57 23t-23 76z" />
+<glyph unicode="¢" d="M602 190q-186 30 -288.5 175t-102.5 380q0 232 102.5 381.5t288.5 182.5v174h82v-166h14q131 0 275 -55l-31 -84q-134 51 -237 51q-187 0 -288.5 -122.5t-101.5 -358.5q0 -225 100.5 -349.5t280.5 -124.5q131 0 267 58v-92q-110 -56 -267 -56h-12v-204h-82v210z" />
+<glyph unicode="£" d="M412 676v-256q0 -116 -35 -196t-113 -128h809v-96h-995v84q110 21 171.5 110t61.5 224v258h-211v82h211v297q0 204 98 315t281 111q175 0 330 -68l-35 -86q-157 66 -295 66q-141 0 -209.5 -81t-68.5 -253v-301h411v-82h-411z" />
+<glyph unicode="¤" d="M991 723q0 -151 -90 -256l139 -141l-59 -60l-137 142q-110 -93 -260 -93q-153 0 -260 93l-138 -142l-59 60l139 141q-90 106 -90 256q0 147 90 258l-139 141l59 60l138 -142q103 93 260 93q155 0 260 -93l137 142l59 -60l-139 -141q90 -111 90 -258zM584 395 q134 0 228.5 95.5t94.5 232.5q0 136 -95 233t-228 97q-134 0 -229 -97t-95 -233t94.5 -232t229.5 -96z" />
+<glyph unicode="¥" d="M586 666l428 796h110l-432 -788h283v-82h-338v-205h338v-82h-338v-305h-105v305h-337v82h337v205h-337v82h278l-430 788h117z" />
+<glyph unicode="¦" horiz-adv-x="1108" d="M508 1561h92v-764h-92v764zM508 258h92v-764h-92v764z" />
+<glyph unicode="§" horiz-adv-x="1057" d="M145 813q0 83 50.5 152.5t138.5 107.5q-86 47 -125 102t-39 136q0 117 101.5 183.5t275.5 66.5q175 0 336 -64l-35 -80q-91 34 -158.5 47t-144.5 13q-134 0 -205.5 -44.5t-71.5 -119.5q0 -54 25.5 -88.5t85.5 -65.5t188 -74q192 -64 264 -132.5t72 -170.5 q0 -173 -186 -274q86 -42 129 -96t43 -136q0 -135 -113 -207.5t-311 -72.5q-92 0 -171 15t-165 52v95q182 -78 332 -78q162 0 247 49.5t85 140.5q0 55 -25 87.5t-88.5 65.5t-190.5 79q-200 73 -272 141.5t-72 169.5zM246 825q0 -65 31.5 -104t105.5 -75t250 -99 q82 41 126 98t44 121q0 62 -32 102t-108.5 77t-236.5 87q-81 -23 -130.5 -79t-49.5 -128z" />
+<glyph unicode="¨" horiz-adv-x="1182" d="M336 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM717 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
+<glyph unicode="©" horiz-adv-x="1704" d="M897 1092q-142 0 -222.5 -94.5t-80.5 -264.5q0 -186 74.5 -275t220.5 -89q84 0 198 43v-88q-102 -45 -208 -45q-187 0 -288.5 115t-101.5 331q0 208 111 332.5t297 124.5q119 0 227 -52l-37 -83q-98 45 -190 45zM100 731q0 200 100 375t275 276t377 101q200 0 375 -100 t276 -275t101 -377q0 -197 -97 -370t-272 -277t-383 -104q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM193 731q0 -178 88.5 -329.5t240.5 -240.5t330 -89t329.5 88.5t240.5 240.5t89 330q0 174 -85.5 325t-239 243t-334.5 92q-176 0 -328.5 -88.5t-241.5 -242.5t-89 -329z " />
+<glyph unicode="ª" horiz-adv-x="686" d="M512 813l-25 72q-84 -84 -202 -84q-95 0 -151 49t-56 139q0 100 80 151.5t241 59.5l95 4v43q0 77 -38 114.5t-106 37.5q-87 0 -196 -49l-33 73q117 56 231 56q228 0 228 -215v-451h-68zM168 993q0 -54 35 -85t96 -31q90 0 142.5 50t52.5 142v64l-88 -5 q-116 -6 -177 -36.5t-61 -98.5z" />
+<glyph unicode="«" horiz-adv-x="885" d="M82 543l309 393l62 -43l-254 -363l254 -362l-62 -43l-309 391v27zM442 543l310 393l61 -43l-254 -363l254 -362l-61 -43l-310 391v27z" />
+<glyph unicode="¬" d="M1038 764v-494h-82v412h-845v82h927z" />
+<glyph unicode="" horiz-adv-x="659" d="M92 512zM92 512v82h475v-82h-475z" />
+<glyph unicode="®" horiz-adv-x="1704" d="M709 731h112q91 0 143 46.5t52 135.5q0 172 -197 172h-110v-354zM1120 918q0 -79 -38.5 -139.5t-110.5 -94.5l237 -393h-121l-210 360h-168v-360h-101v880h211q143 0 222 -62t79 -191zM100 731q0 200 100 375t275 276t377 101q200 0 375 -100t276 -275t101 -377 q0 -197 -97 -370t-272 -277t-383 -104q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM193 731q0 -178 88.5 -329.5t240.5 -240.5t330 -89t329.5 88.5t240.5 240.5t89 330q0 174 -85.5 325t-239 243t-334.5 92q-176 0 -328.5 -88.5t-241.5 -242.5t-89 -329z" />
+<glyph unicode="¯" horiz-adv-x="1024" d="M1030 1556h-1036v82h1036v-82z" />
+<glyph unicode="°" horiz-adv-x="877" d="M139 1184q0 132 86.5 215.5t212.5 83.5t212.5 -83.5t86.5 -215.5t-86.5 -215.5t-212.5 -83.5q-130 0 -214.5 83t-84.5 216zM229 1184q0 -91 61 -154t148 -63q86 0 147.5 62t61.5 155q0 92 -60 154.5t-149 62.5q-90 0 -149.5 -64t-59.5 -153z" />
+<glyph unicode="±" d="M111 1zM111 1v82h948v-82h-948zM625 764h434v-82h-434v-432h-82v432h-432v82h432v434h82v-434z" />
+<glyph unicode="²" horiz-adv-x="688" d="M629 586h-576v78l242 237q125 121 172 193t47 149q0 71 -46.5 112.5t-123.5 41.5q-108 0 -217 -82l-49 65q119 103 270 103q124 0 194 -63.5t70 -174.5q0 -47 -13 -89t-40 -85.5t-68.5 -90t-308.5 -306.5h447v-88z" />
+<glyph unicode="³" horiz-adv-x="688" d="M616 1260q0 -78 -44 -131.5t-117 -75.5q186 -45 186 -211q0 -130 -88.5 -201.5t-247.5 -71.5q-144 0 -264 60v88q136 -62 266 -62q115 0 174.5 49t59.5 136q0 83 -59.5 122t-178.5 39h-131v84h135q105 0 158 43.5t53 120.5q0 67 -47 107.5t-127 40.5q-128 0 -246 -78 l-47 70q130 94 293 94q127 0 199.5 -60t72.5 -163z" />
+<glyph unicode="´" horiz-adv-x="1182" d="M393 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
+<glyph unicode="µ" horiz-adv-x="1221" d="M281 1087v-704q0 -164 69 -238.5t213 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-50 -77 -150 -123.5t-217 -46.5q-99 0 -167.5 27.5t-119.5 84.5q5 -92 5 -170v-414h-99v1579h99z" />
+<glyph unicode="¶" horiz-adv-x="1341" d="M1106 -260h-100v1722h-228v-1722h-100v819q-64 -18 -146 -18q-216 0 -317.5 125t-101.5 376q0 260 109 387t341 127h543v-1816z" />
+<glyph unicode="·" horiz-adv-x="487" d="M162 623zM162 721q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98z" />
+<glyph unicode="¸" horiz-adv-x="420" d="M393 -291q0 -100 -67.5 -150.5t-188.5 -50.5q-68 0 -94 11v88q30 -10 92 -10q78 0 119 28t41 80q0 94 -193 121l93 174h96l-66 -117q168 -37 168 -174z" />
+<glyph unicode="¹" horiz-adv-x="688" d="M350 1462h92v-876h-98v547q0 99 12 233q-26 -23 -233 -145l-47 77z" />
+<glyph unicode="º" horiz-adv-x="739" d="M670 1141q0 -161 -80 -250.5t-223 -89.5t-220 86t-77 254q0 162 78 250t223 88q142 0 220.5 -87t78.5 -251zM160 1141q0 -264 209 -264t209 264q0 131 -50 194.5t-159 63.5t-159 -63.5t-50 -194.5z" />
+<glyph unicode="»" horiz-adv-x="885" d="M803 518l-309 -393l-62 43l254 362l-254 363l62 43l309 -391v-27zM442 518l-309 -393l-61 43l254 362l-254 363l61 43l309 -391v-27z" />
+<glyph unicode="¼" horiz-adv-x="1516" d="M59 0zM333 1462h92v-876h-98v547q0 99 12 233q-26 -23 -233 -145l-47 77zM1148 1462l-811 -1462h-94l811 1462h94zM1392 242h-129v-241h-90v241h-413v60l407 581h96v-563h129v-78zM1173 320v221q0 132 8 232q-6 -12 -21.5 -35.5t-295.5 -417.5h309z" />
+<glyph unicode="½" horiz-adv-x="1516" d="M11 0zM285 1462h92v-876h-98v547q0 99 12 233q-26 -23 -233 -145l-47 77zM1073 1462l-811 -1462h-94l811 1462h94zM1403 1h-576v78l242 237q125 121 172 193t47 149q0 71 -46.5 112.5t-123.5 41.5q-108 0 -217 -82l-49 65q119 103 270 103q124 0 194 -63.5t70 -174.5 q0 -47 -13 -89t-40 -85.5t-68.5 -90t-308.5 -306.5h447v-88z" />
+<glyph unicode="¾" horiz-adv-x="1516" d="M41 0zM616 1260q0 -78 -44 -131.5t-117 -75.5q186 -45 186 -211q0 -130 -88.5 -201.5t-247.5 -71.5q-144 0 -264 60v88q136 -62 266 -62q115 0 174.5 49t59.5 136q0 83 -59.5 122t-178.5 39h-131v84h135q105 0 158 43.5t53 120.5q0 67 -47 107.5t-127 40.5 q-128 0 -246 -78l-47 70q130 94 293 94q127 0 199.5 -60t72.5 -163zM1300 1462l-811 -1462h-94l811 1462h94zM1495 242h-129v-241h-90v241h-413v60l407 581h96v-563h129v-78zM1276 320v221q0 132 8 232q-6 -12 -21.5 -35.5t-295.5 -417.5h309z" />
+<glyph unicode="¿" horiz-adv-x="862" d="M569 711v-37q0 -125 -39.5 -204.5t-136.5 -164.5l-90 -79q-73 -61 -104 -120.5t-31 -138.5q0 -124 82 -200t221 -76q125 0 233 46l64 27l37 -79q-111 -48 -185.5 -64t-152.5 -16q-184 0 -288.5 99t-104.5 269q0 70 20 124t58.5 102t171.5 159q64 53 98.5 98.5t49.5 94 t15 145.5v15h82zM440 1010q0 98 80 98q82 0 82 -98q0 -53 -23.5 -76t-58.5 -23q-34 0 -57 23t-23 76z" />
+<glyph unicode="À" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM720 1579h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
+<glyph unicode="Á" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM504 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
+<glyph unicode="Â" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM328 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
+<glyph unicode="Ã" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM784 1581q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59 q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
+<glyph unicode="Ä" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM367 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM748 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
+<glyph unicode="Å" horiz-adv-x="1229" d="M0 0zM911 516h-594l-204 -516h-113l588 1468h65l576 -1468h-115zM354 608h523l-199 527q-25 62 -60 172q-27 -96 -59 -174zM836 1610q0 -97 -60 -155t-157 -58t-157 58t-60 155q0 94 60 152.5t157 58.5t157 -59t60 -152zM482 1610q0 -66 37.5 -103.5t99.5 -37.5 t99.5 37.5t37.5 103.5q0 64 -39 101.5t-98 37.5q-62 0 -99.5 -38t-37.5 -101z" />
+<glyph unicode="Æ" horiz-adv-x="1653" d="M1528 0h-717v516h-475l-227 -516h-111l653 1462h877v-94h-615v-553h576v-94h-576v-627h615v-94zM377 608h434v760h-100z" />
+<glyph unicode="Ç" horiz-adv-x="1272" d="M129 0zM831 1391q-275 0 -433 -176t-158 -482q0 -313 149 -486t426 -173q184 0 338 47v-90q-145 -51 -362 -51q-308 0 -485 199t-177 556q0 223 84.5 393t243 262.5t368.5 92.5q214 0 383 -80l-41 -92q-160 80 -336 80zM911 -291q0 -100 -67.5 -150.5t-188.5 -50.5 q-68 0 -94 11v88q30 -10 92 -10q78 0 119 28t41 80q0 94 -193 121l93 174h96l-66 -117q168 -37 168 -174z" />
+<glyph unicode="È" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM697 1579h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
+<glyph unicode="É" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM463 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
+<glyph unicode="Ê" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM315 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
+<glyph unicode="Ë" horiz-adv-x="1130" d="M207 0zM1006 0h-799v1462h799v-94h-697v-553h658v-94h-658v-627h697v-94zM354 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM735 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
+<glyph unicode="Ì" horiz-adv-x="516" d="M0 0zM207 0v1462h102v-1462h-102zM320 1579h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
+<glyph unicode="Í" horiz-adv-x="516" d="M191 0zM207 0v1462h102v-1462h-102zM191 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
+<glyph unicode="Î" horiz-adv-x="516" d="M0 0zM207 0v1462h102v-1462h-102zM-32 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
+<glyph unicode="Ï" horiz-adv-x="516" d="M5 0zM207 0v1462h102v-1462h-102zM5 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM386 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
+<glyph unicode="Ð" horiz-adv-x="1466" d="M1317 745q0 -368 -193 -556.5t-567 -188.5h-350v678h-160v94h160v690h395q350 0 532.5 -183t182.5 -534zM1206 741q0 314 -159.5 472.5t-468.5 158.5h-269v-600h406v-94h-406v-588h242q655 0 655 651z" />
+<glyph unicode="Ñ" horiz-adv-x="1477" d="M207 0zM1270 0h-103l-866 1298h-8q12 -232 12 -350v-948h-98v1462h102l865 -1296h6q-9 180 -9 342v954h99v-1462zM897 1581q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59 q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
+<glyph unicode="Ò" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM885 1579h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
+<glyph unicode="Ó" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM686 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
+<glyph unicode="Ô" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM492 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
+<glyph unicode="Õ" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM940 1581q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
+<glyph unicode="Ö" horiz-adv-x="1565" d="M129 0zM1436 733q0 -348 -174 -550.5t-480 -202.5q-305 0 -479 202.5t-174 552.5q0 349 175.5 549.5t479.5 200.5q306 0 479 -201.5t173 -550.5zM240 733q0 -314 140 -485.5t402 -171.5q264 0 403.5 170t139.5 487q0 316 -139.5 484.5t-401.5 168.5q-261 0 -402.5 -170 t-141.5 -483zM529 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM910 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
+<glyph unicode="×" d="M584 780l409 408l58 -58l-408 -407l406 -408l-58 -57l-407 408l-406 -408l-57 57l405 408l-407 407l57 58z" />
+<glyph unicode="Ø" horiz-adv-x="1565" d="M1436 733q0 -348 -174 -550.5t-480 -202.5q-236 0 -395 120l-86 -120l-74 59l90 127q-188 200 -188 569q0 349 175.5 549.5t479.5 200.5q232 0 392 -121l108 152l72 -60l-111 -153q191 -207 191 -570zM1325 733q0 315 -139 486l-742 -1037q133 -106 338 -106 q264 0 403.5 170t139.5 487zM240 733q0 -312 139 -483l739 1034q-133 102 -334 102q-261 0 -402.5 -170t-141.5 -483z" />
+<glyph unicode="Ù" horiz-adv-x="1473" d="M190 0zM1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM833 1579h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
+<glyph unicode="Ú" horiz-adv-x="1473" d="M190 0zM1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM633 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
+<glyph unicode="Û" horiz-adv-x="1473" d="M190 0zM1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM444 1595q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207 q-108 -114 -221 -207h-70v16z" />
+<glyph unicode="Ü" horiz-adv-x="1473" d="M190 0zM1282 1462v-946q0 -252 -146 -394t-407 -142q-254 0 -396.5 142.5t-142.5 397.5v942h103v-946q0 -211 117 -328.5t331 -117.5q209 0 324 115.5t115 320.5v956h102zM481 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM862 1727q0 46 15.5 66 t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
+<glyph unicode="Ý" horiz-adv-x="1081" d="M0 0zM543 662l428 800h110l-487 -897v-565h-105v557l-489 905h117zM434 1595q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
+<glyph unicode="Þ" horiz-adv-x="1198" d="M1087 778q0 -212 -144 -325t-408 -113h-226v-340h-102v1462h102v-264h256q522 0 522 -420zM309 428h201q247 0 357 81.5t110 264.5q0 169 -104 250.5t-322 81.5h-242v-678z" />
+<glyph unicode="ß" horiz-adv-x="1194" d="M961 1284q0 -139 -139 -250q-81 -64 -110.5 -100.5t-29.5 -75.5q0 -44 14.5 -68t51.5 -57t102 -78q106 -75 151.5 -124.5t68 -103t22.5 -120.5q0 -156 -88 -241.5t-246 -85.5q-95 0 -174.5 18.5t-126.5 48.5v107q65 -38 148.5 -62t152.5 -24q114 0 174.5 54.5t60.5 160.5 q0 83 -39 144t-149 136q-127 87 -175 147t-48 146q0 60 32.5 110t106.5 108q74 57 106.5 105.5t32.5 106.5q0 93 -70 143t-202 50q-145 0 -226 -69t-81 -196v-1214h-99v1206q0 173 103.5 267t292.5 94q188 0 285.5 -72.5t97.5 -210.5z" />
+<glyph unicode="à" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM638 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
+<glyph unicode="á" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM422 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
+<glyph unicode="â" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM251 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
+<glyph unicode="ã" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM697 1243q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5 h76q-16 -116 -69 -177t-132 -61z" />
+<glyph unicode="ä" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM282 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM663 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
+<glyph unicode="å" horiz-adv-x="1085" d="M98 0zM842 0l-25 172h-8q-82 -105 -168.5 -148.5t-204.5 -43.5q-160 0 -249 82t-89 227q0 159 132.5 247t383.5 93l207 6v72q0 155 -63 234t-203 79q-151 0 -313 -84l-37 86q179 84 354 84q179 0 267.5 -93t88.5 -290v-723h-73zM442 70q174 0 274.5 99.5t100.5 276.5v107 l-190 -8q-229 -11 -326.5 -71.5t-97.5 -188.5q0 -102 62.5 -158.5t176.5 -56.5zM759 1456q0 -97 -60 -155t-157 -58t-157 58t-60 155q0 94 60 152.5t157 58.5t157 -59t60 -152zM405 1456q0 -66 37.5 -103.5t99.5 -37.5t99.5 37.5t37.5 103.5q0 64 -39 101.5t-98 37.5 q-62 0 -99.5 -38t-37.5 -101z" />
+<glyph unicode="æ" horiz-adv-x="1731" d="M1243 -20q-295 0 -397 256q-68 -133 -168 -194.5t-252 -61.5q-156 0 -242 82.5t-86 226.5q0 154 125 243t377 97l201 6v72q0 155 -61.5 234t-198.5 79q-148 0 -305 -84l-37 86q173 84 346 84q261 0 325 -211q111 213 347 213q184 0 289.5 -134.5t105.5 -363.5v-80h-715 q0 -460 348 -460q85 0 150 12t174 57v-90q-92 -41 -165 -55t-161 -14zM434 70q169 0 266 99.5t97 276.5v107l-187 -8q-219 -11 -313 -71.5t-94 -188.5q0 -102 61 -158.5t170 -56.5zM1217 1020q-284 0 -314 -402h604q0 188 -77.5 295t-212.5 107z" />
+<glyph unicode="ç" horiz-adv-x="973" d="M119 0zM616 -20q-233 0 -365 147t-132 410q0 270 137 420.5t375 150.5q141 0 270 -49l-27 -88q-141 47 -245 47q-200 0 -303 -123.5t-103 -355.5q0 -220 103 -344.5t288 -124.5q148 0 275 53v-92q-104 -51 -273 -51zM723 -291q0 -100 -67.5 -150.5t-188.5 -50.5 q-68 0 -94 11v88q30 -10 92 -10q78 0 119 28t41 80q0 94 -193 121l93 174h96l-66 -117q168 -37 168 -174z" />
+<glyph unicode="è" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM685 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
+<glyph unicode="é" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM452 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
+<glyph unicode="ê" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM290 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
+<glyph unicode="ë" horiz-adv-x="1124" d="M119 0zM621 -20q-237 0 -369.5 146t-132.5 409q0 260 128 416.5t345 156.5q192 0 303 -134t111 -364v-80h-783q2 -224 104.5 -342t293.5 -118q93 0 163.5 13t178.5 56v-90q-92 -40 -170 -54.5t-172 -14.5zM592 1020q-157 0 -252 -103.5t-111 -298.5h672q0 189 -82 295.5 t-227 106.5zM331 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM712 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
+<glyph unicode="ì" horiz-adv-x="463" d="M0 0zM281 0h-99v1087h99v-1087zM349 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
+<glyph unicode="í" horiz-adv-x="463" d="M107 0zM281 0h-99v1087h99v-1087zM107 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
+<glyph unicode="î" horiz-adv-x="463" d="M0 0zM281 0h-99v1087h99v-1087zM-58 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
+<glyph unicode="ï" horiz-adv-x="463" d="M0 0zM281 0h-99v1087h99v-1087zM-21 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM360 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
+<glyph unicode="ð" horiz-adv-x="1174" d="M1055 559q0 -276 -124 -427.5t-349 -151.5q-214 0 -339.5 130t-125.5 361q0 228 126.5 357.5t342.5 129.5q108 0 187.5 -33t148.5 -96l4 2q-64 270 -269 459l-270 -157l-49 77l244 146q-86 62 -199 119l45 81q147 -69 248 -145l225 137l49 -84l-202 -121 q154 -151 230.5 -353t76.5 -431zM950 557q0 146 -97 228.5t-267 82.5q-185 0 -275 -100.5t-90 -304.5q0 -186 94.5 -289.5t268.5 -103.5q179 0 272.5 123t93.5 364z" />
+<glyph unicode="ñ" horiz-adv-x="1208" d="M182 0zM940 0v705q0 164 -69 238.5t-214 74.5q-195 0 -285.5 -98.5t-90.5 -319.5v-600h-99v1087h84l19 -149h6q106 170 377 170q370 0 370 -397v-711h-98zM779 1243q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5 t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
+<glyph unicode="ò" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM718 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
+<glyph unicode="ó" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM499 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
+<glyph unicode="ô" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM309 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
+<glyph unicode="õ" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM761 1243q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
+<glyph unicode="ö" horiz-adv-x="1200" d="M119 0zM1081 545q0 -266 -129 -415.5t-356 -149.5q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q224 0 351.5 -150.5t127.5 -412.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5t278.5 125.5t98.5 349.5q0 225 -99.5 349t-279.5 124t-277.5 -123.5 t-97.5 -349.5zM346 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM727 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
+<glyph unicode="÷" d="M111 682v82h948v-82h-948zM504 1075q0 99 80 99q82 0 82 -99q0 -52 -23.5 -75t-58.5 -23q-34 0 -57 23t-23 75zM504 371q0 98 80 98q82 0 82 -98q0 -53 -23.5 -76t-58.5 -23q-34 0 -57 23t-23 76z" />
+<glyph unicode="ø" horiz-adv-x="1200" d="M1081 545q0 -266 -129 -415.5t-356 -149.5q-173 0 -291 98l-86 -113l-72 58l93 120q-121 153 -121 402q0 266 129 414.5t354 148.5q179 0 301 -104l96 124l74 -55l-104 -137q112 -147 112 -391zM223 545q0 -200 78 -322l543 705q-98 90 -246 90q-180 0 -277.5 -123.5 t-97.5 -349.5zM977 545q0 190 -72 309l-543 -702q94 -82 238 -82q180 0 278.5 125.5t98.5 349.5z" />
+<glyph unicode="ù" horiz-adv-x="1208" d="M170 0zM268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98zM687 1241h-69q-96 79 -188.5 171.5t-125.5 139.5v17h142q26 -48 98.5 -142t142.5 -170v-16z" />
+<glyph unicode="ú" horiz-adv-x="1208" d="M170 0zM268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98zM495 1257q73 79 144.5 171.5t97.5 140.5h141v-17q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
+<glyph unicode="û" horiz-adv-x="1208" d="M170 0zM268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98zM313 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70 v16z" />
+<glyph unicode="ü" horiz-adv-x="1208" d="M170 0zM268 1087v-704q0 -164 69 -238.5t214 -74.5q194 0 285.5 98t91.5 319v600h98v-1087h-84l-18 150h-6q-106 -170 -377 -170q-371 0 -371 397v710h98zM350 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM731 1389q0 46 15.5 66t47.5 20q64 0 64 -86 t-64 -86q-63 0 -63 86z" />
+<glyph unicode="ý" horiz-adv-x="940" d="M0 0zM0 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5zM361 1257q73 79 144.5 171.5t97.5 140.5h141v-17 q-36 -52 -122.5 -138t-190.5 -173h-70v16z" />
+<glyph unicode="þ" horiz-adv-x="1219" d="M281 918q114 190 368 190q220 0 335.5 -144.5t115.5 -420.5q0 -268 -121.5 -415.5t-331.5 -147.5q-251 0 -366 188h-7l3 -84q4 -74 4 -162v-414h-99v2048h99v-391l-7 -247h7zM645 68q167 0 258.5 124t91.5 347q0 479 -348 479q-193 0 -279.5 -105t-86.5 -354v-18 q0 -255 85.5 -364t278.5 -109z" />
+<glyph unicode="ÿ" horiz-adv-x="940" d="M0 0zM0 1087h102l230 -610q105 -281 133 -379h6q42 129 137 385l230 604h102l-487 -1263q-59 -154 -99 -208t-93.5 -81t-129.5 -27q-57 0 -127 21v86q58 -16 125 -16q51 0 90 24t70.5 74.5t73 160t53.5 142.5zM214 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86 q-63 0 -63 86zM595 1389q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
+<glyph unicode="ı" horiz-adv-x="463" d="M281 0h-99v1087h99v-1087z" />
+<glyph unicode="Œ" horiz-adv-x="1839" d="M1714 0h-756q-76 -16 -176 -16q-305 0 -479 200t-174 551q0 347 174.5 545.5t480.5 198.5q78 0 183 -17h747v-94h-655v-553h616v-94h-616v-627h655v-94zM782 80q109 0 174 18v1266q-62 16 -172 16q-262 0 -403 -167.5t-141 -479.5q0 -315 140.5 -484t401.5 -169z" />
+<glyph unicode="œ" horiz-adv-x="1942" d="M1438 -20q-156 0 -266.5 67.5t-165.5 198.5q-59 -128 -158 -197t-252 -69q-143 0 -252 69t-167 198t-58 298q0 266 129 414.5t354 148.5q151 0 251 -70t157 -209q110 279 399 279q192 0 303 -134t111 -364v-80h-762q2 -230 100.5 -345t276.5 -115q93 0 163.5 13t178.5 56 v-90q-92 -40 -170 -54.5t-172 -14.5zM223 545q0 -224 98.5 -349.5t278.5 -125.5q174 0 265 122.5t91 352.5q0 224 -93 348.5t-265 124.5q-180 0 -277.5 -123.5t-97.5 -349.5zM1409 1020q-155 0 -242 -104t-102 -298h653q0 189 -82 295.5t-227 106.5z" />
+<glyph unicode="Ÿ" horiz-adv-x="1081" d="M0 0zM543 662l428 800h110l-487 -897v-565h-105v557l-489 905h117zM288 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86zM669 1727q0 46 15.5 66t47.5 20q64 0 64 -86t-64 -86q-63 0 -63 86z" />
+<glyph unicode="ˆ" horiz-adv-x="1182" d="M299 1257q62 67 131.5 156t110.5 156h98q68 -120 242 -312v-16h-70q-122 101 -221 207q-108 -114 -221 -207h-70v16z" />
+<glyph unicode="˚" horiz-adv-x="1182" d="M805 1456q0 -97 -60 -155t-157 -58t-157 58t-60 155q0 94 60 152.5t157 58.5t157 -59t60 -152zM451 1456q0 -66 37.5 -103.5t99.5 -37.5t99.5 37.5t37.5 103.5q0 64 -39 101.5t-98 37.5q-62 0 -99.5 -38t-37.5 -101z" />
+<glyph unicode="˜" horiz-adv-x="1182" d="M780 1243q-36 0 -75 18.5t-101 71.5q-32 26 -62.5 46t-62.5 20q-45 0 -75 -34.5t-48 -121.5h-73q10 111 63 174.5t137 63.5q48 0 88 -25t82 -59q34 -28 66 -50t61 -22q46 0 77 36.5t48 119.5h76q-16 -116 -69 -177t-132 -61z" />
+<glyph unicode=" " horiz-adv-x="953" />
+<glyph unicode=" " horiz-adv-x="1907" />
+<glyph unicode=" " horiz-adv-x="953" />
+<glyph unicode=" " horiz-adv-x="1907" />
+<glyph unicode=" " horiz-adv-x="635" />
+<glyph unicode=" " horiz-adv-x="476" />
+<glyph unicode=" " horiz-adv-x="317" />
+<glyph unicode=" " horiz-adv-x="317" />
+<glyph unicode=" " horiz-adv-x="238" />
+<glyph unicode=" " horiz-adv-x="381" />
+<glyph unicode=" " horiz-adv-x="105" />
+<glyph unicode="‐" horiz-adv-x="659" d="M92 512v82h475v-82h-475z" />
+<glyph unicode="‑" horiz-adv-x="659" d="M92 512v82h475v-82h-475z" />
+<glyph unicode="‒" horiz-adv-x="659" d="M92 512v82h475v-82h-475z" />
+<glyph unicode="–" horiz-adv-x="1024" d="M82 512v82h860v-82h-860z" />
+<glyph unicode="—" horiz-adv-x="2048" d="M82 512v82h1884v-82h-1884z" />
+<glyph unicode="‘" horiz-adv-x="297" d="M41 961l-12 20q32 112 81.5 251t92.5 230h65q-30 -101 -64.5 -257t-45.5 -244h-117z" />
+<glyph unicode="’" horiz-adv-x="297" d="M256 1462l12 -20q-75 -265 -174 -481h-65q29 96 61 241.5t49 259.5h117z" />
+<glyph unicode="‚" horiz-adv-x="451" d="M68 0zM295 238l12 -20q-75 -265 -174 -481h-65q29 96 61 241.5t49 259.5h117z" />
+<glyph unicode="“" horiz-adv-x="614" d="M358 961l-12 20q34 120 83 255t91 226h66q-30 -98 -63 -248.5t-48 -252.5h-117zM41 961l-12 20q32 112 81.5 251t92.5 230h65q-30 -101 -64.5 -257t-45.5 -244h-117z" />
+<glyph unicode="”" horiz-adv-x="614" d="M256 1462l12 -20q-75 -265 -174 -481h-65q29 96 61 241.5t49 259.5h117zM573 1462l13 -20q-36 -128 -85 -261t-89 -220h-66q30 98 63 248.5t48 252.5h116z" />
+<glyph unicode="„" horiz-adv-x="768" d="M68 0zM295 238l12 -20q-75 -265 -174 -481h-65q29 96 61 241.5t49 259.5h117zM612 238l13 -20q-36 -128 -85 -261t-89 -220h-66q30 98 63 248.5t48 252.5h116z" />
+<glyph unicode="•" horiz-adv-x="770" d="M231 748q0 89 40.5 134.5t113.5 45.5t113.5 -47t40.5 -133q0 -85 -41 -133t-113 -48t-113 47t-41 134z" />
+<glyph unicode="…" horiz-adv-x="1466" d="M162 0zM162 78q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98zM651 78q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98zM1141 78q0 98 80 98q82 0 82 -98t-82 -98q-80 0 -80 98z" />
+<glyph unicode=" " horiz-adv-x="381" />
+<glyph unicode="‹" horiz-adv-x="524" d="M82 543l309 393l62 -43l-254 -363l254 -362l-62 -43l-309 391v27z" />
+<glyph unicode="›" horiz-adv-x="524" d="M442 518l-309 -393l-61 43l254 362l-254 363l61 43l309 -391v-27z" />
+<glyph unicode="⁄" horiz-adv-x="246" d="M573 1462l-811 -1462h-94l811 1462h94z" />
+<glyph unicode=" " horiz-adv-x="476" />
+<glyph unicode="⁴" horiz-adv-x="688" d="M657 827h-129v-241h-90v241h-413v60l407 581h96v-563h129v-78zM438 905v221q0 132 8 232q-6 -12 -21.5 -35.5t-295.5 -417.5h309z" />
+<glyph unicode="€" d="M803 1397q-174 0 -288 -125.5t-155 -364.5h502v-82h-510l-4 -104v-24q0 -65 4 -87h449v-82h-443q30 -217 147.5 -338.5t301.5 -121.5q148 0 287 65v-94q-81 -34 -150.5 -46.5t-140.5 -12.5q-228 0 -367.5 140t-181.5 408h-180v82h172q-4 38 -4 113l4 102h-172v82h184 q39 272 183 425t362 153q88 0 161 -17t148 -57l-39 -86q-132 72 -270 72z" />
+<glyph unicode="™" horiz-adv-x="1485" d="M313 741h-86v643h-217v78h522v-78h-219v-643zM913 741l-221 609h-6l4 -201v-408h-82v721h125l221 -606l224 606h125v-721h-86v398l4 207h-7l-227 -605h-74z" />
+<glyph unicode="−" d="M111 682v82h948v-82h-948z" />
+<glyph unicode="" horiz-adv-x="1085" d="M0 1085h1085v-1085h-1085v1085z" />
+<glyph horiz-adv-x="1219" d="M0 0z" />
+<hkern u1=""" u2="Ÿ" k="-20" />
+<hkern u1=""" u2="œ" k="123" />
+<hkern u1=""" u2="ü" k="61" />
+<hkern u1=""" u2="û" k="61" />
+<hkern u1=""" u2="ú" k="61" />
+<hkern u1=""" u2="ù" k="61" />
+<hkern u1=""" u2="ø" k="123" />
+<hkern u1=""" u2="ö" k="123" />
+<hkern u1=""" u2="õ" k="123" />
+<hkern u1=""" u2="ô" k="123" />
+<hkern u1=""" u2="ó" k="123" />
+<hkern u1=""" u2="ò" k="123" />
+<hkern u1=""" u2="ë" k="123" />
+<hkern u1=""" u2="ê" k="123" />
+<hkern u1=""" u2="é" k="123" />
+<hkern u1=""" u2="è" k="123" />
+<hkern u1=""" u2="ç" k="123" />
+<hkern u1=""" u2="æ" k="82" />
+<hkern u1=""" u2="å" k="82" />
+<hkern u1=""" u2="ä" k="82" />
+<hkern u1=""" u2="ã" k="82" />
+<hkern u1=""" u2="â" k="82" />
+<hkern u1=""" u2="á" k="82" />
+<hkern u1=""" u2="à" k="123" />
+<hkern u1=""" u2="Ý" k="-20" />
+<hkern u1=""" u2="Å" k="143" />
+<hkern u1=""" u2="Ä" k="143" />
+<hkern u1=""" u2="Ã" k="143" />
+<hkern u1=""" u2="Â" k="143" />
+<hkern u1=""" u2="Á" k="143" />
+<hkern u1=""" u2="À" k="143" />
+<hkern u1=""" u2="u" k="61" />
+<hkern u1=""" u2="s" k="61" />
+<hkern u1=""" u2="r" k="61" />
+<hkern u1=""" u2="q" k="123" />
+<hkern u1=""" u2="p" k="61" />
+<hkern u1=""" u2="o" k="123" />
+<hkern u1=""" u2="n" k="61" />
+<hkern u1=""" u2="m" k="61" />
+<hkern u1=""" u2="g" k="61" />
+<hkern u1=""" u2="e" k="123" />
+<hkern u1=""" u2="d" k="123" />
+<hkern u1=""" u2="c" k="123" />
+<hkern u1=""" u2="a" k="82" />
+<hkern u1=""" u2="Y" k="-20" />
+<hkern u1=""" u2="W" k="-41" />
+<hkern u1=""" u2="V" k="-41" />
+<hkern u1=""" u2="T" k="-41" />
+<hkern u1=""" u2="A" k="143" />
+<hkern u1="'" u2="Ÿ" k="-20" />
+<hkern u1="'" u2="œ" k="123" />
+<hkern u1="'" u2="ü" k="61" />
+<hkern u1="'" u2="û" k="61" />
+<hkern u1="'" u2="ú" k="61" />
+<hkern u1="'" u2="ù" k="61" />
+<hkern u1="'" u2="ø" k="123" />
+<hkern u1="'" u2="ö" k="123" />
+<hkern u1="'" u2="õ" k="123" />
+<hkern u1="'" u2="ô" k="123" />
+<hkern u1="'" u2="ó" k="123" />
+<hkern u1="'" u2="ò" k="123" />
+<hkern u1="'" u2="ë" k="123" />
+<hkern u1="'" u2="ê" k="123" />
+<hkern u1="'" u2="é" k="123" />
+<hkern u1="'" u2="è" k="123" />
+<hkern u1="'" u2="ç" k="123" />
+<hkern u1="'" u2="æ" k="82" />
+<hkern u1="'" u2="å" k="82" />
+<hkern u1="'" u2="ä" k="82" />
+<hkern u1="'" u2="ã" k="82" />
+<hkern u1="'" u2="â" k="82" />
+<hkern u1="'" u2="á" k="82" />
+<hkern u1="'" u2="à" k="123" />
+<hkern u1="'" u2="Ý" k="-20" />
+<hkern u1="'" u2="Å" k="143" />
+<hkern u1="'" u2="Ä" k="143" />
+<hkern u1="'" u2="Ã" k="143" />
+<hkern u1="'" u2="Â" k="143" />
+<hkern u1="'" u2="Á" k="143" />
+<hkern u1="'" u2="À" k="143" />
+<hkern u1="'" u2="u" k="61" />
+<hkern u1="'" u2="s" k="61" />
+<hkern u1="'" u2="r" k="61" />
+<hkern u1="'" u2="q" k="123" />
+<hkern u1="'" u2="p" k="61" />
+<hkern u1="'" u2="o" k="123" />
+<hkern u1="'" u2="n" k="61" />
+<hkern u1="'" u2="m" k="61" />
+<hkern u1="'" u2="g" k="61" />
+<hkern u1="'" u2="e" k="123" />
+<hkern u1="'" u2="d" k="123" />
+<hkern u1="'" u2="c" k="123" />
+<hkern u1="'" u2="a" k="82" />
+<hkern u1="'" u2="Y" k="-20" />
+<hkern u1="'" u2="W" k="-41" />
+<hkern u1="'" u2="V" k="-41" />
+<hkern u1="'" u2="T" k="-41" />
+<hkern u1="'" u2="A" k="143" />
+<hkern u1="(" u2="J" k="-184" />
+<hkern u1="," u2="Ÿ" k="123" />
+<hkern u1="," u2="Œ" k="102" />
+<hkern u1="," u2="Ý" k="123" />
+<hkern u1="," u2="Ü" k="41" />
+<hkern u1="," u2="Û" k="41" />
+<hkern u1="," u2="Ú" k="41" />
+<hkern u1="," u2="Ù" k="41" />
+<hkern u1="," u2="Ø" k="102" />
+<hkern u1="," u2="Ö" k="102" />
+<hkern u1="," u2="Õ" k="102" />
+<hkern u1="," u2="Ô" k="102" />
+<hkern u1="," u2="Ó" k="102" />
+<hkern u1="," u2="Ò" k="102" />
+<hkern u1="," u2="Ç" k="102" />
+<hkern u1="," u2="Y" k="123" />
+<hkern u1="," u2="W" k="123" />
+<hkern u1="," u2="V" k="123" />
+<hkern u1="," u2="U" k="41" />
+<hkern u1="," u2="T" k="143" />
+<hkern u1="," u2="Q" k="102" />
+<hkern u1="," u2="O" k="102" />
+<hkern u1="," u2="G" k="102" />
+<hkern u1="," u2="C" k="102" />
+<hkern u1="-" u2="T" k="82" />
+<hkern u1="." u2="Ÿ" k="123" />
+<hkern u1="." u2="Œ" k="102" />
+<hkern u1="." u2="Ý" k="123" />
+<hkern u1="." u2="Ü" k="41" />
+<hkern u1="." u2="Û" k="41" />
+<hkern u1="." u2="Ú" k="41" />
+<hkern u1="." u2="Ù" k="41" />
+<hkern u1="." u2="Ø" k="102" />
+<hkern u1="." u2="Ö" k="102" />
+<hkern u1="." u2="Õ" k="102" />
+<hkern u1="." u2="Ô" k="102" />
+<hkern u1="." u2="Ó" k="102" />
+<hkern u1="." u2="Ò" k="102" />
+<hkern u1="." u2="Ç" k="102" />
+<hkern u1="." u2="Y" k="123" />
+<hkern u1="." u2="W" k="123" />
+<hkern u1="." u2="V" k="123" />
+<hkern u1="." u2="U" k="41" />
+<hkern u1="." u2="T" k="143" />
+<hkern u1="." u2="Q" k="102" />
+<hkern u1="." u2="O" k="102" />
+<hkern u1="." u2="G" k="102" />
+<hkern u1="." u2="C" k="102" />
+<hkern u1="A" u2="”" k="143" />
+<hkern u1="A" u2="’" k="143" />
+<hkern u1="A" u2="Ÿ" k="123" />
+<hkern u1="A" u2="Œ" k="41" />
+<hkern u1="A" u2="Ý" k="123" />
+<hkern u1="A" u2="Ø" k="41" />
+<hkern u1="A" u2="Ö" k="41" />
+<hkern u1="A" u2="Õ" k="41" />
+<hkern u1="A" u2="Ô" k="41" />
+<hkern u1="A" u2="Ó" k="41" />
+<hkern u1="A" u2="Ò" k="41" />
+<hkern u1="A" u2="Ç" k="41" />
+<hkern u1="A" u2="Y" k="123" />
+<hkern u1="A" u2="W" k="82" />
+<hkern u1="A" u2="V" k="82" />
+<hkern u1="A" u2="T" k="143" />
+<hkern u1="A" u2="Q" k="41" />
+<hkern u1="A" u2="O" k="41" />
+<hkern u1="A" u2="J" k="-266" />
+<hkern u1="A" u2="G" k="41" />
+<hkern u1="A" u2="C" k="41" />
+<hkern u1="A" u2="'" k="143" />
+<hkern u1="A" u2=""" k="143" />
+<hkern u1="B" u2="„" k="82" />
+<hkern u1="B" u2="‚" k="82" />
+<hkern u1="B" u2="Ÿ" k="20" />
+<hkern u1="B" u2="Ý" k="20" />
+<hkern u1="B" u2="Å" k="41" />
+<hkern u1="B" u2="Ä" k="41" />
+<hkern u1="B" u2="Ã" k="41" />
+<hkern u1="B" u2="Â" k="41" />
+<hkern u1="B" u2="Á" k="41" />
+<hkern u1="B" u2="À" k="41" />
+<hkern u1="B" u2="Z" k="20" />
+<hkern u1="B" u2="Y" k="20" />
+<hkern u1="B" u2="X" k="41" />
+<hkern u1="B" u2="W" k="20" />
+<hkern u1="B" u2="V" k="20" />
+<hkern u1="B" u2="T" k="61" />
+<hkern u1="B" u2="A" k="41" />
+<hkern u1="B" u2="." k="82" />
+<hkern u1="B" u2="," k="82" />
+<hkern u1="C" u2="Œ" k="41" />
+<hkern u1="C" u2="Ø" k="41" />
+<hkern u1="C" u2="Ö" k="41" />
+<hkern u1="C" u2="Õ" k="41" />
+<hkern u1="C" u2="Ô" k="41" />
+<hkern u1="C" u2="Ó" k="41" />
+<hkern u1="C" u2="Ò" k="41" />
+<hkern u1="C" u2="Ç" k="41" />
+<hkern u1="C" u2="Q" k="41" />
+<hkern u1="C" u2="O" k="41" />
+<hkern u1="C" u2="G" k="41" />
+<hkern u1="C" u2="C" k="41" />
+<hkern u1="D" u2="„" k="82" />
+<hkern u1="D" u2="‚" k="82" />
+<hkern u1="D" u2="Ÿ" k="20" />
+<hkern u1="D" u2="Ý" k="20" />
+<hkern u1="D" u2="Å" k="41" />
+<hkern u1="D" u2="Ä" k="41" />
+<hkern u1="D" u2="Ã" k="41" />
+<hkern u1="D" u2="Â" k="41" />
+<hkern u1="D" u2="Á" k="41" />
+<hkern u1="D" u2="À" k="41" />
+<hkern u1="D" u2="Z" k="20" />
+<hkern u1="D" u2="Y" k="20" />
+<hkern u1="D" u2="X" k="41" />
+<hkern u1="D" u2="W" k="20" />
+<hkern u1="D" u2="V" k="20" />
+<hkern u1="D" u2="T" k="61" />
+<hkern u1="D" u2="A" k="41" />
+<hkern u1="D" u2="." k="82" />
+<hkern u1="D" u2="," k="82" />
+<hkern u1="E" u2="J" k="-123" />
+<hkern u1="F" u2="„" k="123" />
+<hkern u1="F" u2="‚" k="123" />
+<hkern u1="F" u2="Å" k="41" />
+<hkern u1="F" u2="Ä" k="41" />
+<hkern u1="F" u2="Ã" k="41" />
+<hkern u1="F" u2="Â" k="41" />
+<hkern u1="F" u2="Á" k="41" />
+<hkern u1="F" u2="À" k="41" />
+<hkern u1="F" u2="A" k="41" />
+<hkern u1="F" u2="?" k="-41" />
+<hkern u1="F" u2="." k="123" />
+<hkern u1="F" u2="," k="123" />
+<hkern u1="K" u2="Œ" k="41" />
+<hkern u1="K" u2="Ø" k="41" />
+<hkern u1="K" u2="Ö" k="41" />
+<hkern u1="K" u2="Õ" k="41" />
+<hkern u1="K" u2="Ô" k="41" />
+<hkern u1="K" u2="Ó" k="41" />
+<hkern u1="K" u2="Ò" k="41" />
+<hkern u1="K" u2="Ç" k="41" />
+<hkern u1="K" u2="Q" k="41" />
+<hkern u1="K" u2="O" k="41" />
+<hkern u1="K" u2="G" k="41" />
+<hkern u1="K" u2="C" k="41" />
+<hkern u1="L" u2="”" k="164" />
+<hkern u1="L" u2="’" k="164" />
+<hkern u1="L" u2="Ÿ" k="61" />
+<hkern u1="L" u2="Œ" k="41" />
+<hkern u1="L" u2="Ý" k="61" />
+<hkern u1="L" u2="Ü" k="20" />
+<hkern u1="L" u2="Û" k="20" />
+<hkern u1="L" u2="Ú" k="20" />
+<hkern u1="L" u2="Ù" k="20" />
+<hkern u1="L" u2="Ø" k="41" />
+<hkern u1="L" u2="Ö" k="41" />
+<hkern u1="L" u2="Õ" k="41" />
+<hkern u1="L" u2="Ô" k="41" />
+<hkern u1="L" u2="Ó" k="41" />
+<hkern u1="L" u2="Ò" k="41" />
+<hkern u1="L" u2="Ç" k="41" />
+<hkern u1="L" u2="Y" k="61" />
+<hkern u1="L" u2="W" k="41" />
+<hkern u1="L" u2="V" k="41" />
+<hkern u1="L" u2="U" k="20" />
+<hkern u1="L" u2="T" k="41" />
+<hkern u1="L" u2="Q" k="41" />
+<hkern u1="L" u2="O" k="41" />
+<hkern u1="L" u2="G" k="41" />
+<hkern u1="L" u2="C" k="41" />
+<hkern u1="L" u2="'" k="164" />
+<hkern u1="L" u2=""" k="164" />
+<hkern u1="O" u2="„" k="82" />
+<hkern u1="O" u2="‚" k="82" />
+<hkern u1="O" u2="Ÿ" k="20" />
+<hkern u1="O" u2="Ý" k="20" />
+<hkern u1="O" u2="Å" k="41" />
+<hkern u1="O" u2="Ä" k="41" />
+<hkern u1="O" u2="Ã" k="41" />
+<hkern u1="O" u2="Â" k="41" />
+<hkern u1="O" u2="Á" k="41" />
+<hkern u1="O" u2="À" k="41" />
+<hkern u1="O" u2="Z" k="20" />
+<hkern u1="O" u2="Y" k="20" />
+<hkern u1="O" u2="X" k="41" />
+<hkern u1="O" u2="W" k="20" />
+<hkern u1="O" u2="V" k="20" />
+<hkern u1="O" u2="T" k="61" />
+<hkern u1="O" u2="A" k="41" />
+<hkern u1="O" u2="." k="82" />
+<hkern u1="O" u2="," k="82" />
+<hkern u1="P" u2="„" k="266" />
+<hkern u1="P" u2="‚" k="266" />
+<hkern u1="P" u2="Å" k="102" />
+<hkern u1="P" u2="Ä" k="102" />
+<hkern u1="P" u2="Ã" k="102" />
+<hkern u1="P" u2="Â" k="102" />
+<hkern u1="P" u2="Á" k="102" />
+<hkern u1="P" u2="À" k="102" />
+<hkern u1="P" u2="Z" k="20" />
+<hkern u1="P" u2="X" k="41" />
+<hkern u1="P" u2="A" k="102" />
+<hkern u1="P" u2="." k="266" />
+<hkern u1="P" u2="," k="266" />
+<hkern u1="Q" u2="„" k="82" />
+<hkern u1="Q" u2="‚" k="82" />
+<hkern u1="Q" u2="Ÿ" k="20" />
+<hkern u1="Q" u2="Ý" k="20" />
+<hkern u1="Q" u2="Å" k="41" />
+<hkern u1="Q" u2="Ä" k="41" />
+<hkern u1="Q" u2="Ã" k="41" />
+<hkern u1="Q" u2="Â" k="41" />
+<hkern u1="Q" u2="Á" k="41" />
+<hkern u1="Q" u2="À" k="41" />
+<hkern u1="Q" u2="Z" k="20" />
+<hkern u1="Q" u2="Y" k="20" />
+<hkern u1="Q" u2="X" k="41" />
+<hkern u1="Q" u2="W" k="20" />
+<hkern u1="Q" u2="V" k="20" />
+<hkern u1="Q" u2="T" k="61" />
+<hkern u1="Q" u2="A" k="41" />
+<hkern u1="Q" u2="." k="82" />
+<hkern u1="Q" u2="," k="82" />
+<hkern u1="T" u2="„" k="123" />
+<hkern u1="T" u2="‚" k="123" />
+<hkern u1="T" u2="—" k="82" />
+<hkern u1="T" u2="–" k="82" />
+<hkern u1="T" u2="œ" k="143" />
+<hkern u1="T" u2="Œ" k="41" />
+<hkern u1="T" u2="ý" k="41" />
+<hkern u1="T" u2="ü" k="102" />
+<hkern u1="T" u2="û" k="102" />
+<hkern u1="T" u2="ú" k="102" />
+<hkern u1="T" u2="ù" k="102" />
+<hkern u1="T" u2="ø" k="143" />
+<hkern u1="T" u2="ö" k="143" />
+<hkern u1="T" u2="õ" k="143" />
+<hkern u1="T" u2="ô" k="143" />
+<hkern u1="T" u2="ó" k="143" />
+<hkern u1="T" u2="ò" k="143" />
+<hkern u1="T" u2="ë" k="143" />
+<hkern u1="T" u2="ê" k="143" />
+<hkern u1="T" u2="é" k="143" />
+<hkern u1="T" u2="è" k="143" />
+<hkern u1="T" u2="ç" k="143" />
+<hkern u1="T" u2="æ" k="164" />
+<hkern u1="T" u2="å" k="164" />
+<hkern u1="T" u2="ä" k="164" />
+<hkern u1="T" u2="ã" k="164" />
+<hkern u1="T" u2="â" k="164" />
+<hkern u1="T" u2="á" k="164" />
+<hkern u1="T" u2="à" k="143" />
+<hkern u1="T" u2="Ø" k="41" />
+<hkern u1="T" u2="Ö" k="41" />
+<hkern u1="T" u2="Õ" k="41" />
+<hkern u1="T" u2="Ô" k="41" />
+<hkern u1="T" u2="Ó" k="41" />
+<hkern u1="T" u2="Ò" k="41" />
+<hkern u1="T" u2="Ç" k="41" />
+<hkern u1="T" u2="Å" k="143" />
+<hkern u1="T" u2="Ä" k="143" />
+<hkern u1="T" u2="Ã" k="143" />
+<hkern u1="T" u2="Â" k="143" />
+<hkern u1="T" u2="Á" k="143" />
+<hkern u1="T" u2="À" k="143" />
+<hkern u1="T" u2="z" k="82" />
+<hkern u1="T" u2="y" k="41" />
+<hkern u1="T" u2="x" k="41" />
+<hkern u1="T" u2="w" k="41" />
+<hkern u1="T" u2="v" k="41" />
+<hkern u1="T" u2="u" k="102" />
+<hkern u1="T" u2="s" k="123" />
+<hkern u1="T" u2="r" k="102" />
+<hkern u1="T" u2="q" k="143" />
+<hkern u1="T" u2="p" k="102" />
+<hkern u1="T" u2="o" k="143" />
+<hkern u1="T" u2="n" k="102" />
+<hkern u1="T" u2="m" k="102" />
+<hkern u1="T" u2="g" k="143" />
+<hkern u1="T" u2="e" k="143" />
+<hkern u1="T" u2="d" k="143" />
+<hkern u1="T" u2="c" k="143" />
+<hkern u1="T" u2="a" k="164" />
+<hkern u1="T" u2="T" k="-41" />
+<hkern u1="T" u2="Q" k="41" />
+<hkern u1="T" u2="O" k="41" />
+<hkern u1="T" u2="G" k="41" />
+<hkern u1="T" u2="C" k="41" />
+<hkern u1="T" u2="A" k="143" />
+<hkern u1="T" u2="?" k="-41" />
+<hkern u1="T" u2="." k="123" />
+<hkern u1="T" u2="-" k="82" />
+<hkern u1="T" u2="," k="123" />
+<hkern u1="U" u2="„" k="41" />
+<hkern u1="U" u2="‚" k="41" />
+<hkern u1="U" u2="Å" k="20" />
+<hkern u1="U" u2="Ä" k="20" />
+<hkern u1="U" u2="Ã" k="20" />
+<hkern u1="U" u2="Â" k="20" />
+<hkern u1="U" u2="Á" k="20" />
+<hkern u1="U" u2="À" k="20" />
+<hkern u1="U" u2="A" k="20" />
+<hkern u1="U" u2="." k="41" />
+<hkern u1="U" u2="," k="41" />
+<hkern u1="V" u2="„" k="102" />
+<hkern u1="V" u2="‚" k="102" />
+<hkern u1="V" u2="œ" k="41" />
+<hkern u1="V" u2="Œ" k="20" />
+<hkern u1="V" u2="ü" k="20" />
+<hkern u1="V" u2="û" k="20" />
+<hkern u1="V" u2="ú" k="20" />
+<hkern u1="V" u2="ù" k="20" />
+<hkern u1="V" u2="ø" k="41" />
+<hkern u1="V" u2="ö" k="41" />
+<hkern u1="V" u2="õ" k="41" />
+<hkern u1="V" u2="ô" k="41" />
+<hkern u1="V" u2="ó" k="41" />
+<hkern u1="V" u2="ò" k="41" />
+<hkern u1="V" u2="ë" k="41" />
+<hkern u1="V" u2="ê" k="41" />
+<hkern u1="V" u2="é" k="41" />
+<hkern u1="V" u2="è" k="41" />
+<hkern u1="V" u2="ç" k="41" />
+<hkern u1="V" u2="æ" k="41" />
+<hkern u1="V" u2="å" k="41" />
+<hkern u1="V" u2="ä" k="41" />
+<hkern u1="V" u2="ã" k="41" />
+<hkern u1="V" u2="â" k="41" />
+<hkern u1="V" u2="á" k="41" />
+<hkern u1="V" u2="à" k="41" />
+<hkern u1="V" u2="Ø" k="20" />
+<hkern u1="V" u2="Ö" k="20" />
+<hkern u1="V" u2="Õ" k="20" />
+<hkern u1="V" u2="Ô" k="20" />
+<hkern u1="V" u2="Ó" k="20" />
+<hkern u1="V" u2="Ò" k="20" />
+<hkern u1="V" u2="Ç" k="20" />
+<hkern u1="V" u2="Å" k="82" />
+<hkern u1="V" u2="Ä" k="82" />
+<hkern u1="V" u2="Ã" k="82" />
+<hkern u1="V" u2="Â" k="82" />
+<hkern u1="V" u2="Á" k="82" />
+<hkern u1="V" u2="À" k="82" />
+<hkern u1="V" u2="u" k="20" />
+<hkern u1="V" u2="s" k="20" />
+<hkern u1="V" u2="r" k="20" />
+<hkern u1="V" u2="q" k="41" />
+<hkern u1="V" u2="p" k="20" />
+<hkern u1="V" u2="o" k="41" />
+<hkern u1="V" u2="n" k="20" />
+<hkern u1="V" u2="m" k="20" />
+<hkern u1="V" u2="g" k="20" />
+<hkern u1="V" u2="e" k="41" />
+<hkern u1="V" u2="d" k="41" />
+<hkern u1="V" u2="c" k="41" />
+<hkern u1="V" u2="a" k="41" />
+<hkern u1="V" u2="Q" k="20" />
+<hkern u1="V" u2="O" k="20" />
+<hkern u1="V" u2="G" k="20" />
+<hkern u1="V" u2="C" k="20" />
+<hkern u1="V" u2="A" k="82" />
+<hkern u1="V" u2="?" k="-41" />
+<hkern u1="V" u2="." k="102" />
+<hkern u1="V" u2="," k="102" />
+<hkern u1="W" u2="„" k="102" />
+<hkern u1="W" u2="‚" k="102" />
+<hkern u1="W" u2="œ" k="41" />
+<hkern u1="W" u2="Œ" k="20" />
+<hkern u1="W" u2="ü" k="20" />
+<hkern u1="W" u2="û" k="20" />
+<hkern u1="W" u2="ú" k="20" />
+<hkern u1="W" u2="ù" k="20" />
+<hkern u1="W" u2="ø" k="41" />
+<hkern u1="W" u2="ö" k="41" />
+<hkern u1="W" u2="õ" k="41" />
+<hkern u1="W" u2="ô" k="41" />
+<hkern u1="W" u2="ó" k="41" />
+<hkern u1="W" u2="ò" k="41" />
+<hkern u1="W" u2="ë" k="41" />
+<hkern u1="W" u2="ê" k="41" />
+<hkern u1="W" u2="é" k="41" />
+<hkern u1="W" u2="è" k="41" />
+<hkern u1="W" u2="ç" k="41" />
+<hkern u1="W" u2="æ" k="41" />
+<hkern u1="W" u2="å" k="41" />
+<hkern u1="W" u2="ä" k="41" />
+<hkern u1="W" u2="ã" k="41" />
+<hkern u1="W" u2="â" k="41" />
+<hkern u1="W" u2="á" k="41" />
+<hkern u1="W" u2="à" k="41" />
+<hkern u1="W" u2="Ø" k="20" />
+<hkern u1="W" u2="Ö" k="20" />
+<hkern u1="W" u2="Õ" k="20" />
+<hkern u1="W" u2="Ô" k="20" />
+<hkern u1="W" u2="Ó" k="20" />
+<hkern u1="W" u2="Ò" k="20" />
+<hkern u1="W" u2="Ç" k="20" />
+<hkern u1="W" u2="Å" k="82" />
+<hkern u1="W" u2="Ä" k="82" />
+<hkern u1="W" u2="Ã" k="82" />
+<hkern u1="W" u2="Â" k="82" />
+<hkern u1="W" u2="Á" k="82" />
+<hkern u1="W" u2="À" k="82" />
+<hkern u1="W" u2="u" k="20" />
+<hkern u1="W" u2="s" k="20" />
+<hkern u1="W" u2="r" k="20" />
+<hkern u1="W" u2="q" k="41" />
+<hkern u1="W" u2="p" k="20" />
+<hkern u1="W" u2="o" k="41" />
+<hkern u1="W" u2="n" k="20" />
+<hkern u1="W" u2="m" k="20" />
+<hkern u1="W" u2="g" k="20" />
+<hkern u1="W" u2="e" k="41" />
+<hkern u1="W" u2="d" k="41" />
+<hkern u1="W" u2="c" k="41" />
+<hkern u1="W" u2="a" k="41" />
+<hkern u1="W" u2="Q" k="20" />
+<hkern u1="W" u2="O" k="20" />
+<hkern u1="W" u2="G" k="20" />
+<hkern u1="W" u2="C" k="20" />
+<hkern u1="W" u2="A" k="82" />
+<hkern u1="W" u2="?" k="-41" />
+<hkern u1="W" u2="." k="102" />
+<hkern u1="W" u2="," k="102" />
+<hkern u1="X" u2="Œ" k="41" />
+<hkern u1="X" u2="Ø" k="41" />
+<hkern u1="X" u2="Ö" k="41" />
+<hkern u1="X" u2="Õ" k="41" />
+<hkern u1="X" u2="Ô" k="41" />
+<hkern u1="X" u2="Ó" k="41" />
+<hkern u1="X" u2="Ò" k="41" />
+<hkern u1="X" u2="Ç" k="41" />
+<hkern u1="X" u2="Q" k="41" />
+<hkern u1="X" u2="O" k="41" />
+<hkern u1="X" u2="G" k="41" />
+<hkern u1="X" u2="C" k="41" />
+<hkern u1="Y" u2="„" k="123" />
+<hkern u1="Y" u2="‚" k="123" />
+<hkern u1="Y" u2="œ" k="102" />
+<hkern u1="Y" u2="Œ" k="41" />
+<hkern u1="Y" u2="ü" k="61" />
+<hkern u1="Y" u2="û" k="61" />
+<hkern u1="Y" u2="ú" k="61" />
+<hkern u1="Y" u2="ù" k="61" />
+<hkern u1="Y" u2="ø" k="102" />
+<hkern u1="Y" u2="ö" k="102" />
+<hkern u1="Y" u2="õ" k="102" />
+<hkern u1="Y" u2="ô" k="102" />
+<hkern u1="Y" u2="ó" k="102" />
+<hkern u1="Y" u2="ò" k="102" />
+<hkern u1="Y" u2="ë" k="102" />
+<hkern u1="Y" u2="ê" k="102" />
+<hkern u1="Y" u2="é" k="102" />
+<hkern u1="Y" u2="è" k="102" />
+<hkern u1="Y" u2="ç" k="102" />
+<hkern u1="Y" u2="æ" k="102" />
+<hkern u1="Y" u2="å" k="102" />
+<hkern u1="Y" u2="ä" k="102" />
+<hkern u1="Y" u2="ã" k="102" />
+<hkern u1="Y" u2="â" k="102" />
+<hkern u1="Y" u2="á" k="102" />
+<hkern u1="Y" u2="à" k="102" />
+<hkern u1="Y" u2="Ø" k="41" />
+<hkern u1="Y" u2="Ö" k="41" />
+<hkern u1="Y" u2="Õ" k="41" />
+<hkern u1="Y" u2="Ô" k="41" />
+<hkern u1="Y" u2="Ó" k="41" />
+<hkern u1="Y" u2="Ò" k="41" />
+<hkern u1="Y" u2="Ç" k="41" />
+<hkern u1="Y" u2="Å" k="123" />
+<hkern u1="Y" u2="Ä" k="123" />
+<hkern u1="Y" u2="Ã" k="123" />
+<hkern u1="Y" u2="Â" k="123" />
+<hkern u1="Y" u2="Á" k="123" />
+<hkern u1="Y" u2="À" k="123" />
+<hkern u1="Y" u2="z" k="41" />
+<hkern u1="Y" u2="u" k="61" />
+<hkern u1="Y" u2="s" k="82" />
+<hkern u1="Y" u2="r" k="61" />
+<hkern u1="Y" u2="q" k="102" />
+<hkern u1="Y" u2="p" k="61" />
+<hkern u1="Y" u2="o" k="102" />
+<hkern u1="Y" u2="n" k="61" />
+<hkern u1="Y" u2="m" k="61" />
+<hkern u1="Y" u2="g" k="41" />
+<hkern u1="Y" u2="e" k="102" />
+<hkern u1="Y" u2="d" k="102" />
+<hkern u1="Y" u2="c" k="102" />
+<hkern u1="Y" u2="a" k="102" />
+<hkern u1="Y" u2="Q" k="41" />
+<hkern u1="Y" u2="O" k="41" />
+<hkern u1="Y" u2="G" k="41" />
+<hkern u1="Y" u2="C" k="41" />
+<hkern u1="Y" u2="A" k="123" />
+<hkern u1="Y" u2="?" k="-41" />
+<hkern u1="Y" u2="." k="123" />
+<hkern u1="Y" u2="," k="123" />
+<hkern u1="Z" u2="Œ" k="20" />
+<hkern u1="Z" u2="Ø" k="20" />
+<hkern u1="Z" u2="Ö" k="20" />
+<hkern u1="Z" u2="Õ" k="20" />
+<hkern u1="Z" u2="Ô" k="20" />
+<hkern u1="Z" u2="Ó" k="20" />
+<hkern u1="Z" u2="Ò" k="20" />
+<hkern u1="Z" u2="Ç" k="20" />
+<hkern u1="Z" u2="Q" k="20" />
+<hkern u1="Z" u2="O" k="20" />
+<hkern u1="Z" u2="G" k="20" />
+<hkern u1="Z" u2="C" k="20" />
+<hkern u1="[" u2="J" k="-184" />
+<hkern u1="a" u2="”" k="20" />
+<hkern u1="a" u2="’" k="20" />
+<hkern u1="a" u2="'" k="20" />
+<hkern u1="a" u2=""" k="20" />
+<hkern u1="b" u2="”" k="20" />
+<hkern u1="b" u2="’" k="20" />
+<hkern u1="b" u2="ý" k="41" />
+<hkern u1="b" u2="z" k="20" />
+<hkern u1="b" u2="y" k="41" />
+<hkern u1="b" u2="x" k="41" />
+<hkern u1="b" u2="w" k="41" />
+<hkern u1="b" u2="v" k="41" />
+<hkern u1="b" u2="'" k="20" />
+<hkern u1="b" u2=""" k="20" />
+<hkern u1="c" u2="”" k="-41" />
+<hkern u1="c" u2="’" k="-41" />
+<hkern u1="c" u2="'" k="-41" />
+<hkern u1="c" u2=""" k="-41" />
+<hkern u1="e" u2="”" k="20" />
+<hkern u1="e" u2="’" k="20" />
+<hkern u1="e" u2="ý" k="41" />
+<hkern u1="e" u2="z" k="20" />
+<hkern u1="e" u2="y" k="41" />
+<hkern u1="e" u2="x" k="41" />
+<hkern u1="e" u2="w" k="41" />
+<hkern u1="e" u2="v" k="41" />
+<hkern u1="e" u2="'" k="20" />
+<hkern u1="e" u2=""" k="20" />
+<hkern u1="f" u2="”" k="-123" />
+<hkern u1="f" u2="’" k="-123" />
+<hkern u1="f" u2="'" k="-123" />
+<hkern u1="f" u2=""" k="-123" />
+<hkern u1="h" u2="”" k="20" />
+<hkern u1="h" u2="’" k="20" />
+<hkern u1="h" u2="'" k="20" />
+<hkern u1="h" u2=""" k="20" />
+<hkern u1="k" u2="œ" k="41" />
+<hkern u1="k" u2="ø" k="41" />
+<hkern u1="k" u2="ö" k="41" />
+<hkern u1="k" u2="õ" k="41" />
+<hkern u1="k" u2="ô" k="41" />
+<hkern u1="k" u2="ó" k="41" />
+<hkern u1="k" u2="ò" k="41" />
+<hkern u1="k" u2="ë" k="41" />
+<hkern u1="k" u2="ê" k="41" />
+<hkern u1="k" u2="é" k="41" />
+<hkern u1="k" u2="è" k="41" />
+<hkern u1="k" u2="ç" k="41" />
+<hkern u1="k" u2="à" k="41" />
+<hkern u1="k" u2="q" k="41" />
+<hkern u1="k" u2="o" k="41" />
+<hkern u1="k" u2="e" k="41" />
+<hkern u1="k" u2="d" k="41" />
+<hkern u1="k" u2="c" k="41" />
+<hkern u1="m" u2="”" k="20" />
+<hkern u1="m" u2="’" k="20" />
+<hkern u1="m" u2="'" k="20" />
+<hkern u1="m" u2=""" k="20" />
+<hkern u1="n" u2="”" k="20" />
+<hkern u1="n" u2="’" k="20" />
+<hkern u1="n" u2="'" k="20" />
+<hkern u1="n" u2=""" k="20" />
+<hkern u1="o" u2="”" k="20" />
+<hkern u1="o" u2="’" k="20" />
+<hkern u1="o" u2="ý" k="41" />
+<hkern u1="o" u2="z" k="20" />
+<hkern u1="o" u2="y" k="41" />
+<hkern u1="o" u2="x" k="41" />
+<hkern u1="o" u2="w" k="41" />
+<hkern u1="o" u2="v" k="41" />
+<hkern u1="o" u2="'" k="20" />
+<hkern u1="o" u2=""" k="20" />
+<hkern u1="p" u2="”" k="20" />
+<hkern u1="p" u2="’" k="20" />
+<hkern u1="p" u2="ý" k="41" />
+<hkern u1="p" u2="z" k="20" />
+<hkern u1="p" u2="y" k="41" />
+<hkern u1="p" u2="x" k="41" />
+<hkern u1="p" u2="w" k="41" />
+<hkern u1="p" u2="v" k="41" />
+<hkern u1="p" u2="'" k="20" />
+<hkern u1="p" u2=""" k="20" />
+<hkern u1="r" u2="”" k="-82" />
+<hkern u1="r" u2="’" k="-82" />
+<hkern u1="r" u2="œ" k="41" />
+<hkern u1="r" u2="ø" k="41" />
+<hkern u1="r" u2="ö" k="41" />
+<hkern u1="r" u2="õ" k="41" />
+<hkern u1="r" u2="ô" k="41" />
+<hkern u1="r" u2="ó" k="41" />
+<hkern u1="r" u2="ò" k="41" />
+<hkern u1="r" u2="ë" k="41" />
+<hkern u1="r" u2="ê" k="41" />
+<hkern u1="r" u2="é" k="41" />
+<hkern u1="r" u2="è" k="41" />
+<hkern u1="r" u2="ç" k="41" />
+<hkern u1="r" u2="æ" k="41" />
+<hkern u1="r" u2="å" k="41" />
+<hkern u1="r" u2="ä" k="41" />
+<hkern u1="r" u2="ã" k="41" />
+<hkern u1="r" u2="â" k="41" />
+<hkern u1="r" u2="á" k="41" />
+<hkern u1="r" u2="à" k="41" />
+<hkern u1="r" u2="q" k="41" />
+<hkern u1="r" u2="o" k="41" />
+<hkern u1="r" u2="g" k="20" />
+<hkern u1="r" u2="e" k="41" />
+<hkern u1="r" u2="d" k="41" />
+<hkern u1="r" u2="c" k="41" />
+<hkern u1="r" u2="a" k="41" />
+<hkern u1="r" u2="'" k="-82" />
+<hkern u1="r" u2=""" k="-82" />
+<hkern u1="t" u2="”" k="-41" />
+<hkern u1="t" u2="’" k="-41" />
+<hkern u1="t" u2="'" k="-41" />
+<hkern u1="t" u2=""" k="-41" />
+<hkern u1="v" u2="„" k="82" />
+<hkern u1="v" u2="”" k="-82" />
+<hkern u1="v" u2="‚" k="82" />
+<hkern u1="v" u2="’" k="-82" />
+<hkern u1="v" u2="?" k="-41" />
+<hkern u1="v" u2="." k="82" />
+<hkern u1="v" u2="," k="82" />
+<hkern u1="v" u2="'" k="-82" />
+<hkern u1="v" u2=""" k="-82" />
+<hkern u1="w" u2="„" k="82" />
+<hkern u1="w" u2="”" k="-82" />
+<hkern u1="w" u2="‚" k="82" />
+<hkern u1="w" u2="’" k="-82" />
+<hkern u1="w" u2="?" k="-41" />
+<hkern u1="w" u2="." k="82" />
+<hkern u1="w" u2="," k="82" />
+<hkern u1="w" u2="'" k="-82" />
+<hkern u1="w" u2=""" k="-82" />
+<hkern u1="x" u2="œ" k="41" />
+<hkern u1="x" u2="ø" k="41" />
+<hkern u1="x" u2="ö" k="41" />
+<hkern u1="x" u2="õ" k="41" />
+<hkern u1="x" u2="ô" k="41" />
+<hkern u1="x" u2="ó" k="41" />
+<hkern u1="x" u2="ò" k="41" />
+<hkern u1="x" u2="ë" k="41" />
+<hkern u1="x" u2="ê" k="41" />
+<hkern u1="x" u2="é" k="41" />
+<hkern u1="x" u2="è" k="41" />
+<hkern u1="x" u2="ç" k="41" />
+<hkern u1="x" u2="à" k="41" />
+<hkern u1="x" u2="q" k="41" />
+<hkern u1="x" u2="o" k="41" />
+<hkern u1="x" u2="e" k="41" />
+<hkern u1="x" u2="d" k="41" />
+<hkern u1="x" u2="c" k="41" />
+<hkern u1="y" u2="„" k="82" />
+<hkern u1="y" u2="”" k="-82" />
+<hkern u1="y" u2="‚" k="82" />
+<hkern u1="y" u2="’" k="-82" />
+<hkern u1="y" u2="?" k="-41" />
+<hkern u1="y" u2="." k="82" />
+<hkern u1="y" u2="," k="82" />
+<hkern u1="y" u2="'" k="-82" />
+<hkern u1="y" u2=""" k="-82" />
+<hkern u1="{" u2="J" k="-184" />
+<hkern u1="À" u2="”" k="143" />
+<hkern u1="À" u2="’" k="143" />
+<hkern u1="À" u2="Ÿ" k="123" />
+<hkern u1="À" u2="Œ" k="41" />
+<hkern u1="À" u2="Ý" k="123" />
+<hkern u1="À" u2="Ø" k="41" />
+<hkern u1="À" u2="Ö" k="41" />
+<hkern u1="À" u2="Õ" k="41" />
+<hkern u1="À" u2="Ô" k="41" />
+<hkern u1="À" u2="Ó" k="41" />
+<hkern u1="À" u2="Ò" k="41" />
+<hkern u1="À" u2="Ç" k="41" />
+<hkern u1="À" u2="Y" k="123" />
+<hkern u1="À" u2="W" k="82" />
+<hkern u1="À" u2="V" k="82" />
+<hkern u1="À" u2="T" k="143" />
+<hkern u1="À" u2="Q" k="41" />
+<hkern u1="À" u2="O" k="41" />
+<hkern u1="À" u2="J" k="-266" />
+<hkern u1="À" u2="G" k="41" />
+<hkern u1="À" u2="C" k="41" />
+<hkern u1="À" u2="'" k="143" />
+<hkern u1="À" u2=""" k="143" />
+<hkern u1="Á" u2="”" k="143" />
+<hkern u1="Á" u2="’" k="143" />
+<hkern u1="Á" u2="Ÿ" k="123" />
+<hkern u1="Á" u2="Œ" k="41" />
+<hkern u1="Á" u2="Ý" k="123" />
+<hkern u1="Á" u2="Ø" k="41" />
+<hkern u1="Á" u2="Ö" k="41" />
+<hkern u1="Á" u2="Õ" k="41" />
+<hkern u1="Á" u2="Ô" k="41" />
+<hkern u1="Á" u2="Ó" k="41" />
+<hkern u1="Á" u2="Ò" k="41" />
+<hkern u1="Á" u2="Ç" k="41" />
+<hkern u1="Á" u2="Y" k="123" />
+<hkern u1="Á" u2="W" k="82" />
+<hkern u1="Á" u2="V" k="82" />
+<hkern u1="Á" u2="T" k="143" />
+<hkern u1="Á" u2="Q" k="41" />
+<hkern u1="Á" u2="O" k="41" />
+<hkern u1="Á" u2="J" k="-266" />
+<hkern u1="Á" u2="G" k="41" />
+<hkern u1="Á" u2="C" k="41" />
+<hkern u1="Á" u2="'" k="143" />
+<hkern u1="Á" u2=""" k="143" />
+<hkern u1="Â" u2="”" k="143" />
+<hkern u1="Â" u2="’" k="143" />
+<hkern u1="Â" u2="Ÿ" k="123" />
+<hkern u1="Â" u2="Œ" k="41" />
+<hkern u1="Â" u2="Ý" k="123" />
+<hkern u1="Â" u2="Ø" k="41" />
+<hkern u1="Â" u2="Ö" k="41" />
+<hkern u1="Â" u2="Õ" k="41" />
+<hkern u1="Â" u2="Ô" k="41" />
+<hkern u1="Â" u2="Ó" k="41" />
+<hkern u1="Â" u2="Ò" k="41" />
+<hkern u1="Â" u2="Ç" k="41" />
+<hkern u1="Â" u2="Y" k="123" />
+<hkern u1="Â" u2="W" k="82" />
+<hkern u1="Â" u2="V" k="82" />
+<hkern u1="Â" u2="T" k="143" />
+<hkern u1="Â" u2="Q" k="41" />
+<hkern u1="Â" u2="O" k="41" />
+<hkern u1="Â" u2="J" k="-266" />
+<hkern u1="Â" u2="G" k="41" />
+<hkern u1="Â" u2="C" k="41" />
+<hkern u1="Â" u2="'" k="143" />
+<hkern u1="Â" u2=""" k="143" />
+<hkern u1="Ã" u2="”" k="143" />
+<hkern u1="Ã" u2="’" k="143" />
+<hkern u1="Ã" u2="Ÿ" k="123" />
+<hkern u1="Ã" u2="Œ" k="41" />
+<hkern u1="Ã" u2="Ý" k="123" />
+<hkern u1="Ã" u2="Ø" k="41" />
+<hkern u1="Ã" u2="Ö" k="41" />
+<hkern u1="Ã" u2="Õ" k="41" />
+<hkern u1="Ã" u2="Ô" k="41" />
+<hkern u1="Ã" u2="Ó" k="41" />
+<hkern u1="Ã" u2="Ò" k="41" />
+<hkern u1="Ã" u2="Ç" k="41" />
+<hkern u1="Ã" u2="Y" k="123" />
+<hkern u1="Ã" u2="W" k="82" />
+<hkern u1="Ã" u2="V" k="82" />
+<hkern u1="Ã" u2="T" k="143" />
+<hkern u1="Ã" u2="Q" k="41" />
+<hkern u1="Ã" u2="O" k="41" />
+<hkern u1="Ã" u2="J" k="-266" />
+<hkern u1="Ã" u2="G" k="41" />
+<hkern u1="Ã" u2="C" k="41" />
+<hkern u1="Ã" u2="'" k="143" />
+<hkern u1="Ã" u2=""" k="143" />
+<hkern u1="Ä" u2="”" k="143" />
+<hkern u1="Ä" u2="’" k="143" />
+<hkern u1="Ä" u2="Ÿ" k="123" />
+<hkern u1="Ä" u2="Œ" k="41" />
+<hkern u1="Ä" u2="Ý" k="123" />
+<hkern u1="Ä" u2="Ø" k="41" />
+<hkern u1="Ä" u2="Ö" k="41" />
+<hkern u1="Ä" u2="Õ" k="41" />
+<hkern u1="Ä" u2="Ô" k="41" />
+<hkern u1="Ä" u2="Ó" k="41" />
+<hkern u1="Ä" u2="Ò" k="41" />
+<hkern u1="Ä" u2="Ç" k="41" />
+<hkern u1="Ä" u2="Y" k="123" />
+<hkern u1="Ä" u2="W" k="82" />
+<hkern u1="Ä" u2="V" k="82" />
+<hkern u1="Ä" u2="T" k="143" />
+<hkern u1="Ä" u2="Q" k="41" />
+<hkern u1="Ä" u2="O" k="41" />
+<hkern u1="Ä" u2="J" k="-266" />
+<hkern u1="Ä" u2="G" k="41" />
+<hkern u1="Ä" u2="C" k="41" />
+<hkern u1="Ä" u2="'" k="143" />
+<hkern u1="Ä" u2=""" k="143" />
+<hkern u1="Å" u2="”" k="143" />
+<hkern u1="Å" u2="’" k="143" />
+<hkern u1="Å" u2="Ÿ" k="123" />
+<hkern u1="Å" u2="Œ" k="41" />
+<hkern u1="Å" u2="Ý" k="123" />
+<hkern u1="Å" u2="Ø" k="41" />
+<hkern u1="Å" u2="Ö" k="41" />
+<hkern u1="Å" u2="Õ" k="41" />
+<hkern u1="Å" u2="Ô" k="41" />
+<hkern u1="Å" u2="Ó" k="41" />
+<hkern u1="Å" u2="Ò" k="41" />
+<hkern u1="Å" u2="Ç" k="41" />
+<hkern u1="Å" u2="Y" k="123" />
+<hkern u1="Å" u2="W" k="82" />
+<hkern u1="Å" u2="V" k="82" />
+<hkern u1="Å" u2="T" k="143" />
+<hkern u1="Å" u2="Q" k="41" />
+<hkern u1="Å" u2="O" k="41" />
+<hkern u1="Å" u2="J" k="-266" />
+<hkern u1="Å" u2="G" k="41" />
+<hkern u1="Å" u2="C" k="41" />
+<hkern u1="Å" u2="'" k="143" />
+<hkern u1="Å" u2=""" k="143" />
+<hkern u1="Æ" u2="J" k="-123" />
+<hkern u1="Ç" u2="Œ" k="41" />
+<hkern u1="Ç" u2="Ø" k="41" />
+<hkern u1="Ç" u2="Ö" k="41" />
+<hkern u1="Ç" u2="Õ" k="41" />
+<hkern u1="Ç" u2="Ô" k="41" />
+<hkern u1="Ç" u2="Ó" k="41" />
+<hkern u1="Ç" u2="Ò" k="41" />
+<hkern u1="Ç" u2="Ç" k="41" />
+<hkern u1="Ç" u2="Q" k="41" />
+<hkern u1="Ç" u2="O" k="41" />
+<hkern u1="Ç" u2="G" k="41" />
+<hkern u1="Ç" u2="C" k="41" />
+<hkern u1="È" u2="J" k="-123" />
+<hkern u1="É" u2="J" k="-123" />
+<hkern u1="Ê" u2="J" k="-123" />
+<hkern u1="Ë" u2="J" k="-123" />
+<hkern u1="Ð" u2="„" k="82" />
+<hkern u1="Ð" u2="‚" k="82" />
+<hkern u1="Ð" u2="Ÿ" k="20" />
+<hkern u1="Ð" u2="Ý" k="20" />
+<hkern u1="Ð" u2="Å" k="41" />
+<hkern u1="Ð" u2="Ä" k="41" />
+<hkern u1="Ð" u2="Ã" k="41" />
+<hkern u1="Ð" u2="Â" k="41" />
+<hkern u1="Ð" u2="Á" k="41" />
+<hkern u1="Ð" u2="À" k="41" />
+<hkern u1="Ð" u2="Z" k="20" />
+<hkern u1="Ð" u2="Y" k="20" />
+<hkern u1="Ð" u2="X" k="41" />
+<hkern u1="Ð" u2="W" k="20" />
+<hkern u1="Ð" u2="V" k="20" />
+<hkern u1="Ð" u2="T" k="61" />
+<hkern u1="Ð" u2="A" k="41" />
+<hkern u1="Ð" u2="." k="82" />
+<hkern u1="Ð" u2="," k="82" />
+<hkern u1="Ò" u2="„" k="82" />
+<hkern u1="Ò" u2="‚" k="82" />
+<hkern u1="Ò" u2="Ÿ" k="20" />
+<hkern u1="Ò" u2="Ý" k="20" />
+<hkern u1="Ò" u2="Å" k="41" />
+<hkern u1="Ò" u2="Ä" k="41" />
+<hkern u1="Ò" u2="Ã" k="41" />
+<hkern u1="Ò" u2="Â" k="41" />
+<hkern u1="Ò" u2="Á" k="41" />
+<hkern u1="Ò" u2="À" k="41" />
+<hkern u1="Ò" u2="Z" k="20" />
+<hkern u1="Ò" u2="Y" k="20" />
+<hkern u1="Ò" u2="X" k="41" />
+<hkern u1="Ò" u2="W" k="20" />
+<hkern u1="Ò" u2="V" k="20" />
+<hkern u1="Ò" u2="T" k="61" />
+<hkern u1="Ò" u2="A" k="41" />
+<hkern u1="Ò" u2="." k="82" />
+<hkern u1="Ò" u2="," k="82" />
+<hkern u1="Ó" u2="„" k="82" />
+<hkern u1="Ó" u2="‚" k="82" />
+<hkern u1="Ó" u2="Ÿ" k="20" />
+<hkern u1="Ó" u2="Ý" k="20" />
+<hkern u1="Ó" u2="Å" k="41" />
+<hkern u1="Ó" u2="Ä" k="41" />
+<hkern u1="Ó" u2="Ã" k="41" />
+<hkern u1="Ó" u2="Â" k="41" />
+<hkern u1="Ó" u2="Á" k="41" />
+<hkern u1="Ó" u2="À" k="41" />
+<hkern u1="Ó" u2="Z" k="20" />
+<hkern u1="Ó" u2="Y" k="20" />
+<hkern u1="Ó" u2="X" k="41" />
+<hkern u1="Ó" u2="W" k="20" />
+<hkern u1="Ó" u2="V" k="20" />
+<hkern u1="Ó" u2="T" k="61" />
+<hkern u1="Ó" u2="A" k="41" />
+<hkern u1="Ó" u2="." k="82" />
+<hkern u1="Ó" u2="," k="82" />
+<hkern u1="Ô" u2="„" k="82" />
+<hkern u1="Ô" u2="‚" k="82" />
+<hkern u1="Ô" u2="Ÿ" k="20" />
+<hkern u1="Ô" u2="Ý" k="20" />
+<hkern u1="Ô" u2="Å" k="41" />
+<hkern u1="Ô" u2="Ä" k="41" />
+<hkern u1="Ô" u2="Ã" k="41" />
+<hkern u1="Ô" u2="Â" k="41" />
+<hkern u1="Ô" u2="Á" k="41" />
+<hkern u1="Ô" u2="À" k="41" />
+<hkern u1="Ô" u2="Z" k="20" />
+<hkern u1="Ô" u2="Y" k="20" />
+<hkern u1="Ô" u2="X" k="41" />
+<hkern u1="Ô" u2="W" k="20" />
+<hkern u1="Ô" u2="V" k="20" />
+<hkern u1="Ô" u2="T" k="61" />
+<hkern u1="Ô" u2="A" k="41" />
+<hkern u1="Ô" u2="." k="82" />
+<hkern u1="Ô" u2="," k="82" />
+<hkern u1="Õ" u2="„" k="82" />
+<hkern u1="Õ" u2="‚" k="82" />
+<hkern u1="Õ" u2="Ÿ" k="20" />
+<hkern u1="Õ" u2="Ý" k="20" />
+<hkern u1="Õ" u2="Å" k="41" />
+<hkern u1="Õ" u2="Ä" k="41" />
+<hkern u1="Õ" u2="Ã" k="41" />
+<hkern u1="Õ" u2="Â" k="41" />
+<hkern u1="Õ" u2="Á" k="41" />
+<hkern u1="Õ" u2="À" k="41" />
+<hkern u1="Õ" u2="Z" k="20" />
+<hkern u1="Õ" u2="Y" k="20" />
+<hkern u1="Õ" u2="X" k="41" />
+<hkern u1="Õ" u2="W" k="20" />
+<hkern u1="Õ" u2="V" k="20" />
+<hkern u1="Õ" u2="T" k="61" />
+<hkern u1="Õ" u2="A" k="41" />
+<hkern u1="Õ" u2="." k="82" />
+<hkern u1="Õ" u2="," k="82" />
+<hkern u1="Ö" u2="„" k="82" />
+<hkern u1="Ö" u2="‚" k="82" />
+<hkern u1="Ö" u2="Ÿ" k="20" />
+<hkern u1="Ö" u2="Ý" k="20" />
+<hkern u1="Ö" u2="Å" k="41" />
+<hkern u1="Ö" u2="Ä" k="41" />
+<hkern u1="Ö" u2="Ã" k="41" />
+<hkern u1="Ö" u2="Â" k="41" />
+<hkern u1="Ö" u2="Á" k="41" />
+<hkern u1="Ö" u2="À" k="41" />
+<hkern u1="Ö" u2="Z" k="20" />
+<hkern u1="Ö" u2="Y" k="20" />
+<hkern u1="Ö" u2="X" k="41" />
+<hkern u1="Ö" u2="W" k="20" />
+<hkern u1="Ö" u2="V" k="20" />
+<hkern u1="Ö" u2="T" k="61" />
+<hkern u1="Ö" u2="A" k="41" />
+<hkern u1="Ö" u2="." k="82" />
+<hkern u1="Ö" u2="," k="82" />
+<hkern u1="Ø" u2="„" k="82" />
+<hkern u1="Ø" u2="‚" k="82" />
+<hkern u1="Ø" u2="Ÿ" k="20" />
+<hkern u1="Ø" u2="Ý" k="20" />
+<hkern u1="Ø" u2="Å" k="41" />
+<hkern u1="Ø" u2="Ä" k="41" />
+<hkern u1="Ø" u2="Ã" k="41" />
+<hkern u1="Ø" u2="Â" k="41" />
+<hkern u1="Ø" u2="Á" k="41" />
+<hkern u1="Ø" u2="À" k="41" />
+<hkern u1="Ø" u2="Z" k="20" />
+<hkern u1="Ø" u2="Y" k="20" />
+<hkern u1="Ø" u2="X" k="41" />
+<hkern u1="Ø" u2="W" k="20" />
+<hkern u1="Ø" u2="V" k="20" />
+<hkern u1="Ø" u2="T" k="61" />
+<hkern u1="Ø" u2="A" k="41" />
+<hkern u1="Ø" u2="." k="82" />
+<hkern u1="Ø" u2="," k="82" />
+<hkern u1="Ù" u2="„" k="41" />
+<hkern u1="Ù" u2="‚" k="41" />
+<hkern u1="Ù" u2="Å" k="20" />
+<hkern u1="Ù" u2="Ä" k="20" />
+<hkern u1="Ù" u2="Ã" k="20" />
+<hkern u1="Ù" u2="Â" k="20" />
+<hkern u1="Ù" u2="Á" k="20" />
+<hkern u1="Ù" u2="À" k="20" />
+<hkern u1="Ù" u2="A" k="20" />
+<hkern u1="Ù" u2="." k="41" />
+<hkern u1="Ù" u2="," k="41" />
+<hkern u1="Ú" u2="„" k="41" />
+<hkern u1="Ú" u2="‚" k="41" />
+<hkern u1="Ú" u2="Å" k="20" />
+<hkern u1="Ú" u2="Ä" k="20" />
+<hkern u1="Ú" u2="Ã" k="20" />
+<hkern u1="Ú" u2="Â" k="20" />
+<hkern u1="Ú" u2="Á" k="20" />
+<hkern u1="Ú" u2="À" k="20" />
+<hkern u1="Ú" u2="A" k="20" />
+<hkern u1="Ú" u2="." k="41" />
+<hkern u1="Ú" u2="," k="41" />
+<hkern u1="Û" u2="„" k="41" />
+<hkern u1="Û" u2="‚" k="41" />
+<hkern u1="Û" u2="Å" k="20" />
+<hkern u1="Û" u2="Ä" k="20" />
+<hkern u1="Û" u2="Ã" k="20" />
+<hkern u1="Û" u2="Â" k="20" />
+<hkern u1="Û" u2="Á" k="20" />
+<hkern u1="Û" u2="À" k="20" />
+<hkern u1="Û" u2="A" k="20" />
+<hkern u1="Û" u2="." k="41" />
+<hkern u1="Û" u2="," k="41" />
+<hkern u1="Ü" u2="„" k="41" />
+<hkern u1="Ü" u2="‚" k="41" />
+<hkern u1="Ü" u2="Å" k="20" />
+<hkern u1="Ü" u2="Ä" k="20" />
+<hkern u1="Ü" u2="Ã" k="20" />
+<hkern u1="Ü" u2="Â" k="20" />
+<hkern u1="Ü" u2="Á" k="20" />
+<hkern u1="Ü" u2="À" k="20" />
+<hkern u1="Ü" u2="A" k="20" />
+<hkern u1="Ü" u2="." k="41" />
+<hkern u1="Ü" u2="," k="41" />
+<hkern u1="Ý" u2="„" k="123" />
+<hkern u1="Ý" u2="‚" k="123" />
+<hkern u1="Ý" u2="œ" k="102" />
+<hkern u1="Ý" u2="Œ" k="41" />
+<hkern u1="Ý" u2="ü" k="61" />
+<hkern u1="Ý" u2="û" k="61" />
+<hkern u1="Ý" u2="ú" k="61" />
+<hkern u1="Ý" u2="ù" k="61" />
+<hkern u1="Ý" u2="ø" k="102" />
+<hkern u1="Ý" u2="ö" k="102" />
+<hkern u1="Ý" u2="õ" k="102" />
+<hkern u1="Ý" u2="ô" k="102" />
+<hkern u1="Ý" u2="ó" k="102" />
+<hkern u1="Ý" u2="ò" k="102" />
+<hkern u1="Ý" u2="ë" k="102" />
+<hkern u1="Ý" u2="ê" k="102" />
+<hkern u1="Ý" u2="é" k="102" />
+<hkern u1="Ý" u2="è" k="102" />
+<hkern u1="Ý" u2="ç" k="102" />
+<hkern u1="Ý" u2="æ" k="102" />
+<hkern u1="Ý" u2="å" k="102" />
+<hkern u1="Ý" u2="ä" k="102" />
+<hkern u1="Ý" u2="ã" k="102" />
+<hkern u1="Ý" u2="â" k="102" />
+<hkern u1="Ý" u2="á" k="102" />
+<hkern u1="Ý" u2="à" k="102" />
+<hkern u1="Ý" u2="Ø" k="41" />
+<hkern u1="Ý" u2="Ö" k="41" />
+<hkern u1="Ý" u2="Õ" k="41" />
+<hkern u1="Ý" u2="Ô" k="41" />
+<hkern u1="Ý" u2="Ó" k="41" />
+<hkern u1="Ý" u2="Ò" k="41" />
+<hkern u1="Ý" u2="Ç" k="41" />
+<hkern u1="Ý" u2="Å" k="123" />
+<hkern u1="Ý" u2="Ä" k="123" />
+<hkern u1="Ý" u2="Ã" k="123" />
+<hkern u1="Ý" u2="Â" k="123" />
+<hkern u1="Ý" u2="Á" k="123" />
+<hkern u1="Ý" u2="À" k="123" />
+<hkern u1="Ý" u2="z" k="41" />
+<hkern u1="Ý" u2="u" k="61" />
+<hkern u1="Ý" u2="s" k="82" />
+<hkern u1="Ý" u2="r" k="61" />
+<hkern u1="Ý" u2="q" k="102" />
+<hkern u1="Ý" u2="p" k="61" />
+<hkern u1="Ý" u2="o" k="102" />
+<hkern u1="Ý" u2="n" k="61" />
+<hkern u1="Ý" u2="m" k="61" />
+<hkern u1="Ý" u2="g" k="41" />
+<hkern u1="Ý" u2="e" k="102" />
+<hkern u1="Ý" u2="d" k="102" />
+<hkern u1="Ý" u2="c" k="102" />
+<hkern u1="Ý" u2="a" k="102" />
+<hkern u1="Ý" u2="Q" k="41" />
+<hkern u1="Ý" u2="O" k="41" />
+<hkern u1="Ý" u2="G" k="41" />
+<hkern u1="Ý" u2="C" k="41" />
+<hkern u1="Ý" u2="A" k="123" />
+<hkern u1="Ý" u2="?" k="-41" />
+<hkern u1="Ý" u2="." k="123" />
+<hkern u1="Ý" u2="," k="123" />
+<hkern u1="Þ" u2="„" k="266" />
+<hkern u1="Þ" u2="‚" k="266" />
+<hkern u1="Þ" u2="Å" k="102" />
+<hkern u1="Þ" u2="Ä" k="102" />
+<hkern u1="Þ" u2="Ã" k="102" />
+<hkern u1="Þ" u2="Â" k="102" />
+<hkern u1="Þ" u2="Á" k="102" />
+<hkern u1="Þ" u2="À" k="102" />
+<hkern u1="Þ" u2="Z" k="20" />
+<hkern u1="Þ" u2="X" k="41" />
+<hkern u1="Þ" u2="A" k="102" />
+<hkern u1="Þ" u2="." k="266" />
+<hkern u1="Þ" u2="," k="266" />
+<hkern u1="à" u2="”" k="20" />
+<hkern u1="à" u2="’" k="20" />
+<hkern u1="à" u2="'" k="20" />
+<hkern u1="à" u2=""" k="20" />
+<hkern u1="á" u2="”" k="20" />
+<hkern u1="á" u2="’" k="20" />
+<hkern u1="á" u2="'" k="20" />
+<hkern u1="á" u2=""" k="20" />
+<hkern u1="â" u2="”" k="20" />
+<hkern u1="â" u2="’" k="20" />
+<hkern u1="â" u2="'" k="20" />
+<hkern u1="â" u2=""" k="20" />
+<hkern u1="ã" u2="”" k="20" />
+<hkern u1="ã" u2="’" k="20" />
+<hkern u1="ã" u2="'" k="20" />
+<hkern u1="ã" u2=""" k="20" />
+<hkern u1="ä" u2="”" k="20" />
+<hkern u1="ä" u2="’" k="20" />
+<hkern u1="ä" u2="'" k="20" />
+<hkern u1="ä" u2=""" k="20" />
+<hkern u1="å" u2="”" k="20" />
+<hkern u1="å" u2="’" k="20" />
+<hkern u1="å" u2="'" k="20" />
+<hkern u1="å" u2=""" k="20" />
+<hkern u1="è" u2="”" k="20" />
+<hkern u1="è" u2="’" k="20" />
+<hkern u1="è" u2="ý" k="41" />
+<hkern u1="è" u2="z" k="20" />
+<hkern u1="è" u2="y" k="41" />
+<hkern u1="è" u2="x" k="41" />
+<hkern u1="è" u2="w" k="41" />
+<hkern u1="è" u2="v" k="41" />
+<hkern u1="è" u2="'" k="20" />
+<hkern u1="è" u2=""" k="20" />
+<hkern u1="é" u2="”" k="20" />
+<hkern u1="é" u2="’" k="20" />
+<hkern u1="é" u2="ý" k="41" />
+<hkern u1="é" u2="z" k="20" />
+<hkern u1="é" u2="y" k="41" />
+<hkern u1="é" u2="x" k="41" />
+<hkern u1="é" u2="w" k="41" />
+<hkern u1="é" u2="v" k="41" />
+<hkern u1="é" u2="'" k="20" />
+<hkern u1="é" u2=""" k="20" />
+<hkern u1="ê" u2="”" k="20" />
+<hkern u1="ê" u2="’" k="20" />
+<hkern u1="ê" u2="ý" k="41" />
+<hkern u1="ê" u2="z" k="20" />
+<hkern u1="ê" u2="y" k="41" />
+<hkern u1="ê" u2="x" k="41" />
+<hkern u1="ê" u2="w" k="41" />
+<hkern u1="ê" u2="v" k="41" />
+<hkern u1="ê" u2="'" k="20" />
+<hkern u1="ê" u2=""" k="20" />
+<hkern u1="ë" u2="”" k="20" />
+<hkern u1="ë" u2="’" k="20" />
+<hkern u1="ë" u2="ý" k="41" />
+<hkern u1="ë" u2="z" k="20" />
+<hkern u1="ë" u2="y" k="41" />
+<hkern u1="ë" u2="x" k="41" />
+<hkern u1="ë" u2="w" k="41" />
+<hkern u1="ë" u2="v" k="41" />
+<hkern u1="ë" u2="'" k="20" />
+<hkern u1="ë" u2=""" k="20" />
+<hkern u1="ð" u2="”" k="20" />
+<hkern u1="ð" u2="’" k="20" />
+<hkern u1="ð" u2="ý" k="41" />
+<hkern u1="ð" u2="z" k="20" />
+<hkern u1="ð" u2="y" k="41" />
+<hkern u1="ð" u2="x" k="41" />
+<hkern u1="ð" u2="w" k="41" />
+<hkern u1="ð" u2="v" k="41" />
+<hkern u1="ð" u2="'" k="20" />
+<hkern u1="ð" u2=""" k="20" />
+<hkern u1="ò" u2="”" k="20" />
+<hkern u1="ò" u2="’" k="20" />
+<hkern u1="ò" u2="ý" k="41" />
+<hkern u1="ò" u2="z" k="20" />
+<hkern u1="ò" u2="y" k="41" />
+<hkern u1="ò" u2="x" k="41" />
+<hkern u1="ò" u2="w" k="41" />
+<hkern u1="ò" u2="v" k="41" />
+<hkern u1="ò" u2="'" k="20" />
+<hkern u1="ò" u2=""" k="20" />
+<hkern u1="ó" u2="”" k="20" />
+<hkern u1="ó" u2="’" k="20" />
+<hkern u1="ó" u2="ý" k="41" />
+<hkern u1="ó" u2="z" k="20" />
+<hkern u1="ó" u2="y" k="41" />
+<hkern u1="ó" u2="x" k="41" />
+<hkern u1="ó" u2="w" k="41" />
+<hkern u1="ó" u2="v" k="41" />
+<hkern u1="ó" u2="'" k="20" />
+<hkern u1="ó" u2=""" k="20" />
+<hkern u1="ô" u2="”" k="20" />
+<hkern u1="ô" u2="’" k="20" />
+<hkern u1="ô" u2="ý" k="41" />
+<hkern u1="ô" u2="z" k="20" />
+<hkern u1="ô" u2="y" k="41" />
+<hkern u1="ô" u2="x" k="41" />
+<hkern u1="ô" u2="w" k="41" />
+<hkern u1="ô" u2="v" k="41" />
+<hkern u1="ô" u2="'" k="20" />
+<hkern u1="ô" u2=""" k="20" />
+<hkern u1="ö" u2="”" k="41" />
+<hkern u1="ö" u2="’" k="41" />
+<hkern u1="ö" u2="'" k="41" />
+<hkern u1="ö" u2=""" k="41" />
+<hkern u1="ø" u2="”" k="20" />
+<hkern u1="ø" u2="’" k="20" />
+<hkern u1="ø" u2="ý" k="41" />
+<hkern u1="ø" u2="z" k="20" />
+<hkern u1="ø" u2="y" k="41" />
+<hkern u1="ø" u2="x" k="41" />
+<hkern u1="ø" u2="w" k="41" />
+<hkern u1="ø" u2="v" k="41" />
+<hkern u1="ø" u2="'" k="20" />
+<hkern u1="ø" u2=""" k="20" />
+<hkern u1="ý" u2="„" k="82" />
+<hkern u1="ý" u2="”" k="-82" />
+<hkern u1="ý" u2="‚" k="82" />
+<hkern u1="ý" u2="’" k="-82" />
+<hkern u1="ý" u2="?" k="-41" />
+<hkern u1="ý" u2="." k="82" />
+<hkern u1="ý" u2="," k="82" />
+<hkern u1="ý" u2="'" k="-82" />
+<hkern u1="ý" u2=""" k="-82" />
+<hkern u1="þ" u2="”" k="20" />
+<hkern u1="þ" u2="’" k="20" />
+<hkern u1="þ" u2="ý" k="41" />
+<hkern u1="þ" u2="z" k="20" />
+<hkern u1="þ" u2="y" k="41" />
+<hkern u1="þ" u2="x" k="41" />
+<hkern u1="þ" u2="w" k="41" />
+<hkern u1="þ" u2="v" k="41" />
+<hkern u1="þ" u2="'" k="20" />
+<hkern u1="þ" u2=""" k="20" />
+<hkern u1="ÿ" u2="„" k="82" />
+<hkern u1="ÿ" u2="”" k="-82" />
+<hkern u1="ÿ" u2="‚" k="82" />
+<hkern u1="ÿ" u2="’" k="-82" />
+<hkern u1="ÿ" u2="?" k="-41" />
+<hkern u1="ÿ" u2="." k="82" />
+<hkern u1="ÿ" u2="," k="82" />
+<hkern u1="ÿ" u2="'" k="-82" />
+<hkern u1="ÿ" u2=""" k="-82" />
+<hkern u1="Œ" u2="J" k="-123" />
+<hkern u1="Ÿ" u2="„" k="123" />
+<hkern u1="Ÿ" u2="‚" k="123" />
+<hkern u1="Ÿ" u2="œ" k="102" />
+<hkern u1="Ÿ" u2="Œ" k="41" />
+<hkern u1="Ÿ" u2="ü" k="61" />
+<hkern u1="Ÿ" u2="û" k="61" />
+<hkern u1="Ÿ" u2="ú" k="61" />
+<hkern u1="Ÿ" u2="ù" k="61" />
+<hkern u1="Ÿ" u2="ø" k="102" />
+<hkern u1="Ÿ" u2="ö" k="102" />
+<hkern u1="Ÿ" u2="õ" k="102" />
+<hkern u1="Ÿ" u2="ô" k="102" />
+<hkern u1="Ÿ" u2="ó" k="102" />
+<hkern u1="Ÿ" u2="ò" k="102" />
+<hkern u1="Ÿ" u2="ë" k="102" />
+<hkern u1="Ÿ" u2="ê" k="102" />
+<hkern u1="Ÿ" u2="é" k="102" />
+<hkern u1="Ÿ" u2="è" k="102" />
+<hkern u1="Ÿ" u2="ç" k="102" />
+<hkern u1="Ÿ" u2="æ" k="102" />
+<hkern u1="Ÿ" u2="å" k="102" />
+<hkern u1="Ÿ" u2="ä" k="102" />
+<hkern u1="Ÿ" u2="ã" k="102" />
+<hkern u1="Ÿ" u2="â" k="102" />
+<hkern u1="Ÿ" u2="á" k="102" />
+<hkern u1="Ÿ" u2="à" k="102" />
+<hkern u1="Ÿ" u2="Ø" k="41" />
+<hkern u1="Ÿ" u2="Ö" k="41" />
+<hkern u1="Ÿ" u2="Õ" k="41" />
+<hkern u1="Ÿ" u2="Ô" k="41" />
+<hkern u1="Ÿ" u2="Ó" k="41" />
+<hkern u1="Ÿ" u2="Ò" k="41" />
+<hkern u1="Ÿ" u2="Ç" k="41" />
+<hkern u1="Ÿ" u2="Å" k="123" />
+<hkern u1="Ÿ" u2="Ä" k="123" />
+<hkern u1="Ÿ" u2="Ã" k="123" />
+<hkern u1="Ÿ" u2="Â" k="123" />
+<hkern u1="Ÿ" u2="Á" k="123" />
+<hkern u1="Ÿ" u2="À" k="123" />
+<hkern u1="Ÿ" u2="z" k="41" />
+<hkern u1="Ÿ" u2="u" k="61" />
+<hkern u1="Ÿ" u2="s" k="82" />
+<hkern u1="Ÿ" u2="r" k="61" />
+<hkern u1="Ÿ" u2="q" k="102" />
+<hkern u1="Ÿ" u2="p" k="61" />
+<hkern u1="Ÿ" u2="o" k="102" />
+<hkern u1="Ÿ" u2="n" k="61" />
+<hkern u1="Ÿ" u2="m" k="61" />
+<hkern u1="Ÿ" u2="g" k="41" />
+<hkern u1="Ÿ" u2="e" k="102" />
+<hkern u1="Ÿ" u2="d" k="102" />
+<hkern u1="Ÿ" u2="c" k="102" />
+<hkern u1="Ÿ" u2="a" k="102" />
+<hkern u1="Ÿ" u2="Q" k="41" />
+<hkern u1="Ÿ" u2="O" k="41" />
+<hkern u1="Ÿ" u2="G" k="41" />
+<hkern u1="Ÿ" u2="C" k="41" />
+<hkern u1="Ÿ" u2="A" k="123" />
+<hkern u1="Ÿ" u2="?" k="-41" />
+<hkern u1="Ÿ" u2="." k="123" />
+<hkern u1="Ÿ" u2="," k="123" />
+<hkern u1="–" u2="T" k="82" />
+<hkern u1="—" u2="T" k="82" />
+<hkern u1="‘" u2="Ÿ" k="-20" />
+<hkern u1="‘" u2="œ" k="123" />
+<hkern u1="‘" u2="ü" k="61" />
+<hkern u1="‘" u2="û" k="61" />
+<hkern u1="‘" u2="ú" k="61" />
+<hkern u1="‘" u2="ù" k="61" />
+<hkern u1="‘" u2="ø" k="123" />
+<hkern u1="‘" u2="ö" k="123" />
+<hkern u1="‘" u2="õ" k="123" />
+<hkern u1="‘" u2="ô" k="123" />
+<hkern u1="‘" u2="ó" k="123" />
+<hkern u1="‘" u2="ò" k="123" />
+<hkern u1="‘" u2="ë" k="123" />
+<hkern u1="‘" u2="ê" k="123" />
+<hkern u1="‘" u2="é" k="123" />
+<hkern u1="‘" u2="è" k="123" />
+<hkern u1="‘" u2="ç" k="123" />
+<hkern u1="‘" u2="æ" k="82" />
+<hkern u1="‘" u2="å" k="82" />
+<hkern u1="‘" u2="ä" k="82" />
+<hkern u1="‘" u2="ã" k="82" />
+<hkern u1="‘" u2="â" k="82" />
+<hkern u1="‘" u2="á" k="82" />
+<hkern u1="‘" u2="à" k="123" />
+<hkern u1="‘" u2="Ý" k="-20" />
+<hkern u1="‘" u2="Å" k="143" />
+<hkern u1="‘" u2="Ä" k="143" />
+<hkern u1="‘" u2="Ã" k="143" />
+<hkern u1="‘" u2="Â" k="143" />
+<hkern u1="‘" u2="Á" k="143" />
+<hkern u1="‘" u2="À" k="143" />
+<hkern u1="‘" u2="u" k="61" />
+<hkern u1="‘" u2="s" k="61" />
+<hkern u1="‘" u2="r" k="61" />
+<hkern u1="‘" u2="q" k="123" />
+<hkern u1="‘" u2="p" k="61" />
+<hkern u1="‘" u2="o" k="123" />
+<hkern u1="‘" u2="n" k="61" />
+<hkern u1="‘" u2="m" k="61" />
+<hkern u1="‘" u2="g" k="61" />
+<hkern u1="‘" u2="e" k="123" />
+<hkern u1="‘" u2="d" k="123" />
+<hkern u1="‘" u2="c" k="123" />
+<hkern u1="‘" u2="a" k="82" />
+<hkern u1="‘" u2="Y" k="-20" />
+<hkern u1="‘" u2="W" k="-41" />
+<hkern u1="‘" u2="V" k="-41" />
+<hkern u1="‘" u2="T" k="-41" />
+<hkern u1="‘" u2="A" k="143" />
+<hkern u1="’" u2="Ÿ" k="-20" />
+<hkern u1="’" u2="œ" k="123" />
+<hkern u1="’" u2="ü" k="61" />
+<hkern u1="’" u2="û" k="61" />
+<hkern u1="’" u2="ú" k="61" />
+<hkern u1="’" u2="ù" k="61" />
+<hkern u1="’" u2="ø" k="123" />
+<hkern u1="’" u2="ö" k="123" />
+<hkern u1="’" u2="õ" k="123" />
+<hkern u1="’" u2="ô" k="123" />
+<hkern u1="’" u2="ó" k="123" />
+<hkern u1="’" u2="ò" k="123" />
+<hkern u1="’" u2="ë" k="123" />
+<hkern u1="’" u2="ê" k="123" />
+<hkern u1="’" u2="é" k="123" />
+<hkern u1="’" u2="è" k="123" />
+<hkern u1="’" u2="ç" k="123" />
+<hkern u1="’" u2="æ" k="82" />
+<hkern u1="’" u2="å" k="82" />
+<hkern u1="’" u2="ä" k="82" />
+<hkern u1="’" u2="ã" k="82" />
+<hkern u1="’" u2="â" k="82" />
+<hkern u1="’" u2="á" k="82" />
+<hkern u1="’" u2="à" k="123" />
+<hkern u1="’" u2="Ý" k="-20" />
+<hkern u1="’" u2="Å" k="143" />
+<hkern u1="’" u2="Ä" k="143" />
+<hkern u1="’" u2="Ã" k="143" />
+<hkern u1="’" u2="Â" k="143" />
+<hkern u1="’" u2="Á" k="143" />
+<hkern u1="’" u2="À" k="143" />
+<hkern u1="’" u2="u" k="61" />
+<hkern u1="’" u2="s" k="61" />
+<hkern u1="’" u2="r" k="61" />
+<hkern u1="’" u2="q" k="123" />
+<hkern u1="’" u2="p" k="61" />
+<hkern u1="’" u2="o" k="123" />
+<hkern u1="’" u2="n" k="61" />
+<hkern u1="’" u2="m" k="61" />
+<hkern u1="’" u2="g" k="61" />
+<hkern u1="’" u2="e" k="123" />
+<hkern u1="’" u2="d" k="123" />
+<hkern u1="’" u2="c" k="123" />
+<hkern u1="’" u2="a" k="82" />
+<hkern u1="’" u2="Y" k="-20" />
+<hkern u1="’" u2="W" k="-41" />
+<hkern u1="’" u2="V" k="-41" />
+<hkern u1="’" u2="T" k="-41" />
+<hkern u1="’" u2="A" k="143" />
+<hkern u1="‚" u2="Ÿ" k="123" />
+<hkern u1="‚" u2="Œ" k="102" />
+<hkern u1="‚" u2="Ý" k="123" />
+<hkern u1="‚" u2="Ü" k="41" />
+<hkern u1="‚" u2="Û" k="41" />
+<hkern u1="‚" u2="Ú" k="41" />
+<hkern u1="‚" u2="Ù" k="41" />
+<hkern u1="‚" u2="Ø" k="102" />
+<hkern u1="‚" u2="Ö" k="102" />
+<hkern u1="‚" u2="Õ" k="102" />
+<hkern u1="‚" u2="Ô" k="102" />
+<hkern u1="‚" u2="Ó" k="102" />
+<hkern u1="‚" u2="Ò" k="102" />
+<hkern u1="‚" u2="Ç" k="102" />
+<hkern u1="‚" u2="Y" k="123" />
+<hkern u1="‚" u2="W" k="123" />
+<hkern u1="‚" u2="V" k="123" />
+<hkern u1="‚" u2="U" k="41" />
+<hkern u1="‚" u2="T" k="143" />
+<hkern u1="‚" u2="Q" k="102" />
+<hkern u1="‚" u2="O" k="102" />
+<hkern u1="‚" u2="G" k="102" />
+<hkern u1="‚" u2="C" k="102" />
+<hkern u1="“" u2="Ÿ" k="-20" />
+<hkern u1="“" u2="œ" k="123" />
+<hkern u1="“" u2="ü" k="61" />
+<hkern u1="“" u2="û" k="61" />
+<hkern u1="“" u2="ú" k="61" />
+<hkern u1="“" u2="ù" k="61" />
+<hkern u1="“" u2="ø" k="123" />
+<hkern u1="“" u2="ö" k="123" />
+<hkern u1="“" u2="õ" k="123" />
+<hkern u1="“" u2="ô" k="123" />
+<hkern u1="“" u2="ó" k="123" />
+<hkern u1="“" u2="ò" k="123" />
+<hkern u1="“" u2="ë" k="123" />
+<hkern u1="“" u2="ê" k="123" />
+<hkern u1="“" u2="é" k="123" />
+<hkern u1="“" u2="è" k="123" />
+<hkern u1="“" u2="ç" k="123" />
+<hkern u1="“" u2="æ" k="82" />
+<hkern u1="“" u2="å" k="82" />
+<hkern u1="“" u2="ä" k="82" />
+<hkern u1="“" u2="ã" k="82" />
+<hkern u1="“" u2="â" k="82" />
+<hkern u1="“" u2="á" k="82" />
+<hkern u1="“" u2="à" k="123" />
+<hkern u1="“" u2="Ý" k="-20" />
+<hkern u1="“" u2="Å" k="143" />
+<hkern u1="“" u2="Ä" k="143" />
+<hkern u1="“" u2="Ã" k="143" />
+<hkern u1="“" u2="Â" k="143" />
+<hkern u1="“" u2="Á" k="143" />
+<hkern u1="“" u2="À" k="143" />
+<hkern u1="“" u2="u" k="61" />
+<hkern u1="“" u2="s" k="61" />
+<hkern u1="“" u2="r" k="61" />
+<hkern u1="“" u2="q" k="123" />
+<hkern u1="“" u2="p" k="61" />
+<hkern u1="“" u2="o" k="123" />
+<hkern u1="“" u2="n" k="61" />
+<hkern u1="“" u2="m" k="61" />
+<hkern u1="“" u2="g" k="61" />
+<hkern u1="“" u2="e" k="123" />
+<hkern u1="“" u2="d" k="123" />
+<hkern u1="“" u2="c" k="123" />
+<hkern u1="“" u2="a" k="82" />
+<hkern u1="“" u2="Y" k="-20" />
+<hkern u1="“" u2="W" k="-41" />
+<hkern u1="“" u2="V" k="-41" />
+<hkern u1="“" u2="T" k="-41" />
+<hkern u1="“" u2="A" k="143" />
+<hkern u1="„" u2="Ÿ" k="123" />
+<hkern u1="„" u2="Œ" k="102" />
+<hkern u1="„" u2="Ý" k="123" />
+<hkern u1="„" u2="Ü" k="41" />
+<hkern u1="„" u2="Û" k="41" />
+<hkern u1="„" u2="Ú" k="41" />
+<hkern u1="„" u2="Ù" k="41" />
+<hkern u1="„" u2="Ø" k="102" />
+<hkern u1="„" u2="Ö" k="102" />
+<hkern u1="„" u2="Õ" k="102" />
+<hkern u1="„" u2="Ô" k="102" />
+<hkern u1="„" u2="Ó" k="102" />
+<hkern u1="„" u2="Ò" k="102" />
+<hkern u1="„" u2="Ç" k="102" />
+<hkern u1="„" u2="Y" k="123" />
+<hkern u1="„" u2="W" k="123" />
+<hkern u1="„" u2="V" k="123" />
+<hkern u1="„" u2="U" k="41" />
+<hkern u1="„" u2="T" k="143" />
+<hkern u1="„" u2="Q" k="102" />
+<hkern u1="„" u2="O" k="102" />
+<hkern u1="„" u2="G" k="102" />
+<hkern u1="„" u2="C" k="102" />
+</font>
+</defs></svg>
\ No newline at end of file
diff --git a/couchpotato/static/fonts/OpenSans-Light-webfont.ttf b/couchpotato/static/fonts/OpenSans-Light-webfont.ttf
new file mode 100644
index 0000000000..63af664cde
Binary files /dev/null and b/couchpotato/static/fonts/OpenSans-Light-webfont.ttf differ
diff --git a/couchpotato/static/fonts/OpenSans-Light-webfont.woff b/couchpotato/static/fonts/OpenSans-Light-webfont.woff
new file mode 100644
index 0000000000..e786074813
Binary files /dev/null and b/couchpotato/static/fonts/OpenSans-Light-webfont.woff differ
diff --git a/couchpotato/static/fonts/OpenSans-Regular-webfont.eot b/couchpotato/static/fonts/OpenSans-Regular-webfont.eot
new file mode 100755
index 0000000000..dd6fd2cb3a
Binary files /dev/null and b/couchpotato/static/fonts/OpenSans-Regular-webfont.eot differ
diff --git a/couchpotato/static/fonts/OpenSans-Regular-webfont.svg b/couchpotato/static/fonts/OpenSans-Regular-webfont.svg
new file mode 100755
index 0000000000..01038bb1c7
--- /dev/null
+++ b/couchpotato/static/fonts/OpenSans-Regular-webfont.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+This is a custom SVG webfont generated by Font Squirrel.
+Copyright : Digitized data copyright 20102011 Google Corporation
+Foundry : Ascender Corporation
+Foundry URL : httpwwwascendercorpcom
+</metadata>
+<defs>
+<font id="OpenSansRegular" horiz-adv-x="1171" >
+<font-face units-per-em="2048" ascent="1638" descent="-410" />
+<missing-glyph horiz-adv-x="532" />
+<glyph unicode=" " horiz-adv-x="532" />
+<glyph unicode=" " horiz-adv-x="532" />
+<glyph unicode=" " horiz-adv-x="532" />
+<glyph unicode="!" horiz-adv-x="547" d="M152 106q0 136 120 136q58 0 89.5 -35t31.5 -101q0 -64 -32 -99.5t-89 -35.5q-52 0 -86 31.5t-34 103.5zM170 1462h207l-51 -1059h-105z" />
+<glyph unicode=""" horiz-adv-x="821" d="M133 1462h186l-40 -528h-105zM502 1462h186l-41 -528h-104z" />
+<glyph unicode="#" horiz-adv-x="1323" d="M51 430v129h287l68 340h-277v127h299l82 436h139l-82 -436h305l84 436h134l-84 -436h264v-127h-289l-66 -340h283v-129h-307l-84 -430h-137l84 430h-303l-82 -430h-136l80 430h-262zM475 559h303l66 340h-303z" />
+<glyph unicode="$" d="M131 170v156q83 -37 191.5 -60.5t197.5 -23.5v440q-205 65 -287.5 151t-82.5 222q0 131 101.5 215t268.5 102v182h129v-180q184 -5 355 -74l-52 -131q-149 59 -303 70v-434q157 -50 235 -97.5t115 -109t37 -149.5q0 -136 -102 -224.5t-285 -111.5v-232h-129v223 q-112 0 -217 17.5t-172 48.5zM319 1057q0 -76 45 -122t156 -87v387q-99 -16 -150 -62.5t-51 -115.5zM649 252q217 30 217 184q0 72 -44.5 116.5t-172.5 88.5v-389z" />
+<glyph unicode="%" horiz-adv-x="1686" d="M104 1026q0 227 74.5 342t220.5 115q145 0 223 -119t78 -338q0 -228 -76.5 -344.5t-224.5 -116.5q-140 0 -217.5 119t-77.5 342zM242 1026q0 -170 37 -255t120 -85q164 0 164 340q0 338 -164 338q-83 0 -120 -84t-37 -254zM365 0l811 1462h147l-811 -1462h-147zM985 440 q0 227 74.5 342t220.5 115q142 0 221.5 -117.5t79.5 -339.5q0 -227 -76.5 -343.5t-224.5 -116.5q-142 0 -218.5 119t-76.5 341zM1122 440q0 -171 37 -255.5t121 -84.5t124 83.5t40 256.5q0 171 -40 253.5t-124 82.5t-121 -82.5t-37 -253.5z" />
+<glyph unicode="&" horiz-adv-x="1495" d="M113 379q0 130 69.5 230t249.5 202q-85 95 -115.5 144t-48.5 102t-18 110q0 150 98 234t273 84q162 0 255 -83.5t93 -232.5q0 -107 -68 -197.5t-225 -183.5l407 -391q56 62 89.5 145.5t56.5 182.5h168q-68 -286 -205 -434l299 -291h-229l-185 178q-118 -106 -240 -152 t-272 -46q-215 0 -333.5 106t-118.5 293zM285 383q0 -117 77.5 -185.5t206.5 -68.5q241 0 400 154l-437 424q-111 -68 -157 -112.5t-68 -95.5t-22 -116zM414 1171q0 -69 36 -131.5t123 -150.5q129 75 179.5 138.5t50.5 146.5q0 77 -51.5 125.5t-137.5 48.5q-89 0 -144.5 -48 t-55.5 -129z" />
+<glyph unicode="'" horiz-adv-x="453" d="M133 1462h186l-40 -528h-105z" />
+<glyph unicode="(" horiz-adv-x="606" d="M82 561q0 265 77.5 496t223.5 405h162q-144 -193 -216.5 -424t-72.5 -475q0 -240 74 -469t213 -418h-160q-147 170 -224 397t-77 488z" />
+<glyph unicode=")" horiz-adv-x="606" d="M61 1462h162q147 -175 224 -406.5t77 -494.5t-77.5 -490t-223.5 -395h-160q139 188 213 417.5t74 469.5q0 244 -72.5 475t-216.5 424z" />
+<glyph unicode="*" horiz-adv-x="1130" d="M86 1090l29 182l391 -111l-43 395h194l-43 -395l398 111l26 -182l-381 -31l248 -326l-172 -94l-176 362l-160 -362l-176 94l242 326z" />
+<glyph unicode="+" d="M104 653v138h410v428h139v-428h412v-138h-412v-426h-139v426h-410z" />
+<glyph unicode="," horiz-adv-x="502" d="M63 -264q27 104 59.5 257t45.5 245h182l15 -23q-26 -100 -75 -232.5t-102 -246.5h-125z" />
+<glyph unicode="-" horiz-adv-x="659" d="M84 473v152h491v-152h-491z" />
+<glyph unicode="." horiz-adv-x="545" d="M152 106q0 67 30.5 101.5t87.5 34.5q58 0 90.5 -34.5t32.5 -101.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5z" />
+<glyph unicode="/" horiz-adv-x="752" d="M20 0l545 1462h166l-545 -1462h-166z" />
+<glyph unicode="0" d="M102 733q0 382 119 567t363 185q238 0 361.5 -193t123.5 -559q0 -379 -119.5 -566t-365.5 -187q-236 0 -359 191.5t-123 561.5zM270 733q0 -319 75 -464.5t239 -145.5q166 0 240.5 147.5t74.5 462.5t-74.5 461.5t-240.5 146.5q-164 0 -239 -144.5t-75 -463.5z" />
+<glyph unicode="1" d="M188 1163l387 299h140v-1462h-162v1042q0 130 8 246q-21 -21 -47 -44t-238 -195z" />
+<glyph unicode="2" d="M100 0v143l385 387q176 178 232 254t84 148t28 155q0 117 -71 185.5t-197 68.5q-91 0 -172.5 -30t-181.5 -109l-88 113q202 168 440 168q206 0 323 -105.5t117 -283.5q0 -139 -78 -275t-292 -344l-320 -313v-8h752v-154h-961z" />
+<glyph unicode="3" d="M94 59v158q95 -47 202.5 -71.5t203.5 -24.5q379 0 379 297q0 266 -418 266h-144v143h146q171 0 271 75.5t100 209.5q0 107 -73.5 168t-199.5 61q-96 0 -181 -26t-194 -96l-84 112q90 71 207.5 111.5t247.5 40.5q213 0 331 -97.5t118 -267.5q0 -140 -78.5 -229 t-222.5 -119v-8q176 -22 261 -112t85 -236q0 -209 -145 -321.5t-412 -112.5q-116 0 -212.5 17.5t-187.5 61.5z" />
+<glyph unicode="4" d="M43 336v145l694 989h176v-983h217v-151h-217v-336h-159v336h-711zM209 487h545v486q0 143 10 323h-8q-48 -96 -90 -159z" />
+<glyph unicode="5" d="M133 59v160q70 -45 174 -70.5t205 -25.5q176 0 273.5 83t97.5 240q0 306 -375 306q-95 0 -254 -29l-86 55l55 684h727v-153h-585l-37 -439q115 23 229 23q231 0 363.5 -114.5t132.5 -313.5q0 -227 -144.5 -356t-398.5 -129q-247 0 -377 79z" />
+<glyph unicode="6" d="M117 625q0 431 167.5 644.5t495.5 213.5q113 0 178 -19v-143q-77 25 -176 25q-235 0 -359 -146.5t-136 -460.5h12q110 172 348 172q197 0 310.5 -119t113.5 -323q0 -228 -124.5 -358.5t-336.5 -130.5q-227 0 -360 170.5t-133 474.5zM287 506q0 -103 40 -192t113.5 -141 t167.5 -52q142 0 220.5 89.5t78.5 258.5q0 145 -73 228t-218 83q-90 0 -165 -37t-119.5 -102t-44.5 -135z" />
+<glyph unicode="7" d="M94 1309v153h973v-133l-598 -1329h-184l606 1309h-797z" />
+<glyph unicode="8" d="M104 373q0 251 306 391q-138 78 -198 168.5t-60 202.5q0 159 117.5 253.5t314.5 94.5q200 0 317 -93t117 -257q0 -108 -67 -197t-214 -162q178 -85 253 -178.5t75 -216.5q0 -182 -127 -290.5t-348 -108.5q-234 0 -360 102.5t-126 290.5zM268 369q0 -120 83.5 -187 t234.5 -67q149 0 232 70t83 192q0 97 -78 172.5t-272 146.5q-149 -64 -216 -141.5t-67 -185.5zM315 1128q0 -92 59 -158t218 -132q143 60 202.5 129t59.5 161q0 101 -72.5 160.5t-199.5 59.5q-125 0 -196 -60t-71 -160z" />
+<glyph unicode="9" d="M106 991q0 228 127.5 360t335.5 132q149 0 260.5 -76.5t171.5 -223t60 -345.5q0 -858 -664 -858q-116 0 -184 20v143q80 -26 182 -26q240 0 362.5 148.5t133.5 455.5h-12q-55 -83 -146 -126.5t-205 -43.5q-194 0 -308 116t-114 324zM270 993q0 -144 72 -226.5t219 -82.5 q91 0 167.5 37t120.5 101t44 134q0 105 -41 194t-114.5 140t-168.5 51q-143 0 -221 -92t-78 -256z" />
+<glyph unicode=":" horiz-adv-x="545" d="M152 106q0 67 30.5 101.5t87.5 34.5q58 0 90.5 -34.5t32.5 -101.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5zM152 989q0 135 118 135q123 0 123 -135q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5z" />
+<glyph unicode=";" horiz-adv-x="545" d="M63 -264q27 104 59.5 257t45.5 245h182l15 -23q-26 -100 -75 -232.5t-102 -246.5h-125zM147 989q0 135 119 135q123 0 123 -135q0 -65 -33 -100t-90 -35q-58 0 -88.5 35t-30.5 100z" />
+<glyph unicode="<" d="M104 664v98l961 479v-149l-782 -371l782 -328v-151z" />
+<glyph unicode="=" d="M119 449v137h930v-137h-930zM119 858v137h930v-137h-930z" />
+<glyph unicode=">" d="M104 242v151l783 326l-783 373v149l961 -479v-98z" />
+<glyph unicode="?" horiz-adv-x="879" d="M27 1384q189 99 395 99q191 0 297 -94t106 -265q0 -73 -19.5 -128.5t-57.5 -105t-164 -159.5q-101 -86 -133.5 -143t-32.5 -152v-33h-129v54q0 117 36 192.5t134 159.5q136 115 171.5 173t35.5 140q0 102 -65.5 157.5t-188.5 55.5q-79 0 -154 -18.5t-172 -67.5zM240 106 q0 136 120 136q58 0 89.5 -35t31.5 -101q0 -64 -32 -99.5t-89 -35.5q-52 0 -86 31.5t-34 103.5z" />
+<glyph unicode="@" horiz-adv-x="1841" d="M121 571q0 260 107 463t305 314.5t454 111.5q215 0 382.5 -90.5t259 -257t91.5 -383.5q0 -142 -44 -260t-124 -183t-184 -65q-86 0 -145 52t-70 133h-8q-40 -87 -114.5 -136t-176.5 -49q-150 0 -234.5 102.5t-84.5 278.5q0 204 118 331.5t310 127.5q68 0 154 -12.5 t155 -34.5l-25 -470v-22q0 -178 133 -178q91 0 148 107.5t57 279.5q0 181 -74 317t-210.5 209.5t-313.5 73.5q-223 0 -388 -92.5t-252 -264t-87 -396.5q0 -305 161 -469t464 -164q210 0 436 86v-133q-192 -84 -436 -84q-363 0 -563.5 199.5t-200.5 557.5zM686 598 q0 -254 195 -254q207 0 225 313l14 261q-72 20 -157 20q-130 0 -203.5 -90t-73.5 -250z" />
+<glyph unicode="A" horiz-adv-x="1296" d="M0 0l578 1468h143l575 -1468h-176l-182 465h-586l-180 -465h-172zM412 618h473l-170 453q-33 86 -68 211q-22 -96 -63 -211z" />
+<glyph unicode="B" horiz-adv-x="1327" d="M201 0v1462h413q291 0 421 -87t130 -275q0 -130 -72.5 -214.5t-211.5 -109.5v-10q333 -57 333 -350q0 -196 -132.5 -306t-370.5 -110h-510zM371 145h305q177 0 266.5 68.5t89.5 214.5q0 136 -91.5 200t-278.5 64h-291v-547zM371 836h280q180 0 259 56.5t79 190.5 q0 123 -88 177.5t-280 54.5h-250v-479z" />
+<glyph unicode="C" horiz-adv-x="1292" d="M125 733q0 226 84.5 396t244 262t375.5 92q230 0 402 -84l-72 -146q-166 78 -332 78q-241 0 -380.5 -160.5t-139.5 -439.5q0 -287 134.5 -443.5t383.5 -156.5q153 0 349 55v-149q-152 -57 -375 -57q-323 0 -498.5 196t-175.5 557z" />
+<glyph unicode="D" horiz-adv-x="1493" d="M201 0v1462h448q341 0 530 -189t189 -528q0 -362 -196.5 -553.5t-565.5 -191.5h-405zM371 147h207q304 0 457 149.5t153 442.5q0 286 -143.5 431t-426.5 145h-247v-1168z" />
+<glyph unicode="E" horiz-adv-x="1139" d="M201 0v1462h815v-151h-645v-471h606v-150h-606v-538h645v-152h-815z" />
+<glyph unicode="F" horiz-adv-x="1057" d="M201 0v1462h815v-151h-645v-535h606v-151h-606v-625h-170z" />
+<glyph unicode="G" horiz-adv-x="1491" d="M125 731q0 228 91.5 399.5t263.5 262t403 90.5q234 0 436 -86l-66 -150q-198 84 -381 84q-267 0 -417 -159t-150 -441q0 -296 144.5 -449t424.5 -153q152 0 297 35v450h-327v152h497v-711q-116 -37 -236 -56t-278 -19q-332 0 -517 197.5t-185 553.5z" />
+<glyph unicode="H" horiz-adv-x="1511" d="M201 0v1462h170v-622h770v622h170v-1462h-170v688h-770v-688h-170z" />
+<glyph unicode="I" horiz-adv-x="571" d="M201 0v1462h170v-1462h-170z" />
+<glyph unicode="J" horiz-adv-x="547" d="M-160 -213q71 -20 148 -20q99 0 150.5 60t51.5 173v1462h170v-1448q0 -190 -96 -294.5t-276 -104.5q-94 0 -148 27v145z" />
+<glyph unicode="K" horiz-adv-x="1257" d="M201 0v1462h170v-725l663 725h201l-588 -635l610 -827h-200l-533 709l-153 -136v-573h-170z" />
+<glyph unicode="L" horiz-adv-x="1063" d="M201 0v1462h170v-1308h645v-154h-815z" />
+<glyph unicode="M" horiz-adv-x="1849" d="M201 0v1462h256l463 -1206h8l467 1206h254v-1462h-170v942q0 162 14 352h-8l-500 -1294h-137l-496 1296h-8q14 -154 14 -366v-930h-157z" />
+<glyph unicode="N" horiz-adv-x="1544" d="M201 0v1462h192l797 -1222h8q-2 28 -9 174q-5 114 -5 177v32v839h159v-1462h-194l-799 1227h-8q16 -216 16 -396v-831h-157z" />
+<glyph unicode="O" horiz-adv-x="1595" d="M125 735q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552q0 -351 -177.5 -552t-493.5 -201q-323 0 -498.5 197.5t-175.5 557.5zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5q-243 0 -369.5 -153.5 t-126.5 -446.5z" />
+<glyph unicode="P" horiz-adv-x="1233" d="M201 0v1462h379q548 0 548 -426q0 -222 -151.5 -341.5t-433.5 -119.5h-172v-575h-170zM371 721h153q226 0 327 73t101 234q0 145 -95 216t-296 71h-190v-594z" />
+<glyph unicode="Q" horiz-adv-x="1595" d="M125 735q0 357 176 553.5t500 196.5q315 0 492 -200t177 -552q0 -281 -113 -467t-319 -252l348 -362h-247l-285 330l-55 -2q-323 0 -498.5 197.5t-175.5 557.5zM305 733q0 -297 126.5 -450.5t367.5 -153.5q243 0 367 153t124 451q0 295 -123.5 447.5t-365.5 152.5 q-243 0 -369.5 -153.5t-126.5 -446.5z" />
+<glyph unicode="R" horiz-adv-x="1266" d="M201 0v1462h401q269 0 397.5 -103t128.5 -310q0 -290 -294 -392l397 -657h-201l-354 608h-305v-608h-170zM371 754h233q180 0 264 71.5t84 214.5q0 145 -85.5 209t-274.5 64h-221v-559z" />
+<glyph unicode="S" horiz-adv-x="1124" d="M106 47v164q90 -38 196 -60t210 -22q170 0 256 64.5t86 179.5q0 76 -30.5 124.5t-102 89.5t-217.5 93q-204 73 -291.5 173t-87.5 261q0 169 127 269t336 100q218 0 401 -80l-53 -148q-181 76 -352 76q-135 0 -211 -58t-76 -161q0 -76 28 -124.5t94.5 -89t203.5 -89.5 q230 -82 316.5 -176t86.5 -244q0 -193 -140 -301t-380 -108q-260 0 -400 67z" />
+<glyph unicode="T" horiz-adv-x="1133" d="M18 1311v151h1096v-151h-463v-1311h-170v1311h-463z" />
+<glyph unicode="U" horiz-adv-x="1491" d="M186 520v942h170v-954q0 -183 100 -281t294 -98q185 0 285 98.5t100 282.5v952h170v-946q0 -250 -151 -393t-415 -143t-408.5 144t-144.5 396z" />
+<glyph unicode="V" horiz-adv-x="1219" d="M0 1462h180l336 -946q58 -163 92 -317q36 162 94 323l334 940h183l-527 -1462h-168z" />
+<glyph unicode="W" horiz-adv-x="1896" d="M27 1462h180l231 -903q48 -190 70 -344q27 183 80 358l262 889h180l275 -897q48 -155 81 -350q19 142 72 346l230 901h180l-391 -1462h-168l-295 979q-21 65 -47 164t-27 119q-22 -132 -70 -289l-286 -973h-168z" />
+<glyph unicode="X" horiz-adv-x="1182" d="M8 0l486 764l-453 698h188l363 -579l366 579h181l-453 -692l488 -770h-193l-393 643l-400 -643h-180z" />
+<glyph unicode="Y" horiz-adv-x="1147" d="M0 1462h186l387 -731l390 731h184l-488 -895v-567h-172v559z" />
+<glyph unicode="Z" horiz-adv-x="1169" d="M82 0v133l776 1176h-752v153h959v-133l-776 -1175h798v-154h-1005z" />
+<glyph unicode="[" horiz-adv-x="674" d="M166 -324v1786h457v-141h-289v-1503h289v-142h-457z" />
+<glyph unicode="\" horiz-adv-x="752" d="M23 1462h163l547 -1462h-166z" />
+<glyph unicode="]" horiz-adv-x="674" d="M51 -182h289v1503h-289v141h457v-1786h-457v142z" />
+<glyph unicode="^" horiz-adv-x="1110" d="M49 551l434 922h99l477 -922h-152l-372 745l-334 -745h-152z" />
+<glyph unicode="_" horiz-adv-x="918" d="M-4 -184h926v-131h-926v131z" />
+<glyph unicode="`" horiz-adv-x="1182" d="M393 1548v21h203q32 -69 89 -159.5t101 -143.5v-25h-110q-65 52 -154 148t-129 159z" />
+<glyph unicode="a" horiz-adv-x="1139" d="M94 303q0 332 531 348l186 6v68q0 129 -55.5 190.5t-177.5 61.5q-137 0 -310 -84l-51 127q81 44 177.5 69t193.5 25q196 0 290.5 -87t94.5 -279v-748h-123l-33 156h-8q-82 -103 -163.5 -139.5t-203.5 -36.5q-163 0 -255.5 84t-92.5 239zM268 301q0 -90 54.5 -137 t152.5 -47q155 0 243.5 85t88.5 238v99l-166 -7q-198 -7 -285.5 -61.5t-87.5 -169.5z" />
+<glyph unicode="b" horiz-adv-x="1255" d="M176 0v1556h166v-378q0 -127 -8 -228h8q116 164 344 164q216 0 335.5 -147.5t119.5 -417.5t-120.5 -419.5t-334.5 -149.5q-107 0 -195.5 39.5t-148.5 121.5h-12l-35 -141h-119zM342 549q0 -231 77 -330.5t247 -99.5q153 0 228 111.5t75 320.5q0 214 -75 319t-232 105 q-170 0 -245 -97.5t-75 -328.5z" />
+<glyph unicode="c" horiz-adv-x="975" d="M115 541q0 275 132.5 425t377.5 150q79 0 158 -17t124 -40l-51 -141q-55 22 -120 36.5t-115 14.5q-334 0 -334 -426q0 -202 81.5 -310t241.5 -108q137 0 281 59v-147q-110 -57 -277 -57q-238 0 -368.5 146.5t-130.5 414.5z" />
+<glyph unicode="d" horiz-adv-x="1255" d="M115 545q0 271 120 421t334 150q223 0 342 -162h13l-7 79l-4 77v446h166v-1556h-135l-22 147h-9q-115 -167 -344 -167q-215 0 -334.5 147t-119.5 418zM287 543q0 -210 77 -317t226 -107q170 0 246.5 92.5t76.5 298.5v35q0 233 -77.5 332.5t-247.5 99.5 q-146 0 -223.5 -113.5t-77.5 -320.5z" />
+<glyph unicode="e" horiz-adv-x="1149" d="M115 539q0 265 130.5 421t350.5 156q206 0 326 -135.5t120 -357.5v-105h-755q5 -193 97.5 -293t260.5 -100q177 0 350 74v-148q-88 -38 -166.5 -54.5t-189.5 -16.5q-243 0 -383.5 148t-140.5 411zM291 653h573q0 157 -70 240.5t-200 83.5q-132 0 -210.5 -86t-92.5 -238z " />
+<glyph unicode="f" horiz-adv-x="694" d="M29 967v75l196 60v61q0 404 353 404q87 0 204 -35l-43 -133q-96 31 -164 31q-94 0 -139 -62.5t-45 -200.5v-71h279v-129h-279v-967h-166v967h-196z" />
+<glyph unicode="g" horiz-adv-x="1122" d="M39 -186q0 100 64 173t180 99q-42 19 -70.5 59t-28.5 93q0 60 32 105t101 87q-85 35 -138.5 119t-53.5 192q0 180 108 277.5t306 97.5q86 0 155 -20h379v-105l-203 -24q28 -35 50 -91.5t22 -127.5q0 -161 -110 -257t-302 -96q-49 0 -92 8q-106 -56 -106 -141 q0 -45 37 -66.5t127 -21.5h194q178 0 273.5 -75t95.5 -218q0 -182 -146 -277.5t-426 -95.5q-215 0 -331.5 80t-116.5 226zM199 -184q0 -89 75 -135t215 -46q209 0 309.5 62.5t100.5 169.5q0 89 -55 123.5t-207 34.5h-199q-113 0 -176 -54t-63 -155zM289 745q0 -115 65 -174 t181 -59q243 0 243 236q0 247 -246 247q-117 0 -180 -63t-63 -187z" />
+<glyph unicode="h" horiz-adv-x="1257" d="M176 0v1556h166v-471q0 -85 -8 -141h10q49 79 139.5 124.5t206.5 45.5q201 0 301.5 -95.5t100.5 -303.5v-715h-166v709q0 134 -61 200t-191 66q-173 0 -252.5 -94t-79.5 -308v-573h-166z" />
+<glyph unicode="i" horiz-adv-x="518" d="M162 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5zM176 0v1096h166v-1096h-166z" />
+<glyph unicode="j" horiz-adv-x="518" d="M-111 -332q69 -20 136 -20q78 0 114.5 42.5t36.5 129.5v1276h166v-1264q0 -324 -299 -324q-95 0 -154 25v135zM162 1393q0 57 28 83.5t70 26.5q40 0 69 -27t29 -83t-29 -83.5t-69 -27.5q-42 0 -70 27.5t-28 83.5z" />
+<glyph unicode="k" horiz-adv-x="1075" d="M176 0v1556h164v-825q0 -55 -8 -170h8q43 61 131 160l354 375h197l-444 -467l475 -629h-201l-387 518l-125 -108v-410h-164z" />
+<glyph unicode="l" horiz-adv-x="518" d="M176 0v1556h166v-1556h-166z" />
+<glyph unicode="m" horiz-adv-x="1905" d="M176 0v1096h135l27 -150h8q47 80 132.5 125t191.5 45q257 0 336 -186h8q49 86 142 136t212 50q186 0 278.5 -95.5t92.5 -305.5v-715h-166v713q0 131 -56 196.5t-174 65.5q-155 0 -229 -89t-74 -274v-612h-166v713q0 131 -56 196.5t-175 65.5q-156 0 -228.5 -93.5 t-72.5 -306.5v-575h-166z" />
+<glyph unicode="n" horiz-adv-x="1257" d="M176 0v1096h135l27 -150h8q51 81 143 125.5t205 44.5q198 0 298 -95.5t100 -305.5v-715h-166v709q0 134 -61 200t-191 66q-172 0 -252 -93t-80 -307v-575h-166z" />
+<glyph unicode="o" horiz-adv-x="1237" d="M115 549q0 268 134 417.5t372 149.5q230 0 365.5 -153t135.5 -414q0 -268 -135 -418.5t-373 -150.5q-147 0 -261 69t-176 198t-62 302zM287 549q0 -210 84 -320t247 -110t247.5 109.5t84.5 320.5q0 209 -84.5 317.5t-249.5 108.5q-163 0 -246 -107t-83 -319z" />
+<glyph unicode="p" horiz-adv-x="1255" d="M176 -492v1588h135l23 -150h8q64 90 149 130t195 40q218 0 336.5 -149t118.5 -418q0 -270 -120.5 -419.5t-334.5 -149.5q-107 0 -195.5 39.5t-148.5 121.5h-12q12 -96 12 -182v-451h-166zM342 549q0 -231 77 -330.5t247 -99.5q142 0 222.5 115t80.5 317 q0 205 -80.5 314.5t-226.5 109.5q-168 0 -243 -93t-77 -296v-37z" />
+<glyph unicode="q" horiz-adv-x="1255" d="M115 545q0 269 120 420t334 151q225 0 346 -170h9l24 150h131v-1588h-166v469q0 100 11 170h-13q-115 -167 -346 -167q-212 0 -331 149t-119 416zM287 543q0 -207 76.5 -315.5t226.5 -108.5q166 0 242 89t81 300v37q0 230 -78 331t-247 101q-146 0 -223.5 -113.5 t-77.5 -320.5z" />
+<glyph unicode="r" horiz-adv-x="836" d="M176 0v1096h137l19 -203h8q61 107 147 165t189 58q73 0 131 -12l-23 -154q-68 15 -120 15q-133 0 -227.5 -108t-94.5 -269v-588h-166z" />
+<glyph unicode="s" horiz-adv-x="977" d="M106 827q0 134 109 211.5t299 77.5q177 0 346 -72l-59 -135q-165 68 -299 68q-118 0 -178 -37t-60 -102q0 -44 22.5 -75t72.5 -59t192 -81q195 -71 263.5 -143t68.5 -181q0 -153 -114 -236t-320 -83q-218 0 -340 69v154q79 -40 169.5 -63t174.5 -23q130 0 200 41.5 t70 126.5q0 64 -55.5 109.5t-216.5 107.5q-153 57 -217.5 99.5t-96 96.5t-31.5 129z" />
+<glyph unicode="t" horiz-adv-x="723" d="M31 967v80l157 69l70 234h96v-254h318v-129h-318v-645q0 -99 47 -152t129 -53q44 0 85 6.5t65 13.5v-127q-27 -13 -79.5 -21.5t-94.5 -8.5q-318 0 -318 335v652h-157z" />
+<glyph unicode="u" horiz-adv-x="1257" d="M164 379v717h168v-711q0 -134 61 -200t191 -66q172 0 251.5 94t79.5 307v576h166v-1096h-137l-24 147h-9q-51 -81 -141.5 -124t-206.5 -43q-200 0 -299.5 95t-99.5 304z" />
+<glyph unicode="v" horiz-adv-x="1026" d="M0 1096h178l236 -650q80 -228 94 -296h8q11 53 69.5 219.5t262.5 726.5h178l-416 -1096h-194z" />
+<glyph unicode="w" horiz-adv-x="1593" d="M23 1096h174q106 -413 161.5 -629t63.5 -291h8q11 57 35.5 147.5t42.5 143.5l201 629h180l196 -629q56 -172 76 -289h8q4 36 21.5 111t208.5 807h172l-303 -1096h-197l-201 643q-19 59 -71 268h-8q-40 -175 -70 -270l-207 -641h-192z" />
+<glyph unicode="x" horiz-adv-x="1073" d="M39 0l401 561l-381 535h189l289 -420l288 420h187l-381 -535l401 -561h-188l-307 444l-310 -444h-188z" />
+<glyph unicode="y" horiz-adv-x="1032" d="M2 1096h178l240 -625q79 -214 98 -309h8q13 51 54.5 174.5t271.5 759.5h178l-471 -1248q-70 -185 -163.5 -262.5t-229.5 -77.5q-76 0 -150 17v133q55 -12 123 -12q171 0 244 192l61 156z" />
+<glyph unicode="z" horiz-adv-x="958" d="M82 0v113l598 854h-561v129h743v-129l-590 -838h605v-129h-795z" />
+<glyph unicode="{" horiz-adv-x="776" d="M61 498v141q130 2 188 48t58 142v306q0 155 108 241t290 86v-139q-230 -6 -230 -199v-295q0 -215 -223 -254v-12q223 -39 223 -254v-297q0 -102 58.5 -148t171.5 -48v-140q-190 2 -294 87t-104 239v303q0 104 -63 148.5t-183 44.5z" />
+<glyph unicode="|" horiz-adv-x="1128" d="M494 -496v2052h141v-2052h-141z" />
+<glyph unicode="}" horiz-adv-x="776" d="M72 -184q111 2 169 48t58 148v297q0 114 55 174t168 80v12q-223 39 -223 254v295q0 193 -227 199v139q184 0 289.5 -87t105.5 -240v-306q0 -97 59 -142.5t189 -47.5v-141q-122 0 -185 -44.5t-63 -148.5v-303q0 -153 -102.5 -238.5t-292.5 -87.5v140z" />
+<glyph unicode="~" d="M104 592v151q100 109 244 109q68 0 124.5 -14t145.5 -52q66 -28 115 -41.5t96 -13.5q54 0 118 32t118 89v-150q-102 -110 -244 -110q-72 0 -135 16.5t-135 48.5q-75 32 -120 44t-93 12q-53 0 -116.5 -33.5t-117.5 -87.5z" />
+<glyph unicode="¢" d="M190 741q0 508 396 570v172h135v-164q75 -3 146 -19.5t120 -39.5l-49 -140q-133 51 -242 51q-172 0 -253 -105.5t-81 -322.5q0 -212 79.5 -313.5t246.5 -101.5q141 0 283 59v-147q-105 -54 -252 -60v-200h-133v206q-203 32 -299.5 168.5t-96.5 386.5z" />
+<glyph unicode="£" d="M63 0v141q205 47 205 291v223h-198v127h198v316q0 178 112 280.5t302 102.5t360 -84l-61 -133q-154 77 -297 77q-123 0 -185.5 -62t-62.5 -202v-295h422v-127h-422v-221q0 -100 -32.5 -168t-106.5 -112h795v-154h-1029z" />
+<glyph unicode="¥" d="M31 1462h178l375 -727l379 727h174l-416 -770h262v-127h-317v-170h317v-127h-317v-268h-164v268h-316v127h316v170h-316v127h256z" />
+<glyph unicode="©" horiz-adv-x="1704" d="M100 731q0 200 100 375t275 276t377 101q200 0 375 -100t276 -275t101 -377q0 -197 -97 -370t-272 -277t-383 -104q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM205 731q0 -173 87 -323.5t237.5 -237t322.5 -86.5q174 0 323 87t236.5 235.5t87.5 324.5q0 174 -87 323 t-235.5 236.5t-324.5 87.5q-174 0 -323 -87t-236.5 -235.5t-87.5 -324.5zM481 731q0 209 110.5 332t301.5 123q128 0 246 -60l-58 -118q-108 51 -188 51q-125 0 -192.5 -87t-67.5 -241q0 -168 63.5 -249t194.5 -81q86 0 211 45v-124q-48 -20 -98.5 -34t-120.5 -14 q-194 0 -298 120.5t-104 336.5z" />
+<glyph unicode="" horiz-adv-x="659" d="M84 473v152h491v-152h-491z" />
+<glyph unicode="®" horiz-adv-x="1704" d="M100 731q0 200 100 375t275 276t377 101q200 0 375 -100t276 -275t101 -377q0 -197 -97 -370t-272 -277t-383 -104q-207 0 -382 103.5t-272.5 276.5t-97.5 371zM205 731q0 -173 87 -323.5t237.5 -237t322.5 -86.5q174 0 323 87t236.5 235.5t87.5 324.5q0 174 -87 323 t-235.5 236.5t-324.5 87.5q-174 0 -323 -87t-236.5 -235.5t-87.5 -324.5zM575 285v891h261q166 0 243.5 -65t77.5 -198q0 -80 -42.5 -141.5t-119.5 -91.5l238 -395h-168l-207 354h-135v-354h-148zM723 762h108q80 0 128.5 41.5t48.5 105.5q0 75 -43 107.5t-136 32.5h-106 v-287z" />
+<glyph unicode="´" horiz-adv-x="1182" d="M393 1241v25q48 62 103.5 150t87.5 153h202v-21q-44 -65 -131 -160t-151 -147h-111z" />
+<glyph unicode=" " horiz-adv-x="784" />
+<glyph unicode=" " horiz-adv-x="1569" />
+<glyph unicode=" " horiz-adv-x="784" />
+<glyph unicode=" " horiz-adv-x="1569" />
+<glyph unicode=" " horiz-adv-x="523" />
+<glyph unicode=" " horiz-adv-x="392" />
+<glyph unicode=" " horiz-adv-x="261" />
+<glyph unicode=" " horiz-adv-x="261" />
+<glyph unicode=" " horiz-adv-x="196" />
+<glyph unicode=" " horiz-adv-x="313" />
+<glyph unicode=" " horiz-adv-x="87" />
+<glyph unicode="‐" horiz-adv-x="659" d="M84 473v152h491v-152h-491z" />
+<glyph unicode="‑" horiz-adv-x="659" d="M84 473v152h491v-152h-491z" />
+<glyph unicode="‒" horiz-adv-x="659" d="M84 473v152h491v-152h-491z" />
+<glyph unicode="–" horiz-adv-x="1024" d="M82 473v152h860v-152h-860z" />
+<glyph unicode="—" horiz-adv-x="2048" d="M82 473v152h1884v-152h-1884z" />
+<glyph unicode="‘" horiz-adv-x="348" d="M25 983q22 90 71 224t105 255h123q-66 -254 -103 -501h-184z" />
+<glyph unicode="’" horiz-adv-x="348" d="M25 961q70 285 102 501h182l15 -22q-26 -100 -75 -232.5t-102 -246.5h-122z" />
+<glyph unicode="“" horiz-adv-x="717" d="M25 983q22 90 71 224t105 255h123q-66 -254 -103 -501h-184zM391 983q56 215 178 479h123q-30 -115 -59.5 -259.5t-42.5 -241.5h-184z" />
+<glyph unicode="”" horiz-adv-x="717" d="M25 961q70 285 102 501h182l15 -22q-26 -100 -75 -232.5t-102 -246.5h-122zM391 961q26 100 59 254t46 247h182l14 -22q-24 -91 -72 -224t-104 -255h-125z" />
+<glyph unicode="•" horiz-adv-x="770" d="M164 748q0 121 56.5 184t164.5 63q105 0 163 -62t58 -185q0 -119 -57.5 -183.5t-163.5 -64.5q-107 0 -164 65.5t-57 182.5z" />
+<glyph unicode="…" horiz-adv-x="1606" d="M152 106q0 67 30.5 101.5t87.5 34.5q58 0 90.5 -34.5t32.5 -101.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5zM682 106q0 67 30.5 101.5t87.5 34.5q58 0 90.5 -34.5t32.5 -101.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5zM1213 106 q0 67 30.5 101.5t87.5 34.5q58 0 90.5 -34.5t32.5 -101.5q0 -65 -33 -100t-90 -35q-51 0 -84.5 31.5t-33.5 103.5z" />
+<glyph unicode=" " horiz-adv-x="313" />
+<glyph unicode=" " horiz-adv-x="392" />
+<glyph unicode="€" horiz-adv-x="1208" d="M63 506v129h152l-2 42v44l2 80h-152v129h164q39 261 185 407t383 146q201 0 366 -97l-71 -139q-166 86 -295 86q-319 0 -398 -403h510v-129h-524l-2 -57v-64l2 -45h463v-129h-447q37 -180 138.5 -278.5t271.5 -98.5q156 0 309 66v-150q-146 -65 -317 -65 q-237 0 -381.5 134.5t-190.5 391.5h-166z" />
+<glyph unicode="™" horiz-adv-x="1589" d="M37 1356v106h543v-106h-211v-615h-123v615h-209zM647 741v721h187l196 -559l203 559h180v-721h-127v420l6 137h-8l-211 -557h-104l-201 559h-8l6 -129v-430h-119z" />
+<glyph unicode="" horiz-adv-x="1095" d="M0 1095h1095v-1095h-1095v1095z" />
+</font>
+</defs></svg>
\ No newline at end of file
diff --git a/couchpotato/static/fonts/OpenSans-Regular-webfont.ttf b/couchpotato/static/fonts/OpenSans-Regular-webfont.ttf
new file mode 100755
index 0000000000..05951e7b36
Binary files /dev/null and b/couchpotato/static/fonts/OpenSans-Regular-webfont.ttf differ
diff --git a/couchpotato/static/fonts/OpenSans-Regular-webfont.woff b/couchpotato/static/fonts/OpenSans-Regular-webfont.woff
new file mode 100755
index 0000000000..274664b28e
Binary files /dev/null and b/couchpotato/static/fonts/OpenSans-Regular-webfont.woff differ
diff --git a/couchpotato/static/fonts/config.json b/couchpotato/static/fonts/config.json
new file mode 100644
index 0000000000..309d296193
--- /dev/null
+++ b/couchpotato/static/fonts/config.json
@@ -0,0 +1,190 @@
+{
+ "name": "icons",
+ "css_prefix_text": "icon-",
+ "css_use_suffix": false,
+ "hinting": true,
+ "units_per_em": 1000,
+ "ascent": 850,
+ "glyphs": [
+ {
+ "uid": "48cc210e59ff4bc56b6c8fba6eb384b8",
+ "css": "emo-coffee",
+ "code": 59401,
+ "src": "fontelico"
+ },
+ {
+ "uid": "078fec38562c3f83a1201a908040c141",
+ "css": "emo-sunglasses",
+ "code": 59402,
+ "src": "fontelico"
+ },
+ {
+ "uid": "04688d76a33ce7a7950e40fae79c08ac",
+ "css": "emo-cry",
+ "code": 59400,
+ "src": "fontelico"
+ },
+ {
+ "uid": "9dd9e835aebe1060ba7190ad2b2ed951",
+ "css": "search",
+ "code": 59394,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "474656633f79ea2f1dad59ff63f6bf07",
+ "css": "star",
+ "code": 59418,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "d17030afaecc1e1c22349b99f3c4992a",
+ "css": "star-empty",
+ "code": 59419,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "84cf1fcc3fec556e7eaeb19679ca2dc9",
+ "css": "star-half",
+ "code": 59420,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "872d9516df93eb6b776cc4d94bd97dac",
+ "css": "movie",
+ "code": 59416,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "b1887b423d2fd15c345e090320c91ca0",
+ "css": "thumbs",
+ "code": 59397,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "f805bb95d40c7ef2bc51b3d50d4f2e5c",
+ "css": "list",
+ "code": 59398,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "12f4ece88e46abd864e40b35e05b11cd",
+ "css": "ok",
+ "code": 59408,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "5211af474d3a9848f67f945e2ccaf143",
+ "css": "cancel",
+ "code": 59406,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "44e04715aecbca7f266a17d5a7863c68",
+ "css": "plus",
+ "code": 59411,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "3d4ea8a78dc34efe891f3a0f3d961274",
+ "css": "info",
+ "code": 59403,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "d7271d490b71df4311e32cdacae8b331",
+ "css": "home",
+ "code": 59415,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "c5fd349cbd3d23e4ade333789c29c729",
+ "css": "eye",
+ "code": 59412,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "9a76bc135eac17d2c8b8ad4a5774fc87",
+ "css": "download",
+ "code": 59404,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "f48ae54adfb27d8ada53d0fd9e34ee10",
+ "css": "delete",
+ "code": 59405,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "e99461abfef3923546da8d745372c995",
+ "css": "settings",
+ "code": 59393,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "bc71f4c6e53394d5ba46b063040014f1",
+ "css": "redo",
+ "code": 59407,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "a73c5deb486c8d66249811642e5d719a",
+ "css": "refresh",
+ "code": 59414,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "4109c474ff99cad28fd5a2c38af2ec6f",
+ "css": "filter",
+ "code": 59396,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "026007bd17bfc67f3fe013199676f620",
+ "css": "donate",
+ "code": 59421,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "94103e1b3f1e8cf514178ec5912b4469",
+ "css": "dropdown",
+ "code": 59409,
+ "src": "fontawesome"
+ },
+ {
+ "uid": "2cfb3f2b46b34a1790aec0aa846297b6",
+ "css": "menu",
+ "code": 59417,
+ "src": "entypo"
+ },
+ {
+ "uid": "c311c48d79488965b0fab7f9cd12b6b5",
+ "css": "left-arrow",
+ "code": 59392,
+ "src": "entypo"
+ },
+ {
+ "uid": "cb13afd4722a849d48056540bb74c47e",
+ "css": "play",
+ "code": 59410,
+ "src": "entypo"
+ },
+ {
+ "uid": "d10920db2e79c997c5e783279291970c",
+ "css": "dots",
+ "code": 59395,
+ "src": "entypo"
+ },
+ {
+ "uid": "51fb22f9ff9d7f60c95ef31e4c59502d",
+ "css": "notifications",
+ "code": 59399,
+ "src": "mfglabs"
+ },
+ {
+ "uid": "3ab229dd9bccaaaf6c71096da4b72c04",
+ "css": "error",
+ "code": 59413,
+ "src": "elusive"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/couchpotato/static/fonts/icons.eot b/couchpotato/static/fonts/icons.eot
new file mode 100644
index 0000000000..a910d5ea33
Binary files /dev/null and b/couchpotato/static/fonts/icons.eot differ
diff --git a/couchpotato/static/fonts/icons.svg b/couchpotato/static/fonts/icons.svg
new file mode 100644
index 0000000000..2863239dec
--- /dev/null
+++ b/couchpotato/static/fonts/icons.svg
@@ -0,0 +1,41 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Copyright (C) 2015 by original authors @ fontello.com</metadata>
+<defs>
+<font id="icons" horiz-adv-x="1000" >
+<font-face font-family="icons" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
+<missing-glyph horiz-adv-x="1000" />
+<glyph glyph-name="left-arrow" unicode="" d="m242 626q14 16 39 16t41-16q38-36 0-80l-186-196 186-194q38-44 0-80-16-16-40-16t-40 16l-226 236q-16 16-16 38 0 24 16 40 206 214 226 236z" horiz-adv-x="341" />
+<glyph glyph-name="settings" unicode="" d="m571 350q0 59-41 101t-101 42-101-42-42-101 42-101 101-42 101 42 41 101z m286 61v-124q0-7-4-13t-11-7l-104-16q-10-30-21-51 19-27 59-77 6-6 6-13t-5-13q-15-21-55-61t-53-39q-7 0-14 5l-77 60q-25-13-51-21-9-76-16-104-4-16-20-16h-124q-8 0-14 5t-6 12l-16 103q-27 9-50 21l-79-60q-6-5-14-5-8 0-14 6-70 64-92 94-4 5-4 13 0 6 5 12 8 12 28 37t30 40q-15 28-23 55l-102 15q-7 1-11 7t-5 13v124q0 7 5 13t10 7l104 16q8 25 22 51-23 32-60 77-6 7-6 14 0 5 5 12 15 20 55 60t53 40q7 0 15-5l77-60q24 13 50 21 9 76 17 104 3 15 20 15h124q7 0 13-4t7-12l15-103q28-9 50-21l80 60q5 5 13 5 7 0 14-5 72-67 92-95 4-5 4-13 0-6-4-12-9-12-29-38t-30-39q14-28 23-55l102-15q7-1 12-7t4-13z" horiz-adv-x="857.1" />
+<glyph glyph-name="search" unicode="" d="m643 386q0 103-74 176t-176 74-177-74-73-176 73-177 177-73 176 73 74 177z m286-465q0-29-22-50t-50-21q-30 0-50 21l-191 191q-100-69-223-69-80 0-153 31t-125 84-84 125-31 153 31 152 84 126 125 84 153 31 152-31 126-84 84-126 31-152q0-123-69-223l191-191q21-21 21-51z" horiz-adv-x="928.6" />
+<glyph glyph-name="dots" unicode="" d="m110 460q46 0 78-32t32-78q0-44-32-77t-78-33-78 33-32 77q0 46 32 78t78 32z m350 0q46 0 78-32t32-78q0-44-33-77t-77-33-77 33-33 77q0 46 32 78t78 32z m350 0q46 0 78-32t32-78q0-44-32-77t-78-33-78 33-32 77q0 46 32 78t78 32z" horiz-adv-x="920" />
+<glyph glyph-name="filter" unicode="" d="m783 685q9-23-8-39l-275-275v-414q0-23-22-33-7-3-14-3-15 0-25 11l-143 143q-10 10-10 25v271l-275 275q-18 16-8 39 9 22 33 22h714q23 0 33-22z" horiz-adv-x="785.7" />
+<glyph glyph-name="thumbs" unicode="" d="m286 154v-108q0-22-16-37t-38-16h-178q-23 0-38 16t-16 37v108q0 22 16 38t38 15h178q22 0 38-15t16-38z m0 285v-107q0-22-16-38t-38-15h-178q-23 0-38 15t-16 38v107q0 23 16 38t38 16h178q22 0 38-16t16-38z m357-285v-108q0-22-16-37t-38-16h-178q-23 0-38 16t-16 37v108q0 22 16 38t38 15h178q23 0 38-15t16-38z m-357 571v-107q0-22-16-38t-38-16h-178q-23 0-38 16t-16 38v107q0 22 16 38t38 16h178q22 0 38-16t16-38z m357-286v-107q0-22-16-38t-38-15h-178q-23 0-38 15t-16 38v107q0 23 16 38t38 16h178q23 0 38-16t16-38z m357-285v-108q0-22-16-37t-38-16h-178q-22 0-38 16t-16 37v108q0 22 16 38t38 15h178q23 0 38-15t16-38z m-357 571v-107q0-22-16-38t-38-16h-178q-23 0-38 16t-16 38v107q0 22 16 38t38 16h178q23 0 38-16t16-38z m357-286v-107q0-22-16-38t-38-15h-178q-22 0-38 15t-16 38v107q0 23 16 38t38 16h178q23 0 38-16t16-38z m0 286v-107q0-22-16-38t-38-16h-178q-22 0-38 16t-16 38v107q0 22 16 38t38 16h178q23 0 38-16t16-38z" horiz-adv-x="1000" />
+<glyph glyph-name="list" unicode="" d="m286 154v-108q0-22-16-37t-38-16h-178q-23 0-38 16t-16 37v108q0 22 16 38t38 15h178q22 0 38-15t16-38z m0 285v-107q0-22-16-38t-38-15h-178q-23 0-38 15t-16 38v107q0 23 16 38t38 16h178q22 0 38-16t16-38z m714-285v-108q0-22-16-37t-38-16h-535q-23 0-38 16t-16 37v108q0 22 16 38t38 15h535q23 0 38-15t16-38z m-714 571v-107q0-22-16-38t-38-16h-178q-23 0-38 16t-16 38v107q0 22 16 38t38 16h178q22 0 38-16t16-38z m714-286v-107q0-22-16-38t-38-15h-535q-23 0-38 15t-16 38v107q0 23 16 38t38 16h535q23 0 38-16t16-38z m0 286v-107q0-22-16-38t-38-16h-535q-23 0-38 16t-16 38v107q0 22 16 38t38 16h535q23 0 38-16t16-38z" horiz-adv-x="1000" />
+<glyph glyph-name="notifications" unicode="" d="m0 404q0 67 27 130t75 114 114 89 145 59 166 21 166-21 146-59 113-89 76-114 26-130q0-84-42-160t-112-131-168-88-205-33q-105 0-201 31l-121-85q-67-42-94-24t-12 100l25 125q-60 55-92 122t-32 143z" horiz-adv-x="1054.7" />
+<glyph glyph-name="emo-cry" unicode="" d="m278 787c-7 0-15-2-23-5l-128-62-80-38c-2-1-4-2-6-3-1-5-1-11-1-16l0 0 0-1 0 0c0-69 40-162 122-163l0 0 0 0 0 0c34 1 65 19 87 50 26 35 37 82 34 128l18 8c27 13 38 45 25 71-9 19-28 31-48 31z m212 0c-20 0-39-11-48-30-13-27-1-59 25-71l18-9c-3-46 9-93 34-128 22-31 53-49 87-49l0 0 1 0 0 0c82 0 121 93 122 162l0 0 0 1 0 0c0 5-1 11-1 16-2 1-5 2-7 3l-80 38-128 62c-7 3-15 5-23 5z m279-302c-7 0-15-5-21-16-42-72-96-259 27-259 123 1 73 182 16 261-6 8-14 13-22 14z m-512-138c-57 0-112-9-166-26-10-4-20-7-30-11-11-5-21-9-30-13l0 0-1-1 0 0c-26-12-37-44-25-70 13-26 44-38 70-25l0-1c9 5 17 8 24 11 9 3 17 6 25 9 43 14 88 21 133 21 51 0 101-9 148-27 19-7 37-15 55-24 91-49 163-130 200-232 10-27 40-41 68-31 27 10 42 40 32 68-46 126-137 227-250 288-22 12-45 22-69 31-57 21-120 33-184 33z" horiz-adv-x="851" />
+<glyph glyph-name="emo-coffee" unicode="" d="m1234 850c-17 0-34-8-44-23-54-80-24-144 4-204 13-29 26-56 5-72-23-17-28-51-10-74 17-23 51-28 74-10 89 67 60 131 27 201-15 33-32 70-12 99 16 25 10 57-14 74-9 6-20 9-30 9z m-1021-121c-81 0-157-39-203-105-18-25-12-59 14-77 24-17 59-11 76 14 45 63 132 76 193 32l0 0c3-2 7-6 11-9l1-1 1-1c3-3 7-7 10-10l1-2 0 0 0 0 1-1 1 0c20-23 55-25 78-4 22 20 24 55 4 77-46 55-116 87-188 87z m499 0c-80 0-156-39-202-105-18-25-12-59 13-77 25-17 59-11 77 14 44 63 131 76 192 32l0 0c4-2 8-6 12-9l0-1 1-1c4-3 7-7 11-10l1-2 0 0 0 0 1-1 0 0c20-23 55-25 78-4 23 20 25 55 4 77-46 55-116 87-188 87z m206-346c-24 0-44-19-44-43l1-4-1-275 0 0 0 0 0 0c0-58 24-111 62-149l0 0 0 0 0 0c38-38 91-62 148-62l0 0 226 0c1 0 3 0 5 0 13 1 27 2 39 5 15 4 29 8 42 14 55 26 97 74 114 133l31 0 0 0c37 0 70 15 94 39 23 23 38 56 38 92l0 0 0 0 0 119 0 0c0 36-15 69-39 93l0 0c-23 23-56 38-92 38l0 0 0 0-624 0z m604-100c11 0 21-5 28-12l1 0 0 0c7-8 12-18 12-29l0 0 0-110 0 0c0-11-5-21-12-29-8-7-18-12-29-12l0 0-62 0 0 0c-21 0-39-16-40-37-4-41-31-76-67-93-7-3-15-6-22-8-7-1-14-2-21-2l-3 0-209 0 0-1c-30 1-59 13-79 34l-1 0c-21 21-34 50-34 81l0 0 0 0 0 0 1 218 537 0 0 0z m-82-55l0-96 32 0c22 0 39 17 39 38l0 20c0 21-17 38-39 38l-32 0z m-1131-12c-30 0-55-25-55-55s25-55 55-55l297 0c30 0 54 25 54 55s-24 55-54 55l-297 0z" horiz-adv-x="1673" />
+<glyph glyph-name="emo-sunglasses" unicode="" d="m495 745c-154 0-309 0-463 0-18 0-32-15-32-33 3-153 129-306 278-309 84-2 164 36 218 95 55-59 135-97 219-95 149 3 272 156 275 309 0 18-14 33-32 33-155 0-309 0-463 0z m319-510c-18 0-35-9-45-25l0 0c0-1-1-2-1-3-7-12-15-23-24-34-10-12-19-23-29-32-54-51-126-80-203-80l0 0 0 0c-21 0-43 2-64 7-3 0-6 1-10 2-17 5-34 11-51 19-26 12-58 1-70-26-13-27-1-58 25-71 22-10 45-18 69-24 5-1 9-2 14-4 29-6 58-9 87-9l0 0 0 0c104 0 201 39 275 108 15 14 28 29 40 43 11 15 22 31 32 48 0 0 1 1 1 1 15 25 7 58-18 73-9 5-18 7-28 7z" horiz-adv-x="990" />
+<glyph glyph-name="info" unicode="" d="m357 100v-71q0-15-10-25t-26-11h-285q-15 0-25 11t-11 25v71q0 15 11 25t25 11h35v214h-35q-15 0-25 11t-11 25v71q0 15 11 25t25 11h214q15 0 25-11t11-25v-321h35q15 0 26-11t10-25z m-71 643v-107q0-15-11-25t-25-11h-143q-14 0-25 11t-11 25v107q0 14 11 25t25 11h143q15 0 25-11t11-25z" horiz-adv-x="357.1" />
+<glyph glyph-name="download" unicode="" d="m714 100q0 15-10 25t-25 11-26-11-10-25 10-25 26-11 25 11 10 25z m143 0q0 15-10 25t-26 11-25-11-10-25 10-25 25-11 26 11 10 25z m72 125v-179q0-22-16-37t-38-16h-821q-23 0-38 16t-16 37v179q0 22 16 38t38 16h259l75-76q33-32 76-32t76 32l76 76h259q22 0 38-16t16-38z m-182 318q10-23-8-40l-250-250q-10-10-25-10t-25 10l-250 250q-17 17-8 40 10 21 33 21h143v250q0 15 11 25t25 11h143q14 0 25-11t10-25v-250h143q24 0 33-21z" horiz-adv-x="928.6" />
+<glyph glyph-name="delete" unicode="" d="m286 439v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q8 0 13-5t5-13z m143 0v-321q0-8-5-13t-13-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q8 0 13-5t5-13z m142 0v-321q0-8-5-13t-12-5h-36q-8 0-13 5t-5 13v321q0 8 5 13t13 5h36q7 0 12-5t5-13z m72-404v529h-500v-529q0-12 4-22t8-15 6-5h464q2 0 6 5t8 15 4 22z m-375 601h250l-27 65q-4 5-9 6h-177q-6-1-10-6z m518-18v-36q0-8-5-13t-13-5h-54v-529q0-46-26-80t-63-34h-464q-37 0-63 33t-27 79v531h-53q-8 0-13 5t-5 13v36q0 8 5 13t13 5h172l39 93q9 21 31 35t44 15h178q22 0 44-15t30-35l39-93h173q8 0 13-5t5-13z" horiz-adv-x="785.7" />
+<glyph glyph-name="cancel" unicode="" d="m724 112q0-22-15-38l-76-76q-16-15-38-15t-38 15l-164 165-164-165q-16-15-38-15t-38 15l-76 76q-16 16-16 38t16 38l164 164-164 164q-16 16-16 38t16 38l76 76q16 16 38 16t38-16l164-164 164 164q16 16 38 16t38-16l76-76q15-15 15-38t-15-38l-164-164 164-164q15-15 15-38z" horiz-adv-x="785.7" />
+<glyph glyph-name="redo" unicode="" d="m857 707v-250q0-14-10-25t-26-11h-250q-23 0-32 23-10 22 7 38l77 77q-82 77-194 77-58 0-111-23t-91-61-62-91-22-111 22-111 62-91 91-61 111-23q66 0 125 29t100 82q4 6 13 7 8 0 14-5l76-77q5-4 6-11t-5-13q-60-74-147-114t-182-41q-87 0-167 34t-136 92-92 137-34 166 34 166 92 137 136 92 167 34q82 0 158-31t137-88l72 72q16 18 39 8 22-9 22-33z" horiz-adv-x="857.1" />
+<glyph glyph-name="ok" unicode="" d="m932 534q0-22-15-38l-404-404-76-76q-16-15-38-15t-38 15l-76 76-202 202q-15 16-15 38t15 38l76 76q16 16 38 16t38-16l164-165 366 367q16 16 38 16t38-16l76-76q15-16 15-38z" horiz-adv-x="1000" />
+<glyph glyph-name="dropdown" unicode="" d="m571 243q0-15-10-25l-250-250q-11-11-25-11t-25 11l-250 250q-11 10-11 25t11 25 25 11h500q14 0 25-11t10-25z" horiz-adv-x="571.4" />
+<glyph glyph-name="play" unicode="" d="m486 376q14-10 14-26 0-14-14-24l-428-266q-24-16-41-6t-17 40l0 514q0 30 17 40t41-6z" horiz-adv-x="500" />
+<glyph glyph-name="plus" unicode="" d="m786 439v-107q0-22-16-38t-38-15h-232v-233q0-22-16-37t-38-16h-107q-22 0-38 16t-15 37v233h-232q-23 0-38 15t-16 38v107q0 23 16 38t38 16h232v232q0 22 15 38t38 16h107q23 0 38-16t16-38v-232h232q22 0 38-16t16-38z" horiz-adv-x="785.7" />
+<glyph glyph-name="eye" unicode="" d="m929 314q-85 132-213 197 34-58 34-125 0-104-73-177t-177-73-177 73-73 177q0 67 34 125-128-65-213-197 75-114 187-182t242-68 242 68 187 182z m-402 215q0 11-8 19t-19 7q-70 0-120-50t-50-119q0-12 8-19t19-8 19 8 8 19q0 48 34 82t82 34q11 0 19 8t8 19z m473-215q0-19-11-38-78-129-210-206t-279-77-279 77-210 206q-11 19-11 38t11 39q78 128 210 205t279 78 279-78 210-205q11-20 11-39z" horiz-adv-x="1000" />
+<glyph glyph-name="error" unicode="" d="m0 350q0 207 147 354t353 146 354-146 146-354-146-354-354-146-353 146-147 354z m137 0q0-150 106-257t257-106 257 106 106 257-106 257-257 106-257-106-106-257z m97-98l0 196 532 0 0-196-532 0z" horiz-adv-x="1000" />
+<glyph glyph-name="refresh" unicode="" d="m843 261q0-3 0-4-36-150-150-243t-267-93q-81 0-157 31t-136 88l-72-72q-11-11-25-11t-25 11-11 25v250q0 14 11 25t25 11h250q14 0 25-11t10-25-10-25l-77-77q40-37 90-57t105-20q74 0 139 37t104 99q6 10 29 66 5 13 17 13h107q8 0 13-6t5-12z m14 446v-250q0-14-10-25t-26-11h-250q-14 0-25 11t-10 25 10 25l77 77q-82 77-194 77-75 0-140-37t-104-99q-6-10-29-66-5-13-17-13h-111q-7 0-13 6t-5 12v4q36 150 151 243t268 93q81 0 158-31t137-88l72 72q11 11 25 11t26-11 10-25z" horiz-adv-x="857.1" />
+<glyph glyph-name="home" unicode="" d="m786 296v-267q0-15-11-26t-25-10h-214v214h-143v-214h-214q-15 0-25 10t-11 26v267q0 1 0 2t0 2l321 264 321-264q1-1 1-4z m124 39l-34-41q-5-5-12-6h-2q-7 0-12 3l-386 322-386-322q-7-4-13-4-7 2-12 7l-35 41q-4 5-3 13t6 12l401 334q18 15 42 15t43-15l136-114v109q0 8 5 13t13 5h107q8 0 13-5t5-13v-227l122-102q5-5 6-12t-4-13z" horiz-adv-x="928.6" />
+<glyph glyph-name="movie" unicode="" d="m214-43v72q0 14-10 25t-25 10h-72q-14 0-25-10t-11-25v-72q0-14 11-25t25-11h72q14 0 25 11t10 25z m0 214v72q0 14-10 25t-25 11h-72q-14 0-25-11t-11-25v-72q0-14 11-25t25-10h72q14 0 25 10t10 25z m0 215v71q0 15-10 25t-25 11h-72q-14 0-25-11t-11-25v-71q0-15 11-25t25-11h72q14 0 25 11t10 25z m572-429v286q0 14-11 25t-25 11h-429q-14 0-25-11t-10-25v-286q0-14 10-25t25-11h429q15 0 25 11t11 25z m-572 643v71q0 15-10 26t-25 10h-72q-14 0-25-10t-11-26v-71q0-15 11-25t25-11h72q14 0 25 11t10 25z m786-643v72q0 14-11 25t-25 10h-71q-15 0-25-10t-11-25v-72q0-14 11-25t25-11h71q15 0 25 11t11 25z m-214 429v285q0 15-11 26t-25 10h-429q-14 0-25-10t-10-26v-285q0-15 10-25t25-11h429q15 0 25 11t11 25z m214-215v72q0 14-11 25t-25 11h-71q-15 0-25-11t-11-25v-72q0-14 11-25t25-10h71q15 0 25 10t11 25z m0 215v71q0 15-11 25t-25 11h-71q-15 0-25-11t-11-25v-71q0-15 11-25t25-11h71q15 0 25 11t11 25z m0 214v71q0 15-11 26t-25 10h-71q-15 0-25-10t-11-26v-71q0-15 11-25t25-11h71q15 0 25 11t11 25z m71 89v-750q0-37-26-63t-63-26h-893q-36 0-63 26t-26 63v750q0 37 26 63t63 27h893q37 0 63-27t26-63z" horiz-adv-x="1071.4" />
+<glyph glyph-name="menu" unicode="" d="m650 400q22 0 36-15t14-35-15-35-35-15l-600 0q-20 0-35 15t-15 35 14 35 36 15l600 0z m-600 100q-20 0-35 15t-15 35 14 35 36 15l600 0q22 0 36-15t14-35-15-35-35-15l-600 0z m600-300q22 0 36-15t14-35-15-35-35-15l-600 0q-20 0-35 15t-15 35 14 35 36 15l600 0z" horiz-adv-x="700" />
+<glyph glyph-name="star" unicode="" d="m929 489q0-12-15-27l-203-197 48-279q1-4 1-12 0-11-6-19t-17-9q-10 0-22 7l-251 132-250-132q-13-7-23-7-11 0-17 9t-6 19q0 4 1 12l48 279-203 197q-14 15-14 27 0 21 31 26l280 40 126 254q11 23 27 23t28-23l125-254 280-40q32-5 32-26z" horiz-adv-x="928.6" />
+<glyph glyph-name="star-empty" unicode="" d="m634 290l171 165-235 35-106 213-105-213-236-35 171-165-41-235 211 111 211-111z m295 199q0-12-15-27l-203-197 48-279q1-4 1-12 0-28-23-28-10 0-22 7l-251 132-250-132q-13-7-23-7-11 0-17 9t-6 19q0 4 1 12l48 279-203 197q-14 15-14 27 0 21 31 26l280 40 126 254q11 23 27 23t28-23l125-254 280-40q32-5 32-26z" horiz-adv-x="928.6" />
+<glyph glyph-name="star-half" unicode="" d="m662 316l143 139-198 29-37 6-17 34-89 179v-537l33-17 178-94-34 198-7 37z m252 146l-202-197 47-279q3-19-3-29t-19-11q-9 0-22 7l-251 132-250-132q-13-7-23-7-12 0-19 11t-3 29l48 279-203 197q-18 18-13 33t30 20l280 40 126 254q11 23 27 23 16 0 28-23l125-254 280-40q25-4 30-20t-13-33z" horiz-adv-x="928.6" />
+<glyph glyph-name="donate" unicode="" d="m546 189q0-86-56-147t-144-77v-97q0-8-5-13t-13-5h-75q-7 0-13 5t-5 13v97q-37 5-71 18t-57 25-41 26-26 21-10 10q-9 12-1 23l58 76q3 5 12 6 9 1 14-5l1-1q63-55 135-70 21-4 42-4 45 0 79 24t35 68q0 16-9 30t-18 23-33 21-37 18-45 18q-21 9-34 14t-34 15-35 17-32 20-29 24-25 27-20 32-11 37-5 44q0 77 55 135t142 75v100q0 7 5 13t13 5h75q8 0 13-5t5-13v-98q32-4 62-13t48-19 36-21 21-16 9-8q9-10 3-21l-46-81q-4-9-12-9-8-2-16 4-1 1-8 6t-21 15-33 18-42 15-47 6q-53 0-87-24t-33-62q0-14 4-27t17-23 22-18 31-18 34-15 39-15q30-11 45-18t43-19 42-24 34-28 30-35 18-43 7-52z" horiz-adv-x="571.4" />
+</font>
+</defs>
+</svg>
\ No newline at end of file
diff --git a/couchpotato/static/fonts/icons.ttf b/couchpotato/static/fonts/icons.ttf
new file mode 100644
index 0000000000..18c5f3a5fa
Binary files /dev/null and b/couchpotato/static/fonts/icons.ttf differ
diff --git a/couchpotato/static/fonts/icons.woff b/couchpotato/static/fonts/icons.woff
new file mode 100644
index 0000000000..5f1194978d
Binary files /dev/null and b/couchpotato/static/fonts/icons.woff differ
diff --git a/couchpotato/static/images/couch.png b/couchpotato/static/images/couch.png
index 3bc445e77a..5b7efc706c 100644
Binary files a/couchpotato/static/images/couch.png and b/couchpotato/static/images/couch.png differ
diff --git a/couchpotato/static/images/emptylist.png b/couchpotato/static/images/emptylist.png
deleted file mode 100644
index 08db653736..0000000000
Binary files a/couchpotato/static/images/emptylist.png and /dev/null differ
diff --git a/couchpotato/static/images/favicon.ico b/couchpotato/static/images/favicon.ico
deleted file mode 100644
index f93f9fbe77..0000000000
Binary files a/couchpotato/static/images/favicon.ico and /dev/null differ
diff --git a/couchpotato/static/images/gear.png b/couchpotato/static/images/gear.png
deleted file mode 100644
index f1d63badeb..0000000000
Binary files a/couchpotato/static/images/gear.png and /dev/null differ
diff --git a/couchpotato/static/images/homescreen.png b/couchpotato/static/images/homescreen.png
deleted file mode 100644
index 491be66d00..0000000000
Binary files a/couchpotato/static/images/homescreen.png and /dev/null differ
diff --git a/couchpotato/static/images/icon.attention.png b/couchpotato/static/images/icon.attention.png
deleted file mode 100644
index ff10b97643..0000000000
Binary files a/couchpotato/static/images/icon.attention.png and /dev/null differ
diff --git a/couchpotato/static/images/icon.check.png b/couchpotato/static/images/icon.check.png
deleted file mode 100644
index e99e575f59..0000000000
Binary files a/couchpotato/static/images/icon.check.png and /dev/null differ
diff --git a/couchpotato/static/images/icon.delete.png b/couchpotato/static/images/icon.delete.png
deleted file mode 100644
index 5fbfe36d0d..0000000000
Binary files a/couchpotato/static/images/icon.delete.png and /dev/null differ
diff --git a/couchpotato/static/images/icon.download.png b/couchpotato/static/images/icon.download.png
deleted file mode 100644
index e64e999707..0000000000
Binary files a/couchpotato/static/images/icon.download.png and /dev/null differ
diff --git a/couchpotato/static/images/icon.edit.png b/couchpotato/static/images/icon.edit.png
deleted file mode 100644
index 9d7aac683f..0000000000
Binary files a/couchpotato/static/images/icon.edit.png and /dev/null differ
diff --git a/couchpotato/static/images/icon.files.png b/couchpotato/static/images/icon.files.png
deleted file mode 100644
index 951fea6d7b..0000000000
Binary files a/couchpotato/static/images/icon.files.png and /dev/null differ
diff --git a/couchpotato/static/images/icon.folder.gif b/couchpotato/static/images/icon.folder.gif
deleted file mode 100644
index 9fbb12fb11..0000000000
Binary files a/couchpotato/static/images/icon.folder.gif and /dev/null differ
diff --git a/couchpotato/static/images/icon.imdb.png b/couchpotato/static/images/icon.imdb.png
deleted file mode 100644
index a9903c49f3..0000000000
Binary files a/couchpotato/static/images/icon.imdb.png and /dev/null differ
diff --git a/couchpotato/static/images/icon.info.png b/couchpotato/static/images/icon.info.png
deleted file mode 100644
index f61dc86814..0000000000
Binary files a/couchpotato/static/images/icon.info.png and /dev/null differ
diff --git a/couchpotato/static/images/icon.rating.png b/couchpotato/static/images/icon.rating.png
deleted file mode 100644
index f5e07adf32..0000000000
Binary files a/couchpotato/static/images/icon.rating.png and /dev/null differ
diff --git a/couchpotato/static/images/icon.refresh.png b/couchpotato/static/images/icon.refresh.png
deleted file mode 100644
index 906887ed24..0000000000
Binary files a/couchpotato/static/images/icon.refresh.png and /dev/null differ
diff --git a/couchpotato/static/images/icon.spinner.gif b/couchpotato/static/images/icon.spinner.gif
deleted file mode 100644
index c84d177f20..0000000000
Binary files a/couchpotato/static/images/icon.spinner.gif and /dev/null differ
diff --git a/couchpotato/static/images/icon.trailer.png b/couchpotato/static/images/icon.trailer.png
deleted file mode 100644
index 8bdd71715d..0000000000
Binary files a/couchpotato/static/images/icon.trailer.png and /dev/null differ
diff --git a/couchpotato/static/images/icon.undo.png b/couchpotato/static/images/icon.undo.png
deleted file mode 100644
index 71c7ec0af1..0000000000
Binary files a/couchpotato/static/images/icon.undo.png and /dev/null differ
diff --git a/couchpotato/static/images/icons/android.png b/couchpotato/static/images/icons/android.png
new file mode 100644
index 0000000000..6aeb8f0b2a
Binary files /dev/null and b/couchpotato/static/images/icons/android.png differ
diff --git a/couchpotato/static/images/icons/dark/android.png b/couchpotato/static/images/icons/dark/android.png
new file mode 100644
index 0000000000..9efc63c10f
Binary files /dev/null and b/couchpotato/static/images/icons/dark/android.png differ
diff --git a/couchpotato/static/images/icons/dark/favicon.ico b/couchpotato/static/images/icons/dark/favicon.ico
new file mode 100644
index 0000000000..7dc73e7090
Binary files /dev/null and b/couchpotato/static/images/icons/dark/favicon.ico differ
diff --git a/couchpotato/static/images/icons/dark/ios.png b/couchpotato/static/images/icons/dark/ios.png
new file mode 100644
index 0000000000..f0acf841c0
Binary files /dev/null and b/couchpotato/static/images/icons/dark/ios.png differ
diff --git a/couchpotato/static/images/icons/favicon.ico b/couchpotato/static/images/icons/favicon.ico
new file mode 100644
index 0000000000..0342c6e5c9
Binary files /dev/null and b/couchpotato/static/images/icons/favicon.ico differ
diff --git a/couchpotato/static/images/icons/ios.png b/couchpotato/static/images/icons/ios.png
new file mode 100644
index 0000000000..dd694b38bb
Binary files /dev/null and b/couchpotato/static/images/icons/ios.png differ
diff --git a/couchpotato/static/images/icons/windows.png b/couchpotato/static/images/icons/windows.png
new file mode 100644
index 0000000000..84bb3b9c6a
Binary files /dev/null and b/couchpotato/static/images/icons/windows.png differ
diff --git a/couchpotato/static/images/imdb_watchlist.png b/couchpotato/static/images/imdb_watchlist.png
index a0250b3e56..8a84654dde 100644
Binary files a/couchpotato/static/images/imdb_watchlist.png and b/couchpotato/static/images/imdb_watchlist.png differ
diff --git a/couchpotato/static/images/notify.couch.large.png b/couchpotato/static/images/notify.couch.large.png
new file mode 100644
index 0000000000..e918c0493a
Binary files /dev/null and b/couchpotato/static/images/notify.couch.large.png differ
diff --git a/couchpotato/static/images/notify.couch.medium.png b/couchpotato/static/images/notify.couch.medium.png
new file mode 100644
index 0000000000..939aca406d
Binary files /dev/null and b/couchpotato/static/images/notify.couch.medium.png differ
diff --git a/couchpotato/static/images/xbmc-notify.png b/couchpotato/static/images/notify.couch.small.png
similarity index 100%
rename from couchpotato/static/images/xbmc-notify.png
rename to couchpotato/static/images/notify.couch.small.png
diff --git a/couchpotato/static/images/right.arrow.png b/couchpotato/static/images/right.arrow.png
deleted file mode 100644
index 399db7608d..0000000000
Binary files a/couchpotato/static/images/right.arrow.png and /dev/null differ
diff --git a/couchpotato/static/images/sprite.png b/couchpotato/static/images/sprite.png
deleted file mode 100644
index 5ba4d00e5d..0000000000
Binary files a/couchpotato/static/images/sprite.png and /dev/null differ
diff --git a/couchpotato/static/images/toTop.gif b/couchpotato/static/images/toTop.gif
deleted file mode 100644
index 110534a2f2..0000000000
Binary files a/couchpotato/static/images/toTop.gif and /dev/null differ
diff --git a/couchpotato/static/scripts/api.js b/couchpotato/static/scripts/api.js
index 5e507bc17d..df3d0ff39a 100644
--- a/couchpotato/static/scripts/api.js
+++ b/couchpotato/static/scripts/api.js
@@ -1,29 +1,29 @@
var ApiClass = new Class({
setup: function(options){
- var self = this
+ var self = this;
self.options = options;
},
request: function(type, options){
- var self = this;
+ var self = this,
+ r_type = self.options.is_remote ? 'JSONP' : 'JSON';
- var r_type = self.options.is_remote ? 'JSONP' : 'JSON';
return new Request[r_type](Object.merge({
'callbackKey': 'callback_func',
'method': 'get',
- 'url': self.createUrl(type, {'t': randomString()}),
- }, options)).send()
+ 'url': self.createUrl(type, {'t': randomString()})
+ }, options)).send();
},
createUrl: function(action, params){
- return this.options.url + (action || 'default') + '/' + (params ? '?'+Object.toQueryString(params) : '')
+ return this.options.url + (action || 'default') + '/' + (params ? '?'+Object.toQueryString(params) : '');
},
getOption: function(name){
- return this.options[name]
+ return this.options[name];
}
});
-window.Api = new ApiClass()
\ No newline at end of file
+window.Api = new ApiClass();
diff --git a/couchpotato/static/scripts/block.js b/couchpotato/static/scripts/block.js
index 82193ca55d..6f18bae3a3 100644
--- a/couchpotato/static/scripts/block.js
+++ b/couchpotato/static/scripts/block.js
@@ -1,6 +1,6 @@
var BlockBase = new Class({
- Implements: [Options, Events],
+ Implements: [Options],
options: {},
@@ -19,7 +19,7 @@ var BlockBase = new Class({
},
getParent: function(){
- return this.page
+ return this.page;
},
hide: function(){
@@ -31,9 +31,7 @@ var BlockBase = new Class({
},
toElement: function(){
- return this.el
+ return this.el;
}
});
-
-var Block = BlockBase
\ No newline at end of file
diff --git a/couchpotato/static/scripts/block/footer.js b/couchpotato/static/scripts/block/footer.js
index acec158569..619922fd8b 100644
--- a/couchpotato/static/scripts/block/footer.js
+++ b/couchpotato/static/scripts/block/footer.js
@@ -1,4 +1,4 @@
-Block.Footer = new Class({
+var BlockFooter = new Class({
Extends: BlockBase,
@@ -8,4 +8,4 @@ Block.Footer = new Class({
self.el = new Element('div.footer');
}
-});
\ No newline at end of file
+});
diff --git a/couchpotato/static/scripts/block/header.js b/couchpotato/static/scripts/block/header.js
new file mode 100644
index 0000000000..5d802e67df
--- /dev/null
+++ b/couchpotato/static/scripts/block/header.js
@@ -0,0 +1,52 @@
+var BlockHeader = new Class({
+
+ Extends: BlockNavigation,
+
+ create: function(){
+ var self = this,
+ animation_options = {
+ type: dynamics.spring
+ },
+ couch, potato;
+
+ self.parent();
+
+ self.el.adopt(
+ self.logo = new Element('a.logo', {
+ 'href': App.createUrl(''),
+ 'events': {
+ 'mouseenter': function(){
+ dynamics.animate(couch, {
+ opacity: 0,
+ translateX: -50
+ }, animation_options);
+
+ dynamics.animate(potato, {
+ opacity: 1,
+ translateX: 0
+ }, animation_options);
+ },
+ 'mouseleave': function(){
+ dynamics.animate(couch, {
+ opacity: 1,
+ translateX: 0
+ }, animation_options);
+
+ dynamics.animate(potato, {
+ opacity: 0,
+ translateX: 50
+ }, animation_options);
+ }
+ }
+ }).adopt(
+ couch = new Element('span[text=Couch]'),
+ potato = new Element('span[text=Potato]')
+ ),
+ self.nav
+ );
+
+
+
+ }
+
+});
diff --git a/couchpotato/static/scripts/block/menu.js b/couchpotato/static/scripts/block/menu.js
index 4dc143d440..b800e5a1be 100644
--- a/couchpotato/static/scripts/block/menu.js
+++ b/couchpotato/static/scripts/block/menu.js
@@ -1,45 +1,133 @@
-Block.Menu = new Class({
+var BlockMenu = new Class({
Extends: BlockBase,
+ Implements: [Options, Events],
options: {
'class': 'menu'
},
+ lis: null,
+
create: function(){
var self = this;
+ self.lis = [];
+
+ self.shown = false;
self.el = new Element('div', {
'class': 'more_menu '+self.options['class']
}).adopt(
self.wrapper = new Element('div.wrapper').adopt(
self.more_option_ul = new Element('ul')
),
- new Element('a.button.onlay', {
+ self.button = new Element('a' + (self.options.button_class ? '.' + self.options.button_class : ''), {
+ 'text': self.options.button_text || '',
'events': {
'click': function(){
- self.el.toggleClass('show')
- self.fireEvent(self.el.hasClass('show') ? 'open' : 'close')
- if(self.el.hasClass('show'))
- this.addEvent('outerClick', function(){
- self.el.removeClass('show')
- this.removeEvents('outerClick');
- })
- else
- this.removeEvents('outerClick');
+ if(!self.shown){
+ dynamics.css(self.wrapper, {
+ opacity: 0,
+ scale: 0.1,
+ display: 'block'
+ });
+
+ dynamics.animate(self.wrapper, {
+ opacity: 1,
+ scale: 1
+ }, {
+ type: dynamics.spring,
+ frequency: 200,
+ friction: 270,
+ duration: 800
+ });
+
+ if(self.lis === null)
+ self.lis = self.more_option_ul.getElements('> li').slice(0, 10);
+
+ self.lis.each(function(li, nr){
+ dynamics.css(li, {
+ opacity: 0,
+ translateY: 20
+ });
+
+ // Animate to final properties
+ dynamics.animate(li, {
+ opacity: 1,
+ translateY: 0
+ }, {
+ type: dynamics.spring,
+ frequency: 300,
+ friction: 435,
+ duration: 1000,
+ delay: 100 + nr * 40
+ });
+ });
+ self.shown = true;
+ }
+ else {
+ self.hide();
+ }
+
+ self.fireEvent(self.shown ? 'open' : 'close');
+
+ if(self.shown){
+ self.el.addEvent('outerClick', self.removeOuterClick.bind(self));
+ this.addEvent('outerClick', function(e) {
+ if (e.target.get('tag') != 'input')
+ self.removeOuterClick();
+ });
+ }
+ else {
+ self.removeOuterClick();
+ }
}
}
})
- )
+ );
},
- addLink: function(tab, position){
+ hide: function(){
+ var self = this;
+
+ dynamics.animate(self.wrapper, {
+ opacity: 0,
+ scale: 0.1
+ }, {
+ type: dynamics.easeInOut,
+ duration: 300,
+ friction: 100,
+ complete: function(){
+ dynamics.css(self.wrapper, {
+ display: 'none'
+ });
+ }
+ });
+
+ self.shown = false;
+
+ },
+
+ removeOuterClick: function(){
var self = this;
- var el = new Element('li').adopt(tab).inject(self.more_option_ul, position || 'bottom');
- return el;
+
+ self.hide();
+ self.el.removeClass('show');
+ self.el.removeEvents('outerClick');
+
+ self.button.removeEvents('outerClick');
+ },
+
+ addLink: function(tab, position){
+ var self = this,
+ li = new Element('li').adopt(tab).inject(self.more_option_ul, position || 'bottom');
+
+ self.lis = null;
+
+ return li;
}
-});
\ No newline at end of file
+});
diff --git a/couchpotato/static/scripts/block/navigation.js b/couchpotato/static/scripts/block/navigation.js
index 85f20c49ad..1201085499 100644
--- a/couchpotato/static/scripts/block/navigation.js
+++ b/couchpotato/static/scripts/block/navigation.js
@@ -1,43 +1,22 @@
-Block.Navigation = new Class({
+var BlockNavigation = new Class({
Extends: BlockBase,
create: function(){
var self = this;
- self.el = new Element('div.navigation').adopt(
- self.nav = new Element('ul'),
- self.backtotop = new Element('a.backtotop', {
- 'text': 'back to top',
- 'events': {
- 'click': function(){
- window.scroll(0,0)
- }
- },
- 'tween': {
- 'duration': 100
- }
- })
- )
-
- new ScrollSpy({
- min: 400,
- onLeave: function(){
- self.backtotop.fade('out')
- },
- onEnter: function(){
- self.backtotop.fade('in')
- }
- })
+ self.el = new Element('div.navigation').grab(
+ self.nav = new Element('ul')
+ );
},
addTab: function(name, tab){
- var self = this
+ var self = this;
- return new Element('li.tab_'+(name || 'unknown')).adopt(
+ return new Element('li.tab_'+(name || 'unknown')).grab(
new Element('a', tab)
- ).inject(self.nav)
+ ).inject(self.nav);
},
@@ -49,4 +28,4 @@ Block.Navigation = new Class({
}
-});
\ No newline at end of file
+});
diff --git a/couchpotato/static/scripts/combined.base.min.js b/couchpotato/static/scripts/combined.base.min.js
new file mode 100644
index 0000000000..a529870bf4
--- /dev/null
+++ b/couchpotato/static/scripts/combined.base.min.js
@@ -0,0 +1,2081 @@
+var Uniform = new Class({
+ Implements: [ Options ],
+ options: {
+ focusedClass: "focused",
+ holderClass: "ctrlHolder"
+ },
+ initialize: function(options) {
+ this.setOptions(options);
+ var focused = this.options.focusedClass;
+ var holder = "." + this.options.holderClass;
+ $(document.body).addEvents({
+ "focus:relay(input, select, textarea)": function() {
+ var parent = this.getParent(holder);
+ if (parent) parent.addClass(focused);
+ },
+ "blur:relay(input, select, textarea)": function() {
+ var parent = this.getParent(holder);
+ if (parent) parent.removeClass(focused);
+ }
+ });
+ }
+});
+
+var Question = new Class({
+ initialize: function(question, hint, answers) {
+ var self = this;
+ self.question = question;
+ self.hint = hint;
+ self.answers = answers;
+ self.createQuestion();
+ self.answers.each(function(answer) {
+ self.createAnswer(answer);
+ });
+ },
+ createQuestion: function() {
+ var self = this, h3, hint;
+ self.container = new Element("div.mask.question").grab(self.inner = new Element("div.inner").adopt(h3 = new Element("h3", {
+ html: this.question
+ }), hint = this.hint ? new Element("div.hint", {
+ html: this.hint
+ }) : null)).inject(document.body);
+ requestTimeout(function() {
+ self.container.addClass("show");
+ self.inner.getElements("> *").each(function(el, nr) {
+ dynamics.css(el, {
+ opacity: 0,
+ translateY: 50
+ });
+ dynamics.animate(el, {
+ opacity: 1,
+ translateY: 0
+ }, {
+ type: dynamics.spring,
+ frequency: 200,
+ friction: 300,
+ duration: 800,
+ delay: 400 + nr * 100
+ });
+ });
+ }, 10);
+ },
+ createAnswer: function(options) {
+ var self = this;
+ var answer = new Element("a", Object.merge(options, {
+ class: "answer button " + (options["class"] || "") + (options.cancel ? " cancel" : "")
+ })).inject(this.inner);
+ if (options.cancel) {
+ answer.addEvent("click", self.close.bind(self));
+ } else if (options.request) {
+ answer.addEvent("click", function(e) {
+ e.stop();
+ new Request(Object.merge(options, {
+ url: options.href,
+ onComplete: function() {
+ (options.onComplete || function() {})();
+ self.close();
+ }
+ })).send();
+ });
+ }
+ },
+ close: function() {
+ var self = this;
+ var ended = function() {
+ self.container.dispose();
+ self.container.removeEventListener("transitionend", ended);
+ };
+ self.container.addEventListener("transitionend", ended, false);
+ self.inner.getElements("> *").reverse().each(function(el, nr) {
+ dynamics.css(el, {
+ opacity: 1,
+ translateY: 0
+ });
+ dynamics.animate(el, {
+ opacity: 0,
+ translateY: 50
+ }, {
+ type: dynamics.spring,
+ frequency: 200,
+ friction: 300,
+ duration: 800,
+ anticipationSize: 175,
+ anticipationStrength: 400,
+ delay: nr * 100
+ });
+ });
+ dynamics.setTimeout(function() {
+ self.container.removeClass("show");
+ }, 200);
+ },
+ toElement: function() {
+ return this.container;
+ }
+});
+
+var ScrollSpy = new Class({
+ Implements: [ Options, Events ],
+ options: {
+ container: window,
+ max: 0,
+ min: 0,
+ mode: "vertical"
+ },
+ initialize: function(options) {
+ this.setOptions(options);
+ this.container = document.id(this.options.container);
+ this.enters = this.leaves = 0;
+ this.inside = false;
+ var self = this;
+ this.listener = function(e) {
+ var position = self.container.getScroll(), xy = position[self.options.mode == "vertical" ? "y" : "x"], min = typeOf(self.options.min) == "function" ? self.options.min() : self.options.min, max = typeOf(self.options.max) == "function" ? self.options.max() : self.options.max;
+ if (xy >= min && (max === 0 || xy <= max)) {
+ if (!self.inside) {
+ self.inside = true;
+ self.enters++;
+ self.fireEvent("enter", [ position, self.enters, e ]);
+ }
+ self.fireEvent("tick", [ position, self.inside, self.enters, self.leaves, e ]);
+ } else if (self.inside) {
+ self.inside = false;
+ self.leaves++;
+ self.fireEvent("leave", [ position, self.leaves, e ]);
+ }
+ self.fireEvent("scroll", [ position, self.inside, self.enters, self.leaves, e ]);
+ };
+ this.addListener();
+ },
+ start: function() {
+ this.container.addEvent("scroll", this.listener);
+ },
+ stop: function() {
+ this.container.removeEvent("scroll", this.listener);
+ },
+ addListener: function() {
+ this.start();
+ }
+});
+
+var CouchPotato = new Class({
+ Implements: [ Events, Options ],
+ defaults: {
+ page: "home",
+ action: "index",
+ params: {}
+ },
+ pages: [],
+ block: [],
+ initialize: function() {
+ var self = this;
+ self.global_events = {};
+ },
+ setup: function(options) {
+ var self = this;
+ self.setOptions(options);
+ self.c = $(document.body);
+ self.createLayout();
+ self.createPages();
+ if (window.location.hash) History.handleInitialState(); else self.openPage(window.location.pathname);
+ History.addEvent("change", self.openPage.bind(self));
+ self.c.addEvent("click:relay(.header a, .navigation a, .movie_details a, .list_list .movie)", self.ripple.bind(self));
+ self.c.addEvent("click:relay(a[href^=/]:not([target]))", self.pushState.bind(self));
+ self.c.addEvent("click:relay(a[href^=http])", self.openDerefered.bind(self));
+ self.touch_device = "ontouchstart" in window || navigator.msMaxTouchPoints;
+ if (self.touch_device) {
+ self.c.addClass("touch_enabled");
+ FastClick.attach(document.body);
+ }
+ window.addEvent("resize", self.resize.bind(self));
+ self.resize();
+ self.checkCache();
+ },
+ checkCache: function() {
+ window.addEventListener("load", function() {
+ window.applicationCache.addEventListener("updateready", function(e) {
+ if (window.applicationCache.status == window.applicationCache.UPDATEREADY) {
+ window.applicationCache.swapCache();
+ window.location.reload();
+ }
+ }, false);
+ }, false);
+ },
+ resize: function() {
+ var self = this;
+ self.mobile_screen = Math.max(document.documentElement.clientWidth, window.innerWidth || 0) <= 480;
+ self.c[self.mobile_screen ? "addClass" : "removeClass"]("mobile");
+ },
+ ripple: function(e, el) {
+ var self = this, button = el.getCoordinates(), x = e.page.x - button.left, y = e.page.y - button.top, ripple = new Element("div.ripple", {
+ styles: {
+ left: x,
+ top: y
+ }
+ });
+ ripple.inject(el);
+ requestTimeout(function() {
+ ripple.addClass("animate");
+ }, 0);
+ requestTimeout(function() {
+ ripple.dispose();
+ }, 2100);
+ },
+ getOption: function(name) {
+ try {
+ return this.options[name];
+ } catch (e) {
+ return null;
+ }
+ },
+ pushState: function(e, el) {
+ var self = this;
+ if (!e.meta && App.isMac() || !e.control && !App.isMac()) {
+ e.preventDefault();
+ var url = el.get("href");
+ if (e.event && e.event.button === 1) window.open(url); else if (History.getPath() != url) History.push(url);
+ }
+ self.fireEvent("history.push");
+ },
+ isMac: function() {
+ return Browser.platform == "mac";
+ },
+ createLayout: function() {
+ var self = this;
+ self.block.header = new BlockBase();
+ self.c.adopt($(self.block.header).addClass("header").adopt(self.block.navigation = new BlockHeader(self, {}), self.block.search = new BlockSearch(self, {}), self.support = new Element("a.donate.icon-donate", {
+ href: "https://couchpota.to/support/",
+ target: "_blank"
+ }).grab(new Element("span", {
+ text: "Donate"
+ })), self.block.more = new BlockMenu(self, {
+ button_class: "icon-settings"
+ })), new Element("div.corner_background"), self.content = new Element("div.content").adopt(self.pages_container = new Element("div.pages"), self.block.footer = new BlockFooter(self, {})));
+ var setting_links = [ new Element("a", {
+ text: "About CouchPotato",
+ href: App.createUrl("settings/about")
+ }), new Element("a", {
+ text: "Check for Updates",
+ events: {
+ click: self.checkForUpdate.bind(self, null)
+ }
+ }), new Element("a", {
+ text: "Settings",
+ href: App.createUrl("settings/general")
+ }), new Element("a", {
+ text: "Logs",
+ href: App.createUrl("log")
+ }), new Element("a", {
+ text: "Restart",
+ events: {
+ click: self.restartQA.bind(self)
+ }
+ }), new Element("a", {
+ text: "Shutdown",
+ events: {
+ click: self.shutdownQA.bind(self)
+ }
+ }) ];
+ setting_links.each(function(a) {
+ self.block.more.addLink(a);
+ });
+ self.addEvent("setting.save.core.dark_theme", function(enabled) {
+ document.html[enabled ? "addClass" : "removeClass"]("dark");
+ });
+ },
+ createPages: function() {
+ var self = this;
+ var pages = [];
+ Object.each(Page, function(page_class, class_name) {
+ var pg = new Page[class_name](self, {
+ level: 1
+ });
+ self.pages[class_name] = pg;
+ pages.include({
+ order: pg.order,
+ name: class_name,
+ class: pg
+ });
+ });
+ pages.stableSort(self.sortPageByOrder).each(function(page) {
+ page["class"].load();
+ self.fireEvent("load" + page.name);
+ $(page["class"]).inject(self.getPageContainer());
+ });
+ self.fireEvent("load");
+ },
+ sortPageByOrder: function(a, b) {
+ return (a.order || 100) - (b.order || 100);
+ },
+ openPage: function(url) {
+ var self = this, route = new Route(self.defaults);
+ route.parse(rep(History.getPath()));
+ var page_name = route.getPage().capitalize(), action = route.getAction(), params = route.getParams(), current_url = route.getCurrentUrl(), page;
+ if (current_url == self.current_url) return;
+ if (self.current_page) self.current_page.hide();
+ try {
+ page = self.pages[page_name] || self.pages.Home;
+ page.open(action, params, current_url);
+ page.show();
+ } catch (e) {
+ console.error("Can't open page:" + url, e);
+ }
+ self.current_page = page;
+ self.current_url = current_url;
+ },
+ getBlock: function(block_name) {
+ return this.block[block_name];
+ },
+ getPage: function(name) {
+ return this.pages[name];
+ },
+ getPageContainer: function() {
+ return this.pages_container;
+ },
+ shutdown: function() {
+ var self = this;
+ self.blockPage("You have shutdown. This is what is supposed to happen ;)");
+ Api.request("app.shutdown", {
+ onComplete: self.blockPage.bind(self)
+ });
+ self.checkAvailable(1e3);
+ },
+ shutdownQA: function() {
+ var self = this;
+ var q = new Question("Are you sure you want to shutdown CouchPotato?", "", [ {
+ text: "Shutdown",
+ class: "shutdown red",
+ events: {
+ click: function(e) {
+ e.preventDefault();
+ self.shutdown();
+ requestTimeout(q.close.bind(q), 100);
+ }
+ }
+ }, {
+ text: "No, nevah!",
+ cancel: true
+ } ]);
+ },
+ restart: function(message, title) {
+ var self = this;
+ self.blockPage(message || "Restarting... please wait. If this takes too long, something must have gone wrong.", title);
+ Api.request("app.restart");
+ self.checkAvailable(1e3);
+ },
+ restartQA: function(e, message, title) {
+ var self = this;
+ var q = new Question("Are you sure you want to restart CouchPotato?", "", [ {
+ text: "Restart",
+ class: "restart orange",
+ events: {
+ click: function(e) {
+ e.preventDefault();
+ self.restart(message, title);
+ requestTimeout(q.close.bind(q), 100);
+ }
+ }
+ }, {
+ text: "No, nevah!",
+ cancel: true
+ } ]);
+ },
+ checkForUpdate: function(onComplete) {
+ var self = this;
+ Updater.check(onComplete);
+ self.blockPage("Please wait. If this takes too long, something must have gone wrong.", "Checking for updates");
+ self.checkAvailable(3e3);
+ },
+ checkAvailable: function(delay, onAvailable) {
+ var self = this;
+ requestTimeout(function() {
+ var onFailure = function() {
+ requestTimeout(function() {
+ self.checkAvailable(delay, onAvailable);
+ }, 1e3);
+ self.fireEvent("unload");
+ };
+ var request = Api.request("app.available", {
+ timeout: 2e3,
+ onTimeout: function() {
+ request.cancel();
+ onFailure();
+ },
+ onFailure: onFailure,
+ onSuccess: function() {
+ if (onAvailable) onAvailable();
+ self.unBlockPage();
+ self.fireEvent("reload");
+ }
+ });
+ }, delay || 0);
+ },
+ blockPage: function(message, title) {
+ var self = this;
+ self.unBlockPage();
+ self.mask = new Element("div.mask.with_message").adopt(new Element("div.message").adopt(new Element("h1", {
+ text: title || "Unavailable"
+ }), new Element("div", {
+ text: message || "Something must have crashed.. check the logs ;)"
+ }))).inject(document.body);
+ createSpinner(self.mask);
+ requestTimeout(function() {
+ self.mask.addClass("show");
+ }, 10);
+ },
+ unBlockPage: function() {
+ var self = this;
+ if (self.mask) self.mask.get("tween").start("opacity", 0).chain(function() {
+ this.element.destroy();
+ });
+ },
+ createUrl: function(action, params) {
+ return this.options.base_url + (action ? action + "/" : "") + (params ? "?" + Object.toQueryString(params) : "");
+ },
+ openDerefered: function(e, el) {
+ var self = this;
+ e.stop();
+ var url = el.get("href");
+ if (self.getOption("dereferer")) {
+ url = self.getOption("dereferer") + el.get("href");
+ }
+ if (el.get("target") == "_blank" || e.meta && self.isMac() || e.control && !self.isMac()) window.open(url); else window.location = url;
+ },
+ createUserscriptButtons: function() {
+ var host_url = window.location.protocol + "//" + window.location.host;
+ return new Element("div.group_userscript").adopt(new Element("div").adopt(new Element("a.userscript.button", {
+ text: "Install extension",
+ href: "https://couchpota.to/extension/",
+ target: "_blank"
+ }), new Element("span.or[text=or]"), new Element("span.bookmarklet").adopt(new Element("a.button", {
+ text: "+CouchPotato",
+ href: "javascript:void((function(){var e=document.createElement('script');e.setAttribute('type','text/javascript');e.setAttribute('charset','UTF-8');e.setAttribute('src','" + host_url + Api.createUrl("userscript.bookmark") + "?host=" + encodeURI(host_url + Api.createUrl("userscript.get") + randomString() + "/") + "&r='+Math.random()*99999999);document.body.appendChild(e)})());",
+ target: "",
+ events: {
+ click: function(e) {
+ e.stop();
+ alert("Drag it to your bookmark ;)");
+ }
+ }
+ }), new Element("span", {
+ text: "Б┤╫ Drag this to your bookmarks"
+ }))), new Element("img", {
+ src: "https://couchpota.to/media/images/userscript.gif"
+ }));
+ },
+ on: function(name, handle) {
+ var self = this;
+ if (!self.global_events[name]) self.global_events[name] = [];
+ self.global_events[name].push(handle);
+ },
+ trigger: function(name, args, on_complete) {
+ var self = this;
+ if (!self.global_events[name]) {
+ return;
+ }
+ if (!on_complete && typeOf(args) == "function") {
+ on_complete = args;
+ args = [];
+ }
+ self.global_events[name].each(function(handle) {
+ requestTimeout(function() {
+ var results = handle.apply(handle, args || []);
+ if (on_complete) on_complete(results);
+ }, 0);
+ });
+ },
+ off: function(name, handle) {
+ var self = this;
+ if (!self.global_events[name]) return;
+ if (handle) {
+ self.global_events[name] = self.global_events[name].erase(handle);
+ } else {
+ self.global_events[name] = [];
+ }
+ }
+});
+
+window.App = new CouchPotato();
+
+var Route = new Class({
+ defaults: null,
+ page: "",
+ action: "index",
+ params: {},
+ initialize: function(defaults) {
+ var self = this;
+ self.defaults = defaults || {};
+ },
+ parse: function(path) {
+ var self = this;
+ if (path == "/" && location.hash) {
+ path = rep(location.hash.replace("#", "/"));
+ }
+ self.current = path.replace(/^\/+|\/+$/g, "");
+ var url = self.current.split("/");
+ self.page = url.length > 0 ? url.shift() : self.defaults.page;
+ self.action = url.length > 0 ? url.join("/") : self.defaults.action;
+ self.params = Object.merge({}, self.defaults.params);
+ if (url.length > 1) {
+ var key;
+ url.each(function(el, nr) {
+ if (nr % 2 === 0) key = el; else if (key) {
+ self.params[key] = el;
+ key = null;
+ }
+ });
+ } else if (url.length == 1) {
+ self.params[url] = true;
+ }
+ return self;
+ },
+ getPage: function() {
+ return this.page;
+ },
+ getAction: function() {
+ return this.action;
+ },
+ getParams: function() {
+ return this.params;
+ },
+ getCurrentUrl: function() {
+ return this.current;
+ },
+ get: function(param) {
+ return this.params[param];
+ }
+});
+
+var p = function() {
+ if (typeof console !== "undefined" && console !== null) console.log(arguments);
+};
+
+(function() {
+ var events;
+ var check = function(e) {
+ var target = $(e.target);
+ var parents = target.getParents();
+ events.each(function(item) {
+ var element = item.element;
+ if (element != target && !parents.contains(element)) item.fn.call(element, e);
+ });
+ };
+ Element.Events.outerClick = {
+ onAdd: function(fn) {
+ if (!events) {
+ document.addEvent("click", check);
+ events = [];
+ }
+ events.push({
+ element: this,
+ fn: fn
+ });
+ },
+ onRemove: function(fn) {
+ events = events.filter(function(item) {
+ return item.element != this || item.fn != fn;
+ }, this);
+ if (!events.length) {
+ document.removeEvent("click", check);
+ events = null;
+ }
+ }
+ };
+})();
+
+function randomString(length, extra) {
+ var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz" + (extra ? "-._!@#$%^&*()+=" : ""), string_length = length || 8, random_string = "";
+ for (var i = 0; i < string_length; i++) {
+ var rnum = Math.floor(Math.random() * chars.length);
+ random_string += chars.charAt(rnum);
+ }
+ return random_string;
+}
+
+(function() {
+ var keyPaths = [];
+ var saveKeyPath = function(path) {
+ keyPaths.push({
+ sign: path[0] === "+" || path[0] === "-" ? parseInt(path.shift() + 1) : 1,
+ path: path
+ });
+ };
+ var valueOf = function(object, path) {
+ var ptr = object;
+ path.each(function(key) {
+ ptr = ptr[key];
+ });
+ return ptr;
+ };
+ var comparer = function(a, b) {
+ for (var i = 0, l = keyPaths.length; i < l; i++) {
+ var aVal = valueOf(a, keyPaths[i].path), bVal = valueOf(b, keyPaths[i].path);
+ if (aVal > bVal) return keyPaths[i].sign;
+ if (aVal < bVal) return -keyPaths[i].sign;
+ }
+ return 0;
+ };
+ Array.implement({
+ sortBy: function() {
+ keyPaths.empty();
+ Array.each(arguments, function(argument) {
+ switch (typeOf(argument)) {
+ case "array":
+ saveKeyPath(argument);
+ break;
+
+ case "string":
+ saveKeyPath(argument.match(/[+-]|[^.]+/g));
+ break;
+ }
+ });
+ return this.stableSort(comparer);
+ }
+ });
+})();
+
+var createSpinner = function(container) {
+ var spinner = new Element("div.spinner");
+ container.grab(spinner);
+ return spinner;
+};
+
+var rep = function(pa) {
+ return pa.replace(Api.getOption("url"), "/").replace(App.getOption("base_url"), "/");
+};
+
+var ApiClass = new Class({
+ setup: function(options) {
+ var self = this;
+ self.options = options;
+ },
+ request: function(type, options) {
+ var self = this, r_type = self.options.is_remote ? "JSONP" : "JSON";
+ return new Request[r_type](Object.merge({
+ callbackKey: "callback_func",
+ method: "get",
+ url: self.createUrl(type, {
+ t: randomString()
+ })
+ }, options)).send();
+ },
+ createUrl: function(action, params) {
+ return this.options.url + (action || "default") + "/" + (params ? "?" + Object.toQueryString(params) : "");
+ },
+ getOption: function(name) {
+ return this.options[name];
+ }
+});
+
+window.Api = new ApiClass();
+
+var PageBase = new Class({
+ Implements: [ Options, Events ],
+ options: {},
+ order: 1,
+ has_tab: true,
+ name: "",
+ icon: null,
+ parent_page: null,
+ sub_pages: null,
+ initialize: function(parent_page, options) {
+ var self = this;
+ self.parent_page = parent_page;
+ self.setOptions(options);
+ self.el = new Element("div", {
+ class: "page " + self.getPageClass() + (" level_" + (options.level || 0))
+ }).grab(self.content = new Element("div.scroll_content"));
+ App.addEvent("load", function() {
+ requestTimeout(function() {
+ if (!App.mobile_screen && !App.getOption("dev")) {
+ self.content.addEvent("scroll", self.preventHover.bind(self));
+ }
+ }, 100);
+ });
+ },
+ load: function() {
+ var self = this;
+ if (self.has_tab) {
+ var nav;
+ if (self.parent_page && self.parent_page.navigation) {
+ nav = self.parent_page.navigation;
+ } else {
+ nav = App.getBlock("navigation");
+ }
+ self.tab = nav.addTab(self.name, {
+ href: App.createUrl(self.getPageUrl()),
+ title: self.title,
+ html: "<span>" + self.name.capitalize() + "</span>",
+ class: self.icon ? "icon-" + self.icon : null
+ });
+ }
+ if (self.sub_pages) {
+ self.loadSubPages();
+ }
+ },
+ loadSubPages: function() {
+ var self = this;
+ var sub_pages = self.sub_pages;
+ self.sub_pages = [];
+ sub_pages.each(function(class_name) {
+ var pg = new (window[self.name.capitalize() + class_name])(self, {
+ level: 2
+ });
+ self.sub_pages[class_name] = pg;
+ self.sub_pages.include({
+ order: pg.order,
+ name: class_name,
+ class: pg
+ });
+ });
+ self.sub_pages.stableSort(self.sortPageByOrder).each(function(page) {
+ page["class"].load();
+ self.fireEvent("load" + page.name);
+ $(page["class"]).inject(App.getPageContainer());
+ });
+ },
+ sortPageByOrder: function(a, b) {
+ return (a.order || 100) - (b.order || 100);
+ },
+ open: function(action, params) {
+ var self = this;
+ try {
+ var elements;
+ if (!self[action + "Action"]) {
+ elements = self.defaultAction(action, params);
+ } else {
+ elements = self[action + "Action"](params);
+ }
+ if (elements !== undefined) {
+ self.content.empty();
+ self.content.adopt(elements);
+ }
+ App.getBlock("navigation").activate(self.name);
+ self.fireEvent("opened");
+ } catch (e) {
+ self.errorAction(e);
+ self.fireEvent("error");
+ }
+ },
+ openUrl: function(url) {
+ if (History.getPath() != url) History.push(url);
+ },
+ getPageUrl: function() {
+ var self = this;
+ return (self.parent_page && self.parent_page.getPageUrl ? self.parent_page.getPageUrl() + "/" : "") + self.name;
+ },
+ getPageClass: function() {
+ var self = this;
+ return (self.parent_page && self.parent_page.getPageClass ? self.parent_page.getPageClass() + "_" : "") + self.name;
+ },
+ errorAction: function(e) {
+ p("Error, action not found", e);
+ },
+ getName: function() {
+ return this.name;
+ },
+ show: function() {
+ this.el.addClass("active");
+ },
+ hide: function() {
+ var self = this;
+ self.el.removeClass("active");
+ if (self.sub_pages) {
+ self.sub_pages.each(function(sub_page) {
+ sub_page["class"].hide();
+ });
+ }
+ },
+ preventHover: function() {
+ var self = this;
+ if (self.hover_timer) clearRequestTimeout(self.hover_timer);
+ self.el.addClass("disable_hover");
+ self.hover_timer = requestTimeout(function() {
+ self.el.removeClass("disable_hover");
+ }, 200);
+ },
+ toElement: function() {
+ return this.el;
+ }
+});
+
+var Page = {};
+
+var BlockBase = new Class({
+ Implements: [ Options ],
+ options: {},
+ initialize: function(parent, options) {
+ var self = this;
+ self.setOptions(options);
+ self.page = parent;
+ self.create();
+ },
+ create: function() {
+ this.el = new Element("div.block");
+ },
+ getParent: function() {
+ return this.page;
+ },
+ hide: function() {
+ this.el.hide();
+ },
+ show: function() {
+ this.el.show();
+ },
+ toElement: function() {
+ return this.el;
+ }
+});
+
+var BlockNavigation = new Class({
+ Extends: BlockBase,
+ create: function() {
+ var self = this;
+ self.el = new Element("div.navigation").grab(self.nav = new Element("ul"));
+ },
+ addTab: function(name, tab) {
+ var self = this;
+ return new Element("li.tab_" + (name || "unknown")).grab(new Element("a", tab)).inject(self.nav);
+ },
+ activate: function(name) {
+ var self = this;
+ self.nav.getElements(".active").removeClass("active");
+ self.nav.getElements(".tab_" + name).addClass("active");
+ }
+});
+
+var BlockHeader = new Class({
+ Extends: BlockNavigation,
+ create: function() {
+ var self = this, animation_options = {
+ type: dynamics.spring
+ }, couch, potato;
+ self.parent();
+ self.el.adopt(self.logo = new Element("a.logo", {
+ href: App.createUrl(""),
+ events: {
+ mouseenter: function() {
+ dynamics.animate(couch, {
+ opacity: 0,
+ translateX: -50
+ }, animation_options);
+ dynamics.animate(potato, {
+ opacity: 1,
+ translateX: 0
+ }, animation_options);
+ },
+ mouseleave: function() {
+ dynamics.animate(couch, {
+ opacity: 1,
+ translateX: 0
+ }, animation_options);
+ dynamics.animate(potato, {
+ opacity: 0,
+ translateX: 50
+ }, animation_options);
+ }
+ }
+ }).adopt(couch = new Element("span[text=Couch]"), potato = new Element("span[text=Potato]")), self.nav);
+ }
+});
+
+var BlockFooter = new Class({
+ Extends: BlockBase,
+ create: function() {
+ var self = this;
+ self.el = new Element("div.footer");
+ }
+});
+
+var BlockMenu = new Class({
+ Extends: BlockBase,
+ Implements: [ Options, Events ],
+ options: {
+ class: "menu"
+ },
+ lis: null,
+ create: function() {
+ var self = this;
+ self.lis = [];
+ self.shown = false;
+ self.el = new Element("div", {
+ class: "more_menu " + self.options["class"]
+ }).adopt(self.wrapper = new Element("div.wrapper").adopt(self.more_option_ul = new Element("ul")), self.button = new Element("a" + (self.options.button_class ? "." + self.options.button_class : ""), {
+ text: self.options.button_text || "",
+ events: {
+ click: function() {
+ if (!self.shown) {
+ dynamics.css(self.wrapper, {
+ opacity: 0,
+ scale: .1,
+ display: "block"
+ });
+ dynamics.animate(self.wrapper, {
+ opacity: 1,
+ scale: 1
+ }, {
+ type: dynamics.spring,
+ frequency: 200,
+ friction: 270,
+ duration: 800
+ });
+ if (self.lis === null) self.lis = self.more_option_ul.getElements("> li").slice(0, 10);
+ self.lis.each(function(li, nr) {
+ dynamics.css(li, {
+ opacity: 0,
+ translateY: 20
+ });
+ dynamics.animate(li, {
+ opacity: 1,
+ translateY: 0
+ }, {
+ type: dynamics.spring,
+ frequency: 300,
+ friction: 435,
+ duration: 1e3,
+ delay: 100 + nr * 40
+ });
+ });
+ self.shown = true;
+ } else {
+ self.hide();
+ }
+ self.fireEvent(self.shown ? "open" : "close");
+ if (self.shown) {
+ self.el.addEvent("outerClick", self.removeOuterClick.bind(self));
+ this.addEvent("outerClick", function(e) {
+ if (e.target.get("tag") != "input") self.removeOuterClick();
+ });
+ } else {
+ self.removeOuterClick();
+ }
+ }
+ }
+ }));
+ },
+ hide: function() {
+ var self = this;
+ dynamics.animate(self.wrapper, {
+ opacity: 0,
+ scale: .1
+ }, {
+ type: dynamics.easeInOut,
+ duration: 300,
+ friction: 100,
+ complete: function() {
+ dynamics.css(self.wrapper, {
+ display: "none"
+ });
+ }
+ });
+ self.shown = false;
+ },
+ removeOuterClick: function() {
+ var self = this;
+ self.hide();
+ self.el.removeClass("show");
+ self.el.removeEvents("outerClick");
+ self.button.removeEvents("outerClick");
+ },
+ addLink: function(tab, position) {
+ var self = this, li = new Element("li").adopt(tab).inject(self.more_option_ul, position || "bottom");
+ self.lis = null;
+ return li;
+ }
+});
+
+Page.Home = new Class({
+ Extends: PageBase,
+ name: "home",
+ title: "Manage new stuff for things and such",
+ icon: "home",
+ indexAction: function() {
+ var self = this;
+ if (self.soon_list) {
+ self.available_list.update();
+ if (self.late_list) self.late_list.update();
+ return;
+ }
+ self.chain = new Chain();
+ self.chain.chain(self.createAvailable.bind(self), self.createBigsearch.bind(self), self.createSoon.bind(self), self.createSuggestions.bind(self), self.createCharts.bind(self), self.createLate.bind(self));
+ self.chain.callChain();
+ },
+ createBigsearch: function() {
+ var self = this;
+ new Element(".big_search").grab(new BlockSearch(self, {
+ animate: false
+ })).inject(self.content);
+ self.chain.callChain();
+ },
+ createAvailable: function() {
+ var self = this;
+ self.available_list = new MovieList({
+ navigation: false,
+ identifier: "snatched",
+ load_more: false,
+ view: "list",
+ actions: [ MA.MarkAsDone, MA.IMDB, MA.Release, MA.Trailer, MA.Refresh, MA.Readd, MA.Delete, MA.Category, MA.Profile ],
+ title: "Snatched & Available",
+ description: "These movies have been snatched or have finished downloading",
+ on_empty_element: new Element("div").adopt(new Element("h2", {
+ text: "Snatched & Available"
+ }), new Element("span.no_movies", {
+ html: 'No snatched movies or anything!? Damn.. <a href="#">Maybe add a movie.</a>',
+ events: {
+ click: function(e) {
+ e.preventDefault();
+ $(document.body).getElement(".big_search input").focus();
+ }
+ }
+ })),
+ filter: {
+ release_status: "snatched,missing,available,downloaded,done,seeding",
+ with_tags: "recent"
+ },
+ limit: null,
+ onLoaded: function() {
+ self.chain.callChain();
+ },
+ onMovieAdded: function(notification) {
+ var after_search = function(data) {
+ if (notification.data._id != data.data._id) return;
+ self.available_list.update();
+ App.off("movie.searcher.ended", after_search);
+ };
+ App.on("movie.searcher.ended", after_search);
+ }
+ });
+ $(self.available_list).inject(self.content);
+ },
+ createSoon: function() {
+ var self = this;
+ self.soon_list = new MovieList({
+ navigation: false,
+ identifier: "soon",
+ limit: 12,
+ title: "Available soon",
+ description: "Should be available soon as they will be released on DVD/Blu-ray in the coming weeks.",
+ filter: {
+ random: true
+ },
+ actions: [ MA.IMDB, MA.Release, MA.Trailer, MA.Refresh, MA.Delete, MA.Category, MA.Profile ],
+ load_more: false,
+ view: "thumb",
+ force_view: true,
+ api_call: "dashboard.soon",
+ onLoaded: function() {
+ self.chain.callChain();
+ }
+ });
+ $(self.soon_list).inject(self.content);
+ },
+ createSuggestions: function() {
+ var self = this;
+ self.suggestions_list = new MovieList({
+ navigation: false,
+ identifier: "suggest",
+ limit: 12,
+ title: "Suggestions",
+ description: "Based on your current wanted and managed items",
+ actions: [ MA.Add, MA.SuggestIgnore, MA.SuggestSeen, MA.IMDB, MA.Trailer ],
+ load_more: false,
+ view: "thumb",
+ force_view: true,
+ api_call: "suggestion.view",
+ onLoaded: function() {
+ self.chain.callChain();
+ }
+ });
+ $(self.suggestions_list).inject(self.content);
+ },
+ createCharts: function() {
+ var self = this;
+ self.charts_list = new Charts({
+ onCreated: function() {
+ self.chain.callChain();
+ }
+ });
+ $(self.charts_list).inject(self.content);
+ },
+ createLate: function() {
+ var self = this;
+ self.late_list = new MovieList({
+ navigation: false,
+ identifier: "late",
+ limit: 50,
+ title: "Still not available",
+ description: 'Try another quality profile or maybe add more providers in <a href="' + App.createUrl("settings/searcher/providers/") + '">Settings</a>.',
+ filter: {
+ late: true
+ },
+ loader: false,
+ load_more: false,
+ view: "list",
+ actions: [ MA.IMDB, MA.Trailer, MA.Refresh, MA.Delete, MA.Category, MA.Profile ],
+ api_call: "dashboard.soon",
+ onLoaded: function() {
+ self.chain.callChain();
+ }
+ });
+ $(self.late_list).inject(self.content);
+ }
+});
+
+Page.Settings = new Class({
+ Extends: PageBase,
+ order: 50,
+ name: "settings",
+ title: "Change settings.",
+ wizard_only: false,
+ tabs: {},
+ lists: {},
+ current: "about",
+ has_tab: false,
+ open: function(action, params) {
+ var self = this;
+ self.action = action == "index" ? self.default_action : action;
+ self.params = params;
+ if (!self.data) self.getData(self.create.bind(self)); else {
+ self.openTab(action);
+ }
+ App.getBlock("navigation").activate(self.name);
+ },
+ openTab: function(action) {
+ var self = this;
+ action = (action == "index" ? "about" : action) || self.action;
+ if (self.current) self.toggleTab(self.current, true);
+ var tab = self.toggleTab(action);
+ self.current = tab == self.tabs.general ? "general" : action;
+ },
+ toggleTab: function(tab_name, hide) {
+ var self = this;
+ var a = hide ? "removeClass" : "addClass";
+ var c = "active";
+ tab_name = tab_name.split("/")[0];
+ var t = self.tabs[tab_name] || self.tabs[self.action] || self.tabs.general;
+ var subtab = null;
+ Object.each(self.params, function(param, subtab_name) {
+ subtab = param;
+ });
+ self.content.getElements("li." + c + " , .tab_content." + c).each(function(active) {
+ active.removeClass(c);
+ });
+ if (t.subtabs[subtab]) {
+ t.tab[a](c);
+ t.subtabs[subtab].tab[a](c);
+ t.subtabs[subtab].content[a](c);
+ if (!hide) t.subtabs[subtab].content.fireEvent("activate");
+ } else {
+ t.tab[a](c);
+ t.content[a](c);
+ if (!hide) t.content.fireEvent("activate");
+ }
+ return t;
+ },
+ getData: function(onComplete) {
+ var self = this;
+ if (onComplete) Api.request("settings", {
+ useSpinner: true,
+ spinnerOptions: {
+ target: self.content
+ },
+ onComplete: function(json) {
+ self.data = json;
+ onComplete(json);
+ }
+ });
+ return self.data;
+ },
+ getValue: function(section, name) {
+ var self = this;
+ try {
+ return self.data.values[section][name];
+ } catch (e) {
+ return "";
+ }
+ },
+ showAdvanced: function() {
+ var self = this;
+ var c = self.advanced_toggle.checked ? "addClass" : "removeClass";
+ self.el[c]("show_advanced");
+ Cookie.write("advanced_toggle_checked", +self.advanced_toggle.checked, {
+ duration: 365
+ });
+ },
+ sortByOrder: function(a, b) {
+ return (a.order || 100) - (b.order || 100);
+ },
+ create: function(json) {
+ var self = this;
+ self.navigation = new Element("div.navigation").adopt(new Element("h2[text=Settings]"), new Element("div.advanced_toggle").adopt(new Element("span", {
+ text: "Show advanced"
+ }), new Element("label.switch").adopt(self.advanced_toggle = new Element("input[type=checkbox]", {
+ checked: +Cookie.read("advanced_toggle_checked"),
+ events: {
+ change: self.showAdvanced.bind(self)
+ }
+ }), new Element("div.toggle"))));
+ self.tabs_container = new Element("ul.tabs");
+ self.containers = new Element("form.uniForm.containers", {
+ events: {
+ "click:relay(.enabler.disabled h2)": function(e, el) {
+ el.getPrevious().getElements(".check").fireEvent("click");
+ }
+ }
+ });
+ self.showAdvanced();
+ var options = [];
+ Object.each(json.options, function(section, section_name) {
+ section.section_name = section_name;
+ options.include(section);
+ });
+ options.stableSort(self.sortByOrder).each(function(section) {
+ var section_name = section.section_name;
+ section.groups.stableSort(self.sortByOrder).each(function(group) {
+ if (group.hidden) return;
+ if (self.wizard_only && !group.wizard) return;
+ if (!self.tabs[group.tab] || !self.tabs[group.tab].groups) self.createTab(group.tab, {});
+ var content_container = self.tabs[group.tab].content;
+ if (group.subtab) {
+ if (!self.tabs[group.tab].subtabs[group.subtab]) self.createSubTab(group.subtab, group, self.tabs[group.tab], group.tab);
+ content_container = self.tabs[group.tab].subtabs[group.subtab].content;
+ }
+ if (group.list && !self.lists[group.list]) {
+ self.lists[group.list] = self.createList(content_container);
+ }
+ if (!self.tabs[group.tab].groups[group.name]) self.tabs[group.tab].groups[group.name] = self.createGroup(group).inject(group.list ? self.lists[group.list] : content_container).addClass("section_" + section_name);
+ if (group.type && group.type == "list") {
+ if (!self.lists[group.name]) self.lists[group.name] = self.createList(content_container); else self.lists[group.name].inject(self.tabs[group.tab].groups[group.name]);
+ }
+ group.options.stableSort(self.sortByOrder).each(function(option) {
+ if (option.hidden) return;
+ var class_name = (option.type || "string").capitalize();
+ var input = new Option[class_name](section_name, option.name, self.getValue(section_name, option.name), option);
+ input.inject(self.tabs[group.tab].groups[group.name]);
+ input.fireEvent("injected");
+ });
+ });
+ });
+ requestTimeout(function() {
+ self.el.grab(self.navigation);
+ self.content.adopt(self.tabs_container, self.containers);
+ self.fireEvent("create");
+ self.openTab();
+ }, 0);
+ },
+ createTab: function(tab_name, tab) {
+ var self = this;
+ if (self.tabs[tab_name] && self.tabs[tab_name].tab) return self.tabs[tab_name].tab;
+ var label = tab.label || (tab.name || tab_name).capitalize();
+ var tab_el = new Element("li.t_" + tab_name).adopt(new Element("a", {
+ href: App.createUrl(self.name + "/" + tab_name),
+ text: label
+ }).adopt()).inject(self.tabs_container);
+ if (!self.tabs[tab_name]) self.tabs[tab_name] = {
+ label: label
+ };
+ self.tabs[tab_name] = Object.merge(self.tabs[tab_name], {
+ tab: tab_el,
+ subtabs: {},
+ content: new Element("div.tab_content.tab_" + tab_name).inject(self.containers),
+ groups: {}
+ });
+ return self.tabs[tab_name];
+ },
+ createSubTab: function(tab_name, tab, parent_tab, parent_tab_name) {
+ var self = this;
+ if (parent_tab.subtabs[tab_name]) return parent_tab.subtabs[tab_name];
+ if (!parent_tab.subtabs_el) parent_tab.subtabs_el = new Element("ul.subtabs").inject(parent_tab.tab);
+ var label = tab.subtab_label || tab_name.replace("_", " ").capitalize();
+ var tab_el = new Element("li.t_" + tab_name).adopt(new Element("a", {
+ href: App.createUrl(self.name + "/" + parent_tab_name + "/" + tab_name),
+ text: label
+ }).adopt()).inject(parent_tab.subtabs_el);
+ if (!parent_tab.subtabs[tab_name]) parent_tab.subtabs[tab_name] = {
+ label: label
+ };
+ parent_tab.subtabs[tab_name] = Object.merge(parent_tab.subtabs[tab_name], {
+ tab: tab_el,
+ content: new Element("div.tab_content.tab_" + tab_name).inject(self.containers),
+ groups: {}
+ });
+ return parent_tab.subtabs[tab_name];
+ },
+ createGroup: function(group) {
+ var hint;
+ if (typeOf(group.description) == "array") {
+ hint = new Element("span.hint.more_hint", {
+ html: group.description[0]
+ });
+ createTooltip(group.description[1]).inject(hint);
+ } else {
+ hint = new Element("span.hint", {
+ html: group.description || ""
+ });
+ }
+ var icon;
+ if (group.icon) {
+ icon = new Element("span.icon").grab(new Element("img", {
+ src: "data:image/png;base64," + group.icon
+ }));
+ }
+ var label = new Element("span.group_label", {
+ text: group.label || group.name.capitalize()
+ });
+ return new Element("fieldset", {
+ class: (group.advanced ? "inlineLabels advanced" : "inlineLabels") + " group_" + (group.name || "") + " subtab_" + (group.subtab || "")
+ }).grab(new Element("h2").adopt(icon, label, hint));
+ },
+ createList: function(content_container) {
+ return new Element("div.option_list").inject(content_container);
+ }
+});
+
+var OptionBase = new Class({
+ Implements: [ Options, Events ],
+ klass: "",
+ focused_class: "focused",
+ save_on_change: true,
+ initialize: function(section, name, value, options) {
+ var self = this;
+ self.setOptions(options);
+ self.section = section;
+ self.name = name;
+ self.value = self.previous_value = value;
+ self.createBase();
+ self.create();
+ self.createHint();
+ self.setAdvanced();
+ self.input.addEvents({
+ change: self.changed.bind(self),
+ keyup: self.changed.bind(self)
+ });
+ self.addEvent("injected", self.afterInject.bind(self));
+ },
+ createBase: function() {
+ var self = this;
+ self.el = new Element("div.ctrlHolder." + self.section + "_" + self.name + (self.klass ? "." + self.klass : ""));
+ },
+ create: function() {},
+ createLabel: function() {
+ var self = this;
+ return new Element("label", {
+ text: (self.options.label || self.options.name.replace("_", " ")).capitalize()
+ });
+ },
+ setAdvanced: function() {
+ this.el.addClass(this.options.advanced ? "advanced" : "");
+ },
+ createHint: function() {
+ var self = this;
+ if (self.options.description) {
+ if (typeOf(self.options.description) == "array") {
+ var hint = new Element("p.formHint.more_hint", {
+ html: self.options.description[0]
+ }).inject(self.el);
+ createTooltip(self.options.description[1]).inject(hint);
+ } else {
+ new Element("p.formHint", {
+ html: self.options.description || ""
+ }).inject(self.el);
+ }
+ }
+ },
+ afterInject: function() {},
+ changed: function() {
+ var self = this;
+ if (self.getValue() != self.previous_value) {
+ if (self.save_on_change) {
+ if (self.changed_timer) clearRequestTimeout(self.changed_timer);
+ self.changed_timer = requestTimeout(self.save.bind(self), 300);
+ }
+ self.fireEvent("change");
+ }
+ },
+ save: function() {
+ var self = this, value = self.getValue();
+ App.fireEvent("setting.save." + self.section + "." + self.name, value);
+ Api.request("settings.save", {
+ data: {
+ section: self.section,
+ name: self.name,
+ value: value
+ },
+ useSpinner: true,
+ spinnerOptions: {
+ target: self.el
+ },
+ onComplete: self.saveCompleted.bind(self)
+ });
+ },
+ saveCompleted: function(json) {
+ var self = this;
+ var sc = json.success ? "save_success" : "save_failed";
+ self.previous_value = self.getValue();
+ self.el.addClass(sc);
+ requestTimeout(function() {
+ self.el.removeClass(sc);
+ }, 3e3);
+ },
+ setName: function(name) {
+ this.name = name;
+ },
+ postName: function() {
+ var self = this;
+ return self.section + "[" + self.name + "]";
+ },
+ getValue: function() {
+ var self = this;
+ return self.input.get("value");
+ },
+ getSettingValue: function() {
+ return this.value;
+ },
+ inject: function(el, position) {
+ this.el.inject(el, position);
+ return this.el;
+ },
+ toElement: function() {
+ return this.el;
+ }
+});
+
+var Option = {};
+
+Option.String = new Class({
+ Extends: OptionBase,
+ type: "string",
+ create: function() {
+ var self = this;
+ self.el.adopt(self.createLabel(), self.input = new Element("input", {
+ type: "text",
+ name: self.postName(),
+ value: self.getSettingValue(),
+ placeholder: self.getPlaceholder()
+ }));
+ },
+ getPlaceholder: function() {
+ return this.options.placeholder;
+ }
+});
+
+Option.Dropdown = new Class({
+ Extends: OptionBase,
+ create: function() {
+ var self = this;
+ self.el.adopt(self.createLabel(), new Element("div.select_wrapper.icon-dropdown").grab(self.input = new Element("select", {
+ name: self.postName()
+ })));
+ Object.each(self.options.values, function(value) {
+ new Element("option", {
+ text: value[0],
+ value: value[1]
+ }).inject(self.input);
+ });
+ self.input.set("value", self.getSettingValue());
+ }
+});
+
+Option.Checkbox = new Class({
+ Extends: OptionBase,
+ type: "checkbox",
+ create: function() {
+ var self = this;
+ var randomId = "r-" + randomString();
+ self.el.adopt(self.createLabel().set("for", randomId), self.input = new Element("input", {
+ name: self.postName(),
+ type: "checkbox",
+ checked: self.getSettingValue(),
+ id: randomId
+ }));
+ },
+ getValue: function() {
+ var self = this;
+ return +self.input.checked;
+ }
+});
+
+Option.Password = new Class({
+ Extends: Option.String,
+ type: "password",
+ create: function() {
+ var self = this;
+ self.el.adopt(self.createLabel(), self.input = new Element("input", {
+ type: "text",
+ name: self.postName(),
+ value: self.getSettingValue() ? "********" : "",
+ placeholder: self.getPlaceholder()
+ }));
+ self.input.addEvent("focus", function() {
+ self.input.set("value", "");
+ self.input.set("type", "password");
+ });
+ }
+});
+
+Option.Bool = new Class({
+ Extends: Option.Checkbox
+});
+
+Option.Enabler = new Class({
+ Extends: Option.Bool,
+ create: function() {
+ var self = this;
+ self.el.adopt(new Element("label.switch").adopt(self.input = new Element("input", {
+ type: "checkbox",
+ checked: self.getSettingValue(),
+ id: "r-" + randomString()
+ }), new Element("div.toggle")));
+ },
+ changed: function() {
+ this.parent();
+ this.checkState();
+ },
+ checkState: function() {
+ var self = this, enabled = self.getValue();
+ self.parentFieldset[enabled ? "removeClass" : "addClass"]("disabled");
+ },
+ afterInject: function() {
+ var self = this;
+ self.parentFieldset = self.el.getParent("fieldset").addClass("enabler");
+ self.parentList = self.parentFieldset.getParent(".option_list");
+ self.el.inject(self.parentFieldset, "top");
+ self.checkState();
+ }
+});
+
+Option.Int = new Class({
+ Extends: Option.String
+});
+
+Option.Float = new Class({
+ Extends: Option.Int
+});
+
+Option.Directory = new Class({
+ Extends: OptionBase,
+ type: "span",
+ browser: null,
+ save_on_change: false,
+ use_cache: false,
+ current_dir: "",
+ create: function() {
+ var self = this;
+ self.el.adopt(self.createLabel(), self.directory_inlay = new Element("span.directory", {
+ events: {
+ click: self.showBrowser.bind(self)
+ }
+ }).adopt(self.input = new Element("input", {
+ value: self.getSettingValue(),
+ events: {
+ change: self.filterDirectory.bind(self),
+ keydown: function(e) {
+ if (e.key == "enter" || e.key == "tab") e.stop();
+ },
+ keyup: self.filterDirectory.bind(self),
+ paste: self.filterDirectory.bind(self)
+ }
+ })));
+ self.cached = {};
+ },
+ filterDirectory: function(e) {
+ var self = this, value = self.getValue(), path_sep = Api.getOption("path_sep"), active_selector = "li:not(.blur):not(.empty)", first;
+ if (e.key == "enter" || e.key == "tab") {
+ e.stop();
+ first = self.dir_list.getElement(active_selector);
+ if (first) {
+ self.selectDirectory(first.get("data-value"));
+ }
+ } else {
+ if (value.substr(-1) == path_sep) {
+ if (self.current_dir != value) self.selectDirectory(value);
+ } else {
+ var pd = self.getParentDir(value);
+ if (self.current_dir != pd) self.getDirs(pd);
+ var folder_filter = value.split(path_sep).getLast();
+ self.dir_list.getElements("li").each(function(li) {
+ var valid = li.get("text").substr(0, folder_filter.length).toLowerCase() != folder_filter.toLowerCase();
+ li[valid ? "addClass" : "removeClass"]("blur");
+ });
+ first = self.dir_list.getElement(active_selector);
+ if (first) {
+ if (!self.dir_list_scroll) self.dir_list_scroll = new Fx.Scroll(self.dir_list, {
+ transition: "quint:in:out"
+ });
+ self.dir_list_scroll.toElement(first);
+ }
+ }
+ }
+ },
+ selectDirectory: function(dir) {
+ var self = this;
+ self.input.set("value", dir);
+ self.getDirs();
+ },
+ previousDirectory: function() {
+ var self = this;
+ self.selectDirectory(self.getParentDir());
+ },
+ caretAtEnd: function() {
+ var self = this;
+ self.input.focus();
+ if (typeof self.input.selectionStart == "number") {
+ self.input.selectionStart = self.input.selectionEnd = self.input.get("value").length;
+ } else if (typeof el.createTextRange != "undefined") {
+ self.input.focus();
+ var range = self.input.createTextRange();
+ range.collapse(false);
+ range.select();
+ }
+ },
+ showBrowser: function() {
+ var self = this;
+ if (!self.browser || self.browser && !self.browser.isVisible()) self.caretAtEnd();
+ if (!self.browser) {
+ self.browser = new Element("div.directory_list").adopt(self.pointer = new Element("div.pointer"), new Element("div.wrapper").adopt(new Element("div.actions").adopt(self.back_button = new Element("a.back", {
+ html: "",
+ events: {
+ click: self.previousDirectory.bind(self)
+ }
+ }), new Element("label", {
+ text: "Hidden folders"
+ }).adopt(self.show_hidden = new Element("input[type=checkbox]", {
+ events: {
+ change: function() {
+ self.getDirs();
+ }
+ }
+ }))), self.dir_list = new Element("ul", {
+ events: {
+ "click:relay(li:not(.empty))": function(e, el) {
+ e.preventDefault();
+ self.selectDirectory(el.get("data-value"));
+ },
+ mousewheel: function(e) {
+ e.stopPropagation();
+ }
+ }
+ }), new Element("div.actions").adopt(new Element("a.clear.button", {
+ text: "Clear",
+ events: {
+ click: function(e) {
+ self.input.set("value", "");
+ self.hideBrowser(e, true);
+ }
+ }
+ }), new Element("a.cancel", {
+ text: "Cancel",
+ events: {
+ click: self.hideBrowser.bind(self)
+ }
+ }), new Element("span", {
+ text: "or"
+ }), self.save_button = new Element("a.button.save", {
+ text: "Save",
+ events: {
+ click: function(e) {
+ self.hideBrowser(e, true);
+ }
+ }
+ })))).inject(self.directory_inlay, "before");
+ }
+ self.initial_directory = self.input.get("value");
+ self.getDirs();
+ self.browser.show();
+ self.el.addEvent("outerClick", self.hideBrowser.bind(self));
+ },
+ hideBrowser: function(e, save) {
+ var self = this;
+ e.preventDefault();
+ if (save) self.save(); else self.input.set("value", self.initial_directory);
+ self.browser.hide();
+ self.el.removeEvents("outerClick");
+ },
+ fillBrowser: function(json) {
+ var self = this, v = self.getValue();
+ self.data = json;
+ var previous_dir = json.parent;
+ if (v === "") self.input.set("value", json.home);
+ if (previous_dir.length >= 1 && !json.is_root) {
+ var prev_dirname = self.getCurrentDirname(previous_dir);
+ if (previous_dir == json.home) prev_dirname = "Home Folder"; else if (previous_dir == "/" && json.platform == "nt") prev_dirname = "Computer";
+ self.back_button.set("data-value", previous_dir);
+ self.back_button.set("html", "« " + prev_dirname);
+ self.back_button.show();
+ } else {
+ self.back_button.hide();
+ }
+ if (self.use_cache) if (!json) json = self.cached[v]; else self.cached[v] = json;
+ self.dir_list.empty();
+ if (json.dirs.length > 0) json.dirs.each(function(dir) {
+ new Element("li", {
+ "data-value": dir,
+ text: self.getCurrentDirname(dir)
+ }).inject(self.dir_list);
+ }); else new Element("li.empty", {
+ text: "Selected folder is empty"
+ }).inject(self.dir_list);
+ self.dir_list.setStyle("webkitTransform", "scale(1)");
+ self.caretAtEnd();
+ },
+ getDirs: function(dir) {
+ var self = this, c = dir || self.getValue();
+ if (self.cached[c] && self.use_cache) {
+ self.fillBrowser();
+ } else {
+ Api.request("directory.list", {
+ data: {
+ path: c,
+ show_hidden: +self.show_hidden.checked
+ },
+ onComplete: function(json) {
+ self.current_dir = c;
+ self.fillBrowser(json);
+ }
+ });
+ }
+ },
+ getParentDir: function(dir) {
+ var self = this;
+ if (!dir && self.data && self.data.parent) return self.data.parent;
+ var v = dir || self.getValue();
+ var sep = Api.getOption("path_sep");
+ var dirs = v.split(sep);
+ if (dirs.pop() === "") dirs.pop();
+ return dirs.join(sep) + sep;
+ },
+ getCurrentDirname: function(dir) {
+ var dir_split = dir.split(Api.getOption("path_sep"));
+ return dir_split[dir_split.length - 2] || Api.getOption("path_sep");
+ },
+ getValue: function() {
+ var self = this;
+ return self.input.get("value");
+ }
+});
+
+Option.Directories = new Class({
+ Extends: Option.String,
+ directories: [],
+ delimiter: "::",
+ afterInject: function() {
+ var self = this;
+ self.el.setStyle("display", "none");
+ self.directories = [];
+ self.getValue().split(self.delimiter).each(function(value) {
+ self.addDirectory(value);
+ });
+ self.addDirectory();
+ },
+ addDirectory: function(value) {
+ var self = this;
+ var has_empty = false;
+ self.directories.each(function(dir) {
+ if (!dir.getValue()) has_empty = true;
+ });
+ if (has_empty) return;
+ var dir = new Option.Directory(self.section, self.name, value || "", self.options);
+ var parent = self.el.getParent("fieldset");
+ var dirs = parent.getElements(".multi_directory");
+ if (dirs.length === 0) $(dir).inject(parent); else $(dir).inject(dirs.getLast(), "after");
+ dir.save = self.saveItems.bind(self);
+ $(dir).getElement("label").set("text", "Movie Folder");
+ $(dir).getElement(".formHint").destroy();
+ $(dir).addClass("multi_directory");
+ if (!value) $(dir).addClass("is_empty");
+ new Element("a.icon-delete.delete", {
+ events: {
+ click: self.delItem.bind(self, dir)
+ }
+ }).inject(dir);
+ self.directories.include(dir);
+ },
+ delItem: function(dir) {
+ var self = this;
+ self.directories.erase(dir);
+ $(dir).destroy();
+ self.saveItems();
+ self.addDirectory();
+ },
+ saveItems: function() {
+ var self = this;
+ var dirs = [];
+ self.directories.each(function(dir) {
+ if (dir.getValue()) {
+ $(dir).removeClass("is_empty");
+ dirs.include(dir.getValue());
+ } else $(dir).addClass("is_empty");
+ });
+ self.input.set("value", dirs.join(self.delimiter));
+ self.input.fireEvent("change");
+ self.addDirectory();
+ }
+});
+
+Option.Choice = new Class({
+ Extends: Option.String,
+ klass: "choice",
+ afterInject: function() {
+ var self = this;
+ var wrapper = new Element("div.select_wrapper.icon-dropdown").grab(self.select = new Element("select.select", {
+ events: {
+ change: self.addSelection.bind(self)
+ }
+ }).grab(new Element("option[text=Add option]")));
+ var o = self.options.options;
+ Object.each(o.choices, function(label, choice) {
+ new Element("option", {
+ text: label,
+ value: o.pre + choice + o.post
+ }).inject(self.select);
+ });
+ wrapper.inject(self.input, "after");
+ },
+ addSelection: function() {
+ var self = this;
+ self.input.set("value", self.input.get("value") + self.select.get("value"));
+ self.input.fireEvent("change");
+ }
+});
+
+Option.Combined = new Class({
+ Extends: Option.String,
+ afterInject: function() {
+ var self = this;
+ self.fieldset = self.input.getParent("fieldset");
+ self.combined_list = new Element("div.combined_table").inject(self.fieldset.getElement("h2"), "after");
+ self.values = {};
+ self.inputs = {};
+ self.items = [];
+ self.labels = {};
+ self.descriptions = {};
+ self.options.combine.each(function(name) {
+ self.inputs[name] = self.fieldset.getElement("input[name=" + self.section + "[" + name + "]]");
+ var values = self.inputs[name].get("value").split(",");
+ values.each(function(value, nr) {
+ if (!self.values[nr]) self.values[nr] = {};
+ self.values[nr][name] = value.trim();
+ });
+ self.inputs[name].getParent(".ctrlHolder").setStyle("display", "none");
+ self.inputs[name].addEvent("change", self.addEmpty.bind(self));
+ });
+ var head = new Element("div.head").inject(self.combined_list);
+ Object.each(self.inputs, function(input, name) {
+ var _in = input.getNext();
+ self.labels[name] = input.getPrevious().get("text");
+ self.descriptions[name] = _in ? _in.get("text") : "";
+ new Element("abbr", {
+ class: name,
+ text: self.labels[name],
+ title: self.descriptions[name]
+ }).inject(head);
+ });
+ Object.each(self.values, function(item) {
+ self.createItem(item);
+ });
+ self.addEmpty();
+ },
+ add_empty_timeout: 0,
+ addEmpty: function() {
+ var self = this;
+ if (self.add_empty_timeout) clearRequestTimeout(self.add_empty_timeout);
+ var has_empty = 0;
+ self.items.each(function(ctrl_holder) {
+ var empty_count = 0;
+ self.options.combine.each(function(name) {
+ var input = ctrl_holder.getElement("input." + name);
+ if (input.get("value") === "" || input.get("type") == "checkbox") empty_count++;
+ });
+ has_empty += empty_count == self.options.combine.length ? 1 : 0;
+ ctrl_holder[empty_count == self.options.combine.length ? "addClass" : "removeClass"]("is_empty");
+ });
+ if (has_empty > 0) return;
+ self.add_empty_timeout = requestTimeout(function() {
+ self.createItem({
+ use: true
+ });
+ }, 10);
+ },
+ createItem: function(values) {
+ var self = this;
+ var item = new Element("div.ctrlHolder").inject(self.combined_list), value_count = 0, value_empty = 0;
+ self.options.combine.each(function(name) {
+ var value = values[name] || "";
+ if (name.indexOf("use") != -1) {
+ var checkbox = new Element("input[type=checkbox]." + name, {
+ checked: +value,
+ events: {
+ click: self.saveCombined.bind(self),
+ change: self.saveCombined.bind(self)
+ }
+ }).inject(item);
+ } else {
+ value_count++;
+ new Element("input[type=text]." + name, {
+ value: value,
+ placeholder: self.labels[name] || name,
+ events: {
+ keyup: self.saveCombined.bind(self),
+ change: self.saveCombined.bind(self)
+ }
+ }).inject(item);
+ if (!value) value_empty++;
+ }
+ });
+ item[value_empty == value_count ? "addClass" : "removeClass"]("is_empty");
+ new Element("a.icon-cancel.delete", {
+ events: {
+ click: self.deleteCombinedItem.bind(self)
+ }
+ }).inject(item);
+ self.items.include(item);
+ },
+ saveCombined: function() {
+ var self = this, temp = {};
+ self.items.each(function(item, nr) {
+ self.options.combine.each(function(name) {
+ var input = item.getElement("input." + name);
+ if (item.hasClass("is_empty")) return;
+ if (!temp[name]) temp[name] = [];
+ temp[name][nr] = input.get("type") == "checkbox" ? +input.get("checked") : input.get("value").trim();
+ });
+ });
+ self.options.combine.each(function(name) {
+ self.inputs[name].set("value", (temp[name] || []).join(","));
+ self.inputs[name].fireEvent("change");
+ });
+ self.addEmpty();
+ },
+ deleteCombinedItem: function(e) {
+ var self = this;
+ e.preventDefault();
+ var item = e.target.getParent();
+ self.items.erase(item);
+ item.destroy();
+ self.saveCombined();
+ }
+});
+
+var createTooltip = function(description) {
+ var tip = new Element("div.tooltip", {
+ events: {
+ mouseenter: function() {
+ tip.addClass("shown");
+ },
+ mouseleave: function() {
+ tip.removeClass("shown");
+ }
+ }
+ }).adopt(new Element("a.icon-info.info"), new Element("div.tip", {
+ html: description
+ }));
+ return tip;
+};
+
+var AboutSettingTab = new Class({
+ tab: "",
+ content: "",
+ initialize: function() {
+ var self = this;
+ App.addEvent("loadSettings", self.addSettings.bind(self));
+ },
+ addSettings: function() {
+ var self = this;
+ self.settings = App.getPage("Settings");
+ self.settings.addEvent("create", function() {
+ var tab = self.settings.createTab("about", {
+ label: "About",
+ name: "about"
+ });
+ self.tab = tab.tab;
+ self.content = tab.content;
+ self.createAbout();
+ });
+ self.settings.default_action = "about";
+ },
+ createAbout: function() {
+ var self = this;
+ var millennium = new Date(2008, 7, 16), today = new Date(), one_day = 1e3 * 60 * 60 * 24;
+ self.settings.createGroup({
+ label: "About This CouchPotato",
+ name: "variables"
+ }).inject(self.content).adopt(new Element("dl.info").adopt(new Element("dt[text=Version]"), self.version_text = new Element("dd.version", {
+ text: "Getting version...",
+ events: {
+ click: App.checkForUpdate.bind(App, function(json) {
+ self.fillVersion(json.info);
+ }),
+ mouseenter: function() {
+ this.set("text", "Check for updates");
+ },
+ mouseleave: function() {
+ self.fillVersion(Updater.getInfo());
+ }
+ }
+ }), new Element("dt[text=Updater]"), self.updater_type = new Element("dd.updater"), new Element("dt[text=ID]"), new Element("dd", {
+ text: App.getOption("pid")
+ }), new Element("dt[text=Directories]"), new Element("dd", {
+ text: App.getOption("app_dir")
+ }), new Element("dd", {
+ text: App.getOption("data_dir")
+ }), new Element("dt[text=Startup Args]"), new Element("dd", {
+ html: App.getOption("args")
+ }), new Element("dd", {
+ html: App.getOption("options")
+ })));
+ if (!self.fillVersion(Updater.getInfo())) Updater.addEvent("loaded", self.fillVersion.bind(self));
+ self.settings.createGroup({
+ name: "Help Support CouchPotato"
+ }).inject(self.content).adopt(new Element("div.usenet").adopt(new Element("span", {
+ text: "Help support CouchPotato and save some money for yourself by signing up for an account at"
+ }), new Element("a", {
+ href: "https://usenetserver.com/partners/?a_aid=couchpotato&a_bid=3f357c6f",
+ target: "_blank",
+ text: "UsenetServer"
+ }), new Element("span[text=or]"), new Element("a", {
+ href: "http://www.newshosting.com/partners/?a_aid=couchpotato&a_bid=a0b022df",
+ target: "_blank",
+ text: "Newshosting"
+ }), new Element("span", {
+ text: ". For as low as $7.95 per month, youБ─≥ll get:"
+ }), new Element("ul").adopt(new Element("li.icon-ok", {
+ text: Math.ceil((today.getTime() - millennium.getTime()) / one_day) + " days retention"
+ }), new Element("li.icon-ok[text=No speed or download limits]"), new Element("li.icon-ok[text=Free SSL Encrypted connections]"))), new Element("div.donate", {
+ html: "Or support me via:" + '<iframe src="https://couchpota.to/donate.html" style="border:none; height: 200px;" scrolling="no"></iframe>'
+ }));
+ },
+ fillVersion: function(json) {
+ if (!json) return;
+ var self = this;
+ var date = new Date(json.version.date * 1e3);
+ self.version_text.set("text", json.version.hash + (json.version.date ? " (" + date.toLocaleString() + ")" : ""));
+ self.updater_type.set("text", json.version.type != json.branch ? json.version.type + ", " + json.branch : json.branch);
+ }
+});
+
+window.addEvent("domready", function() {
+ new AboutSettingTab();
+});
+
+window.addEvent("domready", function() {
+ var b = $(document.body), login_page = b.hasClass("login");
+ if (login_page) {
+ var form = b.getElement("form"), els = b.getElements("h1, .username, .password, .remember_me, .button");
+ els.each(function(el, nr) {
+ dynamics.css(el, {
+ opacity: 0,
+ translateY: 50
+ });
+ dynamics.animate(el, {
+ opacity: 1,
+ translateY: 0
+ }, {
+ type: dynamics.spring,
+ frequency: 200,
+ friction: 300,
+ duration: 800,
+ anticipationSize: 175,
+ anticipationStrength: 400,
+ delay: nr * 100
+ });
+ });
+ }
+});
\ No newline at end of file
diff --git a/couchpotato/static/scripts/combined.plugins.min.js b/couchpotato/static/scripts/combined.plugins.min.js
new file mode 100644
index 0000000000..1dc0859548
--- /dev/null
+++ b/couchpotato/static/scripts/combined.plugins.min.js
@@ -0,0 +1,3808 @@
+var DownloadersBase = new Class({
+ Implements: [ Events ],
+ initialize: function() {
+ var self = this;
+ App.addEvent("loadSettings", self.addTestButtons.bind(self));
+ },
+ addTestButtons: function() {
+ var self = this;
+ var setting_page = App.getPage("Settings");
+ setting_page.addEvent("create", function() {
+ Object.each(setting_page.tabs.downloaders.groups, self.addTestButton.bind(self));
+ });
+ },
+ addTestButton: function(fieldset, plugin_name) {
+ var self = this, button_name = self.testButtonName(fieldset);
+ if (button_name.contains("Downloaders")) return;
+ new Element(".ctrlHolder.test_button").grab(new Element("a.button", {
+ text: button_name,
+ events: {
+ click: function() {
+ var button = fieldset.getElement(".test_button .button");
+ button.set("text", "Connecting...");
+ Api.request("download." + plugin_name + ".test", {
+ onComplete: function(json) {
+ button.set("text", button_name);
+ var message;
+ if (json.success) {
+ message = new Element("span.success", {
+ text: "Connection successful"
+ }).inject(button, "after");
+ } else {
+ var msg_text = "Connection failed. Check logs for details.";
+ if (json.hasOwnProperty("msg")) msg_text = json.msg;
+ message = new Element("span.failed", {
+ text: msg_text
+ }).inject(button, "after");
+ }
+ requestTimeout(function() {
+ message.destroy();
+ }, 3e3);
+ }
+ });
+ }
+ }
+ })).inject(fieldset);
+ },
+ testButtonName: function(fieldset) {
+ var name = fieldset.getElement("h2 .group_label").get("text");
+ return "Test " + name;
+ }
+});
+
+var Downloaders = new DownloadersBase();
+
+var UpdaterBase = new Class({
+ Implements: [ Events ],
+ initialize: function() {
+ var self = this;
+ App.addEvent("load", self.info.bind(self, 2e3));
+ App.addEvent("unload", function() {
+ if (self.timer) clearRequestTimeout(self.timer);
+ });
+ },
+ check: function(onComplete) {
+ var self = this;
+ Api.request("updater.check", {
+ onComplete: function(json) {
+ if (onComplete) onComplete(json);
+ if (json.update_available) self.doUpdate(); else {
+ App.unBlockPage();
+ App.trigger("message", [ "No updates available" ]);
+ }
+ }
+ });
+ },
+ info: function(timeout) {
+ var self = this;
+ if (self.timer) clearRequestTimeout(self.timer);
+ self.timer = requestTimeout(function() {
+ Api.request("updater.info", {
+ onComplete: function(json) {
+ self.json = json;
+ self.fireEvent("loaded", [ json ]);
+ if (json.update_version) {
+ self.createMessage(json);
+ } else {
+ if (self.message) self.message.destroy();
+ }
+ }
+ });
+ }, timeout || 0);
+ },
+ getInfo: function() {
+ return this.json;
+ },
+ createMessage: function(data) {
+ var self = this;
+ if (self.message) return;
+ var changelog = "https://github.com/" + data.repo_name + "/compare/" + data.version.hash + "..." + data.branch;
+ if (data.update_version.changelog) changelog = data.update_version.changelog + "#" + data.version.hash + "..." + data.update_version.hash;
+ self.message = new Element("div.message.update").adopt(new Element("span", {
+ text: "A new version is available"
+ }), new Element("a", {
+ href: changelog,
+ text: "see what has changed",
+ target: "_blank"
+ }), new Element("span[text=or]"), new Element("a", {
+ text: "just update, gogogo!",
+ events: {
+ click: self.doUpdate.bind(self)
+ }
+ })).inject(App.getBlock("footer"));
+ },
+ doUpdate: function() {
+ var self = this;
+ App.blockPage("Please wait while CouchPotato is being updated with more awesome stuff.", "Updating");
+ Api.request("updater.update", {
+ onComplete: function(json) {
+ if (json.success) self.updating(); else App.unBlockPage();
+ }
+ });
+ },
+ updating: function() {
+ requestTimeout(function() {
+ App.checkAvailable(1e3, function() {
+ window.location.reload();
+ });
+ }, 500);
+ if (self.message) self.message.destroy();
+ }
+});
+
+var Updater = new UpdaterBase();
+
+var PutIODownloader = new Class({
+ initialize: function() {
+ var self = this;
+ App.addEvent("loadSettings", self.addRegisterButton.bind(self));
+ },
+ addRegisterButton: function() {
+ var self = this;
+ var setting_page = App.getPage("Settings");
+ setting_page.addEvent("create", function() {
+ var fieldset = setting_page.tabs.downloaders.groups.putio, l = window.location;
+ var putio_set = 0;
+ fieldset.getElements("input[type=text]").each(function(el) {
+ putio_set += +(el.get("value") !== "");
+ });
+ new Element(".ctrlHolder").adopt(putio_set > 0 ? [ self.unregister = new Element("a.button.red", {
+ text: 'Unregister "' + fieldset.getElement("input[name*=oauth_token]").get("value") + '"',
+ events: {
+ click: function() {
+ fieldset.getElements("input[name*=oauth_token]").set("value", "").fireEvent("change");
+ self.unregister.destroy();
+ self.unregister_or.destroy();
+ }
+ }
+ }), self.unregister_or = new Element("span[text=or]") ] : null, new Element("a.button", {
+ text: putio_set > 0 ? "Register a different account" : "Register your put.io account",
+ events: {
+ click: function() {
+ Api.request("downloader.putio.auth_url", {
+ data: {
+ host: l.protocol + "//" + l.hostname + (l.port ? ":" + l.port : "")
+ },
+ onComplete: function(json) {
+ window.location = json.url;
+ }
+ });
+ }
+ }
+ })).inject(fieldset.getElement(".test_button"), "before");
+ });
+ }
+});
+
+window.addEvent("domready", function() {
+ new PutIODownloader();
+});
+
+var BlockSearch = new Class({
+ Extends: BlockBase,
+ options: {
+ animate: true
+ },
+ cache: {},
+ create: function() {
+ var self = this;
+ var focus_timer = 0;
+ self.el = new Element("div.search_form").adopt(new Element("a.icon-search", {
+ events: {
+ click: self.clear.bind(self)
+ }
+ }), self.wrapper = new Element("div.wrapper").adopt(self.result_container = new Element("div.results_container", {
+ events: {
+ mousewheel: function(e) {
+ e.stopPropagation();
+ }
+ }
+ }).grab(self.results = new Element("div.results")), new Element("div.input").grab(self.input = new Element("input", {
+ placeholder: "Search & add a new media",
+ events: {
+ input: self.keyup.bind(self),
+ paste: self.keyup.bind(self),
+ change: self.keyup.bind(self),
+ keyup: self.keyup.bind(self),
+ focus: function() {
+ if (focus_timer) clearRequestTimeout(focus_timer);
+ if (this.get("value")) self.hideResults(false);
+ },
+ blur: function() {
+ focus_timer = requestTimeout(function() {
+ self.el.removeClass("focused");
+ self.last_q = null;
+ }, 100);
+ }
+ }
+ }))));
+ self.mask = new Element("div.mask").inject(self.result_container);
+ },
+ clear: function(e) {
+ var self = this;
+ e.preventDefault();
+ if (self.last_q === "") {
+ self.input.blur();
+ self.last_q = null;
+ } else {
+ self.last_q = "";
+ self.input.set("value", "");
+ self.el.addClass("focused");
+ self.input.focus();
+ self.media = {};
+ self.results.empty();
+ self.el.removeClass("filled");
+ if (self.options.animate) {
+ dynamics.css(self.wrapper, {
+ opacity: 0,
+ scale: .1
+ });
+ dynamics.animate(self.wrapper, {
+ opacity: 1,
+ scale: 1
+ }, {
+ type: dynamics.spring,
+ frequency: 200,
+ friction: 270,
+ duration: 800
+ });
+ }
+ }
+ },
+ hideResults: function(bool) {
+ var self = this;
+ if (self.hidden == bool) return;
+ self.el[bool ? "removeClass" : "addClass"]("shown");
+ if (bool) {
+ History.removeEvent("change", self.hideResults.bind(self, !bool));
+ self.el.removeEvent("outerClick", self.hideResults.bind(self, !bool));
+ } else {
+ History.addEvent("change", self.hideResults.bind(self, !bool));
+ self.el.addEvent("outerClick", self.hideResults.bind(self, !bool));
+ }
+ self.hidden = bool;
+ },
+ keyup: function() {
+ var self = this;
+ self.el[self.q() ? "addClass" : "removeClass"]("filled");
+ if (self.q() != self.last_q) {
+ if (self.api_request && self.api_request.isRunning()) self.api_request.cancel();
+ if (self.autocomplete_timer) clearRequestTimeout(self.autocomplete_timer);
+ self.autocomplete_timer = requestTimeout(self.autocomplete.bind(self), 300);
+ }
+ },
+ autocomplete: function() {
+ var self = this;
+ if (!self.q()) {
+ self.hideResults(true);
+ return;
+ }
+ self.list();
+ },
+ list: function() {
+ var self = this, q = self.q(), cache = self.cache[q];
+ self.hideResults(false);
+ if (!cache) {
+ requestTimeout(function() {
+ self.mask.addClass("show");
+ }, 10);
+ if (!self.spinner) self.spinner = createSpinner(self.mask);
+ self.api_request = Api.request("search", {
+ data: {
+ q: q
+ },
+ onComplete: self.fill.bind(self, q)
+ });
+ } else self.fill(q, cache);
+ self.last_q = q;
+ },
+ fill: function(q, json) {
+ var self = this;
+ self.cache[q] = json;
+ self.media = {};
+ self.results.empty();
+ Object.each(json, function(media) {
+ if (typeOf(media) == "array") {
+ Object.each(media, function(me) {
+ var m = new (window["BlockSearch" + me.type.capitalize() + "Item"])(me);
+ $(m).inject(self.results);
+ self.media[m.imdb || "r-" + Math.floor(Math.random() * 1e4)] = m;
+ if (q == m.imdb) m.showOptions();
+ });
+ }
+ });
+ self.mask.removeClass("show");
+ },
+ loading: function(bool) {
+ this.el[bool ? "addClass" : "removeClass"]("loading");
+ },
+ q: function() {
+ return this.input.get("value").trim();
+ }
+});
+
+var MovieDetails = new Class({
+ Extends: BlockBase,
+ sections: null,
+ buttons: null,
+ initialize: function(parent, options) {
+ var self = this;
+ self.sections = {};
+ var category = parent.get("category");
+ self.el = new Element("div", {
+ class: "page active movie_details level_" + (options.level || 0)
+ }).adopt(self.overlay = new Element("div.overlay", {
+ events: {
+ click: self.close.bind(self)
+ }
+ }).grab(new Element("a.close.icon-left-arrow")), self.content = new Element("div.scroll_content").grab(new Element("div.head").adopt(new Element("h1").grab(self.title_dropdown = new BlockMenu(self, {
+ class: "title",
+ button_text: parent.getTitle() + (parent.get("year") ? " (" + parent.get("year") + ")" : ""),
+ button_class: "icon-dropdown"
+ })), self.buttons = new Element("div.buttons"))));
+ var eta_date = parent.getETA("%b %Y");
+ self.addSection("description", new Element("div").adopt(new Element("div", {
+ text: parent.get("plot")
+ }), new Element("div.meta", {
+ html: (eta_date ? "<span>ETA:" + eta_date + "</span>" : "") + "<span>" + (parent.get("genres") || []).join(", ") + "</span>"
+ })));
+ var titles = parent.get("info").titles;
+ $(self.title_dropdown).addEvents({
+ "click:relay(li a)": function(e, el) {
+ e.stopPropagation();
+ Api.request("movie.edit", {
+ data: {
+ id: parent.get("_id"),
+ default_title: el.get("text")
+ }
+ });
+ $(self.title_dropdown).getElements(".icon-ok").removeClass("icon-ok");
+ el.addClass("icon-ok");
+ self.title_dropdown.button.set("text", el.get("text") + (parent.get("year") ? " (" + parent.get("year") + ")" : ""));
+ }
+ });
+ titles.each(function(t) {
+ self.title_dropdown.addLink(new Element("a", {
+ text: t,
+ class: parent.get("title") == t ? "icon-ok" : ""
+ }));
+ });
+ },
+ addSection: function(name, section_el) {
+ var self = this;
+ name = name.toLowerCase();
+ self.content.grab(self.sections[name] = new Element("div", {
+ class: "section section_" + name
+ }).grab(section_el));
+ },
+ addButton: function(button) {
+ var self = this;
+ self.buttons.grab(button);
+ },
+ open: function() {
+ var self = this;
+ self.el.addClass("show");
+ self.outer_click = function() {
+ self.close();
+ };
+ App.addEvent("history.push", self.outer_click);
+ },
+ close: function() {
+ var self = this;
+ var ended = function() {
+ self.el.dispose();
+ self.overlay.removeEventListener("transitionend", ended);
+ };
+ self.overlay.addEventListener("transitionend", ended, false);
+ self.el.removeClass("show");
+ App.removeEvent("history.push", self.outer_click);
+ }
+});
+
+var MovieList = new Class({
+ Implements: [ Events, Options ],
+ options: {
+ api_call: "media.list",
+ navigation: true,
+ limit: 50,
+ load_more: true,
+ loader: true,
+ menu: [],
+ add_new: false,
+ force_view: false
+ },
+ available_views: [ "thumb", "list" ],
+ movies: [],
+ movies_added: {},
+ total_movies: 0,
+ letters: {},
+ filter: null,
+ initialize: function(options) {
+ var self = this;
+ self.setOptions(options);
+ self.offset = 0;
+ self.filter = self.options.filter || {
+ starts_with: null,
+ search: null
+ };
+ self.el = new Element("div.movies").adopt(self.title = self.options.title ? new Element("h2", {
+ text: self.options.title,
+ styles: {
+ display: "none"
+ }
+ }) : null, self.description = self.options.description ? new Element("div.description", {
+ html: self.options.description,
+ styles: {
+ display: "none"
+ }
+ }) : null, self.movie_list = new Element("div", {
+ events: {
+ "click:relay(.movie)": function(e, el) {
+ el.retrieve("klass").onClick(e);
+ },
+ "mouseenter:relay(.movie)": function(e, el) {
+ e.stopPropagation();
+ el.retrieve("klass").onMouseenter(e);
+ },
+ "change:relay(.movie input)": function(e, el) {
+ e.stopPropagation();
+ el = el.getParent(".movie");
+ var klass = el.retrieve("klass");
+ klass.fireEvent("select");
+ klass.select(klass.select_checkbox.get("checked"));
+ }
+ }
+ }), self.load_more = self.options.load_more ? new Element("a.load_more", {
+ events: {
+ click: self.loadMore.bind(self)
+ }
+ }) : null);
+ self.changeView(self.getSavedView() || self.options.view || "thumb");
+ if (self.options.navigation) self.createNavigation();
+ if (self.options.api_call) self.getMovies();
+ App.on("movie.added", self.movieAdded.bind(self));
+ App.on("movie.deleted", self.movieDeleted.bind(self));
+ },
+ movieDeleted: function(notification) {
+ var self = this;
+ if (self.movies_added[notification.data._id]) {
+ self.movies.each(function(movie) {
+ if (movie.get("_id") == notification.data._id) {
+ movie.destroy();
+ delete self.movies_added[notification.data._id];
+ self.setCounter(self.counter_count - 1);
+ self.total_movies--;
+ }
+ });
+ }
+ self.checkIfEmpty();
+ },
+ movieAdded: function(notification) {
+ var self = this;
+ self.fireEvent("movieAdded", notification);
+ if (self.options.add_new && !self.movies_added[notification.data._id] && notification.data.status == self.options.status) {
+ window.scroll(0, 0);
+ self.createMovie(notification.data, "top");
+ self.setCounter(self.counter_count + 1);
+ self.checkIfEmpty();
+ }
+ },
+ create: function() {
+ var self = this;
+ if (self.options.load_more) {
+ self.scrollspy = new ScrollSpy({
+ container: self.el.getParent(),
+ min: function() {
+ return self.load_more.getCoordinates().top;
+ },
+ onEnter: self.loadMore.bind(self)
+ });
+ }
+ self.created = true;
+ },
+ addMovies: function(movies, total) {
+ var self = this;
+ if (!self.created) self.create();
+ if (movies.length < self.options.limit && self.scrollspy) {
+ self.load_more.hide();
+ self.scrollspy.stop();
+ }
+ self.createMovie(movies, "bottom");
+ self.total_movies += total;
+ self.setCounter(total);
+ self.calculateSelected();
+ },
+ setCounter: function(count) {
+ var self = this;
+ if (!self.navigation_counter) return;
+ self.counter_count = count;
+ self.navigation_counter.set("text", count === 1 ? "1 movie" : (count || 0) + " movies");
+ if (self.empty_message) {
+ self.empty_message.destroy();
+ self.empty_message = null;
+ }
+ if (self.total_movies && count === 0 && !self.empty_message) {
+ var message = (self.filter.search ? 'for "' + self.filter.search + '"' : "") + (self.filter.starts_with ? " in <strong>" + self.filter.starts_with + "</strong>" : "");
+ self.empty_message = new Element(".message", {
+ html: "No movies found " + message + ".<br/>"
+ }).grab(new Element("a", {
+ text: "Reset filter",
+ events: {
+ click: function() {
+ self.filter = {
+ starts_with: null,
+ search: null
+ };
+ self.navigation_search_input.set("value", "");
+ self.reset();
+ self.activateLetter();
+ self.getMovies(true);
+ self.last_search_value = "";
+ }
+ }
+ })).inject(self.movie_list);
+ }
+ },
+ createMovie: function(movie, inject_at, nr) {
+ var self = this, movies = Array.isArray(movie) ? movie : [ movie ], movie_els = [];
+ inject_at = inject_at || "bottom";
+ movies.each(function(movie, nr) {
+ var m = new Movie(self, {
+ actions: self.options.actions,
+ view: self.current_view,
+ onSelect: self.calculateSelected.bind(self)
+ }, movie);
+ var el = $(m);
+ if (inject_at === "bottom") {
+ movie_els.push(el);
+ } else {
+ el.inject(self.movie_list, inject_at);
+ }
+ self.movies.include(m);
+ self.movies_added[movie._id] = true;
+ });
+ if (movie_els.length > 0) {
+ $(self.movie_list).adopt(movie_els);
+ }
+ },
+ createNavigation: function() {
+ var self = this;
+ var chars = "#ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ self.el.addClass("with_navigation");
+ self.navigation = new Element("div.alph_nav").adopt(self.mass_edit_form = new Element("div.mass_edit_form").adopt(new Element("span.select").adopt(self.mass_edit_select = new Element("input[type=checkbox]", {
+ events: {
+ change: self.massEditToggleAll.bind(self)
+ }
+ }), self.mass_edit_selected = new Element("span.count", {
+ text: 0
+ }), self.mass_edit_selected_label = new Element("span", {
+ text: "selected"
+ })), new Element("div.quality").adopt(self.mass_edit_quality = new Element("select"), new Element("a.button.orange", {
+ text: "Change quality",
+ events: {
+ click: self.changeQualitySelected.bind(self)
+ }
+ })), new Element("div.delete").adopt(new Element("span[text=or]"), new Element("a.button.red", {
+ text: "Delete",
+ events: {
+ click: self.deleteSelected.bind(self)
+ }
+ })), new Element("div.refresh").adopt(new Element("span[text=or]"), new Element("a.button.green", {
+ text: "Refresh",
+ events: {
+ click: self.refreshSelected.bind(self)
+ }
+ }))), new Element("div.menus").adopt(self.navigation_counter = new Element("span.counter[title=Total]"), self.filter_menu = new BlockMenu(self, {
+ class: "filter",
+ button_class: "icon-filter"
+ }), self.navigation_actions = new Element("div.actions", {
+ events: {
+ click: function(e, el) {
+ e.preventDefault();
+ var new_view = self.current_view == "list" ? "thumb" : "list";
+ var a = "active";
+ self.navigation_actions.getElements("." + a).removeClass(a);
+ self.changeView(new_view);
+ self.navigation_actions.getElement("[data-view=" + new_view + "]").addClass(a);
+ }
+ }
+ }), self.navigation_menu = new BlockMenu(self, {
+ class: "extra",
+ button_class: "icon-dots"
+ })));
+ Quality.getActiveProfiles().each(function(profile) {
+ new Element("option", {
+ value: profile.get("_id"),
+ text: profile.get("label")
+ }).inject(self.mass_edit_quality);
+ });
+ self.filter_menu.addLink(self.navigation_search_input = new Element("input", {
+ title: "Search through " + self.options.identifier,
+ placeholder: "Search through " + self.options.identifier,
+ events: {
+ keyup: self.search.bind(self),
+ change: self.search.bind(self)
+ }
+ })).addClass("search icon-search");
+ var available_chars;
+ self.filter_menu.addEvent("open", function() {
+ self.navigation_search_input.focus();
+ if (!available_chars && (self.navigation.isDisplayed() || self.navigation.isVisible())) Api.request("media.available_chars", {
+ data: Object.merge({
+ status: self.options.status
+ }, self.filter),
+ onSuccess: function(json) {
+ available_chars = json.chars;
+ available_chars.each(function(c) {
+ self.letters[c.capitalize()].addClass("available");
+ });
+ }
+ });
+ });
+ self.filter_menu.addLink(self.navigation_alpha = new Element("ul.numbers", {
+ events: {
+ "click:relay(li.available)": function(e, el) {
+ self.activateLetter(el.get("data-letter"));
+ self.getMovies(true);
+ }
+ }
+ }));
+ [ "thumb", "list" ].each(function(view) {
+ var current = self.current_view == view;
+ new Element("a", {
+ class: "icon-" + view + (current ? " active " : ""),
+ "data-view": view
+ }).inject(self.navigation_actions, current ? "top" : "bottom");
+ });
+ self.letters.all = new Element("li.letter_all.available.active", {
+ text: "ALL"
+ }).inject(self.navigation_alpha);
+ chars.split("").each(function(c) {
+ self.letters[c] = new Element("li", {
+ text: c,
+ class: "letter_" + c,
+ "data-letter": c
+ }).inject(self.navigation_alpha);
+ });
+ if (self.options.menu.length > 0) self.options.menu.each(function(menu_item) {
+ self.navigation_menu.addLink(menu_item);
+ }); else self.navigation_menu.hide();
+ },
+ calculateSelected: function() {
+ var self = this;
+ var selected = 0, movies = self.movies.length;
+ self.movies.each(function(movie) {
+ selected += movie.isSelected() ? 1 : 0;
+ });
+ var indeterminate = selected > 0 && selected < movies, checked = selected == movies && selected > 0;
+ document.body[selected > 0 ? "addClass" : "removeClass"]("mass_editing");
+ if (self.mass_edit_select) {
+ self.mass_edit_select.set("checked", checked);
+ self.mass_edit_select.indeterminate = indeterminate;
+ self.mass_edit_selected.set("text", selected);
+ }
+ },
+ deleteSelected: function() {
+ var self = this, ids = self.getSelectedMovies(), help_msg = self.identifier == "wanted" ? "If you do, you won't be able to watch them, as they won't get downloaded!" : "Your files will be safe, this will only delete the references in CouchPotato";
+ var qObj = new Question("Are you sure you want to delete " + ids.length + " movie" + (ids.length != 1 ? "s" : "") + "?", help_msg, [ {
+ text: "Yes, delete " + (ids.length != 1 ? "them" : "it"),
+ class: "delete",
+ events: {
+ click: function(e) {
+ e.preventDefault();
+ this.set("text", "Deleting..");
+ Api.request("media.delete", {
+ method: "post",
+ data: {
+ id: ids.join(","),
+ delete_from: self.options.identifier
+ },
+ onSuccess: function() {
+ qObj.close();
+ var erase_movies = [];
+ self.movies.each(function(movie) {
+ if (movie.isSelected()) {
+ $(movie).destroy();
+ erase_movies.include(movie);
+ }
+ });
+ erase_movies.each(function(movie) {
+ self.movies.erase(movie);
+ movie.destroy();
+ self.setCounter(self.counter_count - 1);
+ self.total_movies--;
+ });
+ self.calculateSelected();
+ }
+ });
+ }
+ }
+ }, {
+ text: "Cancel",
+ cancel: true
+ } ]);
+ },
+ changeQualitySelected: function() {
+ var self = this;
+ var ids = self.getSelectedMovies();
+ Api.request("movie.edit", {
+ method: "post",
+ data: {
+ id: ids.join(","),
+ profile_id: self.mass_edit_quality.get("value")
+ },
+ onSuccess: self.search.bind(self)
+ });
+ },
+ refreshSelected: function() {
+ var self = this;
+ var ids = self.getSelectedMovies();
+ Api.request("media.refresh", {
+ method: "post",
+ data: {
+ id: ids.join(",")
+ }
+ });
+ },
+ getSelectedMovies: function() {
+ var self = this;
+ var ids = [];
+ self.movies.each(function(movie) {
+ if (movie.isSelected()) ids.include(movie.get("_id"));
+ });
+ return ids;
+ },
+ massEditToggleAll: function() {
+ var self = this;
+ var select = self.mass_edit_select.get("checked");
+ self.movies.each(function(movie) {
+ movie.select(select);
+ });
+ self.calculateSelected();
+ },
+ reset: function() {
+ var self = this;
+ self.movies = [];
+ if (self.mass_edit_select) self.calculateSelected();
+ if (self.navigation_alpha) self.navigation_alpha.getElements(".active").removeClass("active");
+ self.offset = 0;
+ if (self.scrollspy) {
+ self.scrollspy.start();
+ }
+ },
+ activateLetter: function(letter) {
+ var self = this;
+ self.reset();
+ self.letters[letter || "all"].addClass("active");
+ self.filter.starts_with = letter;
+ },
+ changeView: function(new_view) {
+ var self = this;
+ if (self.available_views.indexOf(new_view) == -1) new_view = "thumb";
+ self.el.removeClass(self.current_view + "_list").addClass(new_view + "_list");
+ self.current_view = new_view;
+ Cookie.write(self.options.identifier + "_view", new_view, {
+ duration: 1e3
+ });
+ },
+ getSavedView: function() {
+ var self = this;
+ return self.options.force_view ? self.options.view : Cookie.read(self.options.identifier + "_view");
+ },
+ search: function() {
+ var self = this;
+ if (self.search_timer) clearRequestTimeout(self.search_timer);
+ self.search_timer = requestTimeout(function() {
+ var search_value = self.navigation_search_input.get("value");
+ if (search_value == self.last_search_value) return;
+ self.reset();
+ self.activateLetter();
+ self.filter.search = search_value;
+ self.getMovies(true);
+ self.last_search_value = search_value;
+ }, 250);
+ },
+ update: function() {
+ var self = this;
+ self.reset();
+ self.getMovies(true);
+ },
+ getMovies: function(reset) {
+ var self = this;
+ if (self.scrollspy) {
+ self.scrollspy.stop();
+ self.load_more.set("text", "loading...");
+ }
+ var loader_timeout;
+ if (self.movies.length === 0 && self.options.loader) {
+ self.loader_first = new Element("div.mask.loading.with_message").grab(new Element("div.message", {
+ text: self.options.title ? "Loading '" + self.options.title + "'" : "Loading..."
+ })).inject(self.el, "top");
+ createSpinner(self.loader_first);
+ var lfc = self.loader_first;
+ loader_timeout = requestTimeout(function() {
+ lfc.addClass("show");
+ }, 10);
+ self.el.setStyle("min-height", 220);
+ }
+ Api.request(self.options.api_call, {
+ data: Object.merge({
+ type: self.options.type || "movie",
+ status: self.options.status,
+ limit_offset: self.options.limit ? self.options.limit + "," + self.offset : null
+ }, self.filter),
+ onSuccess: function(json) {
+ if (reset) self.movie_list.empty();
+ if (loader_timeout) clearRequestTimeout(loader_timeout);
+ if (self.loader_first) {
+ var lf = self.loader_first;
+ self.loader_first = null;
+ lf.removeClass("show");
+ requestTimeout(function() {
+ lf.destroy();
+ }, 1e3);
+ self.el.setStyle("min-height", null);
+ }
+ self.store(json.movies);
+ self.addMovies(json.movies, json.total || json.movies.length);
+ if (self.scrollspy) {
+ self.load_more.set("text", "load more movies");
+ self.scrollspy.start();
+ }
+ self.checkIfEmpty();
+ self.fireEvent("loaded");
+ }
+ });
+ },
+ loadMore: function() {
+ var self = this;
+ if (self.offset >= self.options.limit) self.getMovies();
+ },
+ store: function(movies) {
+ var self = this;
+ self.offset += movies.length;
+ },
+ checkIfEmpty: function() {
+ var self = this;
+ var is_empty = self.movies.length === 0 && (self.total_movies === 0 || self.total_movies === undefined);
+ if (self.title) self.title[is_empty ? "hide" : "show"]();
+ if (self.description) self.description.setStyle("display", [ is_empty ? "none" : "" ]);
+ if (is_empty && self.options.on_empty_element) {
+ var ee = typeOf(self.options.on_empty_element) == "function" ? self.options.on_empty_element() : self.options.on_empty_element;
+ ee.inject(self.loader_first || self.title || self.movie_list, "after");
+ if (self.navigation) self.navigation.hide();
+ self.empty_element = ee;
+ } else if (self.empty_element) {
+ self.empty_element.destroy();
+ if (self.navigation) self.navigation.show();
+ }
+ },
+ toElement: function() {
+ return this.el;
+ }
+});
+
+var MoviesManage = new Class({
+ Extends: PageBase,
+ order: 20,
+ name: "manage",
+ title: "Do stuff to your existing movies!",
+ indexAction: function() {
+ var self = this;
+ if (!self.list) {
+ self.refresh_button = new Element("a", {
+ title: "Rescan your library for new movies",
+ text: "Full library refresh",
+ events: {
+ click: self.refresh.bind(self, true)
+ }
+ });
+ self.refresh_quick = new Element("a", {
+ title: "Just scan for recently changed",
+ text: "Quick library scan",
+ events: {
+ click: self.refresh.bind(self, false)
+ }
+ });
+ self.list = new MovieList({
+ identifier: "manage",
+ filter: {
+ status: "done",
+ release_status: "done",
+ status_or: 1
+ },
+ actions: [ MA.IMDB, MA.Files, MA.Trailer, MA.Readd, MA.Delete ],
+ menu: [ self.refresh_button, self.refresh_quick ],
+ on_empty_element: new Element("div.empty_manage").adopt(new Element("div", {
+ text: "Seems like you don't have anything in your library yet. Add your existing movie folders in "
+ }).grab(new Element("a", {
+ text: "Settings > Manage",
+ href: App.createUrl("settings/manage")
+ })), new Element("div.after_manage", {
+ text: "When you've done that, hit this button Б├▓ "
+ }).grab(new Element("a.button.green", {
+ text: "Hit me, but not too hard",
+ events: {
+ click: self.refresh.bind(self, true)
+ }
+ })))
+ });
+ $(self.list).inject(self.content);
+ self.startProgressInterval();
+ }
+ },
+ refresh: function(full) {
+ var self = this;
+ if (!self.update_in_progress) {
+ Api.request("manage.update", {
+ data: {
+ full: +full
+ }
+ });
+ self.startProgressInterval();
+ }
+ },
+ startProgressInterval: function() {
+ var self = this;
+ self.progress_interval = requestInterval(function() {
+ if (self.progress_request && self.progress_request.running) return;
+ self.update_in_progress = true;
+ self.progress_request = Api.request("manage.progress", {
+ onComplete: function(json) {
+ if (!json || !json.progress) {
+ clearRequestInterval(self.progress_interval);
+ self.update_in_progress = false;
+ if (self.progress_container) {
+ self.progress_container.destroy();
+ self.list.update();
+ }
+ } else {
+ var progress = json.progress;
+ if (!self.list.navigation) return;
+ if (!self.progress_container) self.progress_container = new Element("div.progress").inject(self.list, "top");
+ self.progress_container.empty();
+ var sorted_table = self.parseProgress(json.progress);
+ sorted_table.each(function(folder) {
+ var folder_progress = progress[folder];
+ new Element("div").adopt(new Element("span.folder", {
+ text: folder + (folder_progress.eta > 0 ? ", " + new Date().increment("second", folder_progress.eta).timeDiffInWords().replace("from now", "to go") : "")
+ }), new Element("span.percentage", {
+ text: folder_progress.total ? Math.round((folder_progress.total - folder_progress.to_go) / folder_progress.total * 100) + "%" : "0%"
+ })).inject(self.progress_container);
+ });
+ }
+ }
+ });
+ }, 1e3);
+ },
+ parseProgress: function(progress_object) {
+ var folder, temp_array = [];
+ for (folder in progress_object) {
+ if (progress_object.hasOwnProperty(folder)) {
+ temp_array.push(folder);
+ }
+ }
+ return temp_array.stableSort();
+ }
+});
+
+var MovieAction = new Class({
+ Implements: [ Options ],
+ class_name: "action",
+ label: "UNKNOWN",
+ icon: null,
+ button: null,
+ details: null,
+ detail_button: null,
+ initialize: function(movie, options) {
+ var self = this;
+ self.setOptions(options);
+ self.movie = movie;
+ self.create();
+ if (self.button) {
+ var wrapper = new Element("div", {
+ class: self.class_name
+ });
+ self.button.inject(wrapper);
+ self.button = wrapper;
+ }
+ },
+ create: function() {},
+ getButton: function() {
+ return this.button || null;
+ },
+ getDetails: function() {
+ return this.details || null;
+ },
+ getDetailButton: function() {
+ return this.detail_button || null;
+ },
+ getLabel: function() {
+ return this.label;
+ },
+ disable: function() {
+ if (this.el) this.el.addClass("disable");
+ },
+ enable: function() {
+ if (this.el) this.el.removeClass("disable");
+ },
+ getTitle: function() {
+ var self = this;
+ try {
+ return self.movie.getTitle(true);
+ } catch (e) {
+ try {
+ return self.movie.original_title ? self.movie.original_title : self.movie.titles[0];
+ } catch (e2) {
+ return "Unknown";
+ }
+ }
+ },
+ get: function(key) {
+ var self = this;
+ try {
+ return self.movie.get(key);
+ } catch (e) {
+ return self.movie[key];
+ }
+ },
+ createMask: function() {
+ var self = this;
+ self.mask = new Element("div.mask", {
+ styles: {
+ "z-index": "1"
+ }
+ }).inject(self.movie, "top").fade("hide");
+ },
+ toElement: function() {
+ return this.el || null;
+ }
+});
+
+var MA = {};
+
+MA.IMDB = new Class({
+ Extends: MovieAction,
+ id: null,
+ create: function() {
+ var self = this;
+ self.id = self.movie.getIdentifier ? self.movie.getIdentifier() : self.get("imdb");
+ self.button = self.createButton();
+ self.detail_button = self.createButton();
+ if (!self.id) self.disable();
+ },
+ createButton: function() {
+ var self = this;
+ return new Element("a.imdb", {
+ text: "IMDB",
+ title: "Go to the IMDB page of " + self.getTitle(),
+ href: "http://www.imdb.com/title/" + self.id + "/",
+ target: "_blank"
+ });
+ }
+});
+
+MA.Release = new Class({
+ Extends: MovieAction,
+ label: "Releases",
+ create: function() {
+ var self = this;
+ App.on("movie.searcher.ended", function(notification) {
+ if (self.movie.data._id != notification.data._id) return;
+ self.releases = null;
+ if (self.options_container) {
+ if (self.options_container.isDisplayed()) {
+ self.options_container.destroy();
+ self.getDetails();
+ } else {
+ self.options_container.destroy();
+ self.options_container = null;
+ }
+ }
+ });
+ },
+ getDetails: function(refresh) {
+ var self = this;
+ if (!self.movie.data.releases || self.movie.data.releases.length === 0) return;
+ if (!self.options_container || refresh) {
+ self.options_container = new Element("div.options").grab(self.release_container = new Element("div.releases.table"));
+ new Element("div.item.head").adopt(new Element("span.name", {
+ text: "Release name"
+ }), new Element("span.status", {
+ text: "Status"
+ }), new Element("span.quality", {
+ text: "Quality"
+ }), new Element("span.size", {
+ text: "Size"
+ }), new Element("span.age", {
+ text: "Age"
+ }), new Element("span.score", {
+ text: "Score"
+ }), new Element("span.provider", {
+ text: "Provider"
+ }), new Element("span.actions")).inject(self.release_container);
+ if (self.movie.data.releases) self.movie.data.releases.each(function(release) {
+ var quality = Quality.getQuality(release.quality) || {}, info = release.info || {}, provider = self.get(release, "provider") + (info.provider_extra ? self.get(release, "provider_extra") : "");
+ var release_name = self.get(release, "name");
+ if (release.files && release.files.length > 0) {
+ try {
+ var movie_file = release.files.filter(function(file) {
+ var type = File.Type.get(file.type_id);
+ return type && type.identifier == "movie";
+ }).pick();
+ release_name = movie_file.path.split(Api.getOption("path_sep")).getLast();
+ } catch (e) {}
+ }
+ var size = info.size ? Math.floor(self.get(release, "size")) : 0;
+ size = size ? size < 1e3 ? size + "MB" : Math.round(size * 10 / 1024) / 10 + "GB" : "n/a";
+ release.el = new Element("div", {
+ class: "item " + release.status,
+ id: "release_" + release._id
+ }).adopt(new Element("span.name", {
+ text: release_name,
+ title: release_name
+ }), new Element("span.status", {
+ text: release.status,
+ class: "status " + release.status
+ }), new Element("span.quality", {
+ text: quality.label + (release.is_3d ? " 3D" : "") || "n/a"
+ }), new Element("span.size", {
+ text: size
+ }), new Element("span.age", {
+ text: self.get(release, "age")
+ }), new Element("span.score", {
+ text: self.get(release, "score")
+ }), new Element("span.provider", {
+ text: provider,
+ title: provider
+ }), new Element("span.actions").adopt(info.detail_url ? new Element("a.icon-info", {
+ href: info.detail_url,
+ target: "_blank"
+ }) : new Element("a"), new Element("a.icon-download", {
+ events: {
+ click: function(e) {
+ e.stopPropagation();
+ if (!this.hasClass("completed")) self.download(release);
+ }
+ }
+ }), new Element("a", {
+ class: release.status == "ignored" ? "icon-redo" : "icon-cancel",
+ events: {
+ click: function(e) {
+ e.stopPropagation();
+ self.ignore(release);
+ this.toggleClass("icon-redo");
+ this.toggleClass("icon-cancel");
+ }
+ }
+ }))).inject(self.release_container);
+ if (release.status == "ignored" || release.status == "failed" || release.status == "snatched") {
+ if (!self.last_release || self.last_release && self.last_release.status != "snatched" && release.status == "snatched") self.last_release = release;
+ } else if (!self.next_release && release.status == "available") {
+ self.next_release = release;
+ }
+ var update_handle = function(notification) {
+ if (notification.data._id != release._id) return;
+ var q = self.movie.quality.getElement(".q_" + release.quality), new_status = notification.data.status;
+ release.el.set("class", "item " + new_status);
+ var status_el = release.el.getElement(".status");
+ status_el.set("class", "status " + new_status);
+ status_el.set("text", new_status);
+ if (!q && (new_status == "snatched" || new_status == "seeding" || new_status == "done")) q = self.addQuality(release.quality_id);
+ if (q && !q.hasClass(new_status)) {
+ q.removeClass(release.status).addClass(new_status);
+ q.set("title", q.get("title").replace(release.status, new_status));
+ }
+ };
+ App.on("release.update_status", update_handle);
+ });
+ if (self.last_release) self.release_container.getElements("#release_" + self.last_release._id).addClass("last_release");
+ if (self.next_release) self.release_container.getElements("#release_" + self.next_release._id).addClass("next_release");
+ if (self.next_release || self.last_release && [ "ignored", "failed" ].indexOf(self.last_release.status) === false) {
+ self.trynext_container = new Element("div.buttons.try_container").inject(self.release_container, "top");
+ var nr = self.next_release, lr = self.last_release;
+ self.trynext_container.adopt(new Element("span.or", {
+ text: "If anything went wrong, download "
+ }), lr ? new Element("a.orange", {
+ text: "the same release again",
+ events: {
+ click: function() {
+ self.download(lr);
+ }
+ }
+ }) : null, nr && lr ? new Element("span.or", {
+ text: ", "
+ }) : null, nr ? [ new Element("a.green", {
+ text: lr ? "another release" : "the best release",
+ events: {
+ click: function() {
+ self.download(nr);
+ }
+ }
+ }), new Element("span.or", {
+ text: " or pick one below"
+ }) ] : null);
+ }
+ self.last_release = null;
+ self.next_release = null;
+ }
+ return self.options_container;
+ },
+ get: function(release, type) {
+ return release.info && release.info[type] !== undefined ? release.info[type] : "n/a";
+ },
+ download: function(release) {
+ var self = this;
+ var release_el = self.release_container.getElement("#release_" + release._id), icon = release_el.getElement(".icon-download");
+ if (icon) icon.addClass("icon spinner").removeClass("download");
+ Api.request("release.manual_download", {
+ data: {
+ id: release._id
+ },
+ onComplete: function(json) {
+ if (icon) icon.removeClass("icon spinner");
+ if (json.success) {
+ if (icon) icon.addClass("completed");
+ release_el.getElement(".status").set("text", "snatched");
+ } else if (icon) icon.addClass("attention").set("title", "Something went wrong when downloading, please check logs.");
+ }
+ });
+ },
+ ignore: function(release) {
+ Api.request("release.ignore", {
+ data: {
+ id: release._id
+ }
+ });
+ }
+});
+
+MA.Trailer = new Class({
+ Extends: MovieAction,
+ id: null,
+ label: "Trailer",
+ getDetails: function() {
+ var self = this, data_url = 'https://www.googleapis.com/youtube/v3/search?q="{title}" {year} trailer&maxResults=1&type=video&videoDefinition=high&videoEmbeddable=true&part=snippet&key=AIzaSyAT3li1KjfLidaL6Vt8T92MRU7n4VOrjYk';
+ if (!self.player_container) {
+ self.id = "trailer-" + randomString();
+ self.container = new Element("div.trailer_container").adopt(self.player_container = new Element("div.icon-play[id=" + self.id + "]", {
+ events: {
+ click: self.watch.bind(self)
+ }
+ }).adopt(new Element('span[text="watch"]'), new Element('span[text="trailer"]')), self.background = new Element("div.background"));
+ requestTimeout(function() {
+ var url = data_url.substitute({
+ title: encodeURI(self.getTitle()),
+ year: self.get("year")
+ });
+ new Request.JSONP({
+ url: url,
+ onComplete: function(json) {
+ if (json.items.length > 0) {
+ self.video_id = json.items[0].id.videoId;
+ self.background.setStyle("background-image", "url(" + json.items[0].snippet.thumbnails.high.url + ")");
+ self.background.addClass("visible");
+ } else {
+ self.container.getParent(".section").addClass("no_trailer");
+ }
+ }
+ }).send();
+ }, 1e3);
+ }
+ return self.container;
+ },
+ watch: function() {
+ var self = this;
+ new Element("iframe", {
+ src: "https://www.youtube-nocookie.com/embed/" + self.video_id + "?rel=0&showinfo=0&autoplay=1&showsearch=0&iv_load_policy=3&vq=hd720"
+ }).inject(self.container);
+ }
+});
+
+MA.Category = new Class({
+ Extends: MovieAction,
+ create: function() {
+ var self = this;
+ var category = self.movie.get("category");
+ self.detail_button = new BlockMenu(self, {
+ class: "category",
+ button_text: category ? category.label : "No category",
+ button_class: "icon-dropdown"
+ });
+ var categories = CategoryList.getAll();
+ if (categories.length > 0) {
+ $(self.detail_button).addEvents({
+ "click:relay(li a)": function(e, el) {
+ e.stopPropagation();
+ Api.request("movie.edit", {
+ data: {
+ id: self.movie.get("_id"),
+ category_id: el.get("data-id")
+ }
+ });
+ $(self.detail_button).getElements(".icon-ok").removeClass("icon-ok");
+ el.addClass("icon-ok");
+ self.detail_button.button.set("text", el.get("text"));
+ }
+ });
+ self.detail_button.addLink(new Element("a[text=No category]", {
+ class: !category ? "icon-ok" : "",
+ "data-id": ""
+ }));
+ categories.each(function(c) {
+ self.detail_button.addLink(new Element("a", {
+ text: c.get("label"),
+ class: category && category._id == c.get("_id") ? "icon-ok" : "",
+ "data-id": c.get("_id")
+ }));
+ });
+ } else {
+ $(self.detail_button).hide();
+ }
+ }
+});
+
+MA.Profile = new Class({
+ Extends: MovieAction,
+ create: function() {
+ var self = this;
+ var profile = self.movie.profile;
+ self.detail_button = new BlockMenu(self, {
+ class: "profile",
+ button_text: profile ? profile.get("label") : "No profile",
+ button_class: "icon-dropdown"
+ });
+ var profiles = Quality.getActiveProfiles();
+ if (profiles.length > 0) {
+ $(self.detail_button).addEvents({
+ "click:relay(li a)": function(e, el) {
+ e.stopPropagation();
+ Api.request("movie.edit", {
+ data: {
+ id: self.movie.get("_id"),
+ profile_id: el.get("data-id")
+ }
+ });
+ $(self.detail_button).getElements(".icon-ok").removeClass("icon-ok");
+ el.addClass("icon-ok");
+ self.detail_button.button.set("text", el.get("text"));
+ }
+ });
+ profiles.each(function(pr) {
+ self.detail_button.addLink(new Element("a", {
+ text: pr.get("label"),
+ class: profile && profile.get("_id") == pr.get("_id") ? "icon-ok" : "",
+ "data-id": pr.get("_id")
+ }));
+ });
+ } else {
+ $(self.detail_button).hide();
+ }
+ }
+});
+
+MA.Refresh = new Class({
+ Extends: MovieAction,
+ icon: "refresh",
+ create: function() {
+ var self = this;
+ self.button = self.createButton();
+ self.detail_button = self.createButton();
+ },
+ createButton: function() {
+ var self = this;
+ return new Element("a.refresh", {
+ text: "Refresh",
+ title: "Refresh the movie info and do a forced search",
+ events: {
+ click: self.doRefresh.bind(self)
+ }
+ });
+ },
+ doRefresh: function(e) {
+ var self = this;
+ e.stop();
+ Api.request("media.refresh", {
+ data: {
+ id: self.movie.get("_id")
+ }
+ });
+ }
+});
+
+var SuggestBase = new Class({
+ Extends: MovieAction,
+ getIMDB: function() {
+ return this.movie.data.info.imdb;
+ },
+ refresh: function(json) {
+ var self = this;
+ if (json && json.movie) {
+ self.movie.list.addMovies([ json.movie ], 1);
+ var last_added = self.movie.list.movies[self.movie.list.movies.length - 1];
+ $(last_added).inject(self.movie, "before");
+ }
+ self.movie.destroy();
+ }
+});
+
+MA.Add = new Class({
+ Extends: SuggestBase,
+ label: "Add",
+ icon: "plus",
+ create: function() {
+ var self = this;
+ self.button = new Element("a.add", {
+ text: "Add",
+ title: "Re-add the movie and mark all previous snatched/downloaded as ignored",
+ events: {
+ click: function() {
+ self.movie.openDetails();
+ }
+ }
+ });
+ },
+ getDetails: function() {
+ var self = this;
+ var m = new BlockSearchMovieItem(self.movie.data.info, {
+ onAdded: self.movie.data.status == "suggested" ? function() {
+ Api.request("suggestion.ignore", {
+ data: {
+ imdb: self.movie.data.info.imdb,
+ remove_only: true
+ },
+ onComplete: self.refresh.bind(self)
+ });
+ } : function() {
+ self.movie.destroy();
+ }
+ });
+ m.showOptions();
+ return m;
+ }
+});
+
+MA.SuggestSeen = new Class({
+ Extends: SuggestBase,
+ icon: "eye",
+ create: function() {
+ var self = this;
+ self.button = self.createButton();
+ self.detail_button = self.createButton();
+ },
+ createButton: function() {
+ var self = this;
+ return new Element("a.seen", {
+ text: "Already seen",
+ title: "Already seen it!",
+ events: {
+ click: self.markAsSeen.bind(self)
+ }
+ });
+ },
+ markAsSeen: function(e) {
+ var self = this;
+ e.stopPropagation();
+ Api.request("suggestion.ignore", {
+ data: {
+ imdb: self.getIMDB(),
+ mark_seen: 1
+ },
+ onComplete: function(json) {
+ self.refresh(json);
+ if (self.movie.details) {
+ self.movie.details.close();
+ }
+ }
+ });
+ }
+});
+
+MA.SuggestIgnore = new Class({
+ Extends: SuggestBase,
+ icon: "error",
+ create: function() {
+ var self = this;
+ self.button = self.createButton();
+ self.detail_button = self.createButton();
+ },
+ createButton: function() {
+ var self = this;
+ return new Element("a.ignore", {
+ text: "Ignore",
+ title: "Don't suggest this movie anymore",
+ events: {
+ click: self.markAsIgnored.bind(self)
+ }
+ });
+ },
+ markAsIgnored: function(e) {
+ var self = this;
+ e.stopPropagation();
+ Api.request("suggestion.ignore", {
+ data: {
+ imdb: self.getIMDB()
+ },
+ onComplete: function(json) {
+ self.refresh(json);
+ if (self.movie.details) {
+ self.movie.details.close();
+ }
+ }
+ });
+ }
+});
+
+MA.ChartIgnore = new Class({
+ Extends: SuggestBase,
+ icon: "error",
+ create: function() {
+ var self = this;
+ self.button = self.createButton();
+ self.detail_button = self.createButton();
+ },
+ createButton: function() {
+ var self = this;
+ return new Element("a.ignore", {
+ text: "Hide",
+ title: "Don't show this movie in charts",
+ events: {
+ click: self.markAsHidden.bind(self)
+ }
+ });
+ },
+ markAsHidden: function(e) {
+ var self = this;
+ e.stopPropagation();
+ Api.request("charts.ignore", {
+ data: {
+ imdb: self.getIMDB()
+ },
+ onComplete: function(json) {
+ if (self.movie.details) {
+ self.movie.details.close();
+ }
+ self.movie.destroy();
+ }
+ });
+ }
+});
+
+MA.Readd = new Class({
+ Extends: MovieAction,
+ create: function() {
+ var self = this, movie_done = self.movie.data.status == "done", snatched;
+ if (self.movie.data.releases && !movie_done) snatched = self.movie.data.releases.filter(function(release) {
+ return release.status && (release.status == "snatched" || release.status == "seeding" || release.status == "downloaded" || release.status == "done");
+ }).length;
+ if (movie_done || snatched && snatched > 0) self.el = new Element("a.readd", {
+ title: "Re-add the movie and mark all previous snatched/downloaded as ignored",
+ events: {
+ click: self.doReadd.bind(self)
+ }
+ });
+ },
+ doReadd: function(e) {
+ var self = this;
+ e.stopPropagation();
+ Api.request("movie.add", {
+ data: {
+ identifier: self.movie.getIdentifier(),
+ ignore_previous: 1
+ }
+ });
+ }
+});
+
+MA.Delete = new Class({
+ Extends: MovieAction,
+ Implements: [ Chain ],
+ create: function() {
+ var self = this;
+ self.button = self.createButton();
+ self.detail_button = self.createButton();
+ },
+ createButton: function() {
+ var self = this;
+ return new Element("a.delete", {
+ text: "Delete",
+ title: "Remove the movie from this CP list",
+ events: {
+ click: self.showConfirm.bind(self)
+ }
+ });
+ },
+ showConfirm: function(e) {
+ var self = this;
+ e.stopPropagation();
+ self.question = new Question("Are you sure you want to delete <strong>" + self.getTitle() + "</strong>?", "", [ {
+ text: "Yes, delete " + self.getTitle(),
+ class: "delete",
+ events: {
+ click: function(e) {
+ e.target.set("text", "Deleting...");
+ self.del();
+ }
+ }
+ }, {
+ text: "Cancel",
+ cancel: true
+ } ]);
+ },
+ del: function() {
+ var self = this;
+ var movie = $(self.movie);
+ Api.request("media.delete", {
+ data: {
+ id: self.movie.get("_id"),
+ delete_from: self.movie.list.options.identifier
+ },
+ onComplete: function() {
+ if (self.question) self.question.close();
+ dynamics.animate(movie, {
+ opacity: 0,
+ scale: 0
+ }, {
+ type: dynamics.bezier,
+ points: [ {
+ x: 0,
+ y: 0,
+ cp: [ {
+ x: .876,
+ y: 0
+ } ]
+ }, {
+ x: 1,
+ y: 1,
+ cp: [ {
+ x: .145,
+ y: 1
+ } ]
+ } ],
+ duration: 400,
+ complete: function() {
+ self.movie.destroy();
+ }
+ });
+ }
+ });
+ }
+});
+
+MA.Files = new Class({
+ Extends: MovieAction,
+ label: "Files",
+ getDetails: function() {
+ var self = this;
+ if (!self.movie.data.releases || self.movie.data.releases.length === 0) return;
+ if (!self.files_container) {
+ self.files_container = new Element("div.files.table");
+ new Element("div.item.head").adopt(new Element("span.name", {
+ text: "File"
+ }), new Element("span.type", {
+ text: "Type"
+ })).inject(self.files_container);
+ if (self.movie.data.releases) Array.each(self.movie.data.releases, function(release) {
+ var rel = new Element("div.release").inject(self.files_container);
+ Object.each(release.files, function(files, type) {
+ Array.each(files, function(file) {
+ new Element("div.file.item").adopt(new Element("span.name", {
+ text: file
+ }), new Element("span.type", {
+ text: type
+ })).inject(rel);
+ });
+ });
+ });
+ }
+ return self.files_container;
+ }
+});
+
+MA.MarkAsDone = new Class({
+ Extends: MovieAction,
+ create: function() {
+ var self = this;
+ self.button = self.createButton();
+ self.detail_button = self.createButton();
+ },
+ createButton: function() {
+ var self = this;
+ return new Element("a.mark_as_done", {
+ text: "Mark as done",
+ title: "Remove from available list and move to managed movies",
+ events: {
+ click: self.markMovieDone.bind(self)
+ }
+ });
+ },
+ markMovieDone: function() {
+ var self = this;
+ Api.request("media.delete", {
+ data: {
+ id: self.movie.get("_id"),
+ delete_from: "wanted"
+ },
+ onComplete: function() {
+ self.movie.destroy();
+ }
+ });
+ }
+});
+
+var Movie = new Class({
+ Extends: BlockBase,
+ Implements: [ Options, Events ],
+ actions: null,
+ details: null,
+ initialize: function(list, options, data) {
+ var self = this;
+ self.actions = [];
+ self.data = data;
+ self.list = list;
+ self.buttons = [];
+ self.el = new Element("a.movie").grab(self.inner = new Element("div.inner"));
+ self.el.store("klass", self);
+ self.profile = Quality.getProfile(data.profile_id) || {};
+ self.category = CategoryList.getCategory(data.category_id) || {};
+ self.parent(self, options);
+ self.addEvents();
+ },
+ openDetails: function() {
+ var self = this;
+ if (!self.details) {
+ self.details = new MovieDetails(self, {
+ level: 3
+ });
+ self.actions.each(function(action, nr) {
+ var details = action.getDetails();
+ if (details) {
+ self.details.addSection(action.getLabel(), details);
+ } else {
+ var button = action.getDetailButton();
+ if (button) {
+ self.details.addButton(button);
+ }
+ }
+ });
+ }
+ App.getPageContainer().grab(self.details);
+ requestTimeout(self.details.open.bind(self.details), 20);
+ },
+ addEvents: function() {
+ var self = this;
+ self.global_events = {};
+ self.global_events["movie.update"] = function(notification) {
+ if (self.data._id != notification.data._id) return;
+ self.busy(false);
+ requestTimeout(function() {
+ self.update(notification);
+ }, 2e3);
+ };
+ App.on("movie.update", self.global_events["movie.update"]);
+ [ "media.busy", "movie.searcher.started" ].each(function(listener) {
+ self.global_events[listener] = function(notification) {
+ if (notification.data && (self.data._id == notification.data._id || typeOf(notification.data._id) == "array" && notification.data._id.indexOf(self.data._id) > -1)) self.busy(true);
+ };
+ App.on(listener, self.global_events[listener]);
+ });
+ self.global_events["movie.searcher.ended"] = function(notification) {
+ if (notification.data && self.data._id == notification.data._id) self.busy(false);
+ };
+ App.on("movie.searcher.ended", self.global_events["movie.searcher.ended"]);
+ self.global_events["release.update_status"] = function(notification) {
+ var data = notification.data;
+ if (data && self.data._id == data.media_id) {
+ if (!self.data.releases) self.data.releases = [];
+ var updated = false;
+ self.data.releases.each(function(release) {
+ if (release._id == data._id) {
+ release.status = data.status;
+ updated = true;
+ }
+ });
+ if (updated) self.updateReleases();
+ }
+ };
+ App.on("release.update_status", self.global_events["release.update_status"]);
+ },
+ destroy: function() {
+ var self = this;
+ self.el.destroy();
+ delete self.list.movies_added[self.get("id")];
+ self.list.movies.erase(self);
+ self.list.checkIfEmpty();
+ if (self.details) self.details.close();
+ Object.each(self.global_events, function(handle, listener) {
+ App.off(listener, handle);
+ });
+ },
+ busy: function(set_busy, timeout) {
+ var self = this;
+ if (!set_busy) {
+ requestTimeout(function() {
+ if (self.spinner) {
+ self.mask.fade("out");
+ requestTimeout(function() {
+ if (self.mask) self.mask.destroy();
+ if (self.spinner) self.spinner.destroy();
+ self.spinner = null;
+ self.mask = null;
+ }, timeout || 400);
+ }
+ }, timeout || 1e3);
+ } else if (!self.spinner) {
+ self.createMask();
+ self.spinner = createSpinner(self.mask);
+ self.mask.fade("in");
+ }
+ },
+ createMask: function() {
+ var self = this;
+ self.mask = new Element("div.mask", {
+ styles: {
+ "z-index": 4
+ }
+ }).inject(self.el, "top").fade("hide");
+ },
+ update: function(notification) {
+ var self = this;
+ self.actions = [];
+ self.data = notification.data;
+ self.inner.empty();
+ self.profile = Quality.getProfile(self.data.profile_id) || {};
+ self.category = CategoryList.getCategory(self.data.category_id) || {};
+ self.create();
+ self.select(self.select_checkbox.get("checked"));
+ self.busy(false);
+ },
+ create: function() {
+ var self = this;
+ self.el.addClass("status_" + self.get("status"));
+ var eta_date = self.getETA();
+ var rating, stars;
+ if ([ "suggested", "chart" ].indexOf(self.data.status) > -1 && self.data.info && self.data.info.rating && self.data.info.rating.imdb) {
+ rating = self.data.info.rating.imdb;
+ stars = [];
+ var half_rating = rating[0] / 2;
+ for (var i = 1; i <= 5; i++) {
+ if (half_rating >= 1) stars.push(new Element("span.icon-star")); else if (half_rating > 0) stars.push(new Element("span.icon-star-half")); else stars.push(new Element("span.icon-star-empty"));
+ half_rating -= 1;
+ }
+ }
+ var thumbnail = new Element("div.poster");
+ if (self.data.files && self.data.files.image_poster && self.data.files.image_poster.length > 0) {
+ thumbnail = new Element("div", {
+ class: "type_image poster",
+ styles: {
+ "background-image": "url(" + Api.createUrl("file.cache") + self.data.files.image_poster[0].split(Api.getOption("path_sep")).pop() + ")"
+ }
+ });
+ } else if (self.data.info && self.data.info.images && self.data.info.images.poster && self.data.info.images.poster.length > 0) {
+ thumbnail = new Element("div", {
+ class: "type_image poster",
+ styles: {
+ "background-image": "url(" + self.data.info.images.poster[0] + ")"
+ }
+ });
+ }
+ self.inner.adopt(self.select_checkbox = new Element("input[type=checkbox]"), new Element("div.poster_container").adopt(thumbnail, self.actions_el = new Element("div.actions")), new Element("div.info").adopt(new Element("div.title").adopt(new Element("span", {
+ text: self.getTitle() || "n/a"
+ }), new Element("div.year", {
+ text: self.data.info.year || "n/a"
+ })), eta_date ? new Element("div.eta", {
+ text: eta_date,
+ title: "ETA"
+ }) : null, self.quality = new Element("div.quality"), rating ? new Element("div.rating[title=" + rating[0] + "]").adopt(stars, new Element("span.votes[text=(" + rating.join(" / ") + ")][title=Votes]")) : null));
+ if (!thumbnail) self.el.addClass("no_thumbnail");
+ if (self.profile.data) self.profile.getTypes().each(function(type) {
+ var q = self.addQuality(type.get("quality"), type.get("3d"));
+ if ((type.finish === true || type.get("finish")) && !q.hasClass("finish")) {
+ q.addClass("finish");
+ q.set("title", q.get("title") + " Will finish searching for this movie if this quality is found.");
+ }
+ });
+ self.updateReleases();
+ },
+ onClick: function(e) {
+ var self = this;
+ if (e.target.getParents(".actions").length === 0 && e.target != self.select_checkbox) {
+ e.stopPropagation();
+ self.addActions();
+ self.openDetails();
+ }
+ },
+ addActions: function() {
+ var self = this;
+ if (self.actions.length <= 0) {
+ self.options.actions.each(function(a) {
+ var action = new a(self), button = action.getButton();
+ if (button) {
+ self.actions_el.grab(button);
+ self.buttons.push(button);
+ }
+ self.actions.push(action);
+ });
+ }
+ },
+ onMouseenter: function() {
+ var self = this;
+ if (App.mobile_screen) return;
+ self.addActions();
+ if (self.list.current_view == "thumb") {
+ self.el.addClass("hover_start");
+ requestTimeout(function() {
+ self.el.removeClass("hover_start");
+ }, 300);
+ dynamics.css(self.inner, {
+ scale: 1
+ });
+ dynamics.animate(self.inner, {
+ scale: .9
+ }, {
+ type: dynamics.bounce
+ });
+ self.buttons.each(function(el, nr) {
+ dynamics.css(el, {
+ opacity: 0,
+ translateY: 50
+ });
+ dynamics.animate(el, {
+ opacity: 1,
+ translateY: 0
+ }, {
+ type: dynamics.spring,
+ frequency: 200,
+ friction: 300,
+ duration: 800,
+ delay: 100 + nr * 40
+ });
+ });
+ }
+ },
+ updateReleases: function() {
+ var self = this;
+ if (!self.data.releases || self.data.releases.length === 0) return;
+ self.data.releases.each(function(release) {
+ var q = self.quality.getElement(".q_" + release.quality + (release.is_3d ? ".is_3d" : ":not(.is_3d)")), status = release.status;
+ if (!q && (status == "snatched" || status == "seeding" || status == "done")) q = self.addQuality(release.quality, release.is_3d || false);
+ if (q && !q.hasClass(status)) {
+ q.addClass(status);
+ q.set("title", (q.get("title") ? q.get("title") : "") + " status: " + status);
+ }
+ });
+ },
+ addQuality: function(quality, is_3d) {
+ var self = this;
+ var q = Quality.getQuality(quality);
+ return new Element("span", {
+ text: q.label + (is_3d ? " 3D" : ""),
+ class: "q_" + q.identifier + (is_3d ? " is_3d" : ""),
+ title: ""
+ }).inject(self.quality);
+ },
+ getTitle: function(prefixed) {
+ var self = this;
+ if (self.data.title) return prefixed ? self.data.title : self.getUnprefixedTitle(self.data.title); else if (self.data.info && self.data.info.titles && self.data.info.titles.length > 0) return prefixed ? self.data.info.titles[0] : self.getUnprefixedTitle(self.data.info.titles[0]);
+ return "Unknown movie";
+ },
+ getUnprefixedTitle: function(t) {
+ if (t.substr(0, 4).toLowerCase() == "the ") t = t.substr(4) + ", The"; else if (t.substr(0, 3).toLowerCase() == "an ") t = t.substr(3) + ", An"; else if (t.substr(0, 2).toLowerCase() == "a ") t = t.substr(2) + ", A";
+ return t;
+ },
+ getIdentifier: function() {
+ var self = this;
+ try {
+ return self.get("identifiers").imdb;
+ } catch (e) {}
+ return self.get("imdb");
+ },
+ getETA: function(format) {
+ var self = this, d = new Date(), now = Math.round(+d / 1e3), eta = null, eta_date = "";
+ if (self.data.info.release_date) [ self.data.info.release_date.dvd, self.data.info.release_date.theater ].each(function(timestamp) {
+ if (timestamp > 0 && (eta === null || Math.abs(timestamp - now) < Math.abs(eta - now))) eta = timestamp;
+ });
+ if (eta) {
+ eta_date = new Date(eta * 1e3);
+ if (+eta_date / 1e3 < now) {
+ eta_date = null;
+ } else {
+ eta_date = format ? eta_date.format(format) : eta_date.format("%b") + (d.getFullYear() != eta_date.getFullYear() ? " " + eta_date.getFullYear() : "");
+ }
+ }
+ return now + 8035200 > eta ? eta_date : "";
+ },
+ get: function(attr) {
+ return this.data[attr] || this.data.info[attr];
+ },
+ select: function(select) {
+ var self = this;
+ self.select_checkbox.set("checked", select);
+ self.el[self.select_checkbox.get("checked") ? "addClass" : "removeClass"]("checked");
+ },
+ isSelected: function() {
+ return this.select_checkbox.get("checked");
+ },
+ toElement: function() {
+ return this.el;
+ }
+});
+
+Page.Movies = new Class({
+ Extends: PageBase,
+ name: "movies",
+ icon: "movie",
+ sub_pages: [ "Wanted", "Manage" ],
+ default_page: "Wanted",
+ current_page: null,
+ initialize: function(parent, options) {
+ var self = this;
+ self.parent(parent, options);
+ self.navigation = new BlockNavigation();
+ $(self.navigation).inject(self.el);
+ },
+ defaultAction: function(action, params) {
+ var self = this;
+ if (self.current_page) {
+ self.current_page.hide();
+ if (self.current_page.list && self.current_page.list.navigation) self.current_page.list.navigation.dispose();
+ }
+ var route = new Route();
+ route.parse(action);
+ var page_name = route.getPage() != "index" ? route.getPage().capitalize() : self.default_page;
+ var page = self.sub_pages.filter(function(page) {
+ return page.name == page_name;
+ }).pick()["class"];
+ page.open(route.getAction() || "index", params);
+ page.show();
+ if (page.list && page.list.navigation) page.list.navigation.inject(self.navigation);
+ self.current_page = page;
+ self.navigation.activate(page_name.toLowerCase());
+ }
+});
+
+var BlockSearchMovieItem = new Class({
+ Implements: [ Options, Events ],
+ initialize: function(info, options) {
+ var self = this;
+ self.setOptions(options);
+ self.info = info;
+ self.alternative_titles = [];
+ self.create();
+ },
+ create: function() {
+ var self = this, info = self.info;
+ var in_library;
+ if (info.in_library) {
+ in_library = [];
+ (info.in_library.releases || []).each(function(release) {
+ in_library.include(release.quality);
+ });
+ }
+ self.el = new Element("div.media_result", {
+ id: info.imdb,
+ events: {
+ click: self.showOptions.bind(self)
+ }
+ }).adopt(self.thumbnail = info.images && info.images.poster.length > 0 ? new Element("img.thumbnail", {
+ src: info.images.poster[0],
+ height: null,
+ width: null
+ }) : null, self.options_el = new Element("div.options"), self.data_container = new Element("div.data").grab(self.info_container = new Element("div.info").grab(new Element("h2", {
+ class: info.in_wanted && info.in_wanted.profile_id || in_library ? "in_library_wanted" : "",
+ title: self.getTitle()
+ }).adopt(self.title = new Element("span.title", {
+ text: self.getTitle()
+ }), self.year = info.year ? new Element("span.year", {
+ text: info.year
+ }) : null, info.in_wanted && info.in_wanted.profile_id ? new Element("span.in_wanted", {
+ text: "Already in wanted list: " + Quality.getProfile(info.in_wanted.profile_id).get("label")
+ }) : in_library ? new Element("span.in_library", {
+ text: "Already in library: " + in_library.join(", ")
+ }) : null))));
+ if (info.titles) info.titles.each(function(title) {
+ self.alternativeTitle({
+ title: title
+ });
+ });
+ },
+ alternativeTitle: function(alternative) {
+ var self = this;
+ self.alternative_titles.include(alternative);
+ },
+ getTitle: function() {
+ var self = this;
+ try {
+ return self.info.original_title ? self.info.original_title : self.info.titles[0];
+ } catch (e) {
+ return "Unknown";
+ }
+ },
+ get: function(key) {
+ return this.info[key];
+ },
+ showOptions: function() {
+ var self = this;
+ self.createOptions();
+ self.data_container.addClass("open");
+ self.el.addEvent("outerClick", self.closeOptions.bind(self));
+ },
+ closeOptions: function() {
+ var self = this;
+ self.data_container.removeClass("open");
+ self.el.removeEvents("outerClick");
+ },
+ add: function(e) {
+ var self = this;
+ if (e) e.preventDefault();
+ self.loadingMask();
+ Api.request("movie.add", {
+ data: {
+ identifier: self.info.imdb,
+ title: self.title_select.get("value"),
+ profile_id: self.profile_select.get("value"),
+ category_id: self.category_select.get("value")
+ },
+ onComplete: function(json) {
+ self.options_el.empty();
+ self.options_el.grab(new Element("div.message", {
+ text: json.success ? "Movie successfully added." : "Movie didn't add properly. Check logs"
+ }));
+ self.mask.fade("out");
+ self.fireEvent("added");
+ },
+ onFailure: function() {
+ self.options_el.empty();
+ self.options_el.grab(new Element("div.message", {
+ text: "Something went wrong, check the logs for more info."
+ }));
+ self.mask.fade("out");
+ }
+ });
+ },
+ createOptions: function() {
+ var self = this, info = self.info;
+ if (!self.options_el.hasClass("set")) {
+ self.options_el.grab(new Element("div").adopt(new Element("div.title").grab(self.title_select = new Element("select", {
+ name: "title"
+ })), new Element("div.profile").grab(self.profile_select = new Element("select", {
+ name: "profile"
+ })), self.category_select_container = new Element("div.category").grab(self.category_select = new Element("select", {
+ name: "category"
+ }).grab(new Element("option", {
+ value: -1,
+ text: "None"
+ }))), new Element("div.add").grab(self.add_button = new Element("a.button", {
+ text: "Add",
+ events: {
+ click: self.add.bind(self)
+ }
+ }))));
+ Array.each(self.alternative_titles, function(alt) {
+ new Element("option", {
+ text: alt.title
+ }).inject(self.title_select);
+ });
+ var categories = CategoryList.getAll();
+ if (categories.length === 0) self.category_select_container.hide(); else {
+ self.category_select_container.show();
+ categories.each(function(category) {
+ new Element("option", {
+ value: category.data._id,
+ text: category.data.label
+ }).inject(self.category_select);
+ });
+ }
+ var profiles = Quality.getActiveProfiles();
+ if (profiles.length == 1) self.profile_select.hide();
+ profiles.each(function(profile) {
+ new Element("option", {
+ value: profile.get("_id"),
+ text: profile.get("label")
+ }).inject(self.profile_select);
+ });
+ self.options_el.addClass("set");
+ if (categories.length === 0 && self.title_select.getElements("option").length == 1 && profiles.length == 1 && !(self.info.in_wanted && self.info.in_wanted.profile_id || in_library)) self.add();
+ }
+ },
+ loadingMask: function() {
+ var self = this;
+ self.mask = new Element("div.mask").inject(self.el).fade("hide");
+ createSpinner(self.mask);
+ self.mask.fade("in");
+ },
+ toElement: function() {
+ return this.el;
+ }
+});
+
+var MoviesWanted = new Class({
+ Extends: PageBase,
+ order: 10,
+ name: "wanted",
+ title: "Gimme gimme gimme!",
+ folder_browser: null,
+ indexAction: function() {
+ var self = this;
+ if (!self.list) {
+ self.manual_search = new Element("a", {
+ title: "Force a search for the full wanted list",
+ text: "Search all wanted",
+ events: {
+ click: self.doFullSearch.bind(self, true)
+ }
+ });
+ self.scan_folder = new Element("a", {
+ title: "Scan a folder and rename all movies in it",
+ text: "Manual folder scan",
+ events: {
+ click: self.scanFolder.bind(self)
+ }
+ });
+ self.list = new MovieList({
+ identifier: "wanted",
+ status: "active",
+ actions: [ MA.IMDB, MA.Release, MA.Trailer, MA.Refresh, MA.Readd, MA.Delete, MA.Category, MA.Profile ],
+ add_new: true,
+ menu: [ self.manual_search, self.scan_folder ],
+ on_empty_element: function() {
+ return new Element("div.empty_wanted").adopt(new Element("div.no_movies", {
+ text: "Seems like you don't have any movies yet.. Maybe add some via search or the extension."
+ }), App.createUserscriptButtons());
+ }
+ });
+ $(self.list).inject(self.content);
+ requestTimeout(self.startProgressInterval.bind(self), 4e3);
+ }
+ },
+ doFullSearch: function() {
+ var self = this;
+ if (!self.search_in_progress) {
+ Api.request("movie.searcher.full_search");
+ self.startProgressInterval();
+ }
+ },
+ startProgressInterval: function() {
+ var self = this;
+ var start_text = self.manual_search.get("text");
+ self.progress_interval = requestInterval(function() {
+ if (self.search_progress && self.search_progress.running) return;
+ self.search_progress = Api.request("movie.searcher.progress", {
+ onComplete: function(json) {
+ self.search_in_progress = true;
+ if (!json.movie) {
+ clearRequestInterval(self.progress_interval);
+ self.search_in_progress = false;
+ self.manual_search.set("text", start_text);
+ } else {
+ var progress = json.movie;
+ self.manual_search.set("text", "Searching.. (" + Math.round((progress.total - progress.to_go) / progress.total * 100) + "%)");
+ }
+ }
+ });
+ }, 1e3);
+ },
+ scanFolder: function(e) {
+ e.stop();
+ var self = this;
+ var options = {
+ name: "Scan_folder"
+ };
+ if (!self.folder_browser) {
+ self.folder_browser = new Option.Directory("Scan", "folder", "", options);
+ self.folder_browser.save = function() {
+ var folder = self.folder_browser.getValue();
+ Api.request("renamer.scan", {
+ data: {
+ base_folder: folder
+ }
+ });
+ };
+ self.folder_browser.inject(self.content, "top");
+ self.folder_browser.fireEvent("injected");
+ self.folder_browser.directory_inlay.hide();
+ self.folder_browser.el.removeChild(self.folder_browser.el.firstChild);
+ self.folder_browser.showBrowser();
+ self.folder_browser.browser.getElements(".clear.button").hide();
+ self.folder_browser.save_button.text = "Select";
+ self.folder_browser.browser.setStyles({
+ "z-index": 1e3,
+ right: 20,
+ top: 0,
+ margin: 0
+ });
+ self.folder_browser.pointer.setStyles({
+ right: 20
+ });
+ } else {
+ self.folder_browser.showBrowser();
+ }
+ self.list.navigation_menu.hide();
+ }
+});
+
+var Charts = new Class({
+ Implements: [ Options, Events ],
+ shown_once: false,
+ initialize: function(options) {
+ var self = this;
+ self.setOptions(options);
+ self.create();
+ },
+ create: function() {
+ var self = this;
+ self.el = new Element("div.charts").grab(self.el_refresh_container = new Element("div.refresh").grab(self.el_refreshing_text = new Element("span.refreshing", {
+ text: "Refreshing charts..."
+ })));
+ self.show();
+ requestTimeout(function() {
+ self.fireEvent("created");
+ }, 0);
+ },
+ fill: function(json) {
+ var self = this;
+ self.el_refreshing_text.hide();
+ if (json && json.count > 0) {
+ json.charts.sort(function(a, b) {
+ return a.order - b.order;
+ });
+ Object.each(json.charts, function(chart) {
+ var chart_list = new MovieList({
+ navigation: false,
+ identifier: chart.name.toLowerCase().replace(/[^a-z0-9]+/g, "_"),
+ title: chart.name,
+ description: '<a href="' + chart.url + '">See source</a>',
+ actions: [ MA.Add, MA.ChartIgnore, MA.IMDB, MA.Trailer ],
+ load_more: false,
+ view: "thumb",
+ force_view: true,
+ api_call: null
+ });
+ chart_list.store(chart.list);
+ chart_list.addMovies(chart.list, chart.list.length);
+ chart_list.checkIfEmpty();
+ chart_list.fireEvent("loaded");
+ $(chart_list).inject(self.el);
+ });
+ }
+ self.fireEvent("loaded");
+ },
+ show: function() {
+ var self = this;
+ self.el.show();
+ if (!self.shown_once) {
+ requestTimeout(function() {
+ self.api_request = Api.request("charts.view", {
+ onComplete: self.fill.bind(self)
+ });
+ }, 100);
+ self.shown_once = true;
+ }
+ },
+ toElement: function() {
+ return this.el;
+ }
+});
+
+var TraktAutomation = new Class({
+ initialize: function() {
+ var self = this;
+ App.addEvent("loadSettings", self.addRegisterButton.bind(self));
+ },
+ addRegisterButton: function() {
+ var self = this, setting_page = App.getPage("Settings");
+ setting_page.addEvent("create", function() {
+ var fieldset = setting_page.tabs.automation.groups.trakt_automation, l = window.location;
+ var trakt_set = 0;
+ fieldset.getElements("input[type=text]").each(function(el) {
+ trakt_set += +(el.get("value") !== "");
+ });
+ new Element(".ctrlHolder").adopt(trakt_set > 0 ? [ self.unregister = new Element("a.button.red", {
+ text: "Unregister",
+ events: {
+ click: function() {
+ fieldset.getElements("input[name*=oauth_token]").set("value", "").fireEvent("change");
+ self.unregister.destroy();
+ self.unregister_or.destroy();
+ }
+ }
+ }), self.unregister_or = new Element("span[text=or]") ] : null, new Element("a.button", {
+ text: trakt_set > 0 ? "Register a different account" : "Register your trakt.tv account",
+ events: {
+ click: function() {
+ Api.request("automation.trakt.auth_url", {
+ data: {
+ host: l.protocol + "//" + l.hostname + (l.port ? ":" + l.port : "")
+ },
+ onComplete: function(json) {
+ window.location = json.url;
+ }
+ });
+ }
+ }
+ })).inject(fieldset);
+ });
+ }
+});
+
+new TraktAutomation();
+
+var NotificationBase = new Class({
+ Extends: BlockBase,
+ Implements: [ Options, Events ],
+ initialize: function(options) {
+ var self = this;
+ self.setOptions(options);
+ App.addEvent("unload", self.stopPoll.bind(self));
+ App.addEvent("reload", self.startInterval.bind(self, [ true ]));
+ App.on("notification", self.notify.bind(self));
+ App.on("message", self.showMessage.bind(self));
+ App.addEvent("loadSettings", self.addTestButtons.bind(self));
+ self.notifications = [];
+ App.addEvent("load", function() {
+ App.block.notification = new BlockMenu(self, {
+ button_class: "icon-notifications",
+ class: "notification_menu",
+ onOpen: self.markAsRead.bind(self)
+ });
+ $(App.block.notification).inject(App.getBlock("search"), "after");
+ self.badge = new Element("div.badge").inject(App.block.notification, "top").hide();
+ });
+ window.addEvent("load", function() {
+ requestTimeout(function() {
+ self.startInterval($(window).getSize().x <= 480 ? 2e3 : 100);
+ }, 0);
+ });
+ },
+ notify: function(result) {
+ var self = this;
+ var added = new Date();
+ added.setTime(result.added * 1e3);
+ result.el = App.getBlock("notification").addLink(new Element("span." + (result.read ? "read" : "")).adopt(new Element("span.message", {
+ html: result.message
+ }), new Element("span.added", {
+ text: added.timeDiffInWords(),
+ title: added
+ })), "top");
+ self.notifications.include(result);
+ if ((result.important !== undefined || result.sticky !== undefined) && !result.read) {
+ var sticky = true;
+ App.trigger("message", [ result.message, sticky, result ]);
+ } else if (!result.read) {
+ self.setBadge(self.notifications.filter(function(n) {
+ return !n.read;
+ }).length);
+ }
+ },
+ setBadge: function(value) {
+ var self = this;
+ self.badge.set("text", value);
+ self.badge[value ? "show" : "hide"]();
+ },
+ markAsRead: function(force_ids) {
+ var self = this, ids = force_ids;
+ if (!force_ids) {
+ var rn = self.notifications.filter(function(n) {
+ return !n.read && n.important === undefined;
+ });
+ ids = [];
+ rn.each(function(n) {
+ ids.include(n._id);
+ });
+ }
+ if (ids.length > 0) Api.request("notification.markread", {
+ data: {
+ ids: ids.join(",")
+ },
+ onSuccess: function() {
+ self.setBadge("");
+ }
+ });
+ },
+ startInterval: function(force) {
+ var self = this;
+ if (self.stopped && !force) {
+ self.stopped = false;
+ return;
+ }
+ self.request = Api.request("notification.listener", {
+ data: {
+ init: true
+ },
+ onSuccess: function(json) {
+ self.processData(json, true);
+ }
+ }).send();
+ requestInterval(function() {
+ if (self.request && self.request.isRunning()) {
+ self.request.cancel();
+ self.startPoll();
+ }
+ }, 12e4);
+ },
+ startPoll: function() {
+ var self = this;
+ if (self.stopped) return;
+ if (self.request && self.request.isRunning()) self.request.cancel();
+ self.request = Api.request("nonblock/notification.listener", {
+ onSuccess: function(json) {
+ self.processData(json, false);
+ },
+ data: {
+ last_id: self.last_id
+ },
+ onFailure: function() {
+ requestTimeout(self.startPoll.bind(self), 2e3);
+ }
+ }).send();
+ },
+ stopPoll: function() {
+ if (this.request) this.request.cancel();
+ this.stopped = true;
+ },
+ processData: function(json, init) {
+ var self = this;
+ if (json && json.result) {
+ Array.each(json.result, function(result) {
+ App.trigger(result._t || result.type, [ result ]);
+ if (result.message && result.read === undefined && !init) self.showMessage(result.message);
+ });
+ if (json.result.length > 0) self.last_id = json.result.getLast().message_id;
+ }
+ requestTimeout(self.startPoll.bind(self), 1500);
+ },
+ showMessage: function(message, sticky, data) {
+ var self = this;
+ if (!self.message_container) self.message_container = new Element("div.messages").inject(document.body);
+ var new_message = new Element("div", {
+ class: "message" + (sticky ? " sticky" : ""),
+ html: '<div class="inner">' + message + "</div>"
+ }).inject(self.message_container, "top");
+ requestTimeout(function() {
+ new_message.addClass("show");
+ }, 10);
+ var hide_message = function() {
+ new_message.addClass("hide");
+ requestTimeout(function() {
+ new_message.destroy();
+ }, 1e3);
+ };
+ if (sticky) new_message.grab(new Element("a.close.icon2", {
+ events: {
+ click: function() {
+ self.markAsRead([ data._id ]);
+ hide_message();
+ }
+ }
+ })); else requestTimeout(hide_message, 4e3);
+ },
+ addTestButtons: function() {
+ var self = this;
+ var setting_page = App.getPage("Settings");
+ setting_page.addEvent("create", function() {
+ Object.each(setting_page.tabs.notifications.groups, self.addTestButton.bind(self));
+ });
+ },
+ addTestButton: function(fieldset, plugin_name) {
+ var self = this, button_name = self.testButtonName(fieldset);
+ if (button_name.contains("Notifications")) return;
+ new Element(".ctrlHolder.test_button").grab(new Element("a.button", {
+ text: button_name,
+ events: {
+ click: function() {
+ var button = fieldset.getElement(".test_button .button");
+ button.set("text", "Sending notification");
+ Api.request("notify." + plugin_name + ".test", {
+ onComplete: function(json) {
+ button.set("text", button_name);
+ var message;
+ if (json.success) {
+ message = new Element("span.success", {
+ text: "Notification successful"
+ }).inject(button, "after");
+ } else {
+ message = new Element("span.failed", {
+ text: "Notification failed. Check logs for details."
+ }).inject(button, "after");
+ }
+ requestTimeout(function() {
+ message.destroy();
+ }, 3e3);
+ }
+ });
+ }
+ }
+ })).inject(fieldset);
+ },
+ testButtonName: function(fieldset) {
+ var name = fieldset.getElement("h2 .group_label").get("text");
+ return "Test " + name;
+ }
+});
+
+window.Notification = new NotificationBase();
+
+var TwitterNotification = new Class({
+ initialize: function() {
+ var self = this;
+ App.addEvent("loadSettings", self.addRegisterButton.bind(self));
+ },
+ addRegisterButton: function() {
+ var self = this;
+ var setting_page = App.getPage("Settings");
+ setting_page.addEvent("create", function() {
+ var fieldset = setting_page.tabs.notifications.groups.twitter, l = window.location;
+ var twitter_set = 0;
+ fieldset.getElements("input[type=text]").each(function(el) {
+ twitter_set += +(el.get("value") !== "");
+ });
+ new Element(".ctrlHolder").adopt(twitter_set > 0 ? [ self.unregister = new Element("a.button.red", {
+ text: 'Unregister "' + fieldset.getElement("input[name*=screen_name]").get("value") + '"',
+ events: {
+ click: function() {
+ fieldset.getElements("input[type=text]").set("value", "").fireEvent("change");
+ self.unregister.destroy();
+ self.unregister_or.destroy();
+ }
+ }
+ }), self.unregister_or = new Element("span[text=or]") ] : null, new Element("a.button", {
+ text: twitter_set > 0 ? "Register a different account" : "Register your Twitter account",
+ events: {
+ click: function() {
+ Api.request("notify.twitter.auth_url", {
+ data: {
+ host: l.protocol + "//" + l.hostname + (l.port ? ":" + l.port : "")
+ },
+ onComplete: function(json) {
+ window.location = json.url;
+ }
+ });
+ }
+ }
+ })).inject(fieldset.getElement(".test_button"), "before");
+ });
+ }
+});
+
+window.addEvent("domready", function() {
+ new TwitterNotification();
+});
+
+var CategoryListBase = new Class({
+ initialize: function() {
+ var self = this;
+ App.addEvent("loadSettings", self.addSettings.bind(self));
+ },
+ setup: function(categories) {
+ var self = this;
+ self.categories = [];
+ Array.each(categories, self.createCategory.bind(self));
+ },
+ addSettings: function() {
+ var self = this;
+ self.settings = App.getPage("Settings");
+ self.settings.addEvent("create", function() {
+ var tab = self.settings.createSubTab("category", {
+ label: "Categories",
+ name: "category",
+ subtab_label: "Category & filtering"
+ }, self.settings.tabs.searcher, "searcher");
+ self.tab = tab.tab;
+ self.content = tab.content;
+ self.createList();
+ self.createOrdering();
+ });
+ self.settings.addEvent("create", function() {
+ var renamer_group = self.settings.tabs.renamer.groups.renamer;
+ self.categories.each(function(category) {
+ var input = new Option.Directory("section_name", "option.name", category.get("destination"), {
+ name: category.get("label")
+ });
+ input.inject(renamer_group.getElement(".renamer_to"));
+ input.fireEvent("injected");
+ input.save = function() {
+ category.data.destination = input.getValue();
+ category.save();
+ };
+ });
+ });
+ },
+ createList: function() {
+ var self = this;
+ var count = self.categories.length;
+ self.settings.createGroup({
+ label: "Categories",
+ description: "Create categories, each one extending global filters. (Needs refresh '" + (App.isMac() ? "CMD+R" : "F5") + "' after editing)"
+ }).inject(self.content).adopt(self.category_container = new Element("div.container"), new Element("a.add_new_category", {
+ text: count > 0 ? "Create another category" : "Click here to create a category.",
+ events: {
+ click: function() {
+ var category = self.createCategory();
+ $(category).inject(self.category_container);
+ }
+ }
+ }));
+ Array.each(self.categories, function(category) {
+ $(category).inject(self.category_container);
+ });
+ },
+ getCategory: function(id) {
+ return this.categories.filter(function(category) {
+ return category.data._id == id;
+ }).pick();
+ },
+ getAll: function() {
+ return this.categories;
+ },
+ createCategory: function(data) {
+ var self = this;
+ data = data || {
+ id: randomString()
+ };
+ var category = new Category(data);
+ self.categories.include(category);
+ return category;
+ },
+ createOrdering: function() {
+ var self = this;
+ var category_list;
+ self.settings.createGroup({
+ label: "Category ordering"
+ }).adopt(new Element(".ctrlHolder#category_ordering").adopt(new Element("label[text=Order]"), category_list = new Element("ul"), new Element("p.formHint", {
+ html: "Change the order the categories are in the dropdown list."
+ }))).inject(self.content);
+ Array.each(self.categories, function(category) {
+ new Element("li", {
+ "data-id": category.data._id
+ }).adopt(new Element("span.category_label", {
+ text: category.data.label
+ }), new Element("span.handle.icon-handle")).inject(category_list);
+ });
+ self.category_sortable = new Sortables(category_list, {
+ revert: true,
+ handle: "",
+ opacity: .5,
+ onComplete: self.saveOrdering.bind(self)
+ });
+ },
+ saveOrdering: function() {
+ var self = this;
+ var ids = [];
+ self.category_sortable.list.getElements("li").each(function(el) {
+ ids.include(el.get("data-id"));
+ });
+ Api.request("category.save_order", {
+ data: {
+ ids: ids
+ }
+ });
+ }
+});
+
+window.CategoryList = new CategoryListBase();
+
+var Category = new Class({
+ data: {},
+ initialize: function(data) {
+ var self = this;
+ self.data = data;
+ self.create();
+ self.el.addEvents({
+ "change:relay(select)": self.save.bind(self, 0),
+ "keyup:relay(input[type=text])": self.save.bind(self, [ 300 ])
+ });
+ },
+ create: function() {
+ var self = this;
+ var data = self.data;
+ self.el = new Element("div.category").adopt(self.delete_button = new Element("span.delete.icon-delete", {
+ events: {
+ click: self.del.bind(self)
+ }
+ }), new Element(".category_label.ctrlHolder").adopt(new Element("label", {
+ text: "Name"
+ }), new Element("input", {
+ type: "text",
+ value: data.label,
+ placeholder: "Example: Kids, Horror or His"
+ }), new Element("p.formHint", {
+ text: "See global filters for explanation."
+ })), new Element(".category_preferred.ctrlHolder").adopt(new Element("label", {
+ text: "Preferred"
+ }), new Element("input", {
+ type: "text",
+ value: data.preferred,
+ placeholder: "Blu-ray, DTS"
+ })), new Element(".category_required.ctrlHolder").adopt(new Element("label", {
+ text: "Required"
+ }), new Element("input", {
+ type: "text",
+ value: data.required,
+ placeholder: "Example: DTS, AC3 & English"
+ })), new Element(".category_ignored.ctrlHolder").adopt(new Element("label", {
+ text: "Ignored"
+ }), new Element("input", {
+ type: "text",
+ value: data.ignored,
+ placeholder: "Example: dubbed, swesub, french"
+ })));
+ self.makeSortable();
+ },
+ save: function(delay) {
+ var self = this;
+ if (self.save_timer) clearRequestTimeout(self.save_timer);
+ self.save_timer = requestTimeout(function() {
+ Api.request("category.save", {
+ data: self.getData(),
+ useSpinner: true,
+ spinnerOptions: {
+ target: self.el
+ },
+ onComplete: function(json) {
+ if (json.success) {
+ self.data = json.category;
+ }
+ }
+ });
+ }, delay || 0);
+ },
+ getData: function() {
+ var self = this;
+ return {
+ id: self.data._id,
+ label: self.el.getElement(".category_label input").get("value"),
+ required: self.el.getElement(".category_required input").get("value"),
+ preferred: self.el.getElement(".category_preferred input").get("value"),
+ ignored: self.el.getElement(".category_ignored input").get("value"),
+ destination: self.data.destination
+ };
+ },
+ del: function() {
+ var self = this;
+ if (self.data.label === undefined) {
+ self.el.destroy();
+ return;
+ }
+ var label = self.el.getElement(".category_label input").get("value");
+ var qObj = new Question('Are you sure you want to delete <strong>"' + label + '"</strong>?', "", [ {
+ text: 'Delete "' + label + '"',
+ class: "delete",
+ events: {
+ click: function(e) {
+ e.preventDefault();
+ Api.request("category.delete", {
+ data: {
+ id: self.data._id
+ },
+ useSpinner: true,
+ spinnerOptions: {
+ target: self.el
+ },
+ onComplete: function(json) {
+ if (json.success) {
+ qObj.close();
+ self.el.destroy();
+ } else {
+ alert(json.message);
+ }
+ }
+ });
+ }
+ }
+ }, {
+ text: "Cancel",
+ cancel: true
+ } ]);
+ },
+ makeSortable: function() {
+ var self = this;
+ self.sortable = new Sortables(self.category_container, {
+ revert: true,
+ handle: ".handle",
+ opacity: .5,
+ onComplete: self.save.bind(self, 300)
+ });
+ },
+ get: function(attr) {
+ return this.data[attr];
+ },
+ toElement: function() {
+ return this.el;
+ }
+});
+
+Page.Log = new Class({
+ Extends: PageBase,
+ order: 60,
+ name: "log",
+ title: "Show recent logs.",
+ has_tab: false,
+ navigation: null,
+ log_items: [],
+ report_text: "### Steps to reproduce:\n" + "1. ..\n" + "2. ..\n" + "\n" + "### Information:\n" + "Movie(s) I have this with: ...\n" + "Quality of the movie being searched: ...\n" + "Providers I use: ...\n" + "Version of CouchPotato: {version}\n" + "Running on: ...\n" + "\n" + "### Logs:\n" + "```\n{issue}```",
+ indexAction: function() {
+ var self = this;
+ self.getLogs(0);
+ },
+ getLogs: function(nr) {
+ var self = this;
+ if (self.log) self.log.destroy();
+ self.log = new Element("div.container.loading", {
+ text: "loading...",
+ events: {
+ "mouseup:relay(.time)": function(e) {
+ requestTimeout(function() {
+ self.showSelectionButton(e);
+ }, 100);
+ }
+ }
+ }).inject(self.content);
+ if (self.navigation) {
+ var nav = self.navigation.getElement(".nav");
+ nav.getElements(".active").removeClass("active");
+ self.navigation.getElements("li")[nr + 1].addClass("active");
+ }
+ if (self.request && self.request.running) self.request.cancel();
+ self.request = Api.request("logging.get", {
+ data: {
+ nr: nr
+ },
+ onComplete: function(json) {
+ self.log.set("text", "");
+ self.log_items = self.createLogElements(json.log);
+ self.log.adopt(self.log_items);
+ self.log.removeClass("loading");
+ self.scrollToBottom();
+ if (!self.navigation) {
+ self.navigation = new Element("div.navigation").adopt(new Element("h2[text=Logs]"), new Element("div.hint", {
+ text: "Select multiple lines & report an issue"
+ }));
+ var nav = new Element("ul.nav", {
+ events: {
+ "click:relay(li.select)": function(e, el) {
+ self.getLogs(parseInt(el.get("text")) - 1);
+ }
+ }
+ }).inject(self.navigation);
+ new Element("li.filter").grab(new Element("select", {
+ events: {
+ change: function() {
+ var type_filter = this.getSelected()[0].get("value");
+ self.content.set("data-filter", type_filter);
+ self.scrollToBottom();
+ }
+ }
+ }).adopt(new Element("option", {
+ value: "ALL",
+ text: "Show all logs"
+ }), new Element("option", {
+ value: "INFO",
+ text: "Show only INFO"
+ }), new Element("option", {
+ value: "DEBUG",
+ text: "Show only DEBUG"
+ }), new Element("option", {
+ value: "ERROR",
+ text: "Show only ERROR"
+ }))).inject(nav);
+ for (var i = 0; i <= json.total; i++) {
+ new Element("li", {
+ text: i + 1,
+ class: "select " + (nr == i ? "active" : "")
+ }).inject(nav);
+ }
+ new Element("li.clear", {
+ text: "clear",
+ events: {
+ click: function() {
+ Api.request("logging.clear", {
+ onComplete: function() {
+ self.getLogs(0);
+ }
+ });
+ }
+ }
+ }).inject(nav);
+ self.navigation.inject(self.content, "top");
+ }
+ }
+ });
+ },
+ createLogElements: function(logs) {
+ var elements = [];
+ logs.each(function(log) {
+ elements.include(new Element("div", {
+ class: "time " + log.type.toLowerCase()
+ }).adopt(new Element("span", {
+ text: log.time
+ }), new Element("span.type", {
+ text: log.type
+ }), new Element("span.message", {
+ text: log.message
+ })));
+ });
+ return elements;
+ },
+ scrollToBottom: function() {
+ new Fx.Scroll(this.content, {
+ duration: 0
+ }).toBottom();
+ },
+ showSelectionButton: function(e) {
+ var self = this, selection = self.getSelected(), start_node = selection.anchorNode, parent_start = start_node.parentNode.getParent(".time"), end_node = selection.focusNode.parentNode.getParent(".time"), text = "";
+ var remove_button = function() {
+ self.log.getElements(".highlight").removeClass("highlight");
+ if (self.do_report) self.do_report.destroy();
+ document.body.removeEvent("click", remove_button);
+ };
+ remove_button();
+ if (parent_start) start_node = parent_start;
+ var index = {
+ start: self.log_items.indexOf(start_node),
+ end: self.log_items.indexOf(end_node)
+ };
+ if (index.start > index.end) {
+ index = {
+ start: index.end,
+ end: index.start
+ };
+ }
+ var nodes = self.log_items.slice(index.start, index.end + 1);
+ nodes.each(function(node, nr) {
+ node.addClass("highlight");
+ node.getElements("span").each(function(span) {
+ text += self.spaceFill(span.get("text") + " ", 6);
+ });
+ text += "\n";
+ });
+ self.do_report = new Element("a.do_report.button", {
+ text: "Report issue",
+ styles: {
+ top: e.page.y,
+ left: e.page.x
+ },
+ events: {
+ click: function(e) {
+ e.stop();
+ self.showReport(text);
+ }
+ }
+ }).inject(document.body);
+ requestTimeout(function() {
+ document.body.addEvent("click", remove_button);
+ }, 0);
+ },
+ showReport: function(text) {
+ var self = this, version = Updater.getInfo(), body = self.report_text.replace("{issue}", text).replace("{version}", version ? version.version.repr : "..."), textarea;
+ var overlay = new Element("div.mask.report_popup", {
+ method: "post",
+ events: {
+ click: function(e) {
+ overlay.destroy();
+ }
+ }
+ }).grab(new Element("div.bug", {
+ events: {
+ click: function(e) {
+ e.stopPropagation();
+ }
+ }
+ }).adopt(new Element("h1", {
+ text: "Report a bug"
+ }), new Element("span").adopt(new Element("span", {
+ text: "Read "
+ }), new Element("a.button", {
+ target: "_blank",
+ text: "the contributing guide",
+ href: "https://github.com/RuudBurger/CouchPotatoServer/blob/develop/contributing.md"
+ }), new Element("span", {
+ html: " before posting, then copy the text below and <strong>FILL IN</strong> the dots."
+ })), textarea = new Element("textarea", {
+ text: body
+ }), new Element("a.button", {
+ target: "_blank",
+ text: "Create a new issue on GitHub with the text above",
+ href: "https://github.com/RuudBurger/CouchPotatoServer/issues/new",
+ events: {
+ click: function(e) {
+ e.stop();
+ var body = textarea.get("value"), bdy = "?body=" + (body.length < 2e3 ? encodeURIComponent(body) : "Paste the text here"), win = window.open(e.target.get("href") + bdy, "_blank");
+ win.focus();
+ }
+ }
+ })));
+ overlay.inject(document.body);
+ },
+ getSelected: function() {
+ if (window.getSelection) return window.getSelection(); else if (document.getSelection) return document.getSelection(); else {
+ var selection = document.selection && document.selection.createRange();
+ if (selection.text) return selection.text;
+ }
+ return false;
+ },
+ spaceFill: function(number, width) {
+ if (number.toString().length >= width) return number;
+ return (new Array(width).join(" ") + number.toString()).substr(-width);
+ }
+});
+
+var Profile = new Class({
+ data: {},
+ types: [],
+ initialize: function(data) {
+ var self = this;
+ self.data = data;
+ self.types = [];
+ self.create();
+ self.el.addEvents({
+ "change:relay(select, input[type=checkbox])": self.save.bind(self, 0),
+ "keyup:relay(input[type=text])": self.save.bind(self, [ 300 ])
+ });
+ },
+ create: function() {
+ var self = this;
+ var data = self.data;
+ self.el = new Element("div.profile").adopt(self.delete_button = new Element("span.delete.icon-delete", {
+ events: {
+ click: self.del.bind(self)
+ }
+ }), new Element(".quality_label.ctrlHolder").adopt(new Element("label", {
+ text: "Name"
+ }), new Element("input", {
+ type: "text",
+ value: data.label,
+ placeholder: "Profile name"
+ })), new Element("div.qualities.ctrlHolder").adopt(new Element("label", {
+ text: "Search for"
+ }), self.type_container = new Element("ol.types"), new Element("div.formHint", {
+ html: "Search these qualities (2 minimum), from top to bottom. Use the checkbox, to stop searching after it found this quality."
+ })), new Element("div.wait_for.ctrlHolder").adopt(new Element("span", {
+ text: "Wait"
+ }), new Element("input.wait_for_input.xsmall", {
+ type: "text",
+ value: data.wait_for && data.wait_for.length > 0 ? data.wait_for[0] : 0
+ }), new Element("span", {
+ text: "day(s) for a better quality "
+ }), new Element("span.advanced", {
+ text: "and keep searching"
+ }), new Element("input.xsmall.stop_after_input.advanced", {
+ type: "text",
+ value: data.stop_after && data.stop_after.length > 0 ? data.stop_after[0] : 0
+ }), new Element("span.advanced", {
+ text: "day(s) for a better (checked) quality."
+ }), new Element("span.advanced", {
+ html: "<br/>Releases need a minimum score of"
+ }), new Element("input.advanced.xsmall.minimum_score_input", {
+ size: 4,
+ type: "text",
+ value: data.minimum_score || 1
+ })));
+ self.makeSortable();
+ if (data.qualities) {
+ data.types = [];
+ data.qualities.each(function(quality, nr) {
+ data.types.include({
+ quality: quality,
+ finish: data.finish[nr] || false,
+ "3d": data["3d"] ? data["3d"][nr] || false : false
+ });
+ });
+ }
+ if (data.types) data.types.each(self.addType.bind(self)); else self.delete_button.hide();
+ self.addType();
+ },
+ save: function(delay) {
+ var self = this;
+ if (self.save_timer) clearRequestTimeout(self.save_timer);
+ self.save_timer = requestTimeout(function() {
+ self.addType();
+ var data = self.getData();
+ if (data.types.length < 2) return; else self.delete_button.show();
+ Api.request("profile.save", {
+ data: self.getData(),
+ useSpinner: true,
+ spinnerOptions: {
+ target: self.el
+ },
+ onComplete: function(json) {
+ if (json.success) {
+ self.data = json.profile;
+ self.type_container.getElement("li:first-child input.finish[type=checkbox]").set("checked", true).getParent().addClass("checked");
+ }
+ }
+ });
+ }, delay);
+ },
+ getData: function() {
+ var self = this;
+ var data = {
+ id: self.data._id,
+ label: self.el.getElement(".quality_label input").get("value"),
+ wait_for: self.el.getElement(".wait_for_input").get("value"),
+ stop_after: self.el.getElement(".stop_after_input").get("value"),
+ minimum_score: self.el.getElement(".minimum_score_input").get("value"),
+ types: []
+ };
+ Array.each(self.type_container.getElements(".type"), function(type) {
+ if (!type.hasClass("deleted") && type.getElement("select").get("value") != -1) data.types.include({
+ quality: type.getElement("select").get("value"),
+ finish: +type.getElement("input.finish[type=checkbox]").checked,
+ "3d": +type.getElement("input.3d[type=checkbox]").checked
+ });
+ });
+ return data;
+ },
+ addType: function(data) {
+ var self = this;
+ var has_empty = false;
+ self.types.each(function(type) {
+ if ($(type).hasClass("is_empty")) has_empty = true;
+ });
+ if (has_empty) return;
+ var t = new Profile.Type(data, {
+ onChange: self.save.bind(self, 0)
+ });
+ $(t).inject(self.type_container);
+ self.sortable.addItems($(t));
+ self.types.include(t);
+ },
+ getTypes: function() {
+ var self = this;
+ return self.types.filter(function(type) {
+ return type.get("quality");
+ });
+ },
+ del: function() {
+ var self = this;
+ var label = self.el.getElement(".quality_label input").get("value");
+ var qObj = new Question('Are you sure you want to delete <strong>"' + label + '"</strong>?', "Items using this profile, will be set to the default quality.", [ {
+ text: 'Delete "' + label + '"',
+ class: "delete",
+ events: {
+ click: function(e) {
+ e.preventDefault();
+ Api.request("profile.delete", {
+ data: {
+ id: self.data._id
+ },
+ useSpinner: true,
+ spinnerOptions: {
+ target: self.el
+ },
+ onComplete: function(json) {
+ if (json.success) {
+ qObj.close();
+ self.el.destroy();
+ } else {
+ alert(json.message);
+ }
+ }
+ });
+ }
+ }
+ }, {
+ text: "Cancel",
+ cancel: true
+ } ]);
+ },
+ makeSortable: function() {
+ var self = this;
+ self.sortable = new Sortables(self.type_container, {
+ revert: true,
+ handle: ".handle",
+ opacity: .5,
+ onComplete: self.save.bind(self, 300)
+ });
+ },
+ get: function(attr) {
+ return this.data[attr];
+ },
+ isCore: function() {
+ return this.data.core;
+ },
+ toElement: function() {
+ return this.el;
+ }
+});
+
+Profile.Type = new Class({
+ Implements: [ Events, Options ],
+ deleted: false,
+ initialize: function(data, options) {
+ var self = this;
+ self.setOptions(options);
+ self.data = data || {};
+ self.create();
+ self.addEvent("change", function() {
+ self.el[self.qualities.get("value") == "-1" ? "addClass" : "removeClass"]("is_empty");
+ self.el[Quality.getQuality(self.qualities.get("value")).allow_3d ? "addClass" : "removeClass"]("allow_3d");
+ self.deleted = self.qualities.get("value") == "-1";
+ });
+ },
+ create: function() {
+ var self = this;
+ var data = self.data;
+ self.el = new Element("li.type").adopt(new Element("span.quality_type.select_wrapper.icon-dropdown").grab(self.fillQualities()), self.finish_container = new Element("label.finish").adopt(self.finish = new Element("input.finish[type=checkbox]", {
+ checked: data.finish !== undefined ? data.finish : 1,
+ events: {
+ change: function() {
+ if (self.el == self.el.getParent().getElement(":first-child")) {
+ alert("Top quality always finishes the search");
+ return;
+ }
+ self.fireEvent("change");
+ }
+ }
+ }), new Element("span.check_label[text=finish]")), self["3d_container"] = new Element("label.threed").adopt(self["3d"] = new Element("input.3d[type=checkbox]", {
+ checked: data["3d"] !== undefined ? data["3d"] : 0,
+ events: {
+ change: function() {
+ self.fireEvent("change");
+ }
+ }
+ }), new Element("span.check_label[text=3D]")), new Element("span.delete.icon-cancel", {
+ events: {
+ click: self.del.bind(self)
+ }
+ }), new Element("span.handle.icon-handle"));
+ self.el[self.data.quality ? "removeClass" : "addClass"]("is_empty");
+ if (self.data.quality && Quality.getQuality(self.data.quality).allow_3d) self.el.addClass("allow_3d");
+ },
+ fillQualities: function() {
+ var self = this;
+ self.qualities = new Element("select", {
+ events: {
+ change: self.fireEvent.bind(self, "change")
+ }
+ }).grab(new Element("option", {
+ text: "+ Add another quality",
+ value: -1
+ }));
+ Object.each(Quality.qualities, function(q) {
+ new Element("option", {
+ text: q.label,
+ value: q.identifier,
+ "data-allow_3d": q.allow_3d
+ }).inject(self.qualities);
+ });
+ self.qualities.set("value", self.data.quality);
+ return self.qualities;
+ },
+ getData: function() {
+ var self = this;
+ return {
+ quality: self.qualities.get("value"),
+ finish: +self.finish.checked,
+ "3d": +self["3d"].checked
+ };
+ },
+ get: function(key) {
+ return this.data[key];
+ },
+ del: function() {
+ var self = this;
+ self.el.addClass("deleted");
+ self.el.hide();
+ self.deleted = true;
+ self.fireEvent("change");
+ },
+ toElement: function() {
+ return this.el;
+ }
+});
+
+var QualityBase = new Class({
+ tab: "",
+ content: "",
+ setup: function(data) {
+ var self = this;
+ self.qualities = data.qualities;
+ self.profiles_list = null;
+ self.profiles = [];
+ Array.each(data.profiles, self.createProfilesClass.bind(self));
+ App.addEvent("loadSettings", self.addSettings.bind(self));
+ },
+ getProfile: function(id) {
+ return this.profiles.filter(function(profile) {
+ return profile.data._id == id;
+ }).pick();
+ },
+ getActiveProfiles: function() {
+ return Array.filter(this.profiles, function(profile) {
+ return !profile.data.hide;
+ });
+ },
+ getQuality: function(identifier) {
+ try {
+ return this.qualities.filter(function(q) {
+ return q.identifier == identifier;
+ }).pick();
+ } catch (e) {}
+ return {};
+ },
+ addSettings: function() {
+ var self = this;
+ self.settings = App.getPage("Settings");
+ self.settings.addEvent("create", function() {
+ var tab = self.settings.createSubTab("profile", {
+ label: "Quality",
+ name: "profile",
+ subtab_label: "Qualities"
+ }, self.settings.tabs.searcher, "searcher");
+ self.tab = tab.tab;
+ self.content = tab.content;
+ self.createProfiles();
+ self.createProfileOrdering();
+ self.createSizes();
+ });
+ },
+ createProfiles: function() {
+ var self = this;
+ var non_core_profiles = Array.filter(self.profiles, function(profile) {
+ return !profile.isCore();
+ });
+ var count = non_core_profiles.length;
+ self.settings.createGroup({
+ label: "Quality Profiles",
+ description: "Create your own profiles with multiple qualities."
+ }).inject(self.content).adopt(self.profile_container = new Element("div.container"), new Element("a.add_new_profile", {
+ text: count > 0 ? "Create another quality profile" : "Click here to create a quality profile.",
+ events: {
+ click: function() {
+ var profile = self.createProfilesClass();
+ $(profile).inject(self.profile_container);
+ }
+ }
+ }));
+ Array.each(non_core_profiles, function(profile) {
+ $(profile).inject(self.profile_container);
+ });
+ },
+ createProfilesClass: function(data) {
+ var self = this;
+ data = data || {
+ id: randomString()
+ };
+ var profile = new Profile(data);
+ self.profiles.include(profile);
+ return profile;
+ },
+ createProfileOrdering: function() {
+ var self = this;
+ self.settings.createGroup({
+ label: "Profile Defaults",
+ description: "(Needs refresh '" + (App.isMac() ? "CMD+R" : "F5") + "' after editing)"
+ }).grab(new Element(".ctrlHolder#profile_ordering").adopt(new Element("label[text=Order]"), self.profiles_list = new Element("ul"), new Element("p.formHint", {
+ html: "Change the order the profiles are in the dropdown list. Uncheck to hide it completely.<br />First one will be default."
+ }))).inject(self.content);
+ Array.each(self.profiles, function(profile) {
+ var check;
+ new Element("li", {
+ "data-id": profile.data._id
+ }).adopt(check = new Element("input[type=checkbox]", {
+ checked: !profile.data.hide,
+ events: {
+ change: self.saveProfileOrdering.bind(self)
+ }
+ }), new Element("span.profile_label", {
+ text: profile.data.label
+ }), new Element("span.handle.icon-handle")).inject(self.profiles_list);
+ });
+ var sorted_changed = false;
+ self.profile_sortable = new Sortables(self.profiles_list, {
+ revert: true,
+ handle: ".handle",
+ opacity: .5,
+ onSort: function() {
+ sorted_changed = true;
+ },
+ onComplete: function() {
+ if (sorted_changed) {
+ self.saveProfileOrdering();
+ sorted_changed = false;
+ }
+ }
+ });
+ },
+ saveProfileOrdering: function() {
+ var self = this, ids = [], hidden = [];
+ self.profiles_list.getElements("li").each(function(el, nr) {
+ ids.include(el.get("data-id"));
+ hidden[nr] = +!el.getElement("input[type=checkbox]").get("checked");
+ });
+ Api.request("profile.save_order", {
+ data: {
+ ids: ids,
+ hidden: hidden
+ }
+ });
+ },
+ createSizes: function() {
+ var self = this;
+ var group = self.settings.createGroup({
+ label: "Sizes",
+ description: "Edit the minimal and maximum sizes (in MB) for each quality.",
+ advanced: true,
+ name: "sizes"
+ }).inject(self.content);
+ new Element("div.item.head.ctrlHolder").adopt(new Element("span.label", {
+ text: "Quality"
+ }), new Element("span.min", {
+ text: "Min"
+ }), new Element("span.max", {
+ text: "Max"
+ })).inject(group);
+ Array.each(self.qualities, function(quality) {
+ new Element("div.ctrlHolder.item").adopt(new Element("span.label", {
+ text: quality.label
+ }), new Element("input.min[type=text]", {
+ value: quality.size_min,
+ events: {
+ keyup: function(e) {
+ self.changeSize(quality.identifier, "size_min", e.target.get("value"));
+ }
+ }
+ }), new Element("input.max[type=text]", {
+ value: quality.size_max,
+ events: {
+ keyup: function(e) {
+ self.changeSize(quality.identifier, "size_max", e.target.get("value"));
+ }
+ }
+ })).inject(group);
+ });
+ },
+ size_timer: {},
+ changeSize: function(identifier, type, value) {
+ var self = this;
+ if (self.size_timer[identifier + type]) clearRequestTimeout(self.size_timer[identifier + type]);
+ self.size_timer[identifier + type] = requestTimeout(function() {
+ Api.request("quality.size.save", {
+ data: {
+ identifier: identifier,
+ value_type: type,
+ value: value
+ }
+ });
+ }, 300);
+ }
+});
+
+window.Quality = new QualityBase();
+
+Page.Userscript = new Class({
+ Extends: PageBase,
+ order: 80,
+ name: "userscript",
+ has_tab: false,
+ options: {
+ onOpened: function() {
+ App.fireEvent("unload");
+ App.getBlock("header").hide();
+ }
+ },
+ indexAction: function() {
+ var self = this;
+ self.content.grab(self.frame = new Element("div.frame.loading", {
+ text: "Loading..."
+ }));
+ var url = window.location.href.split("url=")[1];
+ Api.request("userscript.add_via_url", {
+ data: {
+ url: url
+ },
+ onComplete: function(json) {
+ self.frame.empty();
+ self.frame.removeClass("loading");
+ if (json.error) self.frame.set("html", json.error); else {
+ var item = new BlockSearchMovieItem(json.movie);
+ self.frame.adopt(item);
+ item.showOptions();
+ }
+ }
+ });
+ }
+});
+
+var UserscriptSettingTab = new Class({
+ tab: "",
+ content: "",
+ initialize: function() {
+ var self = this;
+ App.addEvent("loadSettings", self.addSettings.bind(self));
+ },
+ addSettings: function() {
+ var self = this;
+ self.settings = App.getPage("Settings");
+ self.settings.addEvent("create", function() {
+ var host_url = window.location.protocol + "//" + window.location.host;
+ self.settings.createGroup({
+ name: "userscript",
+ label: "Install the browser extension or bookmarklet",
+ description: "Easily add movies via imdb.com, appletrailers and more"
+ }).inject(self.settings.tabs.automation.content, "top").adopt(new Element("div").adopt(new Element("a.userscript.button", {
+ text: "Install extension",
+ href: "https://couchpota.to/extension/",
+ target: "_blank"
+ }), new Element("span.or[text=or]"), new Element("span.bookmarklet").adopt(new Element("a.button.green", {
+ text: "+CouchPotato",
+ href: "javascript:void((function(){var e=document.createElement('script');e.setAttribute('type','text/javascript');e.setAttribute('charset','UTF-8');e.setAttribute('src','" + host_url + Api.createUrl("userscript.bookmark") + "?host=" + encodeURI(host_url + Api.createUrl("userscript.get") + randomString() + "/") + "&r='+Math.random()*99999999);document.body.appendChild(e)})());",
+ target: "",
+ events: {
+ click: function(e) {
+ e.stop();
+ alert("Drag it to your bookmark ;)");
+ }
+ }
+ }), new Element("span", {
+ text: "Б┤╫ Drag this to your bookmarks"
+ }))), new Element("img", {
+ src: "https://couchpota.to/media/images/userscript.gif"
+ }));
+ });
+ }
+});
+
+window.addEvent("domready", function() {
+ new UserscriptSettingTab();
+});
+
+window.addEvent("load", function() {
+ var your_version = $(document.body).get("data-userscript_version"), latest_version = App.getOption("userscript_version") || "", key = "cp_version_check", checked_already = Cookie.read(key);
+ if (your_version && your_version < latest_version && checked_already < latest_version) {
+ if (confirm("Update to the latest Userscript?\nYour version: " + your_version + ", new version: " + latest_version)) {
+ document.location = Api.createUrl("userscript.get") + randomString() + "/couchpotato.user.js";
+ }
+ Cookie.write(key, latest_version, {
+ duration: 100
+ });
+ }
+});
+
+Page.Wizard = new Class({
+ Extends: Page.Settings,
+ order: 70,
+ name: "wizard",
+ current: "welcome",
+ has_tab: false,
+ wizard_only: true,
+ headers: {
+ welcome: {
+ title: "Welcome to the new CouchPotato",
+ description: "To get started, fill in each of the following settings as much as you can.",
+ content: new Element("div", {
+ styles: {
+ margin: "0 0 0 30px"
+ }
+ })
+ },
+ general: {
+ title: "General",
+ description: "If you want to access CP from outside your local network, you better secure it a bit with a username & password."
+ },
+ downloaders: {
+ title: "What download apps are you using?",
+ description: "CP needs an external download app to work with. Choose one below. For more downloaders check settings after you have filled in the wizard. If your download app isn't in the list, use the default Blackhole."
+ },
+ searcher: {
+ label: "Providers",
+ title: "Are you registered at any of these sites?",
+ description: "CP uses these sites to search for movies. A few free are enabled by default, but it's always better to have more."
+ },
+ renamer: {
+ title: "Move & rename the movies after downloading?",
+ description: "The coolest part of CP is that it can move and organize your downloaded movies automagically. Check settings and you can even download trailers, subtitles and other data when it has finished downloading. It's awesome!"
+ },
+ automation: {
+ title: "Easily add movies to your wanted list!",
+ description: "You can easily add movies from your favorite movie site, like IMDB, Rotten Tomatoes, Apple Trailers and more. Just install the extension or drag the bookmarklet to your bookmarks." + "<br />Once installed, just click the bookmarklet on a movie page and watch the magic happen ;)",
+ content: function() {
+ return App.createUserscriptButtons();
+ }
+ },
+ finish: {
+ title: "Finishing Up",
+ description: "Are you done? Did you fill in everything as much as possible?" + "<br />Be sure to check the settings to see what more CP can do!<br /><br />" + '<div class="wizard_support">After you\'ve used CP for a while, and you like it (which of course you will), consider supporting CP. Maybe even by writing some code. <br />Or by getting a subscription at <a href="https://usenetserver.com/partners/?a_aid=couchpotato&a_bid=3f357c6f">Usenet Server</a> or <a href="http://www.newshosting.com/partners/?a_aid=couchpotato&a_bid=a0b022df">Newshosting</a>.</div>',
+ content: new Element("div").grab(new Element("a.button.green", {
+ styles: {
+ "margin-top": 20
+ },
+ text: "I'm ready to start the awesomeness!",
+ events: {
+ click: function(e) {
+ e.preventDefault();
+ Api.request("settings.save", {
+ data: {
+ section: "core",
+ name: "show_wizard",
+ value: 0
+ },
+ useSpinner: true,
+ spinnerOptions: {
+ target: self.el
+ },
+ onComplete: function() {
+ window.location = App.createUrl("wanted");
+ }
+ });
+ }
+ }
+ }))
+ }
+ },
+ groups: [ "welcome", "general", "downloaders", "searcher", "renamer", "automation", "finish" ],
+ open: function(action, params) {
+ var self = this;
+ if (!self.initialized) {
+ App.fireEvent("unload");
+ App.getBlock("header").hide();
+ self.parent(action, params);
+ self.el.addClass("settings");
+ self.addEvent("create", function() {
+ self.orderGroups();
+ });
+ self.initialized = true;
+ self.scroll = new Fx.Scroll(document.body, {
+ transition: "quint:in:out"
+ });
+ } else requestTimeout(function() {
+ var sc = self.el.getElement(".wgroup_" + action);
+ self.scroll.start(0, sc.getCoordinates().top - 80);
+ }, 1);
+ },
+ orderGroups: function() {
+ var self = this;
+ var form = self.el.getElement(".uniForm");
+ var tabs = self.el.getElement(".tabs").hide();
+ self.groups.each(function(group) {
+ var group_container;
+ if (self.headers[group]) {
+ group_container = new Element(".wgroup_" + group);
+ if (self.headers[group].include) {
+ self.headers[group].include.each(function(inc) {
+ group_container.addClass("wgroup_" + inc);
+ });
+ }
+ var content = self.headers[group].content;
+ group_container.adopt(new Element("h1", {
+ text: self.headers[group].title
+ }), self.headers[group].description ? new Element("span.description", {
+ html: self.headers[group].description
+ }) : null, content ? typeOf(content) == "function" ? content() : content : null).inject(form);
+ }
+ var tab_navigation = tabs.getElement(".t_" + group);
+ if (!tab_navigation && self.headers[group] && self.headers[group].include) {
+ tab_navigation = [];
+ self.headers[group].include.each(function(inc) {
+ tab_navigation.include(tabs.getElement(".t_" + inc));
+ });
+ }
+ if (tab_navigation && group_container) {
+ tabs.adopt(tab_navigation);
+ if (self.headers[group] && self.headers[group].include) {
+ self.headers[group].include.each(function(inc) {
+ self.el.getElement(".tab_" + inc).inject(group_container);
+ });
+ new Element("li.t_" + group).grab(new Element("a", {
+ href: App.createUrl("wizard/" + group),
+ text: (self.headers[group].label || group).capitalize()
+ })).inject(tabs);
+ } else self.el.getElement(".tab_" + group).inject(group_container);
+ if (tab_navigation.getElement && self.headers[group]) {
+ var a = tab_navigation.getElement("a");
+ a.set("text", (self.headers[group].label || group).capitalize());
+ var url_split = a.get("href").split("wizard")[1].split("/");
+ if (url_split.length > 3) a.set("href", a.get("href").replace(url_split[url_split.length - 3] + "/", ""));
+ }
+ } else {
+ new Element("li.t_" + group).grab(new Element("a", {
+ href: App.createUrl("wizard/" + group),
+ text: (self.headers[group].label || group).capitalize()
+ })).inject(tabs);
+ }
+ if (self.headers[group] && self.headers[group].event) self.headers[group].event.call();
+ });
+ self.el.getElement(".advanced_toggle").destroy();
+ self.el.getElement(".section_nzb").hide();
+ }
+});
\ No newline at end of file
diff --git a/couchpotato/static/scripts/combined.vendor.min.js b/couchpotato/static/scripts/combined.vendor.min.js
new file mode 100644
index 0000000000..cbc329cda0
--- /dev/null
+++ b/couchpotato/static/scripts/combined.vendor.min.js
@@ -0,0 +1,9070 @@
+(function() {
+ this.MooTools = {
+ version: "1.5.1",
+ build: "0542c135fdeb7feed7d9917e01447a408f22c876"
+ };
+ var typeOf = this.typeOf = function(item) {
+ if (item == null) return "null";
+ if (item.$family != null) return item.$family();
+ if (item.nodeName) {
+ if (item.nodeType == 1) return "element";
+ if (item.nodeType == 3) return /\S/.test(item.nodeValue) ? "textnode" : "whitespace";
+ } else if (typeof item.length == "number") {
+ if ("callee" in item) return "arguments";
+ if ("item" in item) return "collection";
+ }
+ return typeof item;
+ };
+ var instanceOf = this.instanceOf = function(item, object) {
+ if (item == null) return false;
+ var constructor = item.$constructor || item.constructor;
+ while (constructor) {
+ if (constructor === object) return true;
+ constructor = constructor.parent;
+ }
+ if (!item.hasOwnProperty) return false;
+ return item instanceof object;
+ };
+ var Function = this.Function;
+ var enumerables = true;
+ for (var i in {
+ toString: 1
+ }) enumerables = null;
+ if (enumerables) enumerables = [ "hasOwnProperty", "valueOf", "isPrototypeOf", "propertyIsEnumerable", "toLocaleString", "toString", "constructor" ];
+ Function.prototype.overloadSetter = function(usePlural) {
+ var self = this;
+ return function(a, b) {
+ if (a == null) return this;
+ if (usePlural || typeof a != "string") {
+ for (var k in a) self.call(this, k, a[k]);
+ if (enumerables) for (var i = enumerables.length; i--; ) {
+ k = enumerables[i];
+ if (a.hasOwnProperty(k)) self.call(this, k, a[k]);
+ }
+ } else {
+ self.call(this, a, b);
+ }
+ return this;
+ };
+ };
+ Function.prototype.overloadGetter = function(usePlural) {
+ var self = this;
+ return function(a) {
+ var args, result;
+ if (typeof a != "string") args = a; else if (arguments.length > 1) args = arguments; else if (usePlural) args = [ a ];
+ if (args) {
+ result = {};
+ for (var i = 0; i < args.length; i++) result[args[i]] = self.call(this, args[i]);
+ } else {
+ result = self.call(this, a);
+ }
+ return result;
+ };
+ };
+ Function.prototype.extend = function(key, value) {
+ this[key] = value;
+ }.overloadSetter();
+ Function.prototype.implement = function(key, value) {
+ this.prototype[key] = value;
+ }.overloadSetter();
+ var slice = Array.prototype.slice;
+ Function.from = function(item) {
+ return typeOf(item) == "function" ? item : function() {
+ return item;
+ };
+ };
+ Array.from = function(item) {
+ if (item == null) return [];
+ return Type.isEnumerable(item) && typeof item != "string" ? typeOf(item) == "array" ? item : slice.call(item) : [ item ];
+ };
+ Number.from = function(item) {
+ var number = parseFloat(item);
+ return isFinite(number) ? number : null;
+ };
+ String.from = function(item) {
+ return item + "";
+ };
+ Function.implement({
+ hide: function() {
+ this.$hidden = true;
+ return this;
+ },
+ protect: function() {
+ this.$protected = true;
+ return this;
+ }
+ });
+ var Type = this.Type = function(name, object) {
+ if (name) {
+ var lower = name.toLowerCase();
+ var typeCheck = function(item) {
+ return typeOf(item) == lower;
+ };
+ Type["is" + name] = typeCheck;
+ if (object != null) {
+ object.prototype.$family = function() {
+ return lower;
+ }.hide();
+ }
+ }
+ if (object == null) return null;
+ object.extend(this);
+ object.$constructor = Type;
+ object.prototype.$constructor = object;
+ return object;
+ };
+ var toString = Object.prototype.toString;
+ Type.isEnumerable = function(item) {
+ return item != null && typeof item.length == "number" && toString.call(item) != "[object Function]";
+ };
+ var hooks = {};
+ var hooksOf = function(object) {
+ var type = typeOf(object.prototype);
+ return hooks[type] || (hooks[type] = []);
+ };
+ var implement = function(name, method) {
+ if (method && method.$hidden) return;
+ var hooks = hooksOf(this);
+ for (var i = 0; i < hooks.length; i++) {
+ var hook = hooks[i];
+ if (typeOf(hook) == "type") implement.call(hook, name, method); else hook.call(this, name, method);
+ }
+ var previous = this.prototype[name];
+ if (previous == null || !previous.$protected) this.prototype[name] = method;
+ if (this[name] == null && typeOf(method) == "function") extend.call(this, name, function(item) {
+ return method.apply(item, slice.call(arguments, 1));
+ });
+ };
+ var extend = function(name, method) {
+ if (method && method.$hidden) return;
+ var previous = this[name];
+ if (previous == null || !previous.$protected) this[name] = method;
+ };
+ Type.implement({
+ implement: implement.overloadSetter(),
+ extend: extend.overloadSetter(),
+ alias: function(name, existing) {
+ implement.call(this, name, this.prototype[existing]);
+ }.overloadSetter(),
+ mirror: function(hook) {
+ hooksOf(this).push(hook);
+ return this;
+ }
+ });
+ new Type("Type", Type);
+ var force = function(name, object, methods) {
+ var isType = object != Object, prototype = object.prototype;
+ if (isType) object = new Type(name, object);
+ for (var i = 0, l = methods.length; i < l; i++) {
+ var key = methods[i], generic = object[key], proto = prototype[key];
+ if (generic) generic.protect();
+ if (isType && proto) object.implement(key, proto.protect());
+ }
+ if (isType) {
+ var methodsEnumerable = prototype.propertyIsEnumerable(methods[0]);
+ object.forEachMethod = function(fn) {
+ if (!methodsEnumerable) for (var i = 0, l = methods.length; i < l; i++) {
+ fn.call(prototype, prototype[methods[i]], methods[i]);
+ }
+ for (var key in prototype) fn.call(prototype, prototype[key], key);
+ };
+ }
+ return force;
+ };
+ force("String", String, [ "charAt", "charCodeAt", "concat", "contains", "indexOf", "lastIndexOf", "match", "quote", "replace", "search", "slice", "split", "substr", "substring", "trim", "toLowerCase", "toUpperCase" ])("Array", Array, [ "pop", "push", "reverse", "shift", "sort", "splice", "unshift", "concat", "join", "slice", "indexOf", "lastIndexOf", "filter", "forEach", "every", "map", "some", "reduce", "reduceRight" ])("Number", Number, [ "toExponential", "toFixed", "toLocaleString", "toPrecision" ])("Function", Function, [ "apply", "call", "bind" ])("RegExp", RegExp, [ "exec", "test" ])("Object", Object, [ "create", "defineProperty", "defineProperties", "keys", "getPrototypeOf", "getOwnPropertyDescriptor", "getOwnPropertyNames", "preventExtensions", "isExtensible", "seal", "isSealed", "freeze", "isFrozen" ])("Date", Date, [ "now" ]);
+ Object.extend = extend.overloadSetter();
+ Date.extend("now", function() {
+ return +new Date();
+ });
+ new Type("Boolean", Boolean);
+ Number.prototype.$family = function() {
+ return isFinite(this) ? "number" : "null";
+ }.hide();
+ Number.extend("random", function(min, max) {
+ return Math.floor(Math.random() * (max - min + 1) + min);
+ });
+ var hasOwnProperty = Object.prototype.hasOwnProperty;
+ Object.extend("forEach", function(object, fn, bind) {
+ for (var key in object) {
+ if (hasOwnProperty.call(object, key)) fn.call(bind, object[key], key, object);
+ }
+ });
+ Object.each = Object.forEach;
+ Array.implement({
+ forEach: function(fn, bind) {
+ for (var i = 0, l = this.length; i < l; i++) {
+ if (i in this) fn.call(bind, this[i], i, this);
+ }
+ },
+ each: function(fn, bind) {
+ Array.forEach(this, fn, bind);
+ return this;
+ }
+ });
+ var cloneOf = function(item) {
+ switch (typeOf(item)) {
+ case "array":
+ return item.clone();
+
+ case "object":
+ return Object.clone(item);
+
+ default:
+ return item;
+ }
+ };
+ Array.implement("clone", function() {
+ var i = this.length, clone = new Array(i);
+ while (i--) clone[i] = cloneOf(this[i]);
+ return clone;
+ });
+ var mergeOne = function(source, key, current) {
+ switch (typeOf(current)) {
+ case "object":
+ if (typeOf(source[key]) == "object") Object.merge(source[key], current); else source[key] = Object.clone(current);
+ break;
+
+ case "array":
+ source[key] = current.clone();
+ break;
+
+ default:
+ source[key] = current;
+ }
+ return source;
+ };
+ Object.extend({
+ merge: function(source, k, v) {
+ if (typeOf(k) == "string") return mergeOne(source, k, v);
+ for (var i = 1, l = arguments.length; i < l; i++) {
+ var object = arguments[i];
+ for (var key in object) mergeOne(source, key, object[key]);
+ }
+ return source;
+ },
+ clone: function(object) {
+ var clone = {};
+ for (var key in object) clone[key] = cloneOf(object[key]);
+ return clone;
+ },
+ append: function(original) {
+ for (var i = 1, l = arguments.length; i < l; i++) {
+ var extended = arguments[i] || {};
+ for (var key in extended) original[key] = extended[key];
+ }
+ return original;
+ }
+ });
+ [ "Object", "WhiteSpace", "TextNode", "Collection", "Arguments" ].each(function(name) {
+ new Type(name);
+ });
+ var UID = Date.now();
+ String.extend("uniqueID", function() {
+ return (UID++).toString(36);
+ });
+})();
+
+Array.implement({
+ every: function(fn, bind) {
+ for (var i = 0, l = this.length >>> 0; i < l; i++) {
+ if (i in this && !fn.call(bind, this[i], i, this)) return false;
+ }
+ return true;
+ },
+ filter: function(fn, bind) {
+ var results = [];
+ for (var value, i = 0, l = this.length >>> 0; i < l; i++) if (i in this) {
+ value = this[i];
+ if (fn.call(bind, value, i, this)) results.push(value);
+ }
+ return results;
+ },
+ indexOf: function(item, from) {
+ var length = this.length >>> 0;
+ for (var i = from < 0 ? Math.max(0, length + from) : from || 0; i < length; i++) {
+ if (this[i] === item) return i;
+ }
+ return -1;
+ },
+ map: function(fn, bind) {
+ var length = this.length >>> 0, results = Array(length);
+ for (var i = 0; i < length; i++) {
+ if (i in this) results[i] = fn.call(bind, this[i], i, this);
+ }
+ return results;
+ },
+ some: function(fn, bind) {
+ for (var i = 0, l = this.length >>> 0; i < l; i++) {
+ if (i in this && fn.call(bind, this[i], i, this)) return true;
+ }
+ return false;
+ },
+ clean: function() {
+ return this.filter(function(item) {
+ return item != null;
+ });
+ },
+ invoke: function(methodName) {
+ var args = Array.slice(arguments, 1);
+ return this.map(function(item) {
+ return item[methodName].apply(item, args);
+ });
+ },
+ associate: function(keys) {
+ var obj = {}, length = Math.min(this.length, keys.length);
+ for (var i = 0; i < length; i++) obj[keys[i]] = this[i];
+ return obj;
+ },
+ link: function(object) {
+ var result = {};
+ for (var i = 0, l = this.length; i < l; i++) {
+ for (var key in object) {
+ if (object[key](this[i])) {
+ result[key] = this[i];
+ delete object[key];
+ break;
+ }
+ }
+ }
+ return result;
+ },
+ contains: function(item, from) {
+ return this.indexOf(item, from) != -1;
+ },
+ append: function(array) {
+ this.push.apply(this, array);
+ return this;
+ },
+ getLast: function() {
+ return this.length ? this[this.length - 1] : null;
+ },
+ getRandom: function() {
+ return this.length ? this[Number.random(0, this.length - 1)] : null;
+ },
+ include: function(item) {
+ if (!this.contains(item)) this.push(item);
+ return this;
+ },
+ combine: function(array) {
+ for (var i = 0, l = array.length; i < l; i++) this.include(array[i]);
+ return this;
+ },
+ erase: function(item) {
+ for (var i = this.length; i--; ) {
+ if (this[i] === item) this.splice(i, 1);
+ }
+ return this;
+ },
+ empty: function() {
+ this.length = 0;
+ return this;
+ },
+ flatten: function() {
+ var array = [];
+ for (var i = 0, l = this.length; i < l; i++) {
+ var type = typeOf(this[i]);
+ if (type == "null") continue;
+ array = array.concat(type == "array" || type == "collection" || type == "arguments" || instanceOf(this[i], Array) ? Array.flatten(this[i]) : this[i]);
+ }
+ return array;
+ },
+ pick: function() {
+ for (var i = 0, l = this.length; i < l; i++) {
+ if (this[i] != null) return this[i];
+ }
+ return null;
+ },
+ hexToRgb: function(array) {
+ if (this.length != 3) return null;
+ var rgb = this.map(function(value) {
+ if (value.length == 1) value += value;
+ return parseInt(value, 16);
+ });
+ return array ? rgb : "rgb(" + rgb + ")";
+ },
+ rgbToHex: function(array) {
+ if (this.length < 3) return null;
+ if (this.length == 4 && this[3] == 0 && !array) return "transparent";
+ var hex = [];
+ for (var i = 0; i < 3; i++) {
+ var bit = (this[i] - 0).toString(16);
+ hex.push(bit.length == 1 ? "0" + bit : bit);
+ }
+ return array ? hex : "#" + hex.join("");
+ }
+});
+
+String.implement({
+ contains: function(string, index) {
+ return (index ? String(this).slice(index) : String(this)).indexOf(string) > -1;
+ },
+ test: function(regex, params) {
+ return (typeOf(regex) == "regexp" ? regex : new RegExp("" + regex, params)).test(this);
+ },
+ trim: function() {
+ return String(this).replace(/^\s+|\s+$/g, "");
+ },
+ clean: function() {
+ return String(this).replace(/\s+/g, " ").trim();
+ },
+ camelCase: function() {
+ return String(this).replace(/-\D/g, function(match) {
+ return match.charAt(1).toUpperCase();
+ });
+ },
+ hyphenate: function() {
+ return String(this).replace(/[A-Z]/g, function(match) {
+ return "-" + match.charAt(0).toLowerCase();
+ });
+ },
+ capitalize: function() {
+ return String(this).replace(/\b[a-z]/g, function(match) {
+ return match.toUpperCase();
+ });
+ },
+ escapeRegExp: function() {
+ return String(this).replace(/([-.*+?^${}()|[\]\/\\])/g, "\\$1");
+ },
+ toInt: function(base) {
+ return parseInt(this, base || 10);
+ },
+ toFloat: function() {
+ return parseFloat(this);
+ },
+ hexToRgb: function(array) {
+ var hex = String(this).match(/^#?(\w{1,2})(\w{1,2})(\w{1,2})$/);
+ return hex ? hex.slice(1).hexToRgb(array) : null;
+ },
+ rgbToHex: function(array) {
+ var rgb = String(this).match(/\d{1,3}/g);
+ return rgb ? rgb.rgbToHex(array) : null;
+ },
+ substitute: function(object, regexp) {
+ return String(this).replace(regexp || /\\?\{([^{}]+)\}/g, function(match, name) {
+ if (match.charAt(0) == "\\") return match.slice(1);
+ return object[name] != null ? object[name] : "";
+ });
+ }
+});
+
+Function.extend({
+ attempt: function() {
+ for (var i = 0, l = arguments.length; i < l; i++) {
+ try {
+ return arguments[i]();
+ } catch (e) {}
+ }
+ return null;
+ }
+});
+
+Function.implement({
+ attempt: function(args, bind) {
+ try {
+ return this.apply(bind, Array.from(args));
+ } catch (e) {}
+ return null;
+ },
+ bind: function(that) {
+ var self = this, args = arguments.length > 1 ? Array.slice(arguments, 1) : null, F = function() {};
+ var bound = function() {
+ var context = that, length = arguments.length;
+ if (this instanceof bound) {
+ F.prototype = self.prototype;
+ context = new F();
+ }
+ var result = !args && !length ? self.call(context) : self.apply(context, args && length ? args.concat(Array.slice(arguments)) : args || arguments);
+ return context == that ? result : context;
+ };
+ return bound;
+ },
+ pass: function(args, bind) {
+ var self = this;
+ if (args != null) args = Array.from(args);
+ return function() {
+ return self.apply(bind, args || arguments);
+ };
+ },
+ delay: function(delay, bind, args) {
+ return setTimeout(this.pass(args == null ? [] : args, bind), delay);
+ },
+ periodical: function(periodical, bind, args) {
+ return setInterval(this.pass(args == null ? [] : args, bind), periodical);
+ }
+});
+
+Number.implement({
+ limit: function(min, max) {
+ return Math.min(max, Math.max(min, this));
+ },
+ round: function(precision) {
+ precision = Math.pow(10, precision || 0).toFixed(precision < 0 ? -precision : 0);
+ return Math.round(this * precision) / precision;
+ },
+ times: function(fn, bind) {
+ for (var i = 0; i < this; i++) fn.call(bind, i, this);
+ },
+ toFloat: function() {
+ return parseFloat(this);
+ },
+ toInt: function(base) {
+ return parseInt(this, base || 10);
+ }
+});
+
+Number.alias("each", "times");
+
+(function(math) {
+ var methods = {};
+ math.each(function(name) {
+ if (!Number[name]) methods[name] = function() {
+ return Math[name].apply(null, [ this ].concat(Array.from(arguments)));
+ };
+ });
+ Number.implement(methods);
+})([ "abs", "acos", "asin", "atan", "atan2", "ceil", "cos", "exp", "floor", "log", "max", "min", "pow", "sin", "sqrt", "tan" ]);
+
+(function() {
+ var Class = this.Class = new Type("Class", function(params) {
+ if (instanceOf(params, Function)) params = {
+ initialize: params
+ };
+ var newClass = function() {
+ reset(this);
+ if (newClass.$prototyping) return this;
+ this.$caller = null;
+ var value = this.initialize ? this.initialize.apply(this, arguments) : this;
+ this.$caller = this.caller = null;
+ return value;
+ }.extend(this).implement(params);
+ newClass.$constructor = Class;
+ newClass.prototype.$constructor = newClass;
+ newClass.prototype.parent = parent;
+ return newClass;
+ });
+ var parent = function() {
+ if (!this.$caller) throw new Error('The method "parent" cannot be called.');
+ var name = this.$caller.$name, parent = this.$caller.$owner.parent, previous = parent ? parent.prototype[name] : null;
+ if (!previous) throw new Error('The method "' + name + '" has no parent.');
+ return previous.apply(this, arguments);
+ };
+ var reset = function(object) {
+ for (var key in object) {
+ var value = object[key];
+ switch (typeOf(value)) {
+ case "object":
+ var F = function() {};
+ F.prototype = value;
+ object[key] = reset(new F());
+ break;
+
+ case "array":
+ object[key] = value.clone();
+ break;
+ }
+ }
+ return object;
+ };
+ var wrap = function(self, key, method) {
+ if (method.$origin) method = method.$origin;
+ var wrapper = function() {
+ if (method.$protected && this.$caller == null) throw new Error('The method "' + key + '" cannot be called.');
+ var caller = this.caller, current = this.$caller;
+ this.caller = current;
+ this.$caller = wrapper;
+ var result = method.apply(this, arguments);
+ this.$caller = current;
+ this.caller = caller;
+ return result;
+ }.extend({
+ $owner: self,
+ $origin: method,
+ $name: key
+ });
+ return wrapper;
+ };
+ var implement = function(key, value, retain) {
+ if (Class.Mutators.hasOwnProperty(key)) {
+ value = Class.Mutators[key].call(this, value);
+ if (value == null) return this;
+ }
+ if (typeOf(value) == "function") {
+ if (value.$hidden) return this;
+ this.prototype[key] = retain ? value : wrap(this, key, value);
+ } else {
+ Object.merge(this.prototype, key, value);
+ }
+ return this;
+ };
+ var getInstance = function(klass) {
+ klass.$prototyping = true;
+ var proto = new klass();
+ delete klass.$prototyping;
+ return proto;
+ };
+ Class.implement("implement", implement.overloadSetter());
+ Class.Mutators = {
+ Extends: function(parent) {
+ this.parent = parent;
+ this.prototype = getInstance(parent);
+ },
+ Implements: function(items) {
+ Array.from(items).each(function(item) {
+ var instance = new item();
+ for (var key in instance) implement.call(this, key, instance[key], true);
+ }, this);
+ }
+ };
+})();
+
+(function() {
+ this.Chain = new Class({
+ $chain: [],
+ chain: function() {
+ this.$chain.append(Array.flatten(arguments));
+ return this;
+ },
+ callChain: function() {
+ return this.$chain.length ? this.$chain.shift().apply(this, arguments) : false;
+ },
+ clearChain: function() {
+ this.$chain.empty();
+ return this;
+ }
+ });
+ var removeOn = function(string) {
+ return string.replace(/^on([A-Z])/, function(full, first) {
+ return first.toLowerCase();
+ });
+ };
+ this.Events = new Class({
+ $events: {},
+ addEvent: function(type, fn, internal) {
+ type = removeOn(type);
+ this.$events[type] = (this.$events[type] || []).include(fn);
+ if (internal) fn.internal = true;
+ return this;
+ },
+ addEvents: function(events) {
+ for (var type in events) this.addEvent(type, events[type]);
+ return this;
+ },
+ fireEvent: function(type, args, delay) {
+ type = removeOn(type);
+ var events = this.$events[type];
+ if (!events) return this;
+ args = Array.from(args);
+ events.each(function(fn) {
+ if (delay) fn.delay(delay, this, args); else fn.apply(this, args);
+ }, this);
+ return this;
+ },
+ removeEvent: function(type, fn) {
+ type = removeOn(type);
+ var events = this.$events[type];
+ if (events && !fn.internal) {
+ var index = events.indexOf(fn);
+ if (index != -1) delete events[index];
+ }
+ return this;
+ },
+ removeEvents: function(events) {
+ var type;
+ if (typeOf(events) == "object") {
+ for (type in events) this.removeEvent(type, events[type]);
+ return this;
+ }
+ if (events) events = removeOn(events);
+ for (type in this.$events) {
+ if (events && events != type) continue;
+ var fns = this.$events[type];
+ for (var i = fns.length; i--; ) if (i in fns) {
+ this.removeEvent(type, fns[i]);
+ }
+ }
+ return this;
+ }
+ });
+ this.Options = new Class({
+ setOptions: function() {
+ var options = this.options = Object.merge.apply(null, [ {}, this.options ].append(arguments));
+ if (this.addEvent) for (var option in options) {
+ if (typeOf(options[option]) != "function" || !/^on[A-Z]/.test(option)) continue;
+ this.addEvent(option, options[option]);
+ delete options[option];
+ }
+ return this;
+ }
+ });
+})();
+
+(function() {
+ var document = this.document;
+ var window = document.window = this;
+ var parse = function(ua, platform) {
+ ua = ua.toLowerCase();
+ platform = platform ? platform.toLowerCase() : "";
+ var UA = ua.match(/(opera|ie|firefox|chrome|trident|crios|version)[\s\/:]([\w\d\.]+)?.*?(safari|(?:rv[\s\/:]|version[\s\/:])([\w\d\.]+)|$)/) || [ null, "unknown", 0 ];
+ if (UA[1] == "trident") {
+ UA[1] = "ie";
+ if (UA[4]) UA[2] = UA[4];
+ } else if (UA[1] == "crios") {
+ UA[1] = "chrome";
+ }
+ platform = ua.match(/ip(?:ad|od|hone)/) ? "ios" : (ua.match(/(?:webos|android)/) || platform.match(/mac|win|linux/) || [ "other" ])[0];
+ if (platform == "win") platform = "windows";
+ return {
+ extend: Function.prototype.extend,
+ name: UA[1] == "version" ? UA[3] : UA[1],
+ version: parseFloat(UA[1] == "opera" && UA[4] ? UA[4] : UA[2]),
+ platform: platform
+ };
+ };
+ var Browser = this.Browser = parse(navigator.userAgent, navigator.platform);
+ if (Browser.name == "ie") {
+ Browser.version = document.documentMode;
+ }
+ Browser.extend({
+ Features: {
+ xpath: !!document.evaluate,
+ air: !!window.runtime,
+ query: !!document.querySelector,
+ json: !!window.JSON
+ },
+ parseUA: parse
+ });
+ Browser.Request = function() {
+ var XMLHTTP = function() {
+ return new XMLHttpRequest();
+ };
+ var MSXML2 = function() {
+ return new ActiveXObject("MSXML2.XMLHTTP");
+ };
+ var MSXML = function() {
+ return new ActiveXObject("Microsoft.XMLHTTP");
+ };
+ return Function.attempt(function() {
+ XMLHTTP();
+ return XMLHTTP;
+ }, function() {
+ MSXML2();
+ return MSXML2;
+ }, function() {
+ MSXML();
+ return MSXML;
+ });
+ }();
+ Browser.Features.xhr = !!Browser.Request;
+ Browser.exec = function(text) {
+ if (!text) return text;
+ if (window.execScript) {
+ window.execScript(text);
+ } else {
+ var script = document.createElement("script");
+ script.setAttribute("type", "text/javascript");
+ script.text = text;
+ document.head.appendChild(script);
+ document.head.removeChild(script);
+ }
+ return text;
+ };
+ String.implement("stripScripts", function(exec) {
+ var scripts = "";
+ var text = this.replace(/<script[^>]*>([\s\S]*?)<\/script>/gi, function(all, code) {
+ scripts += code + "\n";
+ return "";
+ });
+ if (exec === true) Browser.exec(scripts); else if (typeOf(exec) == "function") exec(scripts, text);
+ return text;
+ });
+ Browser.extend({
+ Document: this.Document,
+ Window: this.Window,
+ Element: this.Element,
+ Event: this.Event
+ });
+ this.Window = this.$constructor = new Type("Window", function() {});
+ this.$family = Function.from("window").hide();
+ Window.mirror(function(name, method) {
+ window[name] = method;
+ });
+ this.Document = document.$constructor = new Type("Document", function() {});
+ document.$family = Function.from("document").hide();
+ Document.mirror(function(name, method) {
+ document[name] = method;
+ });
+ document.html = document.documentElement;
+ if (!document.head) document.head = document.getElementsByTagName("head")[0];
+ if (document.execCommand) try {
+ document.execCommand("BackgroundImageCache", false, true);
+ } catch (e) {}
+ if (this.attachEvent && !this.addEventListener) {
+ var unloadEvent = function() {
+ this.detachEvent("onunload", unloadEvent);
+ document.head = document.html = document.window = null;
+ window = this.Window = document = null;
+ };
+ this.attachEvent("onunload", unloadEvent);
+ }
+ var arrayFrom = Array.from;
+ try {
+ arrayFrom(document.html.childNodes);
+ } catch (e) {
+ Array.from = function(item) {
+ if (typeof item != "string" && Type.isEnumerable(item) && typeOf(item) != "array") {
+ var i = item.length, array = new Array(i);
+ while (i--) array[i] = item[i];
+ return array;
+ }
+ return arrayFrom(item);
+ };
+ var prototype = Array.prototype, slice = prototype.slice;
+ [ "pop", "push", "reverse", "shift", "sort", "splice", "unshift", "concat", "join", "slice" ].each(function(name) {
+ var method = prototype[name];
+ Array[name] = function(item) {
+ return method.apply(Array.from(item), slice.call(arguments, 1));
+ };
+ });
+ }
+})();
+
+(function() {
+ var hasOwnProperty = Object.prototype.hasOwnProperty;
+ Object.extend({
+ subset: function(object, keys) {
+ var results = {};
+ for (var i = 0, l = keys.length; i < l; i++) {
+ var k = keys[i];
+ if (k in object) results[k] = object[k];
+ }
+ return results;
+ },
+ map: function(object, fn, bind) {
+ var results = {};
+ for (var key in object) {
+ if (hasOwnProperty.call(object, key)) results[key] = fn.call(bind, object[key], key, object);
+ }
+ return results;
+ },
+ filter: function(object, fn, bind) {
+ var results = {};
+ for (var key in object) {
+ var value = object[key];
+ if (hasOwnProperty.call(object, key) && fn.call(bind, value, key, object)) results[key] = value;
+ }
+ return results;
+ },
+ every: function(object, fn, bind) {
+ for (var key in object) {
+ if (hasOwnProperty.call(object, key) && !fn.call(bind, object[key], key)) return false;
+ }
+ return true;
+ },
+ some: function(object, fn, bind) {
+ for (var key in object) {
+ if (hasOwnProperty.call(object, key) && fn.call(bind, object[key], key)) return true;
+ }
+ return false;
+ },
+ keys: function(object) {
+ var keys = [];
+ for (var key in object) {
+ if (hasOwnProperty.call(object, key)) keys.push(key);
+ }
+ return keys;
+ },
+ values: function(object) {
+ var values = [];
+ for (var key in object) {
+ if (hasOwnProperty.call(object, key)) values.push(object[key]);
+ }
+ return values;
+ },
+ getLength: function(object) {
+ return Object.keys(object).length;
+ },
+ keyOf: function(object, value) {
+ for (var key in object) {
+ if (hasOwnProperty.call(object, key) && object[key] === value) return key;
+ }
+ return null;
+ },
+ contains: function(object, value) {
+ return Object.keyOf(object, value) != null;
+ },
+ toQueryString: function(object, base) {
+ var queryString = [];
+ Object.each(object, function(value, key) {
+ if (base) key = base + "[" + key + "]";
+ var result;
+ switch (typeOf(value)) {
+ case "object":
+ result = Object.toQueryString(value, key);
+ break;
+
+ case "array":
+ var qs = {};
+ value.each(function(val, i) {
+ qs[i] = val;
+ });
+ result = Object.toQueryString(qs, key);
+ break;
+
+ default:
+ result = key + "=" + encodeURIComponent(value);
+ }
+ if (value != null) queryString.push(result);
+ });
+ return queryString.join("&");
+ }
+ });
+})();
+
+(function() {
+ var parsed, separatorIndex, combinatorIndex, reversed, cache = {}, reverseCache = {}, reUnescape = /\\/g;
+ var parse = function(expression, isReversed) {
+ if (expression == null) return null;
+ if (expression.Slick === true) return expression;
+ expression = ("" + expression).replace(/^\s+|\s+$/g, "");
+ reversed = !!isReversed;
+ var currentCache = reversed ? reverseCache : cache;
+ if (currentCache[expression]) return currentCache[expression];
+ parsed = {
+ Slick: true,
+ expressions: [],
+ raw: expression,
+ reverse: function() {
+ return parse(this.raw, true);
+ }
+ };
+ separatorIndex = -1;
+ while (expression != (expression = expression.replace(regexp, parser))) ;
+ parsed.length = parsed.expressions.length;
+ return currentCache[parsed.raw] = reversed ? reverse(parsed) : parsed;
+ };
+ var reverseCombinator = function(combinator) {
+ if (combinator === "!") return " "; else if (combinator === " ") return "!"; else if (/^!/.test(combinator)) return combinator.replace(/^!/, ""); else return "!" + combinator;
+ };
+ var reverse = function(expression) {
+ var expressions = expression.expressions;
+ for (var i = 0; i < expressions.length; i++) {
+ var exp = expressions[i];
+ var last = {
+ parts: [],
+ tag: "*",
+ combinator: reverseCombinator(exp[0].combinator)
+ };
+ for (var j = 0; j < exp.length; j++) {
+ var cexp = exp[j];
+ if (!cexp.reverseCombinator) cexp.reverseCombinator = " ";
+ cexp.combinator = cexp.reverseCombinator;
+ delete cexp.reverseCombinator;
+ }
+ exp.reverse().push(last);
+ }
+ return expression;
+ };
+ var escapeRegExp = function(string) {
+ return string.replace(/[-[\]{}()*+?.\\^$|,#\s]/g, function(match) {
+ return "\\" + match;
+ });
+ };
+ var regexp = new RegExp("^(?:\\s*(,)\\s*|\\s*(<combinator>+)\\s*|(\\s+)|(<unicode>+|\\*)|\\#(<unicode>+)|\\.(<unicode>+)|\\[\\s*(<unicode1>+)(?:\\s*([*^$!~|]?=)(?:\\s*(?:([\"']?)(.*?)\\9)))?\\s*\\](?!\\])|(:+)(<unicode>+)(?:\\((?:(?:([\"'])([^\\13]*)\\13)|((?:\\([^)]+\\)|[^()]*)+))\\))?)".replace(/<combinator>/, "[" + escapeRegExp(">+~`!@$%^&={}\\;</") + "]").replace(/<unicode>/g, "(?:[\\w\\u00a1-\\uFFFF-]|\\\\[^\\s0-9a-f])").replace(/<unicode1>/g, "(?:[:\\w\\u00a1-\\uFFFF-]|\\\\[^\\s0-9a-f])"));
+ function parser(rawMatch, separator, combinator, combinatorChildren, tagName, id, className, attributeKey, attributeOperator, attributeQuote, attributeValue, pseudoMarker, pseudoClass, pseudoQuote, pseudoClassQuotedValue, pseudoClassValue) {
+ if (separator || separatorIndex === -1) {
+ parsed.expressions[++separatorIndex] = [];
+ combinatorIndex = -1;
+ if (separator) return "";
+ }
+ if (combinator || combinatorChildren || combinatorIndex === -1) {
+ combinator = combinator || " ";
+ var currentSeparator = parsed.expressions[separatorIndex];
+ if (reversed && currentSeparator[combinatorIndex]) currentSeparator[combinatorIndex].reverseCombinator = reverseCombinator(combinator);
+ currentSeparator[++combinatorIndex] = {
+ combinator: combinator,
+ tag: "*"
+ };
+ }
+ var currentParsed = parsed.expressions[separatorIndex][combinatorIndex];
+ if (tagName) {
+ currentParsed.tag = tagName.replace(reUnescape, "");
+ } else if (id) {
+ currentParsed.id = id.replace(reUnescape, "");
+ } else if (className) {
+ className = className.replace(reUnescape, "");
+ if (!currentParsed.classList) currentParsed.classList = [];
+ if (!currentParsed.classes) currentParsed.classes = [];
+ currentParsed.classList.push(className);
+ currentParsed.classes.push({
+ value: className,
+ regexp: new RegExp("(^|\\s)" + escapeRegExp(className) + "(\\s|$)")
+ });
+ } else if (pseudoClass) {
+ pseudoClassValue = pseudoClassValue || pseudoClassQuotedValue;
+ pseudoClassValue = pseudoClassValue ? pseudoClassValue.replace(reUnescape, "") : null;
+ if (!currentParsed.pseudos) currentParsed.pseudos = [];
+ currentParsed.pseudos.push({
+ key: pseudoClass.replace(reUnescape, ""),
+ value: pseudoClassValue,
+ type: pseudoMarker.length == 1 ? "class" : "element"
+ });
+ } else if (attributeKey) {
+ attributeKey = attributeKey.replace(reUnescape, "");
+ attributeValue = (attributeValue || "").replace(reUnescape, "");
+ var test, regexp;
+ switch (attributeOperator) {
+ case "^=":
+ regexp = new RegExp("^" + escapeRegExp(attributeValue));
+ break;
+
+ case "$=":
+ regexp = new RegExp(escapeRegExp(attributeValue) + "$");
+ break;
+
+ case "~=":
+ regexp = new RegExp("(^|\\s)" + escapeRegExp(attributeValue) + "(\\s|$)");
+ break;
+
+ case "|=":
+ regexp = new RegExp("^" + escapeRegExp(attributeValue) + "(-|$)");
+ break;
+
+ case "=":
+ test = function(value) {
+ return attributeValue == value;
+ };
+ break;
+
+ case "*=":
+ test = function(value) {
+ return value && value.indexOf(attributeValue) > -1;
+ };
+ break;
+
+ case "!=":
+ test = function(value) {
+ return attributeValue != value;
+ };
+ break;
+
+ default:
+ test = function(value) {
+ return !!value;
+ };
+ }
+ if (attributeValue == "" && /^[*$^]=$/.test(attributeOperator)) test = function() {
+ return false;
+ };
+ if (!test) test = function(value) {
+ return value && regexp.test(value);
+ };
+ if (!currentParsed.attributes) currentParsed.attributes = [];
+ currentParsed.attributes.push({
+ key: attributeKey,
+ operator: attributeOperator,
+ value: attributeValue,
+ test: test
+ });
+ }
+ return "";
+ }
+ var Slick = this.Slick || {};
+ Slick.parse = function(expression) {
+ return parse(expression);
+ };
+ Slick.escapeRegExp = escapeRegExp;
+ if (!this.Slick) this.Slick = Slick;
+}).apply(typeof exports != "undefined" ? exports : this);
+
+(function() {
+ var local = {}, featuresCache = {}, toString = Object.prototype.toString;
+ local.isNativeCode = function(fn) {
+ return /\{\s*\[native code\]\s*\}/.test("" + fn);
+ };
+ local.isXML = function(document) {
+ return !!document.xmlVersion || !!document.xml || toString.call(document) == "[object XMLDocument]" || document.nodeType == 9 && document.documentElement.nodeName != "HTML";
+ };
+ local.setDocument = function(document) {
+ var nodeType = document.nodeType;
+ if (nodeType == 9) ; else if (nodeType) document = document.ownerDocument; else if (document.navigator) document = document.document; else return;
+ if (this.document === document) return;
+ this.document = document;
+ var root = document.documentElement, rootUid = this.getUIDXML(root), features = featuresCache[rootUid], feature;
+ if (features) {
+ for (feature in features) {
+ this[feature] = features[feature];
+ }
+ return;
+ }
+ features = featuresCache[rootUid] = {};
+ features.root = root;
+ features.isXMLDocument = this.isXML(document);
+ features.brokenStarGEBTN = features.starSelectsClosedQSA = features.idGetsName = features.brokenMixedCaseQSA = features.brokenGEBCN = features.brokenCheckedQSA = features.brokenEmptyAttributeQSA = features.isHTMLDocument = features.nativeMatchesSelector = false;
+ var starSelectsClosed, starSelectsComments, brokenSecondClassNameGEBCN, cachedGetElementsByClassName, brokenFormAttributeGetter;
+ var selected, id = "slick_uniqueid";
+ var testNode = document.createElement("div");
+ var testRoot = document.body || document.getElementsByTagName("body")[0] || root;
+ testRoot.appendChild(testNode);
+ try {
+ testNode.innerHTML = '<a id="' + id + '"></a>';
+ features.isHTMLDocument = !!document.getElementById(id);
+ } catch (e) {}
+ if (features.isHTMLDocument) {
+ testNode.style.display = "none";
+ testNode.appendChild(document.createComment(""));
+ starSelectsComments = testNode.getElementsByTagName("*").length > 1;
+ try {
+ testNode.innerHTML = "foo</foo>";
+ selected = testNode.getElementsByTagName("*");
+ starSelectsClosed = selected && !!selected.length && selected[0].nodeName.charAt(0) == "/";
+ } catch (e) {}
+ features.brokenStarGEBTN = starSelectsComments || starSelectsClosed;
+ try {
+ testNode.innerHTML = '<a name="' + id + '"></a><b id="' + id + '"></b>';
+ features.idGetsName = document.getElementById(id) === testNode.firstChild;
+ } catch (e) {}
+ if (testNode.getElementsByClassName) {
+ try {
+ testNode.innerHTML = '<a class="f"></a><a class="b"></a>';
+ testNode.getElementsByClassName("b").length;
+ testNode.firstChild.className = "b";
+ cachedGetElementsByClassName = testNode.getElementsByClassName("b").length != 2;
+ } catch (e) {}
+ try {
+ testNode.innerHTML = '<a class="a"></a><a class="f b a"></a>';
+ brokenSecondClassNameGEBCN = testNode.getElementsByClassName("a").length != 2;
+ } catch (e) {}
+ features.brokenGEBCN = cachedGetElementsByClassName || brokenSecondClassNameGEBCN;
+ }
+ if (testNode.querySelectorAll) {
+ try {
+ testNode.innerHTML = "foo</foo>";
+ selected = testNode.querySelectorAll("*");
+ features.starSelectsClosedQSA = selected && !!selected.length && selected[0].nodeName.charAt(0) == "/";
+ } catch (e) {}
+ try {
+ testNode.innerHTML = '<a class="MiX"></a>';
+ features.brokenMixedCaseQSA = !testNode.querySelectorAll(".MiX").length;
+ } catch (e) {}
+ try {
+ testNode.innerHTML = '<select><option selected="selected">a</option></select>';
+ features.brokenCheckedQSA = testNode.querySelectorAll(":checked").length == 0;
+ } catch (e) {}
+ try {
+ testNode.innerHTML = '<a class=""></a>';
+ features.brokenEmptyAttributeQSA = testNode.querySelectorAll('[class*=""]').length != 0;
+ } catch (e) {}
+ }
+ try {
+ testNode.innerHTML = '<form action="s"><input id="action"/></form>';
+ brokenFormAttributeGetter = testNode.firstChild.getAttribute("action") != "s";
+ } catch (e) {}
+ features.nativeMatchesSelector = root.matches || root.mozMatchesSelector || root.webkitMatchesSelector;
+ if (features.nativeMatchesSelector) try {
+ features.nativeMatchesSelector.call(root, ":slick");
+ features.nativeMatchesSelector = null;
+ } catch (e) {}
+ }
+ try {
+ root.slick_expando = 1;
+ delete root.slick_expando;
+ features.getUID = this.getUIDHTML;
+ } catch (e) {
+ features.getUID = this.getUIDXML;
+ }
+ testRoot.removeChild(testNode);
+ testNode = selected = testRoot = null;
+ features.getAttribute = features.isHTMLDocument && brokenFormAttributeGetter ? function(node, name) {
+ var method = this.attributeGetters[name];
+ if (method) return method.call(node);
+ var attributeNode = node.getAttributeNode(name);
+ return attributeNode ? attributeNode.nodeValue : null;
+ } : function(node, name) {
+ var method = this.attributeGetters[name];
+ return method ? method.call(node) : node.getAttribute(name);
+ };
+ features.hasAttribute = root && this.isNativeCode(root.hasAttribute) ? function(node, attribute) {
+ return node.hasAttribute(attribute);
+ } : function(node, attribute) {
+ node = node.getAttributeNode(attribute);
+ return !!(node && (node.specified || node.nodeValue));
+ };
+ var nativeRootContains = root && this.isNativeCode(root.contains), nativeDocumentContains = document && this.isNativeCode(document.contains);
+ features.contains = nativeRootContains && nativeDocumentContains ? function(context, node) {
+ return context.contains(node);
+ } : nativeRootContains && !nativeDocumentContains ? function(context, node) {
+ return context === node || (context === document ? document.documentElement : context).contains(node);
+ } : root && root.compareDocumentPosition ? function(context, node) {
+ return context === node || !!(context.compareDocumentPosition(node) & 16);
+ } : function(context, node) {
+ if (node) do {
+ if (node === context) return true;
+ } while (node = node.parentNode);
+ return false;
+ };
+ features.documentSorter = root.compareDocumentPosition ? function(a, b) {
+ if (!a.compareDocumentPosition || !b.compareDocumentPosition) return 0;
+ return a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;
+ } : "sourceIndex" in root ? function(a, b) {
+ if (!a.sourceIndex || !b.sourceIndex) return 0;
+ return a.sourceIndex - b.sourceIndex;
+ } : document.createRange ? function(a, b) {
+ if (!a.ownerDocument || !b.ownerDocument) return 0;
+ var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
+ aRange.setStart(a, 0);
+ aRange.setEnd(a, 0);
+ bRange.setStart(b, 0);
+ bRange.setEnd(b, 0);
+ return aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
+ } : null;
+ root = null;
+ for (feature in features) {
+ this[feature] = features[feature];
+ }
+ };
+ var reSimpleSelector = /^([#.]?)((?:[\w-]+|\*))$/, reEmptyAttribute = /\[.+[*$^]=(?:""|'')?\]/, qsaFailExpCache = {};
+ local.search = function(context, expression, append, first) {
+ var found = this.found = first ? null : append || [];
+ if (!context) return found; else if (context.navigator) context = context.document; else if (!context.nodeType) return found;
+ var parsed, i, uniques = this.uniques = {}, hasOthers = !!(append && append.length), contextIsDocument = context.nodeType == 9;
+ if (this.document !== (contextIsDocument ? context : context.ownerDocument)) this.setDocument(context);
+ if (hasOthers) for (i = found.length; i--; ) uniques[this.getUID(found[i])] = true;
+ if (typeof expression == "string") {
+ var simpleSelector = expression.match(reSimpleSelector);
+ simpleSelectors: if (simpleSelector) {
+ var symbol = simpleSelector[1], name = simpleSelector[2], node, nodes;
+ if (!symbol) {
+ if (name == "*" && this.brokenStarGEBTN) break simpleSelectors;
+ nodes = context.getElementsByTagName(name);
+ if (first) return nodes[0] || null;
+ for (i = 0; node = nodes[i++]; ) {
+ if (!(hasOthers && uniques[this.getUID(node)])) found.push(node);
+ }
+ } else if (symbol == "#") {
+ if (!this.isHTMLDocument || !contextIsDocument) break simpleSelectors;
+ node = context.getElementById(name);
+ if (!node) return found;
+ if (this.idGetsName && node.getAttributeNode("id").nodeValue != name) break simpleSelectors;
+ if (first) return node || null;
+ if (!(hasOthers && uniques[this.getUID(node)])) found.push(node);
+ } else if (symbol == ".") {
+ if (!this.isHTMLDocument || (!context.getElementsByClassName || this.brokenGEBCN) && context.querySelectorAll) break simpleSelectors;
+ if (context.getElementsByClassName && !this.brokenGEBCN) {
+ nodes = context.getElementsByClassName(name);
+ if (first) return nodes[0] || null;
+ for (i = 0; node = nodes[i++]; ) {
+ if (!(hasOthers && uniques[this.getUID(node)])) found.push(node);
+ }
+ } else {
+ var matchClass = new RegExp("(^|\\s)" + Slick.escapeRegExp(name) + "(\\s|$)");
+ nodes = context.getElementsByTagName("*");
+ for (i = 0; node = nodes[i++]; ) {
+ className = node.className;
+ if (!(className && matchClass.test(className))) continue;
+ if (first) return node;
+ if (!(hasOthers && uniques[this.getUID(node)])) found.push(node);
+ }
+ }
+ }
+ if (hasOthers) this.sort(found);
+ return first ? null : found;
+ }
+ querySelector: if (context.querySelectorAll) {
+ if (!this.isHTMLDocument || qsaFailExpCache[expression] || this.brokenMixedCaseQSA || this.brokenCheckedQSA && expression.indexOf(":checked") > -1 || this.brokenEmptyAttributeQSA && reEmptyAttribute.test(expression) || !contextIsDocument && expression.indexOf(",") > -1 || Slick.disableQSA) break querySelector;
+ var _expression = expression, _context = context;
+ if (!contextIsDocument) {
+ var currentId = _context.getAttribute("id"), slickid = "slickid__";
+ _context.setAttribute("id", slickid);
+ _expression = "#" + slickid + " " + _expression;
+ context = _context.parentNode;
+ }
+ try {
+ if (first) return context.querySelector(_expression) || null; else nodes = context.querySelectorAll(_expression);
+ } catch (e) {
+ qsaFailExpCache[expression] = 1;
+ break querySelector;
+ } finally {
+ if (!contextIsDocument) {
+ if (currentId) _context.setAttribute("id", currentId); else _context.removeAttribute("id");
+ context = _context;
+ }
+ }
+ if (this.starSelectsClosedQSA) for (i = 0; node = nodes[i++]; ) {
+ if (node.nodeName > "@" && !(hasOthers && uniques[this.getUID(node)])) found.push(node);
+ } else for (i = 0; node = nodes[i++]; ) {
+ if (!(hasOthers && uniques[this.getUID(node)])) found.push(node);
+ }
+ if (hasOthers) this.sort(found);
+ return found;
+ }
+ parsed = this.Slick.parse(expression);
+ if (!parsed.length) return found;
+ } else if (expression == null) {
+ return found;
+ } else if (expression.Slick) {
+ parsed = expression;
+ } else if (this.contains(context.documentElement || context, expression)) {
+ found ? found.push(expression) : found = expression;
+ return found;
+ } else {
+ return found;
+ }
+ this.posNTH = {};
+ this.posNTHLast = {};
+ this.posNTHType = {};
+ this.posNTHTypeLast = {};
+ this.push = !hasOthers && (first || parsed.length == 1 && parsed.expressions[0].length == 1) ? this.pushArray : this.pushUID;
+ if (found == null) found = [];
+ var j, m, n;
+ var combinator, tag, id, classList, classes, attributes, pseudos;
+ var currentItems, currentExpression, currentBit, lastBit, expressions = parsed.expressions;
+ search: for (i = 0; currentExpression = expressions[i]; i++) for (j = 0; currentBit = currentExpression[j]; j++) {
+ combinator = "combinator:" + currentBit.combinator;
+ if (!this[combinator]) continue search;
+ tag = this.isXMLDocument ? currentBit.tag : currentBit.tag.toUpperCase();
+ id = currentBit.id;
+ classList = currentBit.classList;
+ classes = currentBit.classes;
+ attributes = currentBit.attributes;
+ pseudos = currentBit.pseudos;
+ lastBit = j === currentExpression.length - 1;
+ this.bitUniques = {};
+ if (lastBit) {
+ this.uniques = uniques;
+ this.found = found;
+ } else {
+ this.uniques = {};
+ this.found = [];
+ }
+ if (j === 0) {
+ this[combinator](context, tag, id, classes, attributes, pseudos, classList);
+ if (first && lastBit && found.length) break search;
+ } else {
+ if (first && lastBit) for (m = 0, n = currentItems.length; m < n; m++) {
+ this[combinator](currentItems[m], tag, id, classes, attributes, pseudos, classList);
+ if (found.length) break search;
+ } else for (m = 0, n = currentItems.length; m < n; m++) this[combinator](currentItems[m], tag, id, classes, attributes, pseudos, classList);
+ }
+ currentItems = this.found;
+ }
+ if (hasOthers || parsed.expressions.length > 1) this.sort(found);
+ return first ? found[0] || null : found;
+ };
+ local.uidx = 1;
+ local.uidk = "slick-uniqueid";
+ local.getUIDXML = function(node) {
+ var uid = node.getAttribute(this.uidk);
+ if (!uid) {
+ uid = this.uidx++;
+ node.setAttribute(this.uidk, uid);
+ }
+ return uid;
+ };
+ local.getUIDHTML = function(node) {
+ return node.uniqueNumber || (node.uniqueNumber = this.uidx++);
+ };
+ local.sort = function(results) {
+ if (!this.documentSorter) return results;
+ results.sort(this.documentSorter);
+ return results;
+ };
+ local.cacheNTH = {};
+ local.matchNTH = /^([+-]?\d*)?([a-z]+)?([+-]\d+)?$/;
+ local.parseNTHArgument = function(argument) {
+ var parsed = argument.match(this.matchNTH);
+ if (!parsed) return false;
+ var special = parsed[2] || false;
+ var a = parsed[1] || 1;
+ if (a == "-") a = -1;
+ var b = +parsed[3] || 0;
+ parsed = special == "n" ? {
+ a: a,
+ b: b
+ } : special == "odd" ? {
+ a: 2,
+ b: 1
+ } : special == "even" ? {
+ a: 2,
+ b: 0
+ } : {
+ a: 0,
+ b: a
+ };
+ return this.cacheNTH[argument] = parsed;
+ };
+ local.createNTHPseudo = function(child, sibling, positions, ofType) {
+ return function(node, argument) {
+ var uid = this.getUID(node);
+ if (!this[positions][uid]) {
+ var parent = node.parentNode;
+ if (!parent) return false;
+ var el = parent[child], count = 1;
+ if (ofType) {
+ var nodeName = node.nodeName;
+ do {
+ if (el.nodeName != nodeName) continue;
+ this[positions][this.getUID(el)] = count++;
+ } while (el = el[sibling]);
+ } else {
+ do {
+ if (el.nodeType != 1) continue;
+ this[positions][this.getUID(el)] = count++;
+ } while (el = el[sibling]);
+ }
+ }
+ argument = argument || "n";
+ var parsed = this.cacheNTH[argument] || this.parseNTHArgument(argument);
+ if (!parsed) return false;
+ var a = parsed.a, b = parsed.b, pos = this[positions][uid];
+ if (a == 0) return b == pos;
+ if (a > 0) {
+ if (pos < b) return false;
+ } else {
+ if (b < pos) return false;
+ }
+ return (pos - b) % a == 0;
+ };
+ };
+ local.pushArray = function(node, tag, id, classes, attributes, pseudos) {
+ if (this.matchSelector(node, tag, id, classes, attributes, pseudos)) this.found.push(node);
+ };
+ local.pushUID = function(node, tag, id, classes, attributes, pseudos) {
+ var uid = this.getUID(node);
+ if (!this.uniques[uid] && this.matchSelector(node, tag, id, classes, attributes, pseudos)) {
+ this.uniques[uid] = true;
+ this.found.push(node);
+ }
+ };
+ local.matchNode = function(node, selector) {
+ if (this.isHTMLDocument && this.nativeMatchesSelector) {
+ try {
+ return this.nativeMatchesSelector.call(node, selector.replace(/\[([^=]+)=\s*([^'"\]]+?)\s*\]/g, '[$1="$2"]'));
+ } catch (matchError) {}
+ }
+ var parsed = this.Slick.parse(selector);
+ if (!parsed) return true;
+ var expressions = parsed.expressions, simpleExpCounter = 0, i, currentExpression;
+ for (i = 0; currentExpression = expressions[i]; i++) {
+ if (currentExpression.length == 1) {
+ var exp = currentExpression[0];
+ if (this.matchSelector(node, this.isXMLDocument ? exp.tag : exp.tag.toUpperCase(), exp.id, exp.classes, exp.attributes, exp.pseudos)) return true;
+ simpleExpCounter++;
+ }
+ }
+ if (simpleExpCounter == parsed.length) return false;
+ var nodes = this.search(this.document, parsed), item;
+ for (i = 0; item = nodes[i++]; ) {
+ if (item === node) return true;
+ }
+ return false;
+ };
+ local.matchPseudo = function(node, name, argument) {
+ var pseudoName = "pseudo:" + name;
+ if (this[pseudoName]) return this[pseudoName](node, argument);
+ var attribute = this.getAttribute(node, name);
+ return argument ? argument == attribute : !!attribute;
+ };
+ local.matchSelector = function(node, tag, id, classes, attributes, pseudos) {
+ if (tag) {
+ var nodeName = this.isXMLDocument ? node.nodeName : node.nodeName.toUpperCase();
+ if (tag == "*") {
+ if (nodeName < "@") return false;
+ } else {
+ if (nodeName != tag) return false;
+ }
+ }
+ if (id && node.getAttribute("id") != id) return false;
+ var i, part, cls;
+ if (classes) for (i = classes.length; i--; ) {
+ cls = this.getAttribute(node, "class");
+ if (!(cls && classes[i].regexp.test(cls))) return false;
+ }
+ if (attributes) for (i = attributes.length; i--; ) {
+ part = attributes[i];
+ if (part.operator ? !part.test(this.getAttribute(node, part.key)) : !this.hasAttribute(node, part.key)) return false;
+ }
+ if (pseudos) for (i = pseudos.length; i--; ) {
+ part = pseudos[i];
+ if (!this.matchPseudo(node, part.key, part.value)) return false;
+ }
+ return true;
+ };
+ var combinators = {
+ " ": function(node, tag, id, classes, attributes, pseudos, classList) {
+ var i, item, children;
+ if (this.isHTMLDocument) {
+ getById: if (id) {
+ item = this.document.getElementById(id);
+ if (!item && node.all || this.idGetsName && item && item.getAttributeNode("id").nodeValue != id) {
+ children = node.all[id];
+ if (!children) return;
+ if (!children[0]) children = [ children ];
+ for (i = 0; item = children[i++]; ) {
+ var idNode = item.getAttributeNode("id");
+ if (idNode && idNode.nodeValue == id) {
+ this.push(item, tag, null, classes, attributes, pseudos);
+ break;
+ }
+ }
+ return;
+ }
+ if (!item) {
+ if (this.contains(this.root, node)) return; else break getById;
+ } else if (this.document !== node && !this.contains(node, item)) return;
+ this.push(item, tag, null, classes, attributes, pseudos);
+ return;
+ }
+ getByClass: if (classes && node.getElementsByClassName && !this.brokenGEBCN) {
+ children = node.getElementsByClassName(classList.join(" "));
+ if (!(children && children.length)) break getByClass;
+ for (i = 0; item = children[i++]; ) this.push(item, tag, id, null, attributes, pseudos);
+ return;
+ }
+ }
+ getByTag: {
+ children = node.getElementsByTagName(tag);
+ if (!(children && children.length)) break getByTag;
+ if (!this.brokenStarGEBTN) tag = null;
+ for (i = 0; item = children[i++]; ) this.push(item, tag, id, classes, attributes, pseudos);
+ }
+ },
+ ">": function(node, tag, id, classes, attributes, pseudos) {
+ if (node = node.firstChild) do {
+ if (node.nodeType == 1) this.push(node, tag, id, classes, attributes, pseudos);
+ } while (node = node.nextSibling);
+ },
+ "+": function(node, tag, id, classes, attributes, pseudos) {
+ while (node = node.nextSibling) if (node.nodeType == 1) {
+ this.push(node, tag, id, classes, attributes, pseudos);
+ break;
+ }
+ },
+ "^": function(node, tag, id, classes, attributes, pseudos) {
+ node = node.firstChild;
+ if (node) {
+ if (node.nodeType == 1) this.push(node, tag, id, classes, attributes, pseudos); else this["combinator:+"](node, tag, id, classes, attributes, pseudos);
+ }
+ },
+ "~": function(node, tag, id, classes, attributes, pseudos) {
+ while (node = node.nextSibling) {
+ if (node.nodeType != 1) continue;
+ var uid = this.getUID(node);
+ if (this.bitUniques[uid]) break;
+ this.bitUniques[uid] = true;
+ this.push(node, tag, id, classes, attributes, pseudos);
+ }
+ },
+ "++": function(node, tag, id, classes, attributes, pseudos) {
+ this["combinator:+"](node, tag, id, classes, attributes, pseudos);
+ this["combinator:!+"](node, tag, id, classes, attributes, pseudos);
+ },
+ "~~": function(node, tag, id, classes, attributes, pseudos) {
+ this["combinator:~"](node, tag, id, classes, attributes, pseudos);
+ this["combinator:!~"](node, tag, id, classes, attributes, pseudos);
+ },
+ "!": function(node, tag, id, classes, attributes, pseudos) {
+ while (node = node.parentNode) if (node !== this.document) this.push(node, tag, id, classes, attributes, pseudos);
+ },
+ "!>": function(node, tag, id, classes, attributes, pseudos) {
+ node = node.parentNode;
+ if (node !== this.document) this.push(node, tag, id, classes, attributes, pseudos);
+ },
+ "!+": function(node, tag, id, classes, attributes, pseudos) {
+ while (node = node.previousSibling) if (node.nodeType == 1) {
+ this.push(node, tag, id, classes, attributes, pseudos);
+ break;
+ }
+ },
+ "!^": function(node, tag, id, classes, attributes, pseudos) {
+ node = node.lastChild;
+ if (node) {
+ if (node.nodeType == 1) this.push(node, tag, id, classes, attributes, pseudos); else this["combinator:!+"](node, tag, id, classes, attributes, pseudos);
+ }
+ },
+ "!~": function(node, tag, id, classes, attributes, pseudos) {
+ while (node = node.previousSibling) {
+ if (node.nodeType != 1) continue;
+ var uid = this.getUID(node);
+ if (this.bitUniques[uid]) break;
+ this.bitUniques[uid] = true;
+ this.push(node, tag, id, classes, attributes, pseudos);
+ }
+ }
+ };
+ for (var c in combinators) local["combinator:" + c] = combinators[c];
+ var pseudos = {
+ empty: function(node) {
+ var child = node.firstChild;
+ return !(child && child.nodeType == 1) && !(node.innerText || node.textContent || "").length;
+ },
+ not: function(node, expression) {
+ return !this.matchNode(node, expression);
+ },
+ contains: function(node, text) {
+ return (node.innerText || node.textContent || "").indexOf(text) > -1;
+ },
+ "first-child": function(node) {
+ while (node = node.previousSibling) if (node.nodeType == 1) return false;
+ return true;
+ },
+ "last-child": function(node) {
+ while (node = node.nextSibling) if (node.nodeType == 1) return false;
+ return true;
+ },
+ "only-child": function(node) {
+ var prev = node;
+ while (prev = prev.previousSibling) if (prev.nodeType == 1) return false;
+ var next = node;
+ while (next = next.nextSibling) if (next.nodeType == 1) return false;
+ return true;
+ },
+ "nth-child": local.createNTHPseudo("firstChild", "nextSibling", "posNTH"),
+ "nth-last-child": local.createNTHPseudo("lastChild", "previousSibling", "posNTHLast"),
+ "nth-of-type": local.createNTHPseudo("firstChild", "nextSibling", "posNTHType", true),
+ "nth-last-of-type": local.createNTHPseudo("lastChild", "previousSibling", "posNTHTypeLast", true),
+ index: function(node, index) {
+ return this["pseudo:nth-child"](node, "" + (index + 1));
+ },
+ even: function(node) {
+ return this["pseudo:nth-child"](node, "2n");
+ },
+ odd: function(node) {
+ return this["pseudo:nth-child"](node, "2n+1");
+ },
+ "first-of-type": function(node) {
+ var nodeName = node.nodeName;
+ while (node = node.previousSibling) if (node.nodeName == nodeName) return false;
+ return true;
+ },
+ "last-of-type": function(node) {
+ var nodeName = node.nodeName;
+ while (node = node.nextSibling) if (node.nodeName == nodeName) return false;
+ return true;
+ },
+ "only-of-type": function(node) {
+ var prev = node, nodeName = node.nodeName;
+ while (prev = prev.previousSibling) if (prev.nodeName == nodeName) return false;
+ var next = node;
+ while (next = next.nextSibling) if (next.nodeName == nodeName) return false;
+ return true;
+ },
+ enabled: function(node) {
+ return !node.disabled;
+ },
+ disabled: function(node) {
+ return node.disabled;
+ },
+ checked: function(node) {
+ return node.checked || node.selected;
+ },
+ focus: function(node) {
+ return this.isHTMLDocument && this.document.activeElement === node && (node.href || node.type || this.hasAttribute(node, "tabindex"));
+ },
+ root: function(node) {
+ return node === this.root;
+ },
+ selected: function(node) {
+ return node.selected;
+ }
+ };
+ for (var p in pseudos) local["pseudo:" + p] = pseudos[p];
+ var attributeGetters = local.attributeGetters = {
+ for: function() {
+ return "htmlFor" in this ? this.htmlFor : this.getAttribute("for");
+ },
+ href: function() {
+ return "href" in this ? this.getAttribute("href", 2) : this.getAttribute("href");
+ },
+ style: function() {
+ return this.style ? this.style.cssText : this.getAttribute("style");
+ },
+ tabindex: function() {
+ var attributeNode = this.getAttributeNode("tabindex");
+ return attributeNode && attributeNode.specified ? attributeNode.nodeValue : null;
+ },
+ type: function() {
+ return this.getAttribute("type");
+ },
+ maxlength: function() {
+ var attributeNode = this.getAttributeNode("maxLength");
+ return attributeNode && attributeNode.specified ? attributeNode.nodeValue : null;
+ }
+ };
+ attributeGetters.MAXLENGTH = attributeGetters.maxLength = attributeGetters.maxlength;
+ var Slick = local.Slick = this.Slick || {};
+ Slick.version = "1.1.7";
+ Slick.search = function(context, expression, append) {
+ return local.search(context, expression, append);
+ };
+ Slick.find = function(context, expression) {
+ return local.search(context, expression, null, true);
+ };
+ Slick.contains = function(container, node) {
+ local.setDocument(container);
+ return local.contains(container, node);
+ };
+ Slick.getAttribute = function(node, name) {
+ local.setDocument(node);
+ return local.getAttribute(node, name);
+ };
+ Slick.hasAttribute = function(node, name) {
+ local.setDocument(node);
+ return local.hasAttribute(node, name);
+ };
+ Slick.match = function(node, selector) {
+ if (!(node && selector)) return false;
+ if (!selector || selector === node) return true;
+ local.setDocument(node);
+ return local.matchNode(node, selector);
+ };
+ Slick.defineAttributeGetter = function(name, fn) {
+ local.attributeGetters[name] = fn;
+ return this;
+ };
+ Slick.lookupAttributeGetter = function(name) {
+ return local.attributeGetters[name];
+ };
+ Slick.definePseudo = function(name, fn) {
+ local["pseudo:" + name] = function(node, argument) {
+ return fn.call(node, argument);
+ };
+ return this;
+ };
+ Slick.lookupPseudo = function(name) {
+ var pseudo = local["pseudo:" + name];
+ if (pseudo) return function(argument) {
+ return pseudo.call(this, argument);
+ };
+ return null;
+ };
+ Slick.override = function(regexp, fn) {
+ local.override(regexp, fn);
+ return this;
+ };
+ Slick.isXML = local.isXML;
+ Slick.uidOf = function(node) {
+ return local.getUIDHTML(node);
+ };
+ if (!this.Slick) this.Slick = Slick;
+}).apply(typeof exports != "undefined" ? exports : this);
+
+var Element = this.Element = function(tag, props) {
+ var konstructor = Element.Constructors[tag];
+ if (konstructor) return konstructor(props);
+ if (typeof tag != "string") return document.id(tag).set(props);
+ if (!props) props = {};
+ if (!/^[\w-]+$/.test(tag)) {
+ var parsed = Slick.parse(tag).expressions[0][0];
+ tag = parsed.tag == "*" ? "div" : parsed.tag;
+ if (parsed.id && props.id == null) props.id = parsed.id;
+ var attributes = parsed.attributes;
+ if (attributes) for (var attr, i = 0, l = attributes.length; i < l; i++) {
+ attr = attributes[i];
+ if (props[attr.key] != null) continue;
+ if (attr.value != null && attr.operator == "=") props[attr.key] = attr.value; else if (!attr.value && !attr.operator) props[attr.key] = true;
+ }
+ if (parsed.classList && props["class"] == null) props["class"] = parsed.classList.join(" ");
+ }
+ return document.newElement(tag, props);
+};
+
+if (Browser.Element) {
+ Element.prototype = Browser.Element.prototype;
+ Element.prototype._fireEvent = function(fireEvent) {
+ return function(type, event) {
+ return fireEvent.call(this, type, event);
+ };
+ }(Element.prototype.fireEvent);
+}
+
+new Type("Element", Element).mirror(function(name) {
+ if (Array.prototype[name]) return;
+ var obj = {};
+ obj[name] = function() {
+ var results = [], args = arguments, elements = true;
+ for (var i = 0, l = this.length; i < l; i++) {
+ var element = this[i], result = results[i] = element[name].apply(element, args);
+ elements = elements && typeOf(result) == "element";
+ }
+ return elements ? new Elements(results) : results;
+ };
+ Elements.implement(obj);
+});
+
+if (!Browser.Element) {
+ Element.parent = Object;
+ Element.Prototype = {
+ $constructor: Element,
+ $family: Function.from("element").hide()
+ };
+ Element.mirror(function(name, method) {
+ Element.Prototype[name] = method;
+ });
+}
+
+Element.Constructors = {};
+
+var IFrame = new Type("IFrame", function() {
+ var params = Array.link(arguments, {
+ properties: Type.isObject,
+ iframe: function(obj) {
+ return obj != null;
+ }
+ });
+ var props = params.properties || {}, iframe;
+ if (params.iframe) iframe = document.id(params.iframe);
+ var onload = props.onload || function() {};
+ delete props.onload;
+ props.id = props.name = [ props.id, props.name, iframe ? iframe.id || iframe.name : "IFrame_" + String.uniqueID() ].pick();
+ iframe = new Element(iframe || "iframe", props);
+ var onLoad = function() {
+ onload.call(iframe.contentWindow);
+ };
+ if (window.frames[props.id]) onLoad(); else iframe.addListener("load", onLoad);
+ return iframe;
+});
+
+var Elements = this.Elements = function(nodes) {
+ if (nodes && nodes.length) {
+ var uniques = {}, node;
+ for (var i = 0; node = nodes[i++]; ) {
+ var uid = Slick.uidOf(node);
+ if (!uniques[uid]) {
+ uniques[uid] = true;
+ this.push(node);
+ }
+ }
+ }
+};
+
+Elements.prototype = {
+ length: 0
+};
+
+Elements.parent = Array;
+
+new Type("Elements", Elements).implement({
+ filter: function(filter, bind) {
+ if (!filter) return this;
+ return new Elements(Array.filter(this, typeOf(filter) == "string" ? function(item) {
+ return item.match(filter);
+ } : filter, bind));
+ }.protect(),
+ push: function() {
+ var length = this.length;
+ for (var i = 0, l = arguments.length; i < l; i++) {
+ var item = document.id(arguments[i]);
+ if (item) this[length++] = item;
+ }
+ return this.length = length;
+ }.protect(),
+ unshift: function() {
+ var items = [];
+ for (var i = 0, l = arguments.length; i < l; i++) {
+ var item = document.id(arguments[i]);
+ if (item) items.push(item);
+ }
+ return Array.prototype.unshift.apply(this, items);
+ }.protect(),
+ concat: function() {
+ var newElements = new Elements(this);
+ for (var i = 0, l = arguments.length; i < l; i++) {
+ var item = arguments[i];
+ if (Type.isEnumerable(item)) newElements.append(item); else newElements.push(item);
+ }
+ return newElements;
+ }.protect(),
+ append: function(collection) {
+ for (var i = 0, l = collection.length; i < l; i++) this.push(collection[i]);
+ return this;
+ }.protect(),
+ empty: function() {
+ while (this.length) delete this[--this.length];
+ return this;
+ }.protect()
+});
+
+(function() {
+ var splice = Array.prototype.splice, object = {
+ "0": 0,
+ "1": 1,
+ length: 2
+ };
+ splice.call(object, 1, 1);
+ if (object[1] == 1) Elements.implement("splice", function() {
+ var length = this.length;
+ var result = splice.apply(this, arguments);
+ while (length >= this.length) delete this[length--];
+ return result;
+ }.protect());
+ Array.forEachMethod(function(method, name) {
+ Elements.implement(name, method);
+ });
+ Array.mirror(Elements);
+ var createElementAcceptsHTML;
+ try {
+ createElementAcceptsHTML = document.createElement("<input name=x>").name == "x";
+ } catch (e) {}
+ var escapeQuotes = function(html) {
+ return ("" + html).replace(/&/g, "&").replace(/"/g, """);
+ };
+ var canChangeStyleHTML = function() {
+ var div = document.createElement("style"), flag = false;
+ try {
+ div.innerHTML = "#justTesing{margin: 0px;}";
+ flag = !!div.innerHTML;
+ } catch (e) {}
+ return flag;
+ }();
+ Document.implement({
+ newElement: function(tag, props) {
+ if (props) {
+ if (props.checked != null) props.defaultChecked = props.checked;
+ if ((props.type == "checkbox" || props.type == "radio") && props.value == null) props.value = "on";
+ if (!canChangeStyleHTML && tag == "style") {
+ var styleElement = document.createElement("style");
+ styleElement.setAttribute("type", "text/css");
+ if (props.type) delete props.type;
+ return this.id(styleElement).set(props);
+ }
+ if (createElementAcceptsHTML) {
+ tag = "<" + tag;
+ if (props.name) tag += ' name="' + escapeQuotes(props.name) + '"';
+ if (props.type) tag += ' type="' + escapeQuotes(props.type) + '"';
+ tag += ">";
+ delete props.name;
+ delete props.type;
+ }
+ }
+ return this.id(this.createElement(tag)).set(props);
+ }
+ });
+})();
+
+(function() {
+ Slick.uidOf(window);
+ Slick.uidOf(document);
+ Document.implement({
+ newTextNode: function(text) {
+ return this.createTextNode(text);
+ },
+ getDocument: function() {
+ return this;
+ },
+ getWindow: function() {
+ return this.window;
+ },
+ id: function() {
+ var types = {
+ string: function(id, nocash, doc) {
+ id = Slick.find(doc, "#" + id.replace(/(\W)/g, "\\$1"));
+ return id ? types.element(id, nocash) : null;
+ },
+ element: function(el, nocash) {
+ Slick.uidOf(el);
+ if (!nocash && !el.$family && !/^(?:object|embed)$/i.test(el.tagName)) {
+ var fireEvent = el.fireEvent;
+ el._fireEvent = function(type, event) {
+ return fireEvent(type, event);
+ };
+ Object.append(el, Element.Prototype);
+ }
+ return el;
+ },
+ object: function(obj, nocash, doc) {
+ if (obj.toElement) return types.element(obj.toElement(doc), nocash);
+ return null;
+ }
+ };
+ types.textnode = types.whitespace = types.window = types.document = function(zero) {
+ return zero;
+ };
+ return function(el, nocash, doc) {
+ if (el && el.$family && el.uniqueNumber) return el;
+ var type = typeOf(el);
+ return types[type] ? types[type](el, nocash, doc || document) : null;
+ };
+ }()
+ });
+ if (window.$ == null) Window.implement("$", function(el, nc) {
+ return document.id(el, nc, this.document);
+ });
+ Window.implement({
+ getDocument: function() {
+ return this.document;
+ },
+ getWindow: function() {
+ return this;
+ }
+ });
+ [ Document, Element ].invoke("implement", {
+ getElements: function(expression) {
+ return Slick.search(this, expression, new Elements());
+ },
+ getElement: function(expression) {
+ return document.id(Slick.find(this, expression));
+ }
+ });
+ var contains = {
+ contains: function(element) {
+ return Slick.contains(this, element);
+ }
+ };
+ if (!document.contains) Document.implement(contains);
+ if (!document.createElement("div").contains) Element.implement(contains);
+ var injectCombinator = function(expression, combinator) {
+ if (!expression) return combinator;
+ expression = Object.clone(Slick.parse(expression));
+ var expressions = expression.expressions;
+ for (var i = expressions.length; i--; ) expressions[i][0].combinator = combinator;
+ return expression;
+ };
+ Object.forEach({
+ getNext: "~",
+ getPrevious: "!~",
+ getParent: "!"
+ }, function(combinator, method) {
+ Element.implement(method, function(expression) {
+ return this.getElement(injectCombinator(expression, combinator));
+ });
+ });
+ Object.forEach({
+ getAllNext: "~",
+ getAllPrevious: "!~",
+ getSiblings: "~~",
+ getChildren: ">",
+ getParents: "!"
+ }, function(combinator, method) {
+ Element.implement(method, function(expression) {
+ return this.getElements(injectCombinator(expression, combinator));
+ });
+ });
+ Element.implement({
+ getFirst: function(expression) {
+ return document.id(Slick.search(this, injectCombinator(expression, ">"))[0]);
+ },
+ getLast: function(expression) {
+ return document.id(Slick.search(this, injectCombinator(expression, ">")).getLast());
+ },
+ getWindow: function() {
+ return this.ownerDocument.window;
+ },
+ getDocument: function() {
+ return this.ownerDocument;
+ },
+ getElementById: function(id) {
+ return document.id(Slick.find(this, "#" + ("" + id).replace(/(\W)/g, "\\$1")));
+ },
+ match: function(expression) {
+ return !expression || Slick.match(this, expression);
+ }
+ });
+ if (window.$$ == null) Window.implement("$$", function(selector) {
+ if (arguments.length == 1) {
+ if (typeof selector == "string") return Slick.search(this.document, selector, new Elements()); else if (Type.isEnumerable(selector)) return new Elements(selector);
+ }
+ return new Elements(arguments);
+ });
+ var inserters = {
+ before: function(context, element) {
+ var parent = element.parentNode;
+ if (parent) parent.insertBefore(context, element);
+ },
+ after: function(context, element) {
+ var parent = element.parentNode;
+ if (parent) parent.insertBefore(context, element.nextSibling);
+ },
+ bottom: function(context, element) {
+ element.appendChild(context);
+ },
+ top: function(context, element) {
+ element.insertBefore(context, element.firstChild);
+ }
+ };
+ inserters.inside = inserters.bottom;
+ var propertyGetters = {}, propertySetters = {};
+ var properties = {};
+ Array.forEach([ "type", "value", "defaultValue", "accessKey", "cellPadding", "cellSpacing", "colSpan", "frameBorder", "rowSpan", "tabIndex", "useMap" ], function(property) {
+ properties[property.toLowerCase()] = property;
+ });
+ properties.html = "innerHTML";
+ properties.text = document.createElement("div").textContent == null ? "innerText" : "textContent";
+ Object.forEach(properties, function(real, key) {
+ propertySetters[key] = function(node, value) {
+ node[real] = value;
+ };
+ propertyGetters[key] = function(node) {
+ return node[real];
+ };
+ });
+ propertySetters.text = function(setter) {
+ return function(node, value) {
+ if (node.get("tag") == "style") node.set("html", value); else node[properties.text] = value;
+ };
+ }(propertySetters.text);
+ propertyGetters.text = function(getter) {
+ return function(node) {
+ return node.get("tag") == "style" ? node.innerHTML : getter(node);
+ };
+ }(propertyGetters.text);
+ var bools = [ "compact", "nowrap", "ismap", "declare", "noshade", "checked", "disabled", "readOnly", "multiple", "selected", "noresize", "defer", "defaultChecked", "autofocus", "controls", "autoplay", "loop" ];
+ var booleans = {};
+ Array.forEach(bools, function(bool) {
+ var lower = bool.toLowerCase();
+ booleans[lower] = bool;
+ propertySetters[lower] = function(node, value) {
+ node[bool] = !!value;
+ };
+ propertyGetters[lower] = function(node) {
+ return !!node[bool];
+ };
+ });
+ Object.append(propertySetters, {
+ class: function(node, value) {
+ "className" in node ? node.className = value || "" : node.setAttribute("class", value);
+ },
+ for: function(node, value) {
+ "htmlFor" in node ? node.htmlFor = value : node.setAttribute("for", value);
+ },
+ style: function(node, value) {
+ node.style ? node.style.cssText = value : node.setAttribute("style", value);
+ },
+ value: function(node, value) {
+ node.value = value != null ? value : "";
+ }
+ });
+ propertyGetters["class"] = function(node) {
+ return "className" in node ? node.className || null : node.getAttribute("class");
+ };
+ var el = document.createElement("button");
+ try {
+ el.type = "button";
+ } catch (e) {}
+ if (el.type != "button") propertySetters.type = function(node, value) {
+ node.setAttribute("type", value);
+ };
+ el = null;
+ var canChangeStyleHTML = function() {
+ var div = document.createElement("style"), flag = false;
+ try {
+ div.innerHTML = "#justTesing{margin: 0px;}";
+ flag = !!div.innerHTML;
+ } catch (e) {}
+ return flag;
+ }();
+ var input = document.createElement("input"), volatileInputValue, html5InputSupport;
+ input.value = "t";
+ input.type = "submit";
+ volatileInputValue = input.value != "t";
+ try {
+ input.type = "email";
+ html5InputSupport = input.type == "email";
+ } catch (e) {}
+ input = null;
+ if (volatileInputValue || !html5InputSupport) propertySetters.type = function(node, type) {
+ try {
+ var value = node.value;
+ node.type = type;
+ node.value = value;
+ } catch (e) {}
+ };
+ var pollutesGetAttribute = function(div) {
+ div.random = "attribute";
+ return div.getAttribute("random") == "attribute";
+ }(document.createElement("div"));
+ var hasCloneBug = function(test) {
+ test.innerHTML = '<object><param name="should_fix" value="the unknown" /></object>';
+ return test.cloneNode(true).firstChild.childNodes.length != 1;
+ }(document.createElement("div"));
+ var hasClassList = !!document.createElement("div").classList;
+ var classes = function(className) {
+ var classNames = (className || "").clean().split(" "), uniques = {};
+ return classNames.filter(function(className) {
+ if (className !== "" && !uniques[className]) return uniques[className] = className;
+ });
+ };
+ var addToClassList = function(name) {
+ this.classList.add(name);
+ };
+ var removeFromClassList = function(name) {
+ this.classList.remove(name);
+ };
+ Element.implement({
+ setProperty: function(name, value) {
+ var setter = propertySetters[name.toLowerCase()];
+ if (setter) {
+ setter(this, value);
+ } else {
+ var attributeWhiteList;
+ if (pollutesGetAttribute) attributeWhiteList = this.retrieve("$attributeWhiteList", {});
+ if (value == null) {
+ this.removeAttribute(name);
+ if (pollutesGetAttribute) delete attributeWhiteList[name];
+ } else {
+ this.setAttribute(name, "" + value);
+ if (pollutesGetAttribute) attributeWhiteList[name] = true;
+ }
+ }
+ return this;
+ },
+ setProperties: function(attributes) {
+ for (var attribute in attributes) this.setProperty(attribute, attributes[attribute]);
+ return this;
+ },
+ getProperty: function(name) {
+ var getter = propertyGetters[name.toLowerCase()];
+ if (getter) return getter(this);
+ if (pollutesGetAttribute) {
+ var attr = this.getAttributeNode(name), attributeWhiteList = this.retrieve("$attributeWhiteList", {});
+ if (!attr) return null;
+ if (attr.expando && !attributeWhiteList[name]) {
+ var outer = this.outerHTML;
+ if (outer.substr(0, outer.search(/\/?['"]?>(?![^<]*<['"])/)).indexOf(name) < 0) return null;
+ attributeWhiteList[name] = true;
+ }
+ }
+ var result = Slick.getAttribute(this, name);
+ return !result && !Slick.hasAttribute(this, name) ? null : result;
+ },
+ getProperties: function() {
+ var args = Array.from(arguments);
+ return args.map(this.getProperty, this).associate(args);
+ },
+ removeProperty: function(name) {
+ return this.setProperty(name, null);
+ },
+ removeProperties: function() {
+ Array.each(arguments, this.removeProperty, this);
+ return this;
+ },
+ set: function(prop, value) {
+ var property = Element.Properties[prop];
+ property && property.set ? property.set.call(this, value) : this.setProperty(prop, value);
+ }.overloadSetter(),
+ get: function(prop) {
+ var property = Element.Properties[prop];
+ return property && property.get ? property.get.apply(this) : this.getProperty(prop);
+ }.overloadGetter(),
+ erase: function(prop) {
+ var property = Element.Properties[prop];
+ property && property.erase ? property.erase.apply(this) : this.removeProperty(prop);
+ return this;
+ },
+ hasClass: hasClassList ? function(className) {
+ return this.classList.contains(className);
+ } : function(className) {
+ return classes(this.className).contains(className);
+ },
+ addClass: hasClassList ? function(className) {
+ classes(className).forEach(addToClassList, this);
+ return this;
+ } : function(className) {
+ this.className = classes(className + " " + this.className).join(" ");
+ return this;
+ },
+ removeClass: hasClassList ? function(className) {
+ classes(className).forEach(removeFromClassList, this);
+ return this;
+ } : function(className) {
+ var classNames = classes(this.className);
+ classes(className).forEach(classNames.erase, classNames);
+ this.className = classNames.join(" ");
+ return this;
+ },
+ toggleClass: function(className, force) {
+ if (force == null) force = !this.hasClass(className);
+ return force ? this.addClass(className) : this.removeClass(className);
+ },
+ adopt: function() {
+ var parent = this, fragment, elements = Array.flatten(arguments), length = elements.length;
+ if (length > 1) parent = fragment = document.createDocumentFragment();
+ for (var i = 0; i < length; i++) {
+ var element = document.id(elements[i], true);
+ if (element) parent.appendChild(element);
+ }
+ if (fragment) this.appendChild(fragment);
+ return this;
+ },
+ appendText: function(text, where) {
+ return this.grab(this.getDocument().newTextNode(text), where);
+ },
+ grab: function(el, where) {
+ inserters[where || "bottom"](document.id(el, true), this);
+ return this;
+ },
+ inject: function(el, where) {
+ inserters[where || "bottom"](this, document.id(el, true));
+ return this;
+ },
+ replaces: function(el) {
+ el = document.id(el, true);
+ el.parentNode.replaceChild(this, el);
+ return this;
+ },
+ wraps: function(el, where) {
+ el = document.id(el, true);
+ return this.replaces(el).grab(el, where);
+ },
+ getSelected: function() {
+ this.selectedIndex;
+ return new Elements(Array.from(this.options).filter(function(option) {
+ return option.selected;
+ }));
+ },
+ toQueryString: function() {
+ var queryString = [];
+ this.getElements("input, select, textarea").each(function(el) {
+ var type = el.type;
+ if (!el.name || el.disabled || type == "submit" || type == "reset" || type == "file" || type == "image") return;
+ var value = el.get("tag") == "select" ? el.getSelected().map(function(opt) {
+ return document.id(opt).get("value");
+ }) : (type == "radio" || type == "checkbox") && !el.checked ? null : el.get("value");
+ Array.from(value).each(function(val) {
+ if (typeof val != "undefined") queryString.push(encodeURIComponent(el.name) + "=" + encodeURIComponent(val));
+ });
+ });
+ return queryString.join("&");
+ }
+ });
+ var appendInserters = {
+ before: "beforeBegin",
+ after: "afterEnd",
+ bottom: "beforeEnd",
+ top: "afterBegin",
+ inside: "beforeEnd"
+ };
+ Element.implement("appendHTML", "insertAdjacentHTML" in document.createElement("div") ? function(html, where) {
+ this.insertAdjacentHTML(appendInserters[where || "bottom"], html);
+ return this;
+ } : function(html, where) {
+ var temp = new Element("div", {
+ html: html
+ }), children = temp.childNodes, fragment = temp.firstChild;
+ if (!fragment) return this;
+ if (children.length > 1) {
+ fragment = document.createDocumentFragment();
+ for (var i = 0, l = children.length; i < l; i++) {
+ fragment.appendChild(children[i]);
+ }
+ }
+ inserters[where || "bottom"](fragment, this);
+ return this;
+ });
+ var collected = {}, storage = {};
+ var get = function(uid) {
+ return storage[uid] || (storage[uid] = {});
+ };
+ var clean = function(item) {
+ var uid = item.uniqueNumber;
+ if (item.removeEvents) item.removeEvents();
+ if (item.clearAttributes) item.clearAttributes();
+ if (uid != null) {
+ delete collected[uid];
+ delete storage[uid];
+ }
+ return item;
+ };
+ var formProps = {
+ input: "checked",
+ option: "selected",
+ textarea: "value"
+ };
+ Element.implement({
+ destroy: function() {
+ var children = clean(this).getElementsByTagName("*");
+ Array.each(children, clean);
+ Element.dispose(this);
+ return null;
+ },
+ empty: function() {
+ Array.from(this.childNodes).each(Element.dispose);
+ return this;
+ },
+ dispose: function() {
+ return this.parentNode ? this.parentNode.removeChild(this) : this;
+ },
+ clone: function(contents, keepid) {
+ contents = contents !== false;
+ var clone = this.cloneNode(contents), ce = [ clone ], te = [ this ], i;
+ if (contents) {
+ ce.append(Array.from(clone.getElementsByTagName("*")));
+ te.append(Array.from(this.getElementsByTagName("*")));
+ }
+ for (i = ce.length; i--; ) {
+ var node = ce[i], element = te[i];
+ if (!keepid) node.removeAttribute("id");
+ if (node.clearAttributes) {
+ node.clearAttributes();
+ node.mergeAttributes(element);
+ node.removeAttribute("uniqueNumber");
+ if (node.options) {
+ var no = node.options, eo = element.options;
+ for (var j = no.length; j--; ) no[j].selected = eo[j].selected;
+ }
+ }
+ var prop = formProps[element.tagName.toLowerCase()];
+ if (prop && element[prop]) node[prop] = element[prop];
+ }
+ if (hasCloneBug) {
+ var co = clone.getElementsByTagName("object"), to = this.getElementsByTagName("object");
+ for (i = co.length; i--; ) co[i].outerHTML = to[i].outerHTML;
+ }
+ return document.id(clone);
+ }
+ });
+ [ Element, Window, Document ].invoke("implement", {
+ addListener: function(type, fn) {
+ if (window.attachEvent && !window.addEventListener) {
+ collected[Slick.uidOf(this)] = this;
+ }
+ if (this.addEventListener) this.addEventListener(type, fn, !!arguments[2]); else this.attachEvent("on" + type, fn);
+ return this;
+ },
+ removeListener: function(type, fn) {
+ if (this.removeEventListener) this.removeEventListener(type, fn, !!arguments[2]); else this.detachEvent("on" + type, fn);
+ return this;
+ },
+ retrieve: function(property, dflt) {
+ var storage = get(Slick.uidOf(this)), prop = storage[property];
+ if (dflt != null && prop == null) prop = storage[property] = dflt;
+ return prop != null ? prop : null;
+ },
+ store: function(property, value) {
+ var storage = get(Slick.uidOf(this));
+ storage[property] = value;
+ return this;
+ },
+ eliminate: function(property) {
+ var storage = get(Slick.uidOf(this));
+ delete storage[property];
+ return this;
+ }
+ });
+ if (window.attachEvent && !window.addEventListener) {
+ var gc = function() {
+ Object.each(collected, clean);
+ if (window.CollectGarbage) CollectGarbage();
+ window.removeListener("unload", gc);
+ };
+ window.addListener("unload", gc);
+ }
+ Element.Properties = {};
+ Element.Properties.style = {
+ set: function(style) {
+ this.style.cssText = style;
+ },
+ get: function() {
+ return this.style.cssText;
+ },
+ erase: function() {
+ this.style.cssText = "";
+ }
+ };
+ Element.Properties.tag = {
+ get: function() {
+ return this.tagName.toLowerCase();
+ }
+ };
+ Element.Properties.html = {
+ set: function(html) {
+ if (html == null) html = ""; else if (typeOf(html) == "array") html = html.join("");
+ if (this.styleSheet && !canChangeStyleHTML) this.styleSheet.cssText = html; else this.innerHTML = html;
+ },
+ erase: function() {
+ this.set("html", "");
+ }
+ };
+ var supportsHTML5Elements = true, supportsTableInnerHTML = true, supportsTRInnerHTML = true;
+ var div = document.createElement("div");
+ div.innerHTML = "<nav></nav>";
+ supportsHTML5Elements = div.childNodes.length == 1;
+ if (!supportsHTML5Elements) {
+ var tags = "abbr article aside audio canvas datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video".split(" "), fragment = document.createDocumentFragment(), l = tags.length;
+ while (l--) fragment.createElement(tags[l]);
+ }
+ div = null;
+ supportsTableInnerHTML = Function.attempt(function() {
+ var table = document.createElement("table");
+ table.innerHTML = "<tr><td></td></tr>";
+ return true;
+ });
+ var tr = document.createElement("tr"), html = "<td></td>";
+ tr.innerHTML = html;
+ supportsTRInnerHTML = tr.innerHTML == html;
+ tr = null;
+ if (!supportsTableInnerHTML || !supportsTRInnerHTML || !supportsHTML5Elements) {
+ Element.Properties.html.set = function(set) {
+ var translations = {
+ table: [ 1, "<table>", "</table>" ],
+ select: [ 1, "<select>", "</select>" ],
+ tbody: [ 2, "<table><tbody>", "</tbody></table>" ],
+ tr: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ]
+ };
+ translations.thead = translations.tfoot = translations.tbody;
+ return function(html) {
+ if (this.styleSheet) return set.call(this, html);
+ var wrap = translations[this.get("tag")];
+ if (!wrap && !supportsHTML5Elements) wrap = [ 0, "", "" ];
+ if (!wrap) return set.call(this, html);
+ var level = wrap[0], wrapper = document.createElement("div"), target = wrapper;
+ if (!supportsHTML5Elements) fragment.appendChild(wrapper);
+ wrapper.innerHTML = [ wrap[1], html, wrap[2] ].flatten().join("");
+ while (level--) target = target.firstChild;
+ this.empty().adopt(target.childNodes);
+ if (!supportsHTML5Elements) fragment.removeChild(wrapper);
+ wrapper = null;
+ };
+ }(Element.Properties.html.set);
+ }
+ var testForm = document.createElement("form");
+ testForm.innerHTML = "<select><option>s</option></select>";
+ if (testForm.firstChild.value != "s") Element.Properties.value = {
+ set: function(value) {
+ var tag = this.get("tag");
+ if (tag != "select") return this.setProperty("value", value);
+ var options = this.getElements("option");
+ value = String(value);
+ for (var i = 0; i < options.length; i++) {
+ var option = options[i], attr = option.getAttributeNode("value"), optionValue = attr && attr.specified ? option.value : option.get("text");
+ if (optionValue === value) return option.selected = true;
+ }
+ },
+ get: function() {
+ var option = this, tag = option.get("tag");
+ if (tag != "select" && tag != "option") return this.getProperty("value");
+ if (tag == "select" && !(option = option.getSelected()[0])) return "";
+ var attr = option.getAttributeNode("value");
+ return attr && attr.specified ? option.value : option.get("text");
+ }
+ };
+ testForm = null;
+ if (document.createElement("div").getAttributeNode("id")) Element.Properties.id = {
+ set: function(id) {
+ this.id = this.getAttributeNode("id").value = id;
+ },
+ get: function() {
+ return this.id || null;
+ },
+ erase: function() {
+ this.id = this.getAttributeNode("id").value = "";
+ }
+ };
+})();
+
+(function() {
+ var _keys = {};
+ var normalizeWheelSpeed = function(event) {
+ var normalized;
+ if (event.wheelDelta) {
+ normalized = event.wheelDelta % 120 == 0 ? event.wheelDelta / 120 : event.wheelDelta / 12;
+ } else {
+ var rawAmount = event.deltaY || event.detail || 0;
+ normalized = -(rawAmount % 3 == 0 ? rawAmount / 3 : rawAmount * 10);
+ }
+ return normalized;
+ };
+ var DOMEvent = this.DOMEvent = new Type("DOMEvent", function(event, win) {
+ if (!win) win = window;
+ event = event || win.event;
+ if (event.$extended) return event;
+ this.event = event;
+ this.$extended = true;
+ this.shift = event.shiftKey;
+ this.control = event.ctrlKey;
+ this.alt = event.altKey;
+ this.meta = event.metaKey;
+ var type = this.type = event.type;
+ var target = event.target || event.srcElement;
+ while (target && target.nodeType == 3) target = target.parentNode;
+ this.target = document.id(target);
+ if (type.indexOf("key") == 0) {
+ var code = this.code = event.which || event.keyCode;
+ this.key = _keys[code];
+ if (type == "keydown" || type == "keyup") {
+ if (code > 111 && code < 124) this.key = "f" + (code - 111); else if (code > 95 && code < 106) this.key = code - 96;
+ }
+ if (this.key == null) this.key = String.fromCharCode(code).toLowerCase();
+ } else if (type == "click" || type == "dblclick" || type == "contextmenu" || type == "wheel" || type == "DOMMouseScroll" || type.indexOf("mouse") == 0) {
+ var doc = win.document;
+ doc = !doc.compatMode || doc.compatMode == "CSS1Compat" ? doc.html : doc.body;
+ this.page = {
+ x: event.pageX != null ? event.pageX : event.clientX + doc.scrollLeft,
+ y: event.pageY != null ? event.pageY : event.clientY + doc.scrollTop
+ };
+ this.client = {
+ x: event.pageX != null ? event.pageX - win.pageXOffset : event.clientX,
+ y: event.pageY != null ? event.pageY - win.pageYOffset : event.clientY
+ };
+ if (type == "DOMMouseScroll" || type == "wheel" || type == "mousewheel") this.wheel = normalizeWheelSpeed(event);
+ this.rightClick = event.which == 3 || event.button == 2;
+ if (type == "mouseover" || type == "mouseout") {
+ var related = event.relatedTarget || event[(type == "mouseover" ? "from" : "to") + "Element"];
+ while (related && related.nodeType == 3) related = related.parentNode;
+ this.relatedTarget = document.id(related);
+ }
+ } else if (type.indexOf("touch") == 0 || type.indexOf("gesture") == 0) {
+ this.rotation = event.rotation;
+ this.scale = event.scale;
+ this.targetTouches = event.targetTouches;
+ this.changedTouches = event.changedTouches;
+ var touches = this.touches = event.touches;
+ if (touches && touches[0]) {
+ var touch = touches[0];
+ this.page = {
+ x: touch.pageX,
+ y: touch.pageY
+ };
+ this.client = {
+ x: touch.clientX,
+ y: touch.clientY
+ };
+ }
+ }
+ if (!this.client) this.client = {};
+ if (!this.page) this.page = {};
+ });
+ DOMEvent.implement({
+ stop: function() {
+ return this.preventDefault().stopPropagation();
+ },
+ stopPropagation: function() {
+ if (this.event.stopPropagation) this.event.stopPropagation(); else this.event.cancelBubble = true;
+ return this;
+ },
+ preventDefault: function() {
+ if (this.event.preventDefault) this.event.preventDefault(); else this.event.returnValue = false;
+ return this;
+ }
+ });
+ DOMEvent.defineKey = function(code, key) {
+ _keys[code] = key;
+ return this;
+ };
+ DOMEvent.defineKeys = DOMEvent.defineKey.overloadSetter(true);
+ DOMEvent.defineKeys({
+ "38": "up",
+ "40": "down",
+ "37": "left",
+ "39": "right",
+ "27": "esc",
+ "32": "space",
+ "8": "backspace",
+ "9": "tab",
+ "46": "delete",
+ "13": "enter"
+ });
+})();
+
+(function() {
+ Element.Properties.events = {
+ set: function(events) {
+ this.addEvents(events);
+ }
+ };
+ [ Element, Window, Document ].invoke("implement", {
+ addEvent: function(type, fn) {
+ var events = this.retrieve("events", {});
+ if (!events[type]) events[type] = {
+ keys: [],
+ values: []
+ };
+ if (events[type].keys.contains(fn)) return this;
+ events[type].keys.push(fn);
+ var realType = type, custom = Element.Events[type], condition = fn, self = this;
+ if (custom) {
+ if (custom.onAdd) custom.onAdd.call(this, fn, type);
+ if (custom.condition) {
+ condition = function(event) {
+ if (custom.condition.call(this, event, type)) return fn.call(this, event);
+ return true;
+ };
+ }
+ if (custom.base) realType = Function.from(custom.base).call(this, type);
+ }
+ var defn = function() {
+ return fn.call(self);
+ };
+ var nativeEvent = Element.NativeEvents[realType];
+ if (nativeEvent) {
+ if (nativeEvent == 2) {
+ defn = function(event) {
+ event = new DOMEvent(event, self.getWindow());
+ if (condition.call(self, event) === false) event.stop();
+ };
+ }
+ this.addListener(realType, defn, arguments[2]);
+ }
+ events[type].values.push(defn);
+ return this;
+ },
+ removeEvent: function(type, fn) {
+ var events = this.retrieve("events");
+ if (!events || !events[type]) return this;
+ var list = events[type];
+ var index = list.keys.indexOf(fn);
+ if (index == -1) return this;
+ var value = list.values[index];
+ delete list.keys[index];
+ delete list.values[index];
+ var custom = Element.Events[type];
+ if (custom) {
+ if (custom.onRemove) custom.onRemove.call(this, fn, type);
+ if (custom.base) type = Function.from(custom.base).call(this, type);
+ }
+ return Element.NativeEvents[type] ? this.removeListener(type, value, arguments[2]) : this;
+ },
+ addEvents: function(events) {
+ for (var event in events) this.addEvent(event, events[event]);
+ return this;
+ },
+ removeEvents: function(events) {
+ var type;
+ if (typeOf(events) == "object") {
+ for (type in events) this.removeEvent(type, events[type]);
+ return this;
+ }
+ var attached = this.retrieve("events");
+ if (!attached) return this;
+ if (!events) {
+ for (type in attached) this.removeEvents(type);
+ this.eliminate("events");
+ } else if (attached[events]) {
+ attached[events].keys.each(function(fn) {
+ this.removeEvent(events, fn);
+ }, this);
+ delete attached[events];
+ }
+ return this;
+ },
+ fireEvent: function(type, args, delay) {
+ var events = this.retrieve("events");
+ if (!events || !events[type]) return this;
+ args = Array.from(args);
+ events[type].keys.each(function(fn) {
+ if (delay) fn.delay(delay, this, args); else fn.apply(this, args);
+ }, this);
+ return this;
+ },
+ cloneEvents: function(from, type) {
+ from = document.id(from);
+ var events = from.retrieve("events");
+ if (!events) return this;
+ if (!type) {
+ for (var eventType in events) this.cloneEvents(from, eventType);
+ } else if (events[type]) {
+ events[type].keys.each(function(fn) {
+ this.addEvent(type, fn);
+ }, this);
+ }
+ return this;
+ }
+ });
+ Element.NativeEvents = {
+ click: 2,
+ dblclick: 2,
+ mouseup: 2,
+ mousedown: 2,
+ contextmenu: 2,
+ wheel: 2,
+ mousewheel: 2,
+ DOMMouseScroll: 2,
+ mouseover: 2,
+ mouseout: 2,
+ mousemove: 2,
+ selectstart: 2,
+ selectend: 2,
+ keydown: 2,
+ keypress: 2,
+ keyup: 2,
+ orientationchange: 2,
+ touchstart: 2,
+ touchmove: 2,
+ touchend: 2,
+ touchcancel: 2,
+ gesturestart: 2,
+ gesturechange: 2,
+ gestureend: 2,
+ focus: 2,
+ blur: 2,
+ change: 2,
+ reset: 2,
+ select: 2,
+ submit: 2,
+ paste: 2,
+ input: 2,
+ load: 2,
+ unload: 1,
+ beforeunload: 2,
+ resize: 1,
+ move: 1,
+ DOMContentLoaded: 1,
+ readystatechange: 1,
+ hashchange: 1,
+ popstate: 2,
+ error: 1,
+ abort: 1,
+ scroll: 1,
+ message: 2
+ };
+ Element.Events = {
+ mousewheel: {
+ base: "onwheel" in document ? "wheel" : "onmousewheel" in document ? "mousewheel" : "DOMMouseScroll"
+ }
+ };
+ var check = function(event) {
+ var related = event.relatedTarget;
+ if (related == null) return true;
+ if (!related) return false;
+ return related != this && related.prefix != "xul" && typeOf(this) != "document" && !this.contains(related);
+ };
+ if ("onmouseenter" in document.documentElement) {
+ Element.NativeEvents.mouseenter = Element.NativeEvents.mouseleave = 2;
+ Element.MouseenterCheck = check;
+ } else {
+ Element.Events.mouseenter = {
+ base: "mouseover",
+ condition: check
+ };
+ Element.Events.mouseleave = {
+ base: "mouseout",
+ condition: check
+ };
+ }
+ if (!window.addEventListener) {
+ Element.NativeEvents.propertychange = 2;
+ Element.Events.change = {
+ base: function() {
+ var type = this.type;
+ return this.get("tag") == "input" && (type == "radio" || type == "checkbox") ? "propertychange" : "change";
+ },
+ condition: function(event) {
+ return event.type != "propertychange" || event.event.propertyName == "checked";
+ }
+ };
+ }
+})();
+
+(function() {
+ var eventListenerSupport = !!window.addEventListener;
+ Element.NativeEvents.focusin = Element.NativeEvents.focusout = 2;
+ var bubbleUp = function(self, match, fn, event, target) {
+ while (target && target != self) {
+ if (match(target, event)) return fn.call(target, event, target);
+ target = document.id(target.parentNode);
+ }
+ };
+ var map = {
+ mouseenter: {
+ base: "mouseover",
+ condition: Element.MouseenterCheck
+ },
+ mouseleave: {
+ base: "mouseout",
+ condition: Element.MouseenterCheck
+ },
+ focus: {
+ base: "focus" + (eventListenerSupport ? "" : "in"),
+ capture: true
+ },
+ blur: {
+ base: eventListenerSupport ? "blur" : "focusout",
+ capture: true
+ }
+ };
+ var _key = "$delegation:";
+ var formObserver = function(type) {
+ return {
+ base: "focusin",
+ remove: function(self, uid) {
+ var list = self.retrieve(_key + type + "listeners", {})[uid];
+ if (list && list.forms) for (var i = list.forms.length; i--; ) {
+ if (list.forms[i].removeEvent) list.forms[i].removeEvent(type, list.fns[i]);
+ }
+ },
+ listen: function(self, match, fn, event, target, uid) {
+ var form = target.get("tag") == "form" ? target : event.target.getParent("form");
+ if (!form) return;
+ var listeners = self.retrieve(_key + type + "listeners", {}), listener = listeners[uid] || {
+ forms: [],
+ fns: []
+ }, forms = listener.forms, fns = listener.fns;
+ if (forms.indexOf(form) != -1) return;
+ forms.push(form);
+ var _fn = function(event) {
+ bubbleUp(self, match, fn, event, target);
+ };
+ form.addEvent(type, _fn);
+ fns.push(_fn);
+ listeners[uid] = listener;
+ self.store(_key + type + "listeners", listeners);
+ }
+ };
+ };
+ var inputObserver = function(type) {
+ return {
+ base: "focusin",
+ listen: function(self, match, fn, event, target) {
+ var events = {
+ blur: function() {
+ this.removeEvents(events);
+ }
+ };
+ events[type] = function(event) {
+ bubbleUp(self, match, fn, event, target);
+ };
+ event.target.addEvents(events);
+ }
+ };
+ };
+ if (!eventListenerSupport) Object.append(map, {
+ submit: formObserver("submit"),
+ reset: formObserver("reset"),
+ change: inputObserver("change"),
+ select: inputObserver("select")
+ });
+ var proto = Element.prototype, addEvent = proto.addEvent, removeEvent = proto.removeEvent;
+ var relay = function(old, method) {
+ return function(type, fn, useCapture) {
+ if (type.indexOf(":relay") == -1) return old.call(this, type, fn, useCapture);
+ var parsed = Slick.parse(type).expressions[0][0];
+ if (parsed.pseudos[0].key != "relay") return old.call(this, type, fn, useCapture);
+ var newType = parsed.tag;
+ parsed.pseudos.slice(1).each(function(pseudo) {
+ newType += ":" + pseudo.key + (pseudo.value ? "(" + pseudo.value + ")" : "");
+ });
+ old.call(this, type, fn);
+ return method.call(this, newType, parsed.pseudos[0].value, fn);
+ };
+ };
+ var delegation = {
+ addEvent: function(type, match, fn) {
+ var storage = this.retrieve("$delegates", {}), stored = storage[type];
+ if (stored) for (var _uid in stored) {
+ if (stored[_uid].fn == fn && stored[_uid].match == match) return this;
+ }
+ var _type = type, _match = match, _fn = fn, _map = map[type] || {};
+ type = _map.base || _type;
+ match = function(target) {
+ return Slick.match(target, _match);
+ };
+ var elementEvent = Element.Events[_type];
+ if (_map.condition || elementEvent && elementEvent.condition) {
+ var __match = match, condition = _map.condition || elementEvent.condition;
+ match = function(target, event) {
+ return __match(target, event) && condition.call(target, event, type);
+ };
+ }
+ var self = this, uid = String.uniqueID();
+ var delegator = _map.listen ? function(event, target) {
+ if (!target && event && event.target) target = event.target;
+ if (target) _map.listen(self, match, fn, event, target, uid);
+ } : function(event, target) {
+ if (!target && event && event.target) target = event.target;
+ if (target) bubbleUp(self, match, fn, event, target);
+ };
+ if (!stored) stored = {};
+ stored[uid] = {
+ match: _match,
+ fn: _fn,
+ delegator: delegator
+ };
+ storage[_type] = stored;
+ return addEvent.call(this, type, delegator, _map.capture);
+ },
+ removeEvent: function(type, match, fn, _uid) {
+ var storage = this.retrieve("$delegates", {}), stored = storage[type];
+ if (!stored) return this;
+ if (_uid) {
+ var _type = type, delegator = stored[_uid].delegator, _map = map[type] || {};
+ type = _map.base || _type;
+ if (_map.remove) _map.remove(this, _uid);
+ delete stored[_uid];
+ storage[_type] = stored;
+ return removeEvent.call(this, type, delegator, _map.capture);
+ }
+ var __uid, s;
+ if (fn) for (__uid in stored) {
+ s = stored[__uid];
+ if (s.match == match && s.fn == fn) return delegation.removeEvent.call(this, type, match, fn, __uid);
+ } else for (__uid in stored) {
+ s = stored[__uid];
+ if (s.match == match) delegation.removeEvent.call(this, type, match, s.fn, __uid);
+ }
+ return this;
+ }
+ };
+ [ Element, Window, Document ].invoke("implement", {
+ addEvent: relay(addEvent, delegation.addEvent),
+ removeEvent: relay(removeEvent, delegation.removeEvent)
+ });
+})();
+
+(function() {
+ var html = document.html, el;
+ el = document.createElement("div");
+ el.style.color = "red";
+ el.style.color = null;
+ var doesNotRemoveStyles = el.style.color == "red";
+ var border = "1px solid #123abc";
+ el.style.border = border;
+ var returnsBordersInWrongOrder = el.style.border != border;
+ el = null;
+ var hasGetComputedStyle = !!window.getComputedStyle, supportBorderRadius = document.createElement("div").style.borderRadius != null;
+ Element.Properties.styles = {
+ set: function(styles) {
+ this.setStyles(styles);
+ }
+ };
+ var hasOpacity = html.style.opacity != null, hasFilter = html.style.filter != null, reAlpha = /alpha\(opacity=([\d.]+)\)/i;
+ var setVisibility = function(element, opacity) {
+ element.store("$opacity", opacity);
+ element.style.visibility = opacity > 0 || opacity == null ? "visible" : "hidden";
+ };
+ var setFilter = function(element, regexp, value) {
+ var style = element.style, filter = style.filter || element.getComputedStyle("filter") || "";
+ style.filter = (regexp.test(filter) ? filter.replace(regexp, value) : filter + " " + value).trim();
+ if (!style.filter) style.removeAttribute("filter");
+ };
+ var setOpacity = hasOpacity ? function(element, opacity) {
+ element.style.opacity = opacity;
+ } : hasFilter ? function(element, opacity) {
+ if (!element.currentStyle || !element.currentStyle.hasLayout) element.style.zoom = 1;
+ if (opacity == null || opacity == 1) {
+ setFilter(element, reAlpha, "");
+ if (opacity == 1 && getOpacity(element) != 1) setFilter(element, reAlpha, "alpha(opacity=100)");
+ } else {
+ setFilter(element, reAlpha, "alpha(opacity=" + (opacity * 100).limit(0, 100).round() + ")");
+ }
+ } : setVisibility;
+ var getOpacity = hasOpacity ? function(element) {
+ var opacity = element.style.opacity || element.getComputedStyle("opacity");
+ return opacity == "" ? 1 : opacity.toFloat();
+ } : hasFilter ? function(element) {
+ var filter = element.style.filter || element.getComputedStyle("filter"), opacity;
+ if (filter) opacity = filter.match(reAlpha);
+ return opacity == null || filter == null ? 1 : opacity[1] / 100;
+ } : function(element) {
+ var opacity = element.retrieve("$opacity");
+ if (opacity == null) opacity = element.style.visibility == "hidden" ? 0 : 1;
+ return opacity;
+ };
+ var floatName = html.style.cssFloat == null ? "styleFloat" : "cssFloat", namedPositions = {
+ left: "0%",
+ top: "0%",
+ center: "50%",
+ right: "100%",
+ bottom: "100%"
+ }, hasBackgroundPositionXY = html.style.backgroundPositionX != null;
+ var removeStyle = function(style, property) {
+ if (property == "backgroundPosition") {
+ style.removeAttribute(property + "X");
+ property += "Y";
+ }
+ style.removeAttribute(property);
+ };
+ Element.implement({
+ getComputedStyle: function(property) {
+ if (!hasGetComputedStyle && this.currentStyle) return this.currentStyle[property.camelCase()];
+ var defaultView = Element.getDocument(this).defaultView, computed = defaultView ? defaultView.getComputedStyle(this, null) : null;
+ return computed ? computed.getPropertyValue(property == floatName ? "float" : property.hyphenate()) : "";
+ },
+ setStyle: function(property, value) {
+ if (property == "opacity") {
+ if (value != null) value = parseFloat(value);
+ setOpacity(this, value);
+ return this;
+ }
+ property = (property == "float" ? floatName : property).camelCase();
+ if (typeOf(value) != "string") {
+ var map = (Element.Styles[property] || "@").split(" ");
+ value = Array.from(value).map(function(val, i) {
+ if (!map[i]) return "";
+ return typeOf(val) == "number" ? map[i].replace("@", Math.round(val)) : val;
+ }).join(" ");
+ } else if (value == String(Number(value))) {
+ value = Math.round(value);
+ }
+ this.style[property] = value;
+ if ((value == "" || value == null) && doesNotRemoveStyles && this.style.removeAttribute) {
+ removeStyle(this.style, property);
+ }
+ return this;
+ },
+ getStyle: function(property) {
+ if (property == "opacity") return getOpacity(this);
+ property = (property == "float" ? floatName : property).camelCase();
+ if (supportBorderRadius && property.indexOf("borderRadius") != -1) {
+ return [ "borderTopLeftRadius", "borderTopRightRadius", "borderBottomRightRadius", "borderBottomLeftRadius" ].map(function(corner) {
+ return this.style[corner] || "0px";
+ }, this).join(" ");
+ }
+ var result = this.style[property];
+ if (!result || property == "zIndex") {
+ if (Element.ShortStyles.hasOwnProperty(property)) {
+ result = [];
+ for (var s in Element.ShortStyles[property]) result.push(this.getStyle(s));
+ return result.join(" ");
+ }
+ result = this.getComputedStyle(property);
+ }
+ if (hasBackgroundPositionXY && /^backgroundPosition[XY]?$/.test(property)) {
+ return result.replace(/(top|right|bottom|left)/g, function(position) {
+ return namedPositions[position];
+ }) || "0px";
+ }
+ if (!result && property == "backgroundPosition") return "0px 0px";
+ if (result) {
+ result = String(result);
+ var color = result.match(/rgba?\([\d\s,]+\)/);
+ if (color) result = result.replace(color[0], color[0].rgbToHex());
+ }
+ if (!hasGetComputedStyle && !this.style[property]) {
+ if (/^(height|width)$/.test(property) && !/px$/.test(result)) {
+ var values = property == "width" ? [ "left", "right" ] : [ "top", "bottom" ], size = 0;
+ values.each(function(value) {
+ size += this.getStyle("border-" + value + "-width").toInt() + this.getStyle("padding-" + value).toInt();
+ }, this);
+ return this["offset" + property.capitalize()] - size + "px";
+ }
+ if (/^border(.+)Width|margin|padding/.test(property) && isNaN(parseFloat(result))) {
+ return "0px";
+ }
+ }
+ if (returnsBordersInWrongOrder && /^border(Top|Right|Bottom|Left)?$/.test(property) && /^#/.test(result)) {
+ return result.replace(/^(.+)\s(.+)\s(.+)$/, "$2 $3 $1");
+ }
+ return result;
+ },
+ setStyles: function(styles) {
+ for (var style in styles) this.setStyle(style, styles[style]);
+ return this;
+ },
+ getStyles: function() {
+ var result = {};
+ Array.flatten(arguments).each(function(key) {
+ result[key] = this.getStyle(key);
+ }, this);
+ return result;
+ }
+ });
+ Element.Styles = {
+ left: "@px",
+ top: "@px",
+ bottom: "@px",
+ right: "@px",
+ width: "@px",
+ height: "@px",
+ maxWidth: "@px",
+ maxHeight: "@px",
+ minWidth: "@px",
+ minHeight: "@px",
+ backgroundColor: "rgb(@, @, @)",
+ backgroundSize: "@px",
+ backgroundPosition: "@px @px",
+ color: "rgb(@, @, @)",
+ fontSize: "@px",
+ letterSpacing: "@px",
+ lineHeight: "@px",
+ clip: "rect(@px @px @px @px)",
+ margin: "@px @px @px @px",
+ padding: "@px @px @px @px",
+ border: "@px @ rgb(@, @, @) @px @ rgb(@, @, @) @px @ rgb(@, @, @)",
+ borderWidth: "@px @px @px @px",
+ borderStyle: "@ @ @ @",
+ borderColor: "rgb(@, @, @) rgb(@, @, @) rgb(@, @, @) rgb(@, @, @)",
+ zIndex: "@",
+ zoom: "@",
+ fontWeight: "@",
+ textIndent: "@px",
+ opacity: "@",
+ borderRadius: "@px @px @px @px"
+ };
+ Element.ShortStyles = {
+ margin: {},
+ padding: {},
+ border: {},
+ borderWidth: {},
+ borderStyle: {},
+ borderColor: {}
+ };
+ [ "Top", "Right", "Bottom", "Left" ].each(function(direction) {
+ var Short = Element.ShortStyles;
+ var All = Element.Styles;
+ [ "margin", "padding" ].each(function(style) {
+ var sd = style + direction;
+ Short[style][sd] = All[sd] = "@px";
+ });
+ var bd = "border" + direction;
+ Short.border[bd] = All[bd] = "@px @ rgb(@, @, @)";
+ var bdw = bd + "Width", bds = bd + "Style", bdc = bd + "Color";
+ Short[bd] = {};
+ Short.borderWidth[bdw] = Short[bd][bdw] = All[bdw] = "@px";
+ Short.borderStyle[bds] = Short[bd][bds] = All[bds] = "@";
+ Short.borderColor[bdc] = Short[bd][bdc] = All[bdc] = "rgb(@, @, @)";
+ });
+ if (hasBackgroundPositionXY) Element.ShortStyles.backgroundPosition = {
+ backgroundPositionX: "@",
+ backgroundPositionY: "@"
+ };
+})();
+
+(function() {
+ var element = document.createElement("div"), child = document.createElement("div");
+ element.style.height = "0";
+ element.appendChild(child);
+ var brokenOffsetParent = child.offsetParent === element;
+ element = child = null;
+ var heightComponents = [ "height", "paddingTop", "paddingBottom", "borderTopWidth", "borderBottomWidth" ], widthComponents = [ "width", "paddingLeft", "paddingRight", "borderLeftWidth", "borderRightWidth" ];
+ var svgCalculateSize = function(el) {
+ var gCS = window.getComputedStyle(el), bounds = {
+ x: 0,
+ y: 0
+ };
+ heightComponents.each(function(css) {
+ bounds.y += parseFloat(gCS[css]);
+ });
+ widthComponents.each(function(css) {
+ bounds.x += parseFloat(gCS[css]);
+ });
+ return bounds;
+ };
+ var isOffset = function(el) {
+ return styleString(el, "position") != "static" || isBody(el);
+ };
+ var isOffsetStatic = function(el) {
+ return isOffset(el) || /^(?:table|td|th)$/i.test(el.tagName);
+ };
+ Element.implement({
+ scrollTo: function(x, y) {
+ if (isBody(this)) {
+ this.getWindow().scrollTo(x, y);
+ } else {
+ this.scrollLeft = x;
+ this.scrollTop = y;
+ }
+ return this;
+ },
+ getSize: function() {
+ if (isBody(this)) return this.getWindow().getSize();
+ if (!window.getComputedStyle) return {
+ x: this.offsetWidth,
+ y: this.offsetHeight
+ };
+ if (this.get("tag") == "svg") return svgCalculateSize(this);
+ var bounds = this.getBoundingClientRect();
+ return {
+ x: bounds.width,
+ y: bounds.height
+ };
+ },
+ getScrollSize: function() {
+ if (isBody(this)) return this.getWindow().getScrollSize();
+ return {
+ x: this.scrollWidth,
+ y: this.scrollHeight
+ };
+ },
+ getScroll: function() {
+ if (isBody(this)) return this.getWindow().getScroll();
+ return {
+ x: this.scrollLeft,
+ y: this.scrollTop
+ };
+ },
+ getScrolls: function() {
+ var element = this.parentNode, position = {
+ x: 0,
+ y: 0
+ };
+ while (element && !isBody(element)) {
+ position.x += element.scrollLeft;
+ position.y += element.scrollTop;
+ element = element.parentNode;
+ }
+ return position;
+ },
+ getOffsetParent: brokenOffsetParent ? function() {
+ var element = this;
+ if (isBody(element) || styleString(element, "position") == "fixed") return null;
+ var isOffsetCheck = styleString(element, "position") == "static" ? isOffsetStatic : isOffset;
+ while (element = element.parentNode) {
+ if (isOffsetCheck(element)) return element;
+ }
+ return null;
+ } : function() {
+ var element = this;
+ if (isBody(element) || styleString(element, "position") == "fixed") return null;
+ try {
+ return element.offsetParent;
+ } catch (e) {}
+ return null;
+ },
+ getOffsets: function() {
+ var hasGetBoundingClientRect = this.getBoundingClientRect;
+ if (hasGetBoundingClientRect) {
+ var bound = this.getBoundingClientRect(), html = document.id(this.getDocument().documentElement), htmlScroll = html.getScroll(), elemScrolls = this.getScrolls(), isFixed = styleString(this, "position") == "fixed";
+ return {
+ x: bound.left.toInt() + elemScrolls.x + (isFixed ? 0 : htmlScroll.x) - html.clientLeft,
+ y: bound.top.toInt() + elemScrolls.y + (isFixed ? 0 : htmlScroll.y) - html.clientTop
+ };
+ }
+ var element = this, position = {
+ x: 0,
+ y: 0
+ };
+ if (isBody(this)) return position;
+ while (element && !isBody(element)) {
+ position.x += element.offsetLeft;
+ position.y += element.offsetTop;
+ element = element.offsetParent;
+ }
+ return position;
+ },
+ getPosition: function(relative) {
+ var offset = this.getOffsets(), scroll = this.getScrolls();
+ var position = {
+ x: offset.x - scroll.x,
+ y: offset.y - scroll.y
+ };
+ if (relative && (relative = document.id(relative))) {
+ var relativePosition = relative.getPosition();
+ return {
+ x: position.x - relativePosition.x - leftBorder(relative),
+ y: position.y - relativePosition.y - topBorder(relative)
+ };
+ }
+ return position;
+ },
+ getCoordinates: function(element) {
+ if (isBody(this)) return this.getWindow().getCoordinates();
+ var position = this.getPosition(element), size = this.getSize();
+ var obj = {
+ left: position.x,
+ top: position.y,
+ width: size.x,
+ height: size.y
+ };
+ obj.right = obj.left + obj.width;
+ obj.bottom = obj.top + obj.height;
+ return obj;
+ },
+ computePosition: function(obj) {
+ return {
+ left: obj.x - styleNumber(this, "margin-left"),
+ top: obj.y - styleNumber(this, "margin-top")
+ };
+ },
+ setPosition: function(obj) {
+ return this.setStyles(this.computePosition(obj));
+ }
+ });
+ [ Document, Window ].invoke("implement", {
+ getSize: function() {
+ var doc = getCompatElement(this);
+ return {
+ x: doc.clientWidth,
+ y: doc.clientHeight
+ };
+ },
+ getScroll: function() {
+ var win = this.getWindow(), doc = getCompatElement(this);
+ return {
+ x: win.pageXOffset || doc.scrollLeft,
+ y: win.pageYOffset || doc.scrollTop
+ };
+ },
+ getScrollSize: function() {
+ var doc = getCompatElement(this), min = this.getSize(), body = this.getDocument().body;
+ return {
+ x: Math.max(doc.scrollWidth, body.scrollWidth, min.x),
+ y: Math.max(doc.scrollHeight, body.scrollHeight, min.y)
+ };
+ },
+ getPosition: function() {
+ return {
+ x: 0,
+ y: 0
+ };
+ },
+ getCoordinates: function() {
+ var size = this.getSize();
+ return {
+ top: 0,
+ left: 0,
+ bottom: size.y,
+ right: size.x,
+ height: size.y,
+ width: size.x
+ };
+ }
+ });
+ var styleString = Element.getComputedStyle;
+ function styleNumber(element, style) {
+ return styleString(element, style).toInt() || 0;
+ }
+ function borderBox(element) {
+ return styleString(element, "-moz-box-sizing") == "border-box";
+ }
+ function topBorder(element) {
+ return styleNumber(element, "border-top-width");
+ }
+ function leftBorder(element) {
+ return styleNumber(element, "border-left-width");
+ }
+ function isBody(element) {
+ return /^(?:body|html)$/i.test(element.tagName);
+ }
+ function getCompatElement(element) {
+ var doc = element.getDocument();
+ return !doc.compatMode || doc.compatMode == "CSS1Compat" ? doc.html : doc.body;
+ }
+})();
+
+Element.alias({
+ position: "setPosition"
+});
+
+[ Window, Document, Element ].invoke("implement", {
+ getHeight: function() {
+ return this.getSize().y;
+ },
+ getWidth: function() {
+ return this.getSize().x;
+ },
+ getScrollTop: function() {
+ return this.getScroll().y;
+ },
+ getScrollLeft: function() {
+ return this.getScroll().x;
+ },
+ getScrollHeight: function() {
+ return this.getScrollSize().y;
+ },
+ getScrollWidth: function() {
+ return this.getScrollSize().x;
+ },
+ getTop: function() {
+ return this.getPosition().y;
+ },
+ getLeft: function() {
+ return this.getPosition().x;
+ }
+});
+
+(function() {
+ var Fx = this.Fx = new Class({
+ Implements: [ Chain, Events, Options ],
+ options: {
+ fps: 60,
+ unit: false,
+ duration: 500,
+ frames: null,
+ frameSkip: true,
+ link: "ignore"
+ },
+ initialize: function(options) {
+ this.subject = this.subject || this;
+ this.setOptions(options);
+ },
+ getTransition: function() {
+ return function(p) {
+ return -(Math.cos(Math.PI * p) - 1) / 2;
+ };
+ },
+ step: function(now) {
+ if (this.options.frameSkip) {
+ var diff = this.time != null ? now - this.time : 0, frames = diff / this.frameInterval;
+ this.time = now;
+ this.frame += frames;
+ } else {
+ this.frame++;
+ }
+ if (this.frame < this.frames) {
+ var delta = this.transition(this.frame / this.frames);
+ this.set(this.compute(this.from, this.to, delta));
+ } else {
+ this.frame = this.frames;
+ this.set(this.compute(this.from, this.to, 1));
+ this.stop();
+ }
+ },
+ set: function(now) {
+ return now;
+ },
+ compute: function(from, to, delta) {
+ return Fx.compute(from, to, delta);
+ },
+ check: function() {
+ if (!this.isRunning()) return true;
+ switch (this.options.link) {
+ case "cancel":
+ this.cancel();
+ return true;
+
+ case "chain":
+ this.chain(this.caller.pass(arguments, this));
+ return false;
+ }
+ return false;
+ },
+ start: function(from, to) {
+ if (!this.check(from, to)) return this;
+ this.from = from;
+ this.to = to;
+ this.frame = this.options.frameSkip ? 0 : -1;
+ this.time = null;
+ this.transition = this.getTransition();
+ var frames = this.options.frames, fps = this.options.fps, duration = this.options.duration;
+ this.duration = Fx.Durations[duration] || duration.toInt();
+ this.frameInterval = 1e3 / fps;
+ this.frames = frames || Math.round(this.duration / this.frameInterval);
+ this.fireEvent("start", this.subject);
+ pushInstance.call(this, fps);
+ return this;
+ },
+ stop: function() {
+ if (this.isRunning()) {
+ this.time = null;
+ pullInstance.call(this, this.options.fps);
+ if (this.frames == this.frame) {
+ this.fireEvent("complete", this.subject);
+ if (!this.callChain()) this.fireEvent("chainComplete", this.subject);
+ } else {
+ this.fireEvent("stop", this.subject);
+ }
+ }
+ return this;
+ },
+ cancel: function() {
+ if (this.isRunning()) {
+ this.time = null;
+ pullInstance.call(this, this.options.fps);
+ this.frame = this.frames;
+ this.fireEvent("cancel", this.subject).clearChain();
+ }
+ return this;
+ },
+ pause: function() {
+ if (this.isRunning()) {
+ this.time = null;
+ pullInstance.call(this, this.options.fps);
+ }
+ return this;
+ },
+ resume: function() {
+ if (this.isPaused()) pushInstance.call(this, this.options.fps);
+ return this;
+ },
+ isRunning: function() {
+ var list = instances[this.options.fps];
+ return list && list.contains(this);
+ },
+ isPaused: function() {
+ return this.frame < this.frames && !this.isRunning();
+ }
+ });
+ Fx.compute = function(from, to, delta) {
+ return (to - from) * delta + from;
+ };
+ Fx.Durations = {
+ short: 250,
+ normal: 500,
+ long: 1e3
+ };
+ var instances = {}, timers = {};
+ var loop = function() {
+ var now = Date.now();
+ for (var i = this.length; i--; ) {
+ var instance = this[i];
+ if (instance) instance.step(now);
+ }
+ };
+ var pushInstance = function(fps) {
+ var list = instances[fps] || (instances[fps] = []);
+ list.push(this);
+ if (!timers[fps]) timers[fps] = loop.periodical(Math.round(1e3 / fps), list);
+ };
+ var pullInstance = function(fps) {
+ var list = instances[fps];
+ if (list) {
+ list.erase(this);
+ if (!list.length && timers[fps]) {
+ delete instances[fps];
+ timers[fps] = clearInterval(timers[fps]);
+ }
+ }
+ };
+})();
+
+Fx.CSS = new Class({
+ Extends: Fx,
+ prepare: function(element, property, values) {
+ values = Array.from(values);
+ var from = values[0], to = values[1];
+ if (to == null) {
+ to = from;
+ from = element.getStyle(property);
+ var unit = this.options.unit;
+ if (unit && from && typeof from == "string" && from.slice(-unit.length) != unit && parseFloat(from) != 0) {
+ element.setStyle(property, to + unit);
+ var value = element.getComputedStyle(property);
+ if (!/px$/.test(value)) {
+ value = element.style[("pixel-" + property).camelCase()];
+ if (value == null) {
+ var left = element.style.left;
+ element.style.left = to + unit;
+ value = element.style.pixelLeft;
+ element.style.left = left;
+ }
+ }
+ from = (to || 1) / (parseFloat(value) || 1) * (parseFloat(from) || 0);
+ element.setStyle(property, from + unit);
+ }
+ }
+ return {
+ from: this.parse(from),
+ to: this.parse(to)
+ };
+ },
+ parse: function(value) {
+ value = Function.from(value)();
+ value = typeof value == "string" ? value.split(" ") : Array.from(value);
+ return value.map(function(val) {
+ val = String(val);
+ var found = false;
+ Object.each(Fx.CSS.Parsers, function(parser, key) {
+ if (found) return;
+ var parsed = parser.parse(val);
+ if (parsed || parsed === 0) found = {
+ value: parsed,
+ parser: parser
+ };
+ });
+ found = found || {
+ value: val,
+ parser: Fx.CSS.Parsers.String
+ };
+ return found;
+ });
+ },
+ compute: function(from, to, delta) {
+ var computed = [];
+ Math.min(from.length, to.length).times(function(i) {
+ computed.push({
+ value: from[i].parser.compute(from[i].value, to[i].value, delta),
+ parser: from[i].parser
+ });
+ });
+ computed.$family = Function.from("fx:css:value");
+ return computed;
+ },
+ serve: function(value, unit) {
+ if (typeOf(value) != "fx:css:value") value = this.parse(value);
+ var returned = [];
+ value.each(function(bit) {
+ returned = returned.concat(bit.parser.serve(bit.value, unit));
+ });
+ return returned;
+ },
+ render: function(element, property, value, unit) {
+ element.setStyle(property, this.serve(value, unit));
+ },
+ search: function(selector) {
+ if (Fx.CSS.Cache[selector]) return Fx.CSS.Cache[selector];
+ var to = {}, selectorTest = new RegExp("^" + selector.escapeRegExp() + "$");
+ var searchStyles = function(rules) {
+ Array.each(rules, function(rule, i) {
+ if (rule.media) {
+ searchStyles(rule.rules || rule.cssRules);
+ return;
+ }
+ if (!rule.style) return;
+ var selectorText = rule.selectorText ? rule.selectorText.replace(/^\w+/, function(m) {
+ return m.toLowerCase();
+ }) : null;
+ if (!selectorText || !selectorTest.test(selectorText)) return;
+ Object.each(Element.Styles, function(value, style) {
+ if (!rule.style[style] || Element.ShortStyles[style]) return;
+ value = String(rule.style[style]);
+ to[style] = /^rgb/.test(value) ? value.rgbToHex() : value;
+ });
+ });
+ };
+ Array.each(document.styleSheets, function(sheet, j) {
+ var href = sheet.href;
+ if (href && href.indexOf("://") > -1 && href.indexOf(document.domain) == -1) return;
+ var rules = sheet.rules || sheet.cssRules;
+ searchStyles(rules);
+ });
+ return Fx.CSS.Cache[selector] = to;
+ }
+});
+
+Fx.CSS.Cache = {};
+
+Fx.CSS.Parsers = {
+ Color: {
+ parse: function(value) {
+ if (value.match(/^#[0-9a-f]{3,6}$/i)) return value.hexToRgb(true);
+ return (value = value.match(/(\d+),\s*(\d+),\s*(\d+)/)) ? [ value[1], value[2], value[3] ] : false;
+ },
+ compute: function(from, to, delta) {
+ return from.map(function(value, i) {
+ return Math.round(Fx.compute(from[i], to[i], delta));
+ });
+ },
+ serve: function(value) {
+ return value.map(Number);
+ }
+ },
+ Number: {
+ parse: parseFloat,
+ compute: Fx.compute,
+ serve: function(value, unit) {
+ return unit ? value + unit : value;
+ }
+ },
+ String: {
+ parse: Function.from(false),
+ compute: function(zero, one) {
+ return one;
+ },
+ serve: function(zero) {
+ return zero;
+ }
+ }
+};
+
+Fx.Morph = new Class({
+ Extends: Fx.CSS,
+ initialize: function(element, options) {
+ this.element = this.subject = document.id(element);
+ this.parent(options);
+ },
+ set: function(now) {
+ if (typeof now == "string") now = this.search(now);
+ for (var p in now) this.render(this.element, p, now[p], this.options.unit);
+ return this;
+ },
+ compute: function(from, to, delta) {
+ var now = {};
+ for (var p in from) now[p] = this.parent(from[p], to[p], delta);
+ return now;
+ },
+ start: function(properties) {
+ if (!this.check(properties)) return this;
+ if (typeof properties == "string") properties = this.search(properties);
+ var from = {}, to = {};
+ for (var p in properties) {
+ var parsed = this.prepare(this.element, p, properties[p]);
+ from[p] = parsed.from;
+ to[p] = parsed.to;
+ }
+ return this.parent(from, to);
+ }
+});
+
+Element.Properties.morph = {
+ set: function(options) {
+ this.get("morph").cancel().setOptions(options);
+ return this;
+ },
+ get: function() {
+ var morph = this.retrieve("morph");
+ if (!morph) {
+ morph = new Fx.Morph(this, {
+ link: "cancel"
+ });
+ this.store("morph", morph);
+ }
+ return morph;
+ }
+};
+
+Element.implement({
+ morph: function(props) {
+ this.get("morph").start(props);
+ return this;
+ }
+});
+
+Fx.implement({
+ getTransition: function() {
+ var trans = this.options.transition || Fx.Transitions.Sine.easeInOut;
+ if (typeof trans == "string") {
+ var data = trans.split(":");
+ trans = Fx.Transitions;
+ trans = trans[data[0]] || trans[data[0].capitalize()];
+ if (data[1]) trans = trans["ease" + data[1].capitalize() + (data[2] ? data[2].capitalize() : "")];
+ }
+ return trans;
+ }
+});
+
+Fx.Transition = function(transition, params) {
+ params = Array.from(params);
+ var easeIn = function(pos) {
+ return transition(pos, params);
+ };
+ return Object.append(easeIn, {
+ easeIn: easeIn,
+ easeOut: function(pos) {
+ return 1 - transition(1 - pos, params);
+ },
+ easeInOut: function(pos) {
+ return (pos <= .5 ? transition(2 * pos, params) : 2 - transition(2 * (1 - pos), params)) / 2;
+ }
+ });
+};
+
+Fx.Transitions = {
+ linear: function(zero) {
+ return zero;
+ }
+};
+
+Fx.Transitions.extend = function(transitions) {
+ for (var transition in transitions) Fx.Transitions[transition] = new Fx.Transition(transitions[transition]);
+};
+
+Fx.Transitions.extend({
+ Pow: function(p, x) {
+ return Math.pow(p, x && x[0] || 6);
+ },
+ Expo: function(p) {
+ return Math.pow(2, 8 * (p - 1));
+ },
+ Circ: function(p) {
+ return 1 - Math.sin(Math.acos(p));
+ },
+ Sine: function(p) {
+ return 1 - Math.cos(p * Math.PI / 2);
+ },
+ Back: function(p, x) {
+ x = x && x[0] || 1.618;
+ return Math.pow(p, 2) * ((x + 1) * p - x);
+ },
+ Bounce: function(p) {
+ var value;
+ for (var a = 0, b = 1; 1; a += b, b /= 2) {
+ if (p >= (7 - 4 * a) / 11) {
+ value = b * b - Math.pow((11 - 6 * a - 11 * p) / 4, 2);
+ break;
+ }
+ }
+ return value;
+ },
+ Elastic: function(p, x) {
+ return Math.pow(2, 10 * --p) * Math.cos(20 * p * Math.PI * (x && x[0] || 1) / 3);
+ }
+});
+
+[ "Quad", "Cubic", "Quart", "Quint" ].each(function(transition, i) {
+ Fx.Transitions[transition] = new Fx.Transition(function(p) {
+ return Math.pow(p, i + 2);
+ });
+});
+
+Fx.Tween = new Class({
+ Extends: Fx.CSS,
+ initialize: function(element, options) {
+ this.element = this.subject = document.id(element);
+ this.parent(options);
+ },
+ set: function(property, now) {
+ if (arguments.length == 1) {
+ now = property;
+ property = this.property || this.options.property;
+ }
+ this.render(this.element, property, now, this.options.unit);
+ return this;
+ },
+ start: function(property, from, to) {
+ if (!this.check(property, from, to)) return this;
+ var args = Array.flatten(arguments);
+ this.property = this.options.property || args.shift();
+ var parsed = this.prepare(this.element, this.property, args);
+ return this.parent(parsed.from, parsed.to);
+ }
+});
+
+Element.Properties.tween = {
+ set: function(options) {
+ this.get("tween").cancel().setOptions(options);
+ return this;
+ },
+ get: function() {
+ var tween = this.retrieve("tween");
+ if (!tween) {
+ tween = new Fx.Tween(this, {
+ link: "cancel"
+ });
+ this.store("tween", tween);
+ }
+ return tween;
+ }
+};
+
+Element.implement({
+ tween: function(property, from, to) {
+ this.get("tween").start(property, from, to);
+ return this;
+ },
+ fade: function(how) {
+ var fade = this.get("tween"), method, args = [ "opacity" ].append(arguments), toggle;
+ if (args[1] == null) args[1] = "toggle";
+ switch (args[1]) {
+ case "in":
+ method = "start";
+ args[1] = 1;
+ break;
+
+ case "out":
+ method = "start";
+ args[1] = 0;
+ break;
+
+ case "show":
+ method = "set";
+ args[1] = 1;
+ break;
+
+ case "hide":
+ method = "set";
+ args[1] = 0;
+ break;
+
+ case "toggle":
+ var flag = this.retrieve("fade:flag", this.getStyle("opacity") == 1);
+ method = "start";
+ args[1] = flag ? 0 : 1;
+ this.store("fade:flag", !flag);
+ toggle = true;
+ break;
+
+ default:
+ method = "start";
+ }
+ if (!toggle) this.eliminate("fade:flag");
+ fade[method].apply(fade, args);
+ var to = args[args.length - 1];
+ if (method == "set" || to != 0) this.setStyle("visibility", to == 0 ? "hidden" : "visible"); else fade.chain(function() {
+ this.element.setStyle("visibility", "hidden");
+ this.callChain();
+ });
+ return this;
+ },
+ highlight: function(start, end) {
+ if (!end) {
+ end = this.retrieve("highlight:original", this.getStyle("background-color"));
+ end = end == "transparent" ? "#fff" : end;
+ }
+ var tween = this.get("tween");
+ tween.start("background-color", start || "#ffff88", end).chain(function() {
+ this.setStyle("background-color", this.retrieve("highlight:original"));
+ tween.callChain();
+ }.bind(this));
+ return this;
+ }
+});
+
+(function() {
+ var empty = function() {}, progressSupport = "onprogress" in new Browser.Request();
+ var Request = this.Request = new Class({
+ Implements: [ Chain, Events, Options ],
+ options: {
+ url: "",
+ data: "",
+ headers: {
+ "X-Requested-With": "XMLHttpRequest",
+ Accept: "text/javascript, text/html, application/xml, text/xml, */*"
+ },
+ async: true,
+ format: false,
+ method: "post",
+ link: "ignore",
+ isSuccess: null,
+ emulation: true,
+ urlEncoded: true,
+ encoding: "utf-8",
+ evalScripts: false,
+ evalResponse: false,
+ timeout: 0,
+ noCache: false
+ },
+ initialize: function(options) {
+ this.xhr = new Browser.Request();
+ this.setOptions(options);
+ this.headers = this.options.headers;
+ },
+ onStateChange: function() {
+ var xhr = this.xhr;
+ if (xhr.readyState != 4 || !this.running) return;
+ this.running = false;
+ this.status = 0;
+ Function.attempt(function() {
+ var status = xhr.status;
+ this.status = status == 1223 ? 204 : status;
+ }.bind(this));
+ xhr.onreadystatechange = empty;
+ if (progressSupport) xhr.onprogress = xhr.onloadstart = empty;
+ if (this.timer) {
+ clearTimeout(this.timer);
+ delete this.timer;
+ }
+ this.response = {
+ text: this.xhr.responseText || "",
+ xml: this.xhr.responseXML
+ };
+ if (this.options.isSuccess.call(this, this.status)) this.success(this.response.text, this.response.xml); else this.failure();
+ },
+ isSuccess: function() {
+ var status = this.status;
+ return status >= 200 && status < 300;
+ },
+ isRunning: function() {
+ return !!this.running;
+ },
+ processScripts: function(text) {
+ if (this.options.evalResponse || /(ecma|java)script/.test(this.getHeader("Content-type"))) return Browser.exec(text);
+ return text.stripScripts(this.options.evalScripts);
+ },
+ success: function(text, xml) {
+ this.onSuccess(this.processScripts(text), xml);
+ },
+ onSuccess: function() {
+ this.fireEvent("complete", arguments).fireEvent("success", arguments).callChain();
+ },
+ failure: function() {
+ this.onFailure();
+ },
+ onFailure: function() {
+ this.fireEvent("complete").fireEvent("failure", this.xhr);
+ },
+ loadstart: function(event) {
+ this.fireEvent("loadstart", [ event, this.xhr ]);
+ },
+ progress: function(event) {
+ this.fireEvent("progress", [ event, this.xhr ]);
+ },
+ timeout: function() {
+ this.fireEvent("timeout", this.xhr);
+ },
+ setHeader: function(name, value) {
+ this.headers[name] = value;
+ return this;
+ },
+ getHeader: function(name) {
+ return Function.attempt(function() {
+ return this.xhr.getResponseHeader(name);
+ }.bind(this));
+ },
+ check: function() {
+ if (!this.running) return true;
+ switch (this.options.link) {
+ case "cancel":
+ this.cancel();
+ return true;
+
+ case "chain":
+ this.chain(this.caller.pass(arguments, this));
+ return false;
+ }
+ return false;
+ },
+ send: function(options) {
+ if (!this.check(options)) return this;
+ this.options.isSuccess = this.options.isSuccess || this.isSuccess;
+ this.running = true;
+ var type = typeOf(options);
+ if (type == "string" || type == "element") options = {
+ data: options
+ };
+ var old = this.options;
+ options = Object.append({
+ data: old.data,
+ url: old.url,
+ method: old.method
+ }, options);
+ var data = options.data, url = String(options.url), method = options.method.toLowerCase();
+ switch (typeOf(data)) {
+ case "element":
+ data = document.id(data).toQueryString();
+ break;
+
+ case "object":
+ case "hash":
+ data = Object.toQueryString(data);
+ }
+ if (this.options.format) {
+ var format = "format=" + this.options.format;
+ data = data ? format + "&" + data : format;
+ }
+ if (this.options.emulation && ![ "get", "post" ].contains(method)) {
+ var _method = "_method=" + method;
+ data = data ? _method + "&" + data : _method;
+ method = "post";
+ }
+ if (this.options.urlEncoded && [ "post", "put" ].contains(method)) {
+ var encoding = this.options.encoding ? "; charset=" + this.options.encoding : "";
+ this.headers["Content-type"] = "application/x-www-form-urlencoded" + encoding;
+ }
+ if (!url) url = document.location.pathname;
+ var trimPosition = url.lastIndexOf("/");
+ if (trimPosition > -1 && (trimPosition = url.indexOf("#")) > -1) url = url.substr(0, trimPosition);
+ if (this.options.noCache) url += (url.indexOf("?") > -1 ? "&" : "?") + String.uniqueID();
+ if (data && (method == "get" || method == "delete")) {
+ url += (url.indexOf("?") > -1 ? "&" : "?") + data;
+ data = null;
+ }
+ var xhr = this.xhr;
+ if (progressSupport) {
+ xhr.onloadstart = this.loadstart.bind(this);
+ xhr.onprogress = this.progress.bind(this);
+ }
+ xhr.open(method.toUpperCase(), url, this.options.async, this.options.user, this.options.password);
+ if (this.options.withCredentials && "withCredentials" in xhr) xhr.withCredentials = true;
+ xhr.onreadystatechange = this.onStateChange.bind(this);
+ Object.each(this.headers, function(value, key) {
+ try {
+ xhr.setRequestHeader(key, value);
+ } catch (e) {
+ this.fireEvent("exception", [ key, value ]);
+ }
+ }, this);
+ this.fireEvent("request");
+ xhr.send(data);
+ if (!this.options.async) this.onStateChange(); else if (this.options.timeout) this.timer = this.timeout.delay(this.options.timeout, this);
+ return this;
+ },
+ cancel: function() {
+ if (!this.running) return this;
+ this.running = false;
+ var xhr = this.xhr;
+ xhr.abort();
+ if (this.timer) {
+ clearTimeout(this.timer);
+ delete this.timer;
+ }
+ xhr.onreadystatechange = empty;
+ if (progressSupport) xhr.onprogress = xhr.onloadstart = empty;
+ this.xhr = new Browser.Request();
+ this.fireEvent("cancel");
+ return this;
+ }
+ });
+ var methods = {};
+ [ "get", "post", "put", "delete", "patch", "head", "GET", "POST", "PUT", "DELETE", "PATCH", "HEAD" ].each(function(method) {
+ methods[method] = function(data) {
+ var object = {
+ method: method
+ };
+ if (data != null) object.data = data;
+ return this.send(object);
+ };
+ });
+ Request.implement(methods);
+ Element.Properties.send = {
+ set: function(options) {
+ var send = this.get("send").cancel();
+ send.setOptions(options);
+ return this;
+ },
+ get: function() {
+ var send = this.retrieve("send");
+ if (!send) {
+ send = new Request({
+ data: this,
+ link: "cancel",
+ method: this.get("method") || "post",
+ url: this.get("action")
+ });
+ this.store("send", send);
+ }
+ return send;
+ }
+ };
+ Element.implement({
+ send: function(url) {
+ var sender = this.get("send");
+ sender.send({
+ data: this,
+ url: url || sender.options.url
+ });
+ return this;
+ }
+ });
+})();
+
+if (typeof JSON == "undefined") this.JSON = {};
+
+(function() {
+ var special = {
+ "\b": "\\b",
+ " ": "\\t",
+ "\n": "\\n",
+ "\f": "\\f",
+ "\r": "\\r",
+ '"': '\\"',
+ "\\": "\\\\"
+ };
+ var escape = function(chr) {
+ return special[chr] || "\\u" + ("0000" + chr.charCodeAt(0).toString(16)).slice(-4);
+ };
+ JSON.validate = function(string) {
+ string = string.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]").replace(/(?:^|:|,)(?:\s*\[)+/g, "");
+ return /^[\],:{}\s]*$/.test(string);
+ };
+ JSON.encode = JSON.stringify ? function(obj) {
+ return JSON.stringify(obj);
+ } : function(obj) {
+ if (obj && obj.toJSON) obj = obj.toJSON();
+ switch (typeOf(obj)) {
+ case "string":
+ return '"' + obj.replace(/[\x00-\x1f\\"]/g, escape) + '"';
+
+ case "array":
+ return "[" + obj.map(JSON.encode).clean() + "]";
+
+ case "object":
+ case "hash":
+ var string = [];
+ Object.each(obj, function(value, key) {
+ var json = JSON.encode(value);
+ if (json) string.push(JSON.encode(key) + ":" + json);
+ });
+ return "{" + string + "}";
+
+ case "number":
+ case "boolean":
+ return "" + obj;
+
+ case "null":
+ return "null";
+ }
+ return null;
+ };
+ JSON.secure = true;
+ JSON.decode = function(string, secure) {
+ if (!string || typeOf(string) != "string") return null;
+ if (secure == null) secure = JSON.secure;
+ if (secure) {
+ if (JSON.parse) return JSON.parse(string);
+ if (!JSON.validate(string)) throw new Error("JSON could not decode the input; security is enabled and the value is not secure.");
+ }
+ return eval("(" + string + ")");
+ };
+})();
+
+Request.JSON = new Class({
+ Extends: Request,
+ options: {
+ secure: true
+ },
+ initialize: function(options) {
+ this.parent(options);
+ Object.append(this.headers, {
+ Accept: "application/json",
+ "X-Request": "JSON"
+ });
+ },
+ success: function(text) {
+ var json;
+ try {
+ json = this.response.json = JSON.decode(text, this.options.secure);
+ } catch (error) {
+ this.fireEvent("error", [ text, error ]);
+ return;
+ }
+ if (json == null) this.onFailure(); else this.onSuccess(json, text);
+ }
+});
+
+var Cookie = new Class({
+ Implements: Options,
+ options: {
+ path: "/",
+ domain: false,
+ duration: false,
+ secure: false,
+ document: document,
+ encode: true
+ },
+ initialize: function(key, options) {
+ this.key = key;
+ this.setOptions(options);
+ },
+ write: function(value) {
+ if (this.options.encode) value = encodeURIComponent(value);
+ if (this.options.domain) value += "; domain=" + this.options.domain;
+ if (this.options.path) value += "; path=" + this.options.path;
+ if (this.options.duration) {
+ var date = new Date();
+ date.setTime(date.getTime() + this.options.duration * 24 * 60 * 60 * 1e3);
+ value += "; expires=" + date.toGMTString();
+ }
+ if (this.options.secure) value += "; secure";
+ this.options.document.cookie = this.key + "=" + value;
+ return this;
+ },
+ read: function() {
+ var value = this.options.document.cookie.match("(?:^|;)\\s*" + this.key.escapeRegExp() + "=([^;]*)");
+ return value ? decodeURIComponent(value[1]) : null;
+ },
+ dispose: function() {
+ new Cookie(this.key, Object.merge({}, this.options, {
+ duration: -1
+ })).write("");
+ return this;
+ }
+});
+
+Cookie.write = function(key, value, options) {
+ return new Cookie(key, options).write(value);
+};
+
+Cookie.read = function(key) {
+ return new Cookie(key).read();
+};
+
+Cookie.dispose = function(key, options) {
+ return new Cookie(key, options).dispose();
+};
+
+(function(window, document) {
+ var ready, loaded, checks = [], shouldPoll, timer, testElement = document.createElement("div");
+ var domready = function() {
+ clearTimeout(timer);
+ if (!ready) {
+ Browser.loaded = ready = true;
+ document.removeListener("DOMContentLoaded", domready).removeListener("readystatechange", check);
+ document.fireEvent("domready");
+ window.fireEvent("domready");
+ }
+ document = window = testElement = null;
+ };
+ var check = function() {
+ for (var i = checks.length; i--; ) if (checks[i]()) {
+ domready();
+ return true;
+ }
+ return false;
+ };
+ var poll = function() {
+ clearTimeout(timer);
+ if (!check()) timer = setTimeout(poll, 10);
+ };
+ document.addListener("DOMContentLoaded", domready);
+ var doScrollWorks = function() {
+ try {
+ testElement.doScroll();
+ return true;
+ } catch (e) {}
+ return false;
+ };
+ if (testElement.doScroll && !doScrollWorks()) {
+ checks.push(doScrollWorks);
+ shouldPoll = true;
+ }
+ if (document.readyState) checks.push(function() {
+ var state = document.readyState;
+ return state == "loaded" || state == "complete";
+ });
+ if ("onreadystatechange" in document) document.addListener("readystatechange", check); else shouldPoll = true;
+ if (shouldPoll) poll();
+ Element.Events.domready = {
+ onAdd: function(fn) {
+ if (ready) fn.call(this);
+ }
+ };
+ Element.Events.load = {
+ base: "load",
+ onAdd: function(fn) {
+ if (loaded && this == window) fn.call(this);
+ },
+ condition: function() {
+ if (this == window) {
+ domready();
+ delete Element.Events.load;
+ }
+ return true;
+ }
+ };
+ window.addEvent("load", function() {
+ loaded = true;
+ });
+})(window, document);
+
+MooTools.More = {
+ version: "1.5.1",
+ build: "2dd695ba957196ae4b0275a690765d6636a61ccd"
+};
+
+(function() {
+ Events.Pseudos = function(pseudos, addEvent, removeEvent) {
+ var storeKey = "_monitorEvents:";
+ var storageOf = function(object) {
+ return {
+ store: object.store ? function(key, value) {
+ object.store(storeKey + key, value);
+ } : function(key, value) {
+ (object._monitorEvents || (object._monitorEvents = {}))[key] = value;
+ },
+ retrieve: object.retrieve ? function(key, dflt) {
+ return object.retrieve(storeKey + key, dflt);
+ } : function(key, dflt) {
+ if (!object._monitorEvents) return dflt;
+ return object._monitorEvents[key] || dflt;
+ }
+ };
+ };
+ var splitType = function(type) {
+ if (type.indexOf(":") == -1 || !pseudos) return null;
+ var parsed = Slick.parse(type).expressions[0][0], parsedPseudos = parsed.pseudos, l = parsedPseudos.length, splits = [];
+ while (l--) {
+ var pseudo = parsedPseudos[l].key, listener = pseudos[pseudo];
+ if (listener != null) splits.push({
+ event: parsed.tag,
+ value: parsedPseudos[l].value,
+ pseudo: pseudo,
+ original: type,
+ listener: listener
+ });
+ }
+ return splits.length ? splits : null;
+ };
+ return {
+ addEvent: function(type, fn, internal) {
+ var split = splitType(type);
+ if (!split) return addEvent.call(this, type, fn, internal);
+ var storage = storageOf(this), events = storage.retrieve(type, []), eventType = split[0].event, args = Array.slice(arguments, 2), stack = fn, self = this;
+ split.each(function(item) {
+ var listener = item.listener, stackFn = stack;
+ if (listener == false) eventType += ":" + item.pseudo + "(" + item.value + ")"; else stack = function() {
+ listener.call(self, item, stackFn, arguments, stack);
+ };
+ });
+ events.include({
+ type: eventType,
+ event: fn,
+ monitor: stack
+ });
+ storage.store(type, events);
+ if (type != eventType) addEvent.apply(this, [ type, fn ].concat(args));
+ return addEvent.apply(this, [ eventType, stack ].concat(args));
+ },
+ removeEvent: function(type, fn) {
+ var split = splitType(type);
+ if (!split) return removeEvent.call(this, type, fn);
+ var storage = storageOf(this), events = storage.retrieve(type);
+ if (!events) return this;
+ var args = Array.slice(arguments, 2);
+ removeEvent.apply(this, [ type, fn ].concat(args));
+ events.each(function(monitor, i) {
+ if (!fn || monitor.event == fn) removeEvent.apply(this, [ monitor.type, monitor.monitor ].concat(args));
+ delete events[i];
+ }, this);
+ storage.store(type, events);
+ return this;
+ }
+ };
+ };
+ var pseudos = {
+ once: function(split, fn, args, monitor) {
+ fn.apply(this, args);
+ this.removeEvent(split.event, monitor).removeEvent(split.original, fn);
+ },
+ throttle: function(split, fn, args) {
+ if (!fn._throttled) {
+ fn.apply(this, args);
+ fn._throttled = setTimeout(function() {
+ fn._throttled = false;
+ }, split.value || 250);
+ }
+ },
+ pause: function(split, fn, args) {
+ clearTimeout(fn._pause);
+ fn._pause = fn.delay(split.value || 250, this, args);
+ }
+ };
+ Events.definePseudo = function(key, listener) {
+ pseudos[key] = listener;
+ return this;
+ };
+ Events.lookupPseudo = function(key) {
+ return pseudos[key];
+ };
+ var proto = Events.prototype;
+ Events.implement(Events.Pseudos(pseudos, proto.addEvent, proto.removeEvent));
+ [ "Request", "Fx" ].each(function(klass) {
+ if (this[klass]) this[klass].implement(Events.prototype);
+ });
+})();
+
+var Drag = new Class({
+ Implements: [ Events, Options ],
+ options: {
+ snap: 6,
+ unit: "px",
+ grid: false,
+ style: true,
+ limit: false,
+ handle: false,
+ invert: false,
+ preventDefault: false,
+ stopPropagation: false,
+ compensateScroll: false,
+ modifiers: {
+ x: "left",
+ y: "top"
+ }
+ },
+ initialize: function() {
+ var params = Array.link(arguments, {
+ options: Type.isObject,
+ element: function(obj) {
+ return obj != null;
+ }
+ });
+ this.element = document.id(params.element);
+ this.document = this.element.getDocument();
+ this.setOptions(params.options || {});
+ var htype = typeOf(this.options.handle);
+ this.handles = (htype == "array" || htype == "collection" ? $$(this.options.handle) : document.id(this.options.handle)) || this.element;
+ this.mouse = {
+ now: {},
+ pos: {}
+ };
+ this.value = {
+ start: {},
+ now: {}
+ };
+ this.offsetParent = function(el) {
+ var offsetParent = el.getOffsetParent();
+ var isBody = !offsetParent || /^(?:body|html)$/i.test(offsetParent.tagName);
+ return isBody ? window : document.id(offsetParent);
+ }(this.element);
+ this.selection = "selectstart" in document ? "selectstart" : "mousedown";
+ this.compensateScroll = {
+ start: {},
+ diff: {},
+ last: {}
+ };
+ if ("ondragstart" in document && !("FileReader" in window) && !Drag.ondragstartFixed) {
+ document.ondragstart = Function.from(false);
+ Drag.ondragstartFixed = true;
+ }
+ this.bound = {
+ start: this.start.bind(this),
+ check: this.check.bind(this),
+ drag: this.drag.bind(this),
+ stop: this.stop.bind(this),
+ cancel: this.cancel.bind(this),
+ eventStop: Function.from(false),
+ scrollListener: this.scrollListener.bind(this)
+ };
+ this.attach();
+ },
+ attach: function() {
+ this.handles.addEvent("mousedown", this.bound.start);
+ if (this.options.compensateScroll) this.offsetParent.addEvent("scroll", this.bound.scrollListener);
+ return this;
+ },
+ detach: function() {
+ this.handles.removeEvent("mousedown", this.bound.start);
+ if (this.options.compensateScroll) this.offsetParent.removeEvent("scroll", this.bound.scrollListener);
+ return this;
+ },
+ scrollListener: function() {
+ if (!this.mouse.start) return;
+ var newScrollValue = this.offsetParent.getScroll();
+ if (this.element.getStyle("position") == "absolute") {
+ var scrollDiff = this.sumValues(newScrollValue, this.compensateScroll.last, -1);
+ this.mouse.now = this.sumValues(this.mouse.now, scrollDiff, 1);
+ } else {
+ this.compensateScroll.diff = this.sumValues(newScrollValue, this.compensateScroll.start, -1);
+ }
+ if (this.offsetParent != window) this.compensateScroll.diff = this.sumValues(this.compensateScroll.start, newScrollValue, -1);
+ this.compensateScroll.last = newScrollValue;
+ this.render(this.options);
+ },
+ sumValues: function(alpha, beta, op) {
+ var sum = {}, options = this.options;
+ for (z in options.modifiers) {
+ if (!options.modifiers[z]) continue;
+ sum[z] = alpha[z] + beta[z] * op;
+ }
+ return sum;
+ },
+ start: function(event) {
+ var options = this.options;
+ if (event.rightClick) return;
+ if (options.preventDefault) event.preventDefault();
+ if (options.stopPropagation) event.stopPropagation();
+ this.compensateScroll.start = this.compensateScroll.last = this.offsetParent.getScroll();
+ this.compensateScroll.diff = {
+ x: 0,
+ y: 0
+ };
+ this.mouse.start = event.page;
+ this.fireEvent("beforeStart", this.element);
+ var limit = options.limit;
+ this.limit = {
+ x: [],
+ y: []
+ };
+ var z, coordinates, offsetParent = this.offsetParent == window ? null : this.offsetParent;
+ for (z in options.modifiers) {
+ if (!options.modifiers[z]) continue;
+ var style = this.element.getStyle(options.modifiers[z]);
+ if (style && !style.match(/px$/)) {
+ if (!coordinates) coordinates = this.element.getCoordinates(offsetParent);
+ style = coordinates[options.modifiers[z]];
+ }
+ if (options.style) this.value.now[z] = (style || 0).toInt(); else this.value.now[z] = this.element[options.modifiers[z]];
+ if (options.invert) this.value.now[z] *= -1;
+ this.mouse.pos[z] = event.page[z] - this.value.now[z];
+ if (limit && limit[z]) {
+ var i = 2;
+ while (i--) {
+ var limitZI = limit[z][i];
+ if (limitZI || limitZI === 0) this.limit[z][i] = typeof limitZI == "function" ? limitZI() : limitZI;
+ }
+ }
+ }
+ if (typeOf(this.options.grid) == "number") this.options.grid = {
+ x: this.options.grid,
+ y: this.options.grid
+ };
+ var events = {
+ mousemove: this.bound.check,
+ mouseup: this.bound.cancel
+ };
+ events[this.selection] = this.bound.eventStop;
+ this.document.addEvents(events);
+ },
+ check: function(event) {
+ if (this.options.preventDefault) event.preventDefault();
+ var distance = Math.round(Math.sqrt(Math.pow(event.page.x - this.mouse.start.x, 2) + Math.pow(event.page.y - this.mouse.start.y, 2)));
+ if (distance > this.options.snap) {
+ this.cancel();
+ this.document.addEvents({
+ mousemove: this.bound.drag,
+ mouseup: this.bound.stop
+ });
+ this.fireEvent("start", [ this.element, event ]).fireEvent("snap", this.element);
+ }
+ },
+ drag: function(event) {
+ var options = this.options;
+ if (options.preventDefault) event.preventDefault();
+ this.mouse.now = this.sumValues(event.page, this.compensateScroll.diff, -1);
+ this.render(options);
+ this.fireEvent("drag", [ this.element, event ]);
+ },
+ render: function(options) {
+ for (var z in options.modifiers) {
+ if (!options.modifiers[z]) continue;
+ this.value.now[z] = this.mouse.now[z] - this.mouse.pos[z];
+ if (options.invert) this.value.now[z] *= -1;
+ if (options.limit && this.limit[z]) {
+ if ((this.limit[z][1] || this.limit[z][1] === 0) && this.value.now[z] > this.limit[z][1]) {
+ this.value.now[z] = this.limit[z][1];
+ } else if ((this.limit[z][0] || this.limit[z][0] === 0) && this.value.now[z] < this.limit[z][0]) {
+ this.value.now[z] = this.limit[z][0];
+ }
+ }
+ if (options.grid[z]) this.value.now[z] -= (this.value.now[z] - (this.limit[z][0] || 0)) % options.grid[z];
+ if (options.style) this.element.setStyle(options.modifiers[z], this.value.now[z] + options.unit); else this.element[options.modifiers[z]] = this.value.now[z];
+ }
+ },
+ cancel: function(event) {
+ this.document.removeEvents({
+ mousemove: this.bound.check,
+ mouseup: this.bound.cancel
+ });
+ if (event) {
+ this.document.removeEvent(this.selection, this.bound.eventStop);
+ this.fireEvent("cancel", this.element);
+ }
+ },
+ stop: function(event) {
+ var events = {
+ mousemove: this.bound.drag,
+ mouseup: this.bound.stop
+ };
+ events[this.selection] = this.bound.eventStop;
+ this.document.removeEvents(events);
+ this.mouse.start = null;
+ if (event) this.fireEvent("complete", [ this.element, event ]);
+ }
+});
+
+Element.implement({
+ makeResizable: function(options) {
+ var drag = new Drag(this, Object.merge({
+ modifiers: {
+ x: "width",
+ y: "height"
+ }
+ }, options));
+ this.store("resizer", drag);
+ return drag.addEvent("drag", function() {
+ this.fireEvent("resize", drag);
+ }.bind(this));
+ }
+});
+
+Drag.Move = new Class({
+ Extends: Drag,
+ options: {
+ droppables: [],
+ container: false,
+ precalculate: false,
+ includeMargins: true,
+ checkDroppables: true
+ },
+ initialize: function(element, options) {
+ this.parent(element, options);
+ element = this.element;
+ this.droppables = $$(this.options.droppables);
+ this.setContainer(this.options.container);
+ if (this.options.style) {
+ if (this.options.modifiers.x == "left" && this.options.modifiers.y == "top") {
+ var parent = element.getOffsetParent(), styles = element.getStyles("left", "top");
+ if (parent && (styles.left == "auto" || styles.top == "auto")) {
+ element.setPosition(element.getPosition(parent));
+ }
+ }
+ if (element.getStyle("position") == "static") element.setStyle("position", "absolute");
+ }
+ this.addEvent("start", this.checkDroppables, true);
+ this.overed = null;
+ },
+ setContainer: function(container) {
+ this.container = document.id(container);
+ if (this.container && typeOf(this.container) != "element") {
+ this.container = document.id(this.container.getDocument().body);
+ }
+ },
+ start: function(event) {
+ if (this.container) this.options.limit = this.calculateLimit();
+ if (this.options.precalculate) {
+ this.positions = this.droppables.map(function(el) {
+ return el.getCoordinates();
+ });
+ }
+ this.parent(event);
+ },
+ calculateLimit: function() {
+ var element = this.element, container = this.container, offsetParent = document.id(element.getOffsetParent()) || document.body, containerCoordinates = container.getCoordinates(offsetParent), elementMargin = {}, elementBorder = {}, containerMargin = {}, containerBorder = {}, offsetParentPadding = {}, offsetScroll = offsetParent.getScroll();
+ [ "top", "right", "bottom", "left" ].each(function(pad) {
+ elementMargin[pad] = element.getStyle("margin-" + pad).toInt();
+ elementBorder[pad] = element.getStyle("border-" + pad).toInt();
+ containerMargin[pad] = container.getStyle("margin-" + pad).toInt();
+ containerBorder[pad] = container.getStyle("border-" + pad).toInt();
+ offsetParentPadding[pad] = offsetParent.getStyle("padding-" + pad).toInt();
+ }, this);
+ var width = element.offsetWidth + elementMargin.left + elementMargin.right, height = element.offsetHeight + elementMargin.top + elementMargin.bottom, left = 0 + offsetScroll.x, top = 0 + offsetScroll.y, right = containerCoordinates.right - containerBorder.right - width + offsetScroll.x, bottom = containerCoordinates.bottom - containerBorder.bottom - height + offsetScroll.y;
+ if (this.options.includeMargins) {
+ left += elementMargin.left;
+ top += elementMargin.top;
+ } else {
+ right += elementMargin.right;
+ bottom += elementMargin.bottom;
+ }
+ if (element.getStyle("position") == "relative") {
+ var coords = element.getCoordinates(offsetParent);
+ coords.left -= element.getStyle("left").toInt();
+ coords.top -= element.getStyle("top").toInt();
+ left -= coords.left;
+ top -= coords.top;
+ if (container.getStyle("position") != "relative") {
+ left += containerBorder.left;
+ top += containerBorder.top;
+ }
+ right += elementMargin.left - coords.left;
+ bottom += elementMargin.top - coords.top;
+ if (container != offsetParent) {
+ left += containerMargin.left + offsetParentPadding.left;
+ if (!offsetParentPadding.left && left < 0) left = 0;
+ top += offsetParent == document.body ? 0 : containerMargin.top + offsetParentPadding.top;
+ if (!offsetParentPadding.top && top < 0) top = 0;
+ }
+ } else {
+ left -= elementMargin.left;
+ top -= elementMargin.top;
+ if (container != offsetParent) {
+ left += containerCoordinates.left + containerBorder.left;
+ top += containerCoordinates.top + containerBorder.top;
+ }
+ }
+ return {
+ x: [ left, right ],
+ y: [ top, bottom ]
+ };
+ },
+ getDroppableCoordinates: function(element) {
+ var position = element.getCoordinates();
+ if (element.getStyle("position") == "fixed") {
+ var scroll = window.getScroll();
+ position.left += scroll.x;
+ position.right += scroll.x;
+ position.top += scroll.y;
+ position.bottom += scroll.y;
+ }
+ return position;
+ },
+ checkDroppables: function() {
+ var overed = this.droppables.filter(function(el, i) {
+ el = this.positions ? this.positions[i] : this.getDroppableCoordinates(el);
+ var now = this.mouse.now;
+ return now.x > el.left && now.x < el.right && now.y < el.bottom && now.y > el.top;
+ }, this).getLast();
+ if (this.overed != overed) {
+ if (this.overed) this.fireEvent("leave", [ this.element, this.overed ]);
+ if (overed) this.fireEvent("enter", [ this.element, overed ]);
+ this.overed = overed;
+ }
+ },
+ drag: function(event) {
+ this.parent(event);
+ if (this.options.checkDroppables && this.droppables.length) this.checkDroppables();
+ },
+ stop: function(event) {
+ this.checkDroppables();
+ this.fireEvent("drop", [ this.element, this.overed, event ]);
+ this.overed = null;
+ return this.parent(event);
+ }
+});
+
+Element.implement({
+ makeDraggable: function(options) {
+ var drag = new Drag.Move(this, options);
+ this.store("dragger", drag);
+ return drag;
+ }
+});
+
+var Sortables = new Class({
+ Implements: [ Events, Options ],
+ options: {
+ opacity: 1,
+ clone: false,
+ revert: false,
+ handle: false,
+ dragOptions: {},
+ unDraggableTags: [ "button", "input", "a", "textarea", "select", "option" ]
+ },
+ initialize: function(lists, options) {
+ this.setOptions(options);
+ this.elements = [];
+ this.lists = [];
+ this.idle = true;
+ this.addLists($$(document.id(lists) || lists));
+ if (!this.options.clone) this.options.revert = false;
+ if (this.options.revert) this.effect = new Fx.Morph(null, Object.merge({
+ duration: 250,
+ link: "cancel"
+ }, this.options.revert));
+ },
+ attach: function() {
+ this.addLists(this.lists);
+ return this;
+ },
+ detach: function() {
+ this.lists = this.removeLists(this.lists);
+ return this;
+ },
+ addItems: function() {
+ Array.flatten(arguments).each(function(element) {
+ this.elements.push(element);
+ var start = element.retrieve("sortables:start", function(event) {
+ this.start.call(this, event, element);
+ }.bind(this));
+ (this.options.handle ? element.getElement(this.options.handle) || element : element).addEvent("mousedown", start);
+ }, this);
+ return this;
+ },
+ addLists: function() {
+ Array.flatten(arguments).each(function(list) {
+ this.lists.include(list);
+ this.addItems(list.getChildren());
+ }, this);
+ return this;
+ },
+ removeItems: function() {
+ return $$(Array.flatten(arguments).map(function(element) {
+ this.elements.erase(element);
+ var start = element.retrieve("sortables:start");
+ (this.options.handle ? element.getElement(this.options.handle) || element : element).removeEvent("mousedown", start);
+ return element;
+ }, this));
+ },
+ removeLists: function() {
+ return $$(Array.flatten(arguments).map(function(list) {
+ this.lists.erase(list);
+ this.removeItems(list.getChildren());
+ return list;
+ }, this));
+ },
+ getDroppableCoordinates: function(element) {
+ var offsetParent = element.getOffsetParent();
+ var position = element.getPosition(offsetParent);
+ var scroll = {
+ w: window.getScroll(),
+ offsetParent: offsetParent.getScroll()
+ };
+ position.x += scroll.offsetParent.x;
+ position.y += scroll.offsetParent.y;
+ if (offsetParent.getStyle("position") == "fixed") {
+ position.x -= scroll.w.x;
+ position.y -= scroll.w.y;
+ }
+ return position;
+ },
+ getClone: function(event, element) {
+ if (!this.options.clone) return new Element(element.tagName).inject(document.body);
+ if (typeOf(this.options.clone) == "function") return this.options.clone.call(this, event, element, this.list);
+ var clone = element.clone(true).setStyles({
+ margin: 0,
+ position: "absolute",
+ visibility: "hidden",
+ width: element.getStyle("width")
+ }).addEvent("mousedown", function(event) {
+ element.fireEvent("mousedown", event);
+ });
+ if (clone.get("html").test("radio")) {
+ clone.getElements("input[type=radio]").each(function(input, i) {
+ input.set("name", "clone_" + i);
+ if (input.get("checked")) element.getElements("input[type=radio]")[i].set("checked", true);
+ });
+ }
+ return clone.inject(this.list).setPosition(this.getDroppableCoordinates(this.element));
+ },
+ getDroppables: function() {
+ var droppables = this.list.getChildren().erase(this.clone).erase(this.element);
+ if (!this.options.constrain) droppables.append(this.lists).erase(this.list);
+ return droppables;
+ },
+ insert: function(dragging, element) {
+ var where = "inside";
+ if (this.lists.contains(element)) {
+ this.list = element;
+ this.drag.droppables = this.getDroppables();
+ } else {
+ where = this.element.getAllPrevious().contains(element) ? "before" : "after";
+ }
+ this.element.inject(element, where);
+ this.fireEvent("sort", [ this.element, this.clone ]);
+ },
+ start: function(event, element) {
+ if (!this.idle || event.rightClick || !this.options.handle && this.options.unDraggableTags.contains(event.target.get("tag"))) return;
+ this.idle = false;
+ this.element = element;
+ this.opacity = element.getStyle("opacity");
+ this.list = element.getParent();
+ this.clone = this.getClone(event, element);
+ this.drag = new Drag.Move(this.clone, Object.merge({
+ droppables: this.getDroppables()
+ }, this.options.dragOptions)).addEvents({
+ onSnap: function() {
+ event.stop();
+ this.clone.setStyle("visibility", "visible");
+ this.element.setStyle("opacity", this.options.opacity || 0);
+ this.fireEvent("start", [ this.element, this.clone ]);
+ }.bind(this),
+ onEnter: this.insert.bind(this),
+ onCancel: this.end.bind(this),
+ onComplete: this.end.bind(this)
+ });
+ this.clone.inject(this.element, "before");
+ this.drag.start(event);
+ },
+ end: function() {
+ this.drag.detach();
+ this.element.setStyle("opacity", this.opacity);
+ var self = this;
+ if (this.effect) {
+ var dim = this.element.getStyles("width", "height"), clone = this.clone, pos = clone.computePosition(this.getDroppableCoordinates(clone));
+ var destroy = function() {
+ this.removeEvent("cancel", destroy);
+ clone.destroy();
+ self.reset();
+ };
+ this.effect.element = clone;
+ this.effect.start({
+ top: pos.top,
+ left: pos.left,
+ width: dim.width,
+ height: dim.height,
+ opacity: .25
+ }).addEvent("cancel", destroy).chain(destroy);
+ } else {
+ this.clone.destroy();
+ self.reset();
+ }
+ },
+ reset: function() {
+ this.idle = true;
+ this.fireEvent("complete", this.element);
+ },
+ serialize: function() {
+ var params = Array.link(arguments, {
+ modifier: Type.isFunction,
+ index: function(obj) {
+ return obj != null;
+ }
+ });
+ var serial = this.lists.map(function(list) {
+ return list.getChildren().map(params.modifier || function(element) {
+ return element.get("id");
+ }, this);
+ }, this);
+ var index = params.index;
+ if (this.lists.length == 1) index = 0;
+ return (index || index === 0) && index >= 0 && index < this.lists.length ? serial[index] : serial;
+ }
+});
+
+(function() {
+ var special = {
+ a: /[ц═ц║ц╒цёц╓ц╔д┐д┘]/g,
+ A: /[ц─ц│ц┌ц┐ц└ц┘д┌д└]/g,
+ c: /[д┤д█ц╖]/g,
+ C: /[д├д▄ц┤]/g,
+ d: /[д▐д▒]/g,
+ D: /[д▌ц░]/g,
+ e: /[ц╗ц╘ц╙ц╚д⌡д≥]/g,
+ E: /[ц┬ц┴ц┼ц▀д д≤]/g,
+ g: /[д÷]/g,
+ G: /[д·]/g,
+ i: /[ц╛ц╜ц╝ц╞]/g,
+ I: /[ц▄ц█ц▌ц▐]/g,
+ l: /[д╨д╬е┌]/g,
+ L: /[д╧д╫е│]/g,
+ n: /[ц╠е┬е└]/g,
+ N: /[ц▒е┤е┐]/g,
+ o: /[ц╡цЁц╢ц╣ц╤ц╦е▒]/g,
+ O: /[ц▓ц⌠ц■ц∙ц√ц≤]/g,
+ r: /[е≥е∙]/g,
+ R: /[е≤е■]/g,
+ s: /[е║е║е÷]/g,
+ S: /[е═е·е ]/g,
+ t: /[е╔её]/g,
+ T: /[е╓е╒]/g,
+ u: /[ц╧ц╨ц╩е╞ц╪б╣]/g,
+ U: /[ц≥ц ц⌡е╝ц°]/g,
+ y: /[ц©ц╫]/g,
+ Y: /[е╦ц²]/g,
+ z: /[е╬е╨е╪]/g,
+ Z: /[е╫е╧е╩]/g,
+ th: /[ц╬]/g,
+ TH: /[ц·]/g,
+ dh: /[ц╟]/g,
+ DH: /[ц░]/g,
+ ss: /[ц÷]/g,
+ oe: /[е⌠]/g,
+ OE: /[е▓]/g,
+ ae: /[ц╕]/g,
+ AE: /[ц├]/g
+ }, tidy = {
+ " ": /[\xa0\u2002\u2003\u2009]/g,
+ "*": /[\xb7]/g,
+ "'": /[\u2018\u2019]/g,
+ '"': /[\u201c\u201d]/g,
+ "...": /[\u2026]/g,
+ "-": /[\u2013]/g,
+ "»": /[\uFFFD]/g
+ }, conversions = {
+ ms: 1,
+ s: 1e3,
+ m: 6e4,
+ h: 36e5
+ }, findUnits = /(\d*.?\d+)([msh]+)/;
+ var walk = function(string, replacements) {
+ var result = string, key;
+ for (key in replacements) result = result.replace(replacements[key], key);
+ return result;
+ };
+ var getRegexForTag = function(tag, contents) {
+ tag = tag || "";
+ var regstr = contents ? "<" + tag + "(?!\\w)[^>]*>([\\s\\S]*?)</" + tag + "(?!\\w)>" : "</?" + tag + "([^>]+)?>", reg = new RegExp(regstr, "gi");
+ return reg;
+ };
+ String.implement({
+ standardize: function() {
+ return walk(this, special);
+ },
+ repeat: function(times) {
+ return new Array(times + 1).join(this);
+ },
+ pad: function(length, str, direction) {
+ if (this.length >= length) return this;
+ var pad = (str == null ? " " : "" + str).repeat(length - this.length).substr(0, length - this.length);
+ if (!direction || direction == "right") return this + pad;
+ if (direction == "left") return pad + this;
+ return pad.substr(0, (pad.length / 2).floor()) + this + pad.substr(0, (pad.length / 2).ceil());
+ },
+ getTags: function(tag, contents) {
+ return this.match(getRegexForTag(tag, contents)) || [];
+ },
+ stripTags: function(tag, contents) {
+ return this.replace(getRegexForTag(tag, contents), "");
+ },
+ tidy: function() {
+ return walk(this, tidy);
+ },
+ truncate: function(max, trail, atChar) {
+ var string = this;
+ if (trail == null && arguments.length == 1) trail = "Б─╕";
+ if (string.length > max) {
+ string = string.substring(0, max);
+ if (atChar) {
+ var index = string.lastIndexOf(atChar);
+ if (index != -1) string = string.substr(0, index);
+ }
+ if (trail) string += trail;
+ }
+ return string;
+ },
+ ms: function() {
+ var units = findUnits.exec(this);
+ if (units == null) return Number(this);
+ return Number(units[1]) * conversions[units[2]];
+ }
+ });
+})();
+
+Element.implement({
+ tidy: function() {
+ this.set("value", this.get("value").tidy());
+ },
+ getTextInRange: function(start, end) {
+ return this.get("value").substring(start, end);
+ },
+ getSelectedText: function() {
+ if (this.setSelectionRange) return this.getTextInRange(this.getSelectionStart(), this.getSelectionEnd());
+ return document.selection.createRange().text;
+ },
+ getSelectedRange: function() {
+ if (this.selectionStart != null) {
+ return {
+ start: this.selectionStart,
+ end: this.selectionEnd
+ };
+ }
+ var pos = {
+ start: 0,
+ end: 0
+ };
+ var range = this.getDocument().selection.createRange();
+ if (!range || range.parentElement() != this) return pos;
+ var duplicate = range.duplicate();
+ if (this.type == "text") {
+ pos.start = 0 - duplicate.moveStart("character", -1e5);
+ pos.end = pos.start + range.text.length;
+ } else {
+ var value = this.get("value");
+ var offset = value.length;
+ duplicate.moveToElementText(this);
+ duplicate.setEndPoint("StartToEnd", range);
+ if (duplicate.text.length) offset -= value.match(/[\n\r]*$/)[0].length;
+ pos.end = offset - duplicate.text.length;
+ duplicate.setEndPoint("StartToStart", range);
+ pos.start = offset - duplicate.text.length;
+ }
+ return pos;
+ },
+ getSelectionStart: function() {
+ return this.getSelectedRange().start;
+ },
+ getSelectionEnd: function() {
+ return this.getSelectedRange().end;
+ },
+ setCaretPosition: function(pos) {
+ if (pos == "end") pos = this.get("value").length;
+ this.selectRange(pos, pos);
+ return this;
+ },
+ getCaretPosition: function() {
+ return this.getSelectedRange().start;
+ },
+ selectRange: function(start, end) {
+ if (this.setSelectionRange) {
+ this.focus();
+ this.setSelectionRange(start, end);
+ } else {
+ var value = this.get("value");
+ var diff = value.substr(start, end - start).replace(/\r/g, "").length;
+ start = value.substr(0, start).replace(/\r/g, "").length;
+ var range = this.createTextRange();
+ range.collapse(true);
+ range.moveEnd("character", start + diff);
+ range.moveStart("character", start);
+ range.select();
+ }
+ return this;
+ },
+ insertAtCursor: function(value, select) {
+ var pos = this.getSelectedRange();
+ var text = this.get("value");
+ this.set("value", text.substring(0, pos.start) + value + text.substring(pos.end, text.length));
+ if (select !== false) this.selectRange(pos.start, pos.start + value.length); else this.setCaretPosition(pos.start + value.length);
+ return this;
+ },
+ insertAroundCursor: function(options, select) {
+ options = Object.append({
+ before: "",
+ defaultMiddle: "",
+ after: ""
+ }, options);
+ var value = this.getSelectedText() || options.defaultMiddle;
+ var pos = this.getSelectedRange();
+ var text = this.get("value");
+ if (pos.start == pos.end) {
+ this.set("value", text.substring(0, pos.start) + options.before + value + options.after + text.substring(pos.end, text.length));
+ this.selectRange(pos.start + options.before.length, pos.end + options.before.length + value.length);
+ } else {
+ var current = text.substring(pos.start, pos.end);
+ this.set("value", text.substring(0, pos.start) + options.before + current + options.after + text.substring(pos.end, text.length));
+ var selStart = pos.start + options.before.length;
+ if (select !== false) this.selectRange(selStart, selStart + current.length); else this.setCaretPosition(selStart + text.length);
+ }
+ return this;
+ }
+});
+
+(function() {
+ var getStylesList = function(styles, planes) {
+ var list = [];
+ Object.each(planes, function(directions) {
+ Object.each(directions, function(edge) {
+ styles.each(function(style) {
+ list.push(style + "-" + edge + (style == "border" ? "-width" : ""));
+ });
+ });
+ });
+ return list;
+ };
+ var calculateEdgeSize = function(edge, styles) {
+ var total = 0;
+ Object.each(styles, function(value, style) {
+ if (style.test(edge)) total = total + value.toInt();
+ });
+ return total;
+ };
+ var isVisible = function(el) {
+ return !!(!el || el.offsetHeight || el.offsetWidth);
+ };
+ Element.implement({
+ measure: function(fn) {
+ if (isVisible(this)) return fn.call(this);
+ var parent = this.getParent(), toMeasure = [];
+ while (!isVisible(parent) && parent != document.body) {
+ toMeasure.push(parent.expose());
+ parent = parent.getParent();
+ }
+ var restore = this.expose(), result = fn.call(this);
+ restore();
+ toMeasure.each(function(restore) {
+ restore();
+ });
+ return result;
+ },
+ expose: function() {
+ if (this.getStyle("display") != "none") return function() {};
+ var before = this.style.cssText;
+ this.setStyles({
+ display: "block",
+ position: "absolute",
+ visibility: "hidden"
+ });
+ return function() {
+ this.style.cssText = before;
+ }.bind(this);
+ },
+ getDimensions: function(options) {
+ options = Object.merge({
+ computeSize: false
+ }, options);
+ var dim = {
+ x: 0,
+ y: 0
+ };
+ var getSize = function(el, options) {
+ return options.computeSize ? el.getComputedSize(options) : el.getSize();
+ };
+ var parent = this.getParent("body");
+ if (parent && this.getStyle("display") == "none") {
+ dim = this.measure(function() {
+ return getSize(this, options);
+ });
+ } else if (parent) {
+ try {
+ dim = getSize(this, options);
+ } catch (e) {}
+ }
+ return Object.append(dim, dim.x || dim.x === 0 ? {
+ width: dim.x,
+ height: dim.y
+ } : {
+ x: dim.width,
+ y: dim.height
+ });
+ },
+ getComputedSize: function(options) {
+ options = Object.merge({
+ styles: [ "padding", "border" ],
+ planes: {
+ height: [ "top", "bottom" ],
+ width: [ "left", "right" ]
+ },
+ mode: "both"
+ }, options);
+ var styles = {}, size = {
+ width: 0,
+ height: 0
+ }, dimensions;
+ if (options.mode == "vertical") {
+ delete size.width;
+ delete options.planes.width;
+ } else if (options.mode == "horizontal") {
+ delete size.height;
+ delete options.planes.height;
+ }
+ getStylesList(options.styles, options.planes).each(function(style) {
+ styles[style] = this.getStyle(style).toInt();
+ }, this);
+ Object.each(options.planes, function(edges, plane) {
+ var capitalized = plane.capitalize(), style = this.getStyle(plane);
+ if (style == "auto" && !dimensions) dimensions = this.getDimensions();
+ style = styles[plane] = style == "auto" ? dimensions[plane] : style.toInt();
+ size["total" + capitalized] = style;
+ edges.each(function(edge) {
+ var edgesize = calculateEdgeSize(edge, styles);
+ size["computed" + edge.capitalize()] = edgesize;
+ size["total" + capitalized] += edgesize;
+ });
+ }, this);
+ return Object.append(size, styles);
+ }
+ });
+})();
+
+(function(original) {
+ var local = Element.Position = {
+ options: {
+ relativeTo: document.body,
+ position: {
+ x: "center",
+ y: "center"
+ },
+ offset: {
+ x: 0,
+ y: 0
+ }
+ },
+ getOptions: function(element, options) {
+ options = Object.merge({}, local.options, options);
+ local.setPositionOption(options);
+ local.setEdgeOption(options);
+ local.setOffsetOption(element, options);
+ local.setDimensionsOption(element, options);
+ return options;
+ },
+ setPositionOption: function(options) {
+ options.position = local.getCoordinateFromValue(options.position);
+ },
+ setEdgeOption: function(options) {
+ var edgeOption = local.getCoordinateFromValue(options.edge);
+ options.edge = edgeOption ? edgeOption : options.position.x == "center" && options.position.y == "center" ? {
+ x: "center",
+ y: "center"
+ } : {
+ x: "left",
+ y: "top"
+ };
+ },
+ setOffsetOption: function(element, options) {
+ var parentOffset = {
+ x: 0,
+ y: 0
+ };
+ var parentScroll = {
+ x: 0,
+ y: 0
+ };
+ var offsetParent = element.measure(function() {
+ return document.id(this.getOffsetParent());
+ });
+ if (!offsetParent || offsetParent == element.getDocument().body) return;
+ parentScroll = offsetParent.getScroll();
+ parentOffset = offsetParent.measure(function() {
+ var position = this.getPosition();
+ if (this.getStyle("position") == "fixed") {
+ var scroll = window.getScroll();
+ position.x += scroll.x;
+ position.y += scroll.y;
+ }
+ return position;
+ });
+ options.offset = {
+ parentPositioned: offsetParent != document.id(options.relativeTo),
+ x: options.offset.x - parentOffset.x + parentScroll.x,
+ y: options.offset.y - parentOffset.y + parentScroll.y
+ };
+ },
+ setDimensionsOption: function(element, options) {
+ options.dimensions = element.getDimensions({
+ computeSize: true,
+ styles: [ "padding", "border", "margin" ]
+ });
+ },
+ getPosition: function(element, options) {
+ var position = {};
+ options = local.getOptions(element, options);
+ var relativeTo = document.id(options.relativeTo) || document.body;
+ local.setPositionCoordinates(options, position, relativeTo);
+ if (options.edge) local.toEdge(position, options);
+ var offset = options.offset;
+ position.left = (position.x >= 0 || offset.parentPositioned || options.allowNegative ? position.x : 0).toInt();
+ position.top = (position.y >= 0 || offset.parentPositioned || options.allowNegative ? position.y : 0).toInt();
+ local.toMinMax(position, options);
+ if (options.relFixedPosition || relativeTo.getStyle("position") == "fixed") local.toRelFixedPosition(relativeTo, position);
+ if (options.ignoreScroll) local.toIgnoreScroll(relativeTo, position);
+ if (options.ignoreMargins) local.toIgnoreMargins(position, options);
+ position.left = Math.ceil(position.left);
+ position.top = Math.ceil(position.top);
+ delete position.x;
+ delete position.y;
+ return position;
+ },
+ setPositionCoordinates: function(options, position, relativeTo) {
+ var offsetY = options.offset.y, offsetX = options.offset.x, calc = relativeTo == document.body ? window.getScroll() : relativeTo.getPosition(), top = calc.y, left = calc.x, winSize = window.getSize();
+ switch (options.position.x) {
+ case "left":
+ position.x = left + offsetX;
+ break;
+
+ case "right":
+ position.x = left + offsetX + relativeTo.offsetWidth;
+ break;
+
+ default:
+ position.x = left + (relativeTo == document.body ? winSize.x : relativeTo.offsetWidth) / 2 + offsetX;
+ break;
+ }
+ switch (options.position.y) {
+ case "top":
+ position.y = top + offsetY;
+ break;
+
+ case "bottom":
+ position.y = top + offsetY + relativeTo.offsetHeight;
+ break;
+
+ default:
+ position.y = top + (relativeTo == document.body ? winSize.y : relativeTo.offsetHeight) / 2 + offsetY;
+ break;
+ }
+ },
+ toMinMax: function(position, options) {
+ var xy = {
+ left: "x",
+ top: "y"
+ }, value;
+ [ "minimum", "maximum" ].each(function(minmax) {
+ [ "left", "top" ].each(function(lr) {
+ value = options[minmax] ? options[minmax][xy[lr]] : null;
+ if (value != null && (minmax == "minimum" ? position[lr] < value : position[lr] > value)) position[lr] = value;
+ });
+ });
+ },
+ toRelFixedPosition: function(relativeTo, position) {
+ var winScroll = window.getScroll();
+ position.top += winScroll.y;
+ position.left += winScroll.x;
+ },
+ toIgnoreScroll: function(relativeTo, position) {
+ var relScroll = relativeTo.getScroll();
+ position.top -= relScroll.y;
+ position.left -= relScroll.x;
+ },
+ toIgnoreMargins: function(position, options) {
+ position.left += options.edge.x == "right" ? options.dimensions["margin-right"] : options.edge.x != "center" ? -options.dimensions["margin-left"] : -options.dimensions["margin-left"] + (options.dimensions["margin-right"] + options.dimensions["margin-left"]) / 2;
+ position.top += options.edge.y == "bottom" ? options.dimensions["margin-bottom"] : options.edge.y != "center" ? -options.dimensions["margin-top"] : -options.dimensions["margin-top"] + (options.dimensions["margin-bottom"] + options.dimensions["margin-top"]) / 2;
+ },
+ toEdge: function(position, options) {
+ var edgeOffset = {}, dimensions = options.dimensions, edge = options.edge;
+ switch (edge.x) {
+ case "left":
+ edgeOffset.x = 0;
+ break;
+
+ case "right":
+ edgeOffset.x = -dimensions.x - dimensions.computedRight - dimensions.computedLeft;
+ break;
+
+ default:
+ edgeOffset.x = -Math.round(dimensions.totalWidth / 2);
+ break;
+ }
+ switch (edge.y) {
+ case "top":
+ edgeOffset.y = 0;
+ break;
+
+ case "bottom":
+ edgeOffset.y = -dimensions.y - dimensions.computedTop - dimensions.computedBottom;
+ break;
+
+ default:
+ edgeOffset.y = -Math.round(dimensions.totalHeight / 2);
+ break;
+ }
+ position.x += edgeOffset.x;
+ position.y += edgeOffset.y;
+ },
+ getCoordinateFromValue: function(option) {
+ if (typeOf(option) != "string") return option;
+ option = option.toLowerCase();
+ return {
+ x: option.test("left") ? "left" : option.test("right") ? "right" : "center",
+ y: option.test(/upper|top/) ? "top" : option.test("bottom") ? "bottom" : "center"
+ };
+ }
+ };
+ Element.implement({
+ position: function(options) {
+ if (options && (options.x != null || options.y != null)) {
+ return original ? original.apply(this, arguments) : this;
+ }
+ var position = this.setStyle("position", "absolute").calculatePosition(options);
+ return options && options.returnPos ? position : this.setStyles(position);
+ },
+ calculatePosition: function(options) {
+ return local.getPosition(this, options);
+ }
+ });
+})(Element.prototype.position);
+
+Element.implement({
+ isDisplayed: function() {
+ return this.getStyle("display") != "none";
+ },
+ isVisible: function() {
+ var w = this.offsetWidth, h = this.offsetHeight;
+ return w == 0 && h == 0 ? false : w > 0 && h > 0 ? true : this.style.display != "none";
+ },
+ toggle: function() {
+ return this[this.isDisplayed() ? "hide" : "show"]();
+ },
+ hide: function() {
+ var d;
+ try {
+ d = this.getStyle("display");
+ } catch (e) {}
+ if (d == "none") return this;
+ return this.store("element:_originalDisplay", d || "").setStyle("display", "none");
+ },
+ show: function(display) {
+ if (!display && this.isDisplayed()) return this;
+ display = display || this.retrieve("element:_originalDisplay") || "block";
+ return this.setStyle("display", display == "none" ? "block" : display);
+ },
+ swapClass: function(remove, add) {
+ return this.removeClass(remove).addClass(add);
+ }
+});
+
+Document.implement({
+ clearSelection: function() {
+ if (window.getSelection) {
+ var selection = window.getSelection();
+ if (selection && selection.removeAllRanges) selection.removeAllRanges();
+ } else if (document.selection && document.selection.empty) {
+ try {
+ document.selection.empty();
+ } catch (e) {}
+ }
+ }
+});
+
+(function() {
+ var defined = function(value) {
+ return value != null;
+ };
+ var hasOwnProperty = Object.prototype.hasOwnProperty;
+ Object.extend({
+ getFromPath: function(source, parts) {
+ if (typeof parts == "string") parts = parts.split(".");
+ for (var i = 0, l = parts.length; i < l; i++) {
+ if (hasOwnProperty.call(source, parts[i])) source = source[parts[i]]; else return null;
+ }
+ return source;
+ },
+ cleanValues: function(object, method) {
+ method = method || defined;
+ for (var key in object) if (!method(object[key])) {
+ delete object[key];
+ }
+ return object;
+ },
+ erase: function(object, key) {
+ if (hasOwnProperty.call(object, key)) delete object[key];
+ return object;
+ },
+ run: function(object) {
+ var args = Array.slice(arguments, 1);
+ for (var key in object) if (object[key].apply) {
+ object[key].apply(object, args);
+ }
+ return object;
+ }
+ });
+})();
+
+(function() {
+ var current = null, locales = {}, inherits = {};
+ var getSet = function(set) {
+ if (instanceOf(set, Locale.Set)) return set; else return locales[set];
+ };
+ var Locale = this.Locale = {
+ define: function(locale, set, key, value) {
+ var name;
+ if (instanceOf(locale, Locale.Set)) {
+ name = locale.name;
+ if (name) locales[name] = locale;
+ } else {
+ name = locale;
+ if (!locales[name]) locales[name] = new Locale.Set(name);
+ locale = locales[name];
+ }
+ if (set) locale.define(set, key, value);
+ if (!current) current = locale;
+ return locale;
+ },
+ use: function(locale) {
+ locale = getSet(locale);
+ if (locale) {
+ current = locale;
+ this.fireEvent("change", locale);
+ }
+ return this;
+ },
+ getCurrent: function() {
+ return current;
+ },
+ get: function(key, args) {
+ return current ? current.get(key, args) : "";
+ },
+ inherit: function(locale, inherits, set) {
+ locale = getSet(locale);
+ if (locale) locale.inherit(inherits, set);
+ return this;
+ },
+ list: function() {
+ return Object.keys(locales);
+ }
+ };
+ Object.append(Locale, new Events());
+ Locale.Set = new Class({
+ sets: {},
+ inherits: {
+ locales: [],
+ sets: {}
+ },
+ initialize: function(name) {
+ this.name = name || "";
+ },
+ define: function(set, key, value) {
+ var defineData = this.sets[set];
+ if (!defineData) defineData = {};
+ if (key) {
+ if (typeOf(key) == "object") defineData = Object.merge(defineData, key); else defineData[key] = value;
+ }
+ this.sets[set] = defineData;
+ return this;
+ },
+ get: function(key, args, _base) {
+ var value = Object.getFromPath(this.sets, key);
+ if (value != null) {
+ var type = typeOf(value);
+ if (type == "function") value = value.apply(null, Array.from(args)); else if (type == "object") value = Object.clone(value);
+ return value;
+ }
+ var index = key.indexOf("."), set = index < 0 ? key : key.substr(0, index), names = (this.inherits.sets[set] || []).combine(this.inherits.locales).include("en-US");
+ if (!_base) _base = [];
+ for (var i = 0, l = names.length; i < l; i++) {
+ if (_base.contains(names[i])) continue;
+ _base.include(names[i]);
+ var locale = locales[names[i]];
+ if (!locale) continue;
+ value = locale.get(key, args, _base);
+ if (value != null) return value;
+ }
+ return "";
+ },
+ inherit: function(names, set) {
+ names = Array.from(names);
+ if (set && !this.inherits.sets[set]) this.inherits.sets[set] = [];
+ var l = names.length;
+ while (l--) (set ? this.inherits.sets[set] : this.inherits.locales).unshift(names[l]);
+ return this;
+ }
+ });
+})();
+
+Locale.define("en-US", "Date", {
+ months: [ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" ],
+ months_abbr: [ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ],
+ days: [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ],
+ days_abbr: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ],
+ dateOrder: [ "month", "date", "year" ],
+ shortDate: "%m/%d/%Y",
+ shortTime: "%I:%M%p",
+ AM: "AM",
+ PM: "PM",
+ firstDayOfWeek: 0,
+ ordinal: function(dayOfMonth) {
+ return dayOfMonth > 3 && dayOfMonth < 21 ? "th" : [ "th", "st", "nd", "rd", "th" ][Math.min(dayOfMonth % 10, 4)];
+ },
+ lessThanMinuteAgo: "less than a minute ago",
+ minuteAgo: "about a minute ago",
+ minutesAgo: "{delta} minutes ago",
+ hourAgo: "about an hour ago",
+ hoursAgo: "about {delta} hours ago",
+ dayAgo: "1 day ago",
+ daysAgo: "{delta} days ago",
+ weekAgo: "1 week ago",
+ weeksAgo: "{delta} weeks ago",
+ monthAgo: "1 month ago",
+ monthsAgo: "{delta} months ago",
+ yearAgo: "1 year ago",
+ yearsAgo: "{delta} years ago",
+ lessThanMinuteUntil: "less than a minute from now",
+ minuteUntil: "about a minute from now",
+ minutesUntil: "{delta} minutes from now",
+ hourUntil: "about an hour from now",
+ hoursUntil: "about {delta} hours from now",
+ dayUntil: "1 day from now",
+ daysUntil: "{delta} days from now",
+ weekUntil: "1 week from now",
+ weeksUntil: "{delta} weeks from now",
+ monthUntil: "1 month from now",
+ monthsUntil: "{delta} months from now",
+ yearUntil: "1 year from now",
+ yearsUntil: "{delta} years from now"
+});
+
+(function() {
+ var Date = this.Date;
+ var DateMethods = Date.Methods = {
+ ms: "Milliseconds",
+ year: "FullYear",
+ min: "Minutes",
+ mo: "Month",
+ sec: "Seconds",
+ hr: "Hours"
+ };
+ [ "Date", "Day", "FullYear", "Hours", "Milliseconds", "Minutes", "Month", "Seconds", "Time", "TimezoneOffset", "Week", "Timezone", "GMTOffset", "DayOfYear", "LastMonth", "LastDayOfMonth", "UTCDate", "UTCDay", "UTCFullYear", "AMPM", "Ordinal", "UTCHours", "UTCMilliseconds", "UTCMinutes", "UTCMonth", "UTCSeconds", "UTCMilliseconds" ].each(function(method) {
+ Date.Methods[method.toLowerCase()] = method;
+ });
+ var pad = function(n, digits, string) {
+ if (digits == 1) return n;
+ return n < Math.pow(10, digits - 1) ? (string || "0") + pad(n, digits - 1, string) : n;
+ };
+ Date.implement({
+ set: function(prop, value) {
+ prop = prop.toLowerCase();
+ var method = DateMethods[prop] && "set" + DateMethods[prop];
+ if (method && this[method]) this[method](value);
+ return this;
+ }.overloadSetter(),
+ get: function(prop) {
+ prop = prop.toLowerCase();
+ var method = DateMethods[prop] && "get" + DateMethods[prop];
+ if (method && this[method]) return this[method]();
+ return null;
+ }.overloadGetter(),
+ clone: function() {
+ return new Date(this.get("time"));
+ },
+ increment: function(interval, times) {
+ interval = interval || "day";
+ times = times != null ? times : 1;
+ switch (interval) {
+ case "year":
+ return this.increment("month", times * 12);
+
+ case "month":
+ var d = this.get("date");
+ this.set("date", 1).set("mo", this.get("mo") + times);
+ return this.set("date", d.min(this.get("lastdayofmonth")));
+
+ case "week":
+ return this.increment("day", times * 7);
+
+ case "day":
+ return this.set("date", this.get("date") + times);
+ }
+ if (!Date.units[interval]) throw new Error(interval + " is not a supported interval");
+ return this.set("time", this.get("time") + times * Date.units[interval]());
+ },
+ decrement: function(interval, times) {
+ return this.increment(interval, -1 * (times != null ? times : 1));
+ },
+ isLeapYear: function() {
+ return Date.isLeapYear(this.get("year"));
+ },
+ clearTime: function() {
+ return this.set({
+ hr: 0,
+ min: 0,
+ sec: 0,
+ ms: 0
+ });
+ },
+ diff: function(date, resolution) {
+ if (typeOf(date) == "string") date = Date.parse(date);
+ return ((date - this) / Date.units[resolution || "day"](3, 3)).round();
+ },
+ getLastDayOfMonth: function() {
+ return Date.daysInMonth(this.get("mo"), this.get("year"));
+ },
+ getDayOfYear: function() {
+ return (Date.UTC(this.get("year"), this.get("mo"), this.get("date") + 1) - Date.UTC(this.get("year"), 0, 1)) / Date.units.day();
+ },
+ setDay: function(day, firstDayOfWeek) {
+ if (firstDayOfWeek == null) {
+ firstDayOfWeek = Date.getMsg("firstDayOfWeek");
+ if (firstDayOfWeek === "") firstDayOfWeek = 1;
+ }
+ day = (7 + Date.parseDay(day, true) - firstDayOfWeek) % 7;
+ var currentDay = (7 + this.get("day") - firstDayOfWeek) % 7;
+ return this.increment("day", day - currentDay);
+ },
+ getWeek: function(firstDayOfWeek) {
+ if (firstDayOfWeek == null) {
+ firstDayOfWeek = Date.getMsg("firstDayOfWeek");
+ if (firstDayOfWeek === "") firstDayOfWeek = 1;
+ }
+ var date = this, dayOfWeek = (7 + date.get("day") - firstDayOfWeek) % 7, dividend = 0, firstDayOfYear;
+ if (firstDayOfWeek == 1) {
+ var month = date.get("month"), startOfWeek = date.get("date") - dayOfWeek;
+ if (month == 11 && startOfWeek > 28) return 1;
+ if (month == 0 && startOfWeek < -2) {
+ date = new Date(date).decrement("day", dayOfWeek);
+ dayOfWeek = 0;
+ }
+ firstDayOfYear = new Date(date.get("year"), 0, 1).get("day") || 7;
+ if (firstDayOfYear > 4) dividend = -7;
+ } else {
+ firstDayOfYear = new Date(date.get("year"), 0, 1).get("day");
+ }
+ dividend += date.get("dayofyear");
+ dividend += 6 - dayOfWeek;
+ dividend += (7 + firstDayOfYear - firstDayOfWeek) % 7;
+ return dividend / 7;
+ },
+ getOrdinal: function(day) {
+ return Date.getMsg("ordinal", day || this.get("date"));
+ },
+ getTimezone: function() {
+ return this.toString().replace(/^.*? ([A-Z]{3}).[0-9]{4}.*$/, "$1").replace(/^.*?\(([A-Z])[a-z]+ ([A-Z])[a-z]+ ([A-Z])[a-z]+\)$/, "$1$2$3");
+ },
+ getGMTOffset: function() {
+ var off = this.get("timezoneOffset");
+ return (off > 0 ? "-" : "+") + pad((off.abs() / 60).floor(), 2) + pad(off % 60, 2);
+ },
+ setAMPM: function(ampm) {
+ ampm = ampm.toUpperCase();
+ var hr = this.get("hr");
+ if (hr > 11 && ampm == "AM") return this.decrement("hour", 12); else if (hr < 12 && ampm == "PM") return this.increment("hour", 12);
+ return this;
+ },
+ getAMPM: function() {
+ return this.get("hr") < 12 ? "AM" : "PM";
+ },
+ parse: function(str) {
+ this.set("time", Date.parse(str));
+ return this;
+ },
+ isValid: function(date) {
+ if (!date) date = this;
+ return typeOf(date) == "date" && !isNaN(date.valueOf());
+ },
+ format: function(format) {
+ if (!this.isValid()) return "invalid date";
+ if (!format) format = "%x %X";
+ if (typeof format == "string") format = formats[format.toLowerCase()] || format;
+ if (typeof format == "function") return format(this);
+ var d = this;
+ return format.replace(/%([a-z%])/gi, function($0, $1) {
+ switch ($1) {
+ case "a":
+ return Date.getMsg("days_abbr")[d.get("day")];
+
+ case "A":
+ return Date.getMsg("days")[d.get("day")];
+
+ case "b":
+ return Date.getMsg("months_abbr")[d.get("month")];
+
+ case "B":
+ return Date.getMsg("months")[d.get("month")];
+
+ case "c":
+ return d.format("%a %b %d %H:%M:%S %Y");
+
+ case "d":
+ return pad(d.get("date"), 2);
+
+ case "e":
+ return pad(d.get("date"), 2, " ");
+
+ case "H":
+ return pad(d.get("hr"), 2);
+
+ case "I":
+ return pad(d.get("hr") % 12 || 12, 2);
+
+ case "j":
+ return pad(d.get("dayofyear"), 3);
+
+ case "k":
+ return pad(d.get("hr"), 2, " ");
+
+ case "l":
+ return pad(d.get("hr") % 12 || 12, 2, " ");
+
+ case "L":
+ return pad(d.get("ms"), 3);
+
+ case "m":
+ return pad(d.get("mo") + 1, 2);
+
+ case "M":
+ return pad(d.get("min"), 2);
+
+ case "o":
+ return d.get("ordinal");
+
+ case "p":
+ return Date.getMsg(d.get("ampm"));
+
+ case "s":
+ return Math.round(d / 1e3);
+
+ case "S":
+ return pad(d.get("seconds"), 2);
+
+ case "T":
+ return d.format("%H:%M:%S");
+
+ case "U":
+ return pad(d.get("week"), 2);
+
+ case "w":
+ return d.get("day");
+
+ case "x":
+ return d.format(Date.getMsg("shortDate"));
+
+ case "X":
+ return d.format(Date.getMsg("shortTime"));
+
+ case "y":
+ return d.get("year").toString().substr(2);
+
+ case "Y":
+ return d.get("year");
+
+ case "z":
+ return d.get("GMTOffset");
+
+ case "Z":
+ return d.get("Timezone");
+ }
+ return $1;
+ });
+ },
+ toISOString: function() {
+ return this.format("iso8601");
+ }
+ }).alias({
+ toJSON: "toISOString",
+ compare: "diff",
+ strftime: "format"
+ });
+ var rfcDayAbbr = [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ], rfcMonthAbbr = [ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ];
+ var formats = {
+ db: "%Y-%m-%d %H:%M:%S",
+ compact: "%Y%m%dT%H%M%S",
+ short: "%d %b %H:%M",
+ long: "%B %d, %Y %H:%M",
+ rfc822: function(date) {
+ return rfcDayAbbr[date.get("day")] + date.format(", %d ") + rfcMonthAbbr[date.get("month")] + date.format(" %Y %H:%M:%S %Z");
+ },
+ rfc2822: function(date) {
+ return rfcDayAbbr[date.get("day")] + date.format(", %d ") + rfcMonthAbbr[date.get("month")] + date.format(" %Y %H:%M:%S %z");
+ },
+ iso8601: function(date) {
+ return date.getUTCFullYear() + "-" + pad(date.getUTCMonth() + 1, 2) + "-" + pad(date.getUTCDate(), 2) + "T" + pad(date.getUTCHours(), 2) + ":" + pad(date.getUTCMinutes(), 2) + ":" + pad(date.getUTCSeconds(), 2) + "." + pad(date.getUTCMilliseconds(), 3) + "Z";
+ }
+ };
+ var parsePatterns = [], nativeParse = Date.parse;
+ var parseWord = function(type, word, num) {
+ var ret = -1, translated = Date.getMsg(type + "s");
+ switch (typeOf(word)) {
+ case "object":
+ ret = translated[word.get(type)];
+ break;
+
+ case "number":
+ ret = translated[word];
+ if (!ret) throw new Error("Invalid " + type + " index: " + word);
+ break;
+
+ case "string":
+ var match = translated.filter(function(name) {
+ return this.test(name);
+ }, new RegExp("^" + word, "i"));
+ if (!match.length) throw new Error("Invalid " + type + " string");
+ if (match.length > 1) throw new Error("Ambiguous " + type);
+ ret = match[0];
+ }
+ return num ? translated.indexOf(ret) : ret;
+ };
+ var startCentury = 1900, startYear = 70;
+ Date.extend({
+ getMsg: function(key, args) {
+ return Locale.get("Date." + key, args);
+ },
+ units: {
+ ms: Function.from(1),
+ second: Function.from(1e3),
+ minute: Function.from(6e4),
+ hour: Function.from(36e5),
+ day: Function.from(864e5),
+ week: Function.from(6084e5),
+ month: function(month, year) {
+ var d = new Date();
+ return Date.daysInMonth(month != null ? month : d.get("mo"), year != null ? year : d.get("year")) * 864e5;
+ },
+ year: function(year) {
+ year = year || new Date().get("year");
+ return Date.isLeapYear(year) ? 316224e5 : 31536e6;
+ }
+ },
+ daysInMonth: function(month, year) {
+ return [ 31, Date.isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 ][month];
+ },
+ isLeapYear: function(year) {
+ return year % 4 === 0 && year % 100 !== 0 || year % 400 === 0;
+ },
+ parse: function(from) {
+ var t = typeOf(from);
+ if (t == "number") return new Date(from);
+ if (t != "string") return from;
+ from = from.clean();
+ if (!from.length) return null;
+ var parsed;
+ parsePatterns.some(function(pattern) {
+ var bits = pattern.re.exec(from);
+ return bits ? parsed = pattern.handler(bits) : false;
+ });
+ if (!(parsed && parsed.isValid())) {
+ parsed = new Date(nativeParse(from));
+ if (!(parsed && parsed.isValid())) parsed = new Date(from.toInt());
+ }
+ return parsed;
+ },
+ parseDay: function(day, num) {
+ return parseWord("day", day, num);
+ },
+ parseMonth: function(month, num) {
+ return parseWord("month", month, num);
+ },
+ parseUTC: function(value) {
+ var localDate = new Date(value);
+ var utcSeconds = Date.UTC(localDate.get("year"), localDate.get("mo"), localDate.get("date"), localDate.get("hr"), localDate.get("min"), localDate.get("sec"), localDate.get("ms"));
+ return new Date(utcSeconds);
+ },
+ orderIndex: function(unit) {
+ return Date.getMsg("dateOrder").indexOf(unit) + 1;
+ },
+ defineFormat: function(name, format) {
+ formats[name] = format;
+ return this;
+ },
+ defineParser: function(pattern) {
+ parsePatterns.push(pattern.re && pattern.handler ? pattern : build(pattern));
+ return this;
+ },
+ defineParsers: function() {
+ Array.flatten(arguments).each(Date.defineParser);
+ return this;
+ },
+ define2DigitYearStart: function(year) {
+ startYear = year % 100;
+ startCentury = year - startYear;
+ return this;
+ }
+ }).extend({
+ defineFormats: Date.defineFormat.overloadSetter()
+ });
+ var regexOf = function(type) {
+ return new RegExp("(?:" + Date.getMsg(type).map(function(name) {
+ return name.substr(0, 3);
+ }).join("|") + ")[a-z]*");
+ };
+ var replacers = function(key) {
+ switch (key) {
+ case "T":
+ return "%H:%M:%S";
+
+ case "x":
+ return (Date.orderIndex("month") == 1 ? "%m[-./]%d" : "%d[-./]%m") + "([-./]%y)?";
+
+ case "X":
+ return "%H([.:]%M)?([.:]%S([.:]%s)?)? ?%p? ?%z?";
+ }
+ return null;
+ };
+ var keys = {
+ d: /[0-2]?[0-9]|3[01]/,
+ H: /[01]?[0-9]|2[0-3]/,
+ I: /0?[1-9]|1[0-2]/,
+ M: /[0-5]?\d/,
+ s: /\d+/,
+ o: /[a-z]*/,
+ p: /[ap]\.?m\.?/,
+ y: /\d{2}|\d{4}/,
+ Y: /\d{4}/,
+ z: /Z|[+-]\d{2}(?::?\d{2})?/
+ };
+ keys.m = keys.I;
+ keys.S = keys.M;
+ var currentLanguage;
+ var recompile = function(language) {
+ currentLanguage = language;
+ keys.a = keys.A = regexOf("days");
+ keys.b = keys.B = regexOf("months");
+ parsePatterns.each(function(pattern, i) {
+ if (pattern.format) parsePatterns[i] = build(pattern.format);
+ });
+ };
+ var build = function(format) {
+ if (!currentLanguage) return {
+ format: format
+ };
+ var parsed = [];
+ var re = (format.source || format).replace(/%([a-z])/gi, function($0, $1) {
+ return replacers($1) || $0;
+ }).replace(/\((?!\?)/g, "(?:").replace(/ (?!\?|\*)/g, ",? ").replace(/%([a-z%])/gi, function($0, $1) {
+ var p = keys[$1];
+ if (!p) return $1;
+ parsed.push($1);
+ return "(" + p.source + ")";
+ }).replace(/\[a-z\]/gi, "[a-z\\u00c0-\\uffff;&]");
+ return {
+ format: format,
+ re: new RegExp("^" + re + "$", "i"),
+ handler: function(bits) {
+ bits = bits.slice(1).associate(parsed);
+ var date = new Date().clearTime(), year = bits.y || bits.Y;
+ if (year != null) handle.call(date, "y", year);
+ if ("d" in bits) handle.call(date, "d", 1);
+ if ("m" in bits || bits.b || bits.B) handle.call(date, "m", 1);
+ for (var key in bits) handle.call(date, key, bits[key]);
+ return date;
+ }
+ };
+ };
+ var handle = function(key, value) {
+ if (!value) return this;
+ switch (key) {
+ case "a":
+ case "A":
+ return this.set("day", Date.parseDay(value, true));
+
+ case "b":
+ case "B":
+ return this.set("mo", Date.parseMonth(value, true));
+
+ case "d":
+ return this.set("date", value);
+
+ case "H":
+ case "I":
+ return this.set("hr", value);
+
+ case "m":
+ return this.set("mo", value - 1);
+
+ case "M":
+ return this.set("min", value);
+
+ case "p":
+ return this.set("ampm", value.replace(/\./g, ""));
+
+ case "S":
+ return this.set("sec", value);
+
+ case "s":
+ return this.set("ms", ("0." + value) * 1e3);
+
+ case "w":
+ return this.set("day", value);
+
+ case "Y":
+ return this.set("year", value);
+
+ case "y":
+ value = +value;
+ if (value < 100) value += startCentury + (value < startYear ? 100 : 0);
+ return this.set("year", value);
+
+ case "z":
+ if (value == "Z") value = "+00";
+ var offset = value.match(/([+-])(\d{2}):?(\d{2})?/);
+ offset = (offset[1] + "1") * (offset[2] * 60 + (+offset[3] || 0)) + this.getTimezoneOffset();
+ return this.set("time", this - offset * 6e4);
+ }
+ return this;
+ };
+ Date.defineParsers("%Y([-./]%m([-./]%d((T| )%X)?)?)?", "%Y%m%d(T%H(%M%S?)?)?", "%x( %X)?", "%d%o( %b( %Y)?)?( %X)?", "%b( %d%o)?( %Y)?( %X)?", "%Y %b( %d%o( %X)?)?", "%o %b %d %X %z %Y", "%T", "%H:%M( ?%p)?");
+ Locale.addEvent("change", function(language) {
+ if (Locale.get("Date")) recompile(language);
+ }).fireEvent("change", Locale.getCurrent());
+})();
+
+(function() {
+ Fx.Scroll = new Class({
+ Extends: Fx,
+ options: {
+ offset: {
+ x: 0,
+ y: 0
+ },
+ wheelStops: true
+ },
+ initialize: function(element, options) {
+ this.element = this.subject = document.id(element);
+ this.parent(options);
+ if (typeOf(this.element) != "element") this.element = document.id(this.element.getDocument().body);
+ if (this.options.wheelStops) {
+ var stopper = this.element, cancel = this.cancel.pass(false, this);
+ this.addEvent("start", function() {
+ stopper.addEvent("mousewheel", cancel);
+ }, true);
+ this.addEvent("complete", function() {
+ stopper.removeEvent("mousewheel", cancel);
+ }, true);
+ }
+ },
+ set: function() {
+ var now = Array.flatten(arguments);
+ this.element.scrollTo(now[0], now[1]);
+ return this;
+ },
+ compute: function(from, to, delta) {
+ return [ 0, 1 ].map(function(i) {
+ return Fx.compute(from[i], to[i], delta);
+ });
+ },
+ start: function(x, y) {
+ if (!this.check(x, y)) return this;
+ var scroll = this.element.getScroll();
+ return this.parent([ scroll.x, scroll.y ], [ x, y ]);
+ },
+ calculateScroll: function(x, y) {
+ var element = this.element, scrollSize = element.getScrollSize(), scroll = element.getScroll(), size = element.getSize(), offset = this.options.offset, values = {
+ x: x,
+ y: y
+ };
+ for (var z in values) {
+ if (!values[z] && values[z] !== 0) values[z] = scroll[z];
+ if (typeOf(values[z]) != "number") values[z] = scrollSize[z] - size[z];
+ values[z] += offset[z];
+ }
+ return [ values.x, values.y ];
+ },
+ toTop: function() {
+ return this.start.apply(this, this.calculateScroll(false, 0));
+ },
+ toLeft: function() {
+ return this.start.apply(this, this.calculateScroll(0, false));
+ },
+ toRight: function() {
+ return this.start.apply(this, this.calculateScroll("right", false));
+ },
+ toBottom: function() {
+ return this.start.apply(this, this.calculateScroll(false, "bottom"));
+ },
+ toElement: function(el, axes) {
+ axes = axes ? Array.from(axes) : [ "x", "y" ];
+ var scroll = isBody(this.element) ? {
+ x: 0,
+ y: 0
+ } : this.element.getScroll();
+ var position = Object.map(document.id(el).getPosition(this.element), function(value, axis) {
+ return axes.contains(axis) ? value + scroll[axis] : false;
+ });
+ return this.start.apply(this, this.calculateScroll(position.x, position.y));
+ },
+ toElementEdge: function(el, axes, offset) {
+ axes = axes ? Array.from(axes) : [ "x", "y" ];
+ el = document.id(el);
+ var to = {}, position = el.getPosition(this.element), size = el.getSize(), scroll = this.element.getScroll(), containerSize = this.element.getSize(), edge = {
+ x: position.x + size.x,
+ y: position.y + size.y
+ };
+ [ "x", "y" ].each(function(axis) {
+ if (axes.contains(axis)) {
+ if (edge[axis] > scroll[axis] + containerSize[axis]) to[axis] = edge[axis] - containerSize[axis];
+ if (position[axis] < scroll[axis]) to[axis] = position[axis];
+ }
+ if (to[axis] == null) to[axis] = scroll[axis];
+ if (offset && offset[axis]) to[axis] = to[axis] + offset[axis];
+ }, this);
+ if (to.x != scroll.x || to.y != scroll.y) this.start(to.x, to.y);
+ return this;
+ },
+ toElementCenter: function(el, axes, offset) {
+ axes = axes ? Array.from(axes) : [ "x", "y" ];
+ el = document.id(el);
+ var to = {}, position = el.getPosition(this.element), size = el.getSize(), scroll = this.element.getScroll(), containerSize = this.element.getSize();
+ [ "x", "y" ].each(function(axis) {
+ if (axes.contains(axis)) {
+ to[axis] = position[axis] - (containerSize[axis] - size[axis]) / 2;
+ }
+ if (to[axis] == null) to[axis] = scroll[axis];
+ if (offset && offset[axis]) to[axis] = to[axis] + offset[axis];
+ }, this);
+ if (to.x != scroll.x || to.y != scroll.y) this.start(to.x, to.y);
+ return this;
+ }
+ });
+ function isBody(element) {
+ return /^(?:body|html)$/i.test(element.tagName);
+ }
+})();
+
+Fx.Slide = new Class({
+ Extends: Fx,
+ options: {
+ mode: "vertical",
+ wrapper: false,
+ hideOverflow: true,
+ resetHeight: false
+ },
+ initialize: function(element, options) {
+ element = this.element = this.subject = document.id(element);
+ this.parent(options);
+ options = this.options;
+ var wrapper = element.retrieve("wrapper"), styles = element.getStyles("margin", "position", "overflow");
+ if (options.hideOverflow) styles = Object.append(styles, {
+ overflow: "hidden"
+ });
+ if (options.wrapper) wrapper = document.id(options.wrapper).setStyles(styles);
+ if (!wrapper) wrapper = new Element("div", {
+ styles: styles
+ }).wraps(element);
+ element.store("wrapper", wrapper).setStyle("margin", 0);
+ if (element.getStyle("overflow") == "visible") element.setStyle("overflow", "hidden");
+ this.now = [];
+ this.open = true;
+ this.wrapper = wrapper;
+ this.addEvent("complete", function() {
+ this.open = wrapper["offset" + this.layout.capitalize()] != 0;
+ if (this.open && this.options.resetHeight) wrapper.setStyle("height", "");
+ }, true);
+ },
+ vertical: function() {
+ this.margin = "margin-top";
+ this.layout = "height";
+ this.offset = this.element.offsetHeight;
+ },
+ horizontal: function() {
+ this.margin = "margin-left";
+ this.layout = "width";
+ this.offset = this.element.offsetWidth;
+ },
+ set: function(now) {
+ this.element.setStyle(this.margin, now[0]);
+ this.wrapper.setStyle(this.layout, now[1]);
+ return this;
+ },
+ compute: function(from, to, delta) {
+ return [ 0, 1 ].map(function(i) {
+ return Fx.compute(from[i], to[i], delta);
+ });
+ },
+ start: function(how, mode) {
+ if (!this.check(how, mode)) return this;
+ this[mode || this.options.mode]();
+ var margin = this.element.getStyle(this.margin).toInt(), layout = this.wrapper.getStyle(this.layout).toInt(), caseIn = [ [ margin, layout ], [ 0, this.offset ] ], caseOut = [ [ margin, layout ], [ -this.offset, 0 ] ], start;
+ switch (how) {
+ case "in":
+ start = caseIn;
+ break;
+
+ case "out":
+ start = caseOut;
+ break;
+
+ case "toggle":
+ start = layout == 0 ? caseIn : caseOut;
+ }
+ return this.parent(start[0], start[1]);
+ },
+ slideIn: function(mode) {
+ return this.start("in", mode);
+ },
+ slideOut: function(mode) {
+ return this.start("out", mode);
+ },
+ hide: function(mode) {
+ this[mode || this.options.mode]();
+ this.open = false;
+ return this.set([ -this.offset, 0 ]);
+ },
+ show: function(mode) {
+ this[mode || this.options.mode]();
+ this.open = true;
+ return this.set([ 0, this.offset ]);
+ },
+ toggle: function(mode) {
+ return this.start("toggle", mode);
+ }
+});
+
+Element.Properties.slide = {
+ set: function(options) {
+ this.get("slide").cancel().setOptions(options);
+ return this;
+ },
+ get: function() {
+ var slide = this.retrieve("slide");
+ if (!slide) {
+ slide = new Fx.Slide(this, {
+ link: "cancel"
+ });
+ this.store("slide", slide);
+ }
+ return slide;
+ }
+};
+
+Element.implement({
+ slide: function(how, mode) {
+ how = how || "toggle";
+ var slide = this.get("slide"), toggle;
+ switch (how) {
+ case "hide":
+ slide.hide(mode);
+ break;
+
+ case "show":
+ slide.show(mode);
+ break;
+
+ case "toggle":
+ var flag = this.retrieve("slide:flag", slide.open);
+ slide[flag ? "slideOut" : "slideIn"](mode);
+ this.store("slide:flag", !flag);
+ toggle = true;
+ break;
+
+ default:
+ slide.start(how, mode);
+ }
+ if (!toggle) this.eliminate("slide:flag");
+ return this;
+ }
+});
+
+Request.JSONP = new Class({
+ Implements: [ Chain, Events, Options ],
+ options: {
+ onRequest: function(src) {
+ if (this.options.log && window.console && console.log) {
+ console.log("JSONP retrieving script with url:" + src);
+ }
+ },
+ onError: function(src) {
+ if (this.options.log && window.console && console.warn) {
+ console.warn("JSONP " + src + " will fail in Internet Explorer, which enforces a 2083 bytes length limit on URIs");
+ }
+ },
+ url: "",
+ callbackKey: "callback",
+ injectScript: document.head,
+ data: "",
+ link: "ignore",
+ timeout: 0,
+ log: false
+ },
+ initialize: function(options) {
+ this.setOptions(options);
+ },
+ send: function(options) {
+ if (!Request.prototype.check.call(this, options)) return this;
+ this.running = true;
+ var type = typeOf(options);
+ if (type == "string" || type == "element") options = {
+ data: options
+ };
+ options = Object.merge(this.options, options || {});
+ var data = options.data;
+ switch (typeOf(data)) {
+ case "element":
+ data = document.id(data).toQueryString();
+ break;
+
+ case "object":
+ case "hash":
+ data = Object.toQueryString(data);
+ }
+ var index = this.index = Request.JSONP.counter++;
+ var src = options.url + (options.url.test("\\?") ? "&" : "?") + options.callbackKey + "=Request.JSONP.request_map.request_" + index + (data ? "&" + data : "");
+ if (src.length > 2083) this.fireEvent("error", src);
+ Request.JSONP.request_map["request_" + index] = function() {
+ this.success(arguments, index);
+ }.bind(this);
+ var script = this.getScript(src).inject(options.injectScript);
+ this.fireEvent("request", [ src, script ]);
+ if (options.timeout) this.timeout.delay(options.timeout, this);
+ return this;
+ },
+ getScript: function(src) {
+ if (!this.script) this.script = new Element("script", {
+ type: "text/javascript",
+ async: true,
+ src: src
+ });
+ return this.script;
+ },
+ success: function(args, index) {
+ if (!this.running) return;
+ this.clear().fireEvent("complete", args).fireEvent("success", args).callChain();
+ },
+ cancel: function() {
+ if (this.running) this.clear().fireEvent("cancel");
+ return this;
+ },
+ isRunning: function() {
+ return !!this.running;
+ },
+ clear: function() {
+ this.running = false;
+ if (this.script) {
+ this.script.destroy();
+ this.script = null;
+ }
+ return this;
+ },
+ timeout: function() {
+ if (this.running) {
+ this.running = false;
+ this.fireEvent("timeout", [ this.script.get("src"), this.script ]).fireEvent("failure").cancel();
+ }
+ return this;
+ }
+});
+
+Request.JSONP.counter = 0;
+
+Request.JSONP.request_map = {};
+
+Request.implement({
+ options: {
+ initialDelay: 5e3,
+ delay: 5e3,
+ limit: 6e4
+ },
+ startTimer: function(data) {
+ var fn = function() {
+ if (!this.running) this.send({
+ data: data
+ });
+ };
+ this.lastDelay = this.options.initialDelay;
+ this.timer = fn.delay(this.lastDelay, this);
+ this.completeCheck = function(response) {
+ clearTimeout(this.timer);
+ this.lastDelay = response ? this.options.delay : (this.lastDelay + this.options.delay).min(this.options.limit);
+ this.timer = fn.delay(this.lastDelay, this);
+ };
+ return this.addEvent("complete", this.completeCheck);
+ },
+ stopTimer: function() {
+ clearTimeout(this.timer);
+ return this.removeEvent("complete", this.completeCheck);
+ }
+});
+
+Date.implement({
+ timeDiffInWords: function(to) {
+ return Date.distanceOfTimeInWords(this, to || new Date());
+ },
+ timeDiff: function(to, separator) {
+ if (to == null) to = new Date();
+ var delta = ((to - this) / 1e3).floor().abs();
+ var vals = [], durations = [ 60, 60, 24, 365, 0 ], names = [ "s", "m", "h", "d", "y" ], value, duration;
+ for (var item = 0; item < durations.length; item++) {
+ if (item && !delta) break;
+ value = delta;
+ if (duration = durations[item]) {
+ value = delta % duration;
+ delta = (delta / duration).floor();
+ }
+ vals.unshift(value + (names[item] || ""));
+ }
+ return vals.join(separator || ":");
+ }
+}).extend({
+ distanceOfTimeInWords: function(from, to) {
+ return Date.getTimePhrase(((to - from) / 1e3).toInt());
+ },
+ getTimePhrase: function(delta) {
+ var suffix = delta < 0 ? "Until" : "Ago";
+ if (delta < 0) delta *= -1;
+ var units = {
+ minute: 60,
+ hour: 60,
+ day: 24,
+ week: 7,
+ month: 52 / 12,
+ year: 12,
+ eon: Infinity
+ };
+ var msg = "lessThanMinute";
+ for (var unit in units) {
+ var interval = units[unit];
+ if (delta < 1.5 * interval) {
+ if (delta > .75 * interval) msg = unit;
+ break;
+ }
+ delta /= interval;
+ msg = unit + "s";
+ }
+ delta = delta.round();
+ return Date.getMsg(msg + suffix, delta).substitute({
+ delta: delta
+ });
+ }
+}).defineParsers({
+ re: /^(?:tod|tom|yes)/i,
+ handler: function(bits) {
+ var d = new Date().clearTime();
+ switch (bits[0]) {
+ case "tom":
+ return d.increment();
+
+ case "yes":
+ return d.decrement();
+
+ default:
+ return d;
+ }
+ }
+}, {
+ re: /^(next|last) ([a-z]+)$/i,
+ handler: function(bits) {
+ var d = new Date().clearTime();
+ var day = d.getDay();
+ var newDay = Date.parseDay(bits[2], true);
+ var addDays = newDay - day;
+ if (newDay <= day) addDays += 7;
+ if (bits[1] == "last") addDays -= 7;
+ return d.set("date", d.getDate() + addDays);
+ }
+}).alias("timeAgoInWords", "timeDiffInWords");
+
+(function() {
+ var defaultSortFunction = function(a, b) {
+ return a > b ? 1 : a < b ? -1 : 0;
+ };
+ Array.implement({
+ stableSort: function(compare) {
+ return Browser.chrome || Browser.firefox2 || Browser.opera9 ? this.mergeSort(compare) : this.sort(compare);
+ },
+ mergeSort: function(compare, token) {
+ compare = compare || defaultSortFunction;
+ if (this.length > 1) {
+ var right = this.splice(Math.floor(this.length / 2)).mergeSort(compare);
+ var left = this.splice(0).mergeSort(compare);
+ while (left.length > 0 || right.length > 0) {
+ this.push(right.length === 0 ? left.shift() : left.length === 0 ? right.shift() : compare(left[0], right[0]) > 0 ? right.shift() : left.shift());
+ }
+ }
+ return this;
+ }
+ });
+})();
+
+Class.Binds = new Class({
+ $bound: {},
+ bound: function(name) {
+ return this.$bound[name] ? this.$bound[name] : this.$bound[name] = this[name].bind(this);
+ }
+});
+
+(function() {
+ var events = Element.NativeEvents, location = window.location, base = location.pathname, history = window.history, hasPushState = "pushState" in history, event = hasPushState ? "popstate" : "hashchange";
+ this.History = new new Class({
+ Implements: [ Class.Binds, Events ],
+ initialize: hasPushState ? function() {
+ events[event] = 2;
+ window.addEvent(event, this.bound("pop"));
+ } : function() {
+ events[event] = 1;
+ window.addEvent(event, this.bound("pop"));
+ this.hash = location.hash;
+ var hashchange = "onhashchange" in window;
+ if (!(hashchange && (document.documentMode === undefined || document.documentMode > 7))) this.timer = this.check.periodical(200, this);
+ },
+ push: hasPushState ? function(url, title, state) {
+ if (base && base != url) base = null;
+ history.pushState(state || null, title || null, url);
+ this.onChange(url, state);
+ } : function(url) {
+ location.hash = url;
+ },
+ replace: hasPushState ? function(url, title, state) {
+ history.replaceState(state || null, title || null, url);
+ } : function(url) {
+ this.hash = "#" + url;
+ this.push(url);
+ },
+ pop: hasPushState ? function(event) {
+ var url = location.pathname;
+ if (url == base) {
+ base = null;
+ return;
+ }
+ this.onChange(url, event.event.state);
+ } : function() {
+ var hash = location.hash;
+ if (this.hash == hash) return;
+ this.hash = hash;
+ this.onChange(hash.substr(1));
+ },
+ onChange: function(url, state) {
+ this.fireEvent("change", [ url, state || {} ]);
+ },
+ back: function() {
+ history.back();
+ },
+ forward: function() {
+ history.forward();
+ },
+ getPath: function() {
+ return hasPushState ? location.pathname : location.hash.substr(1);
+ },
+ hasPushState: function() {
+ return hasPushState;
+ },
+ check: function() {
+ if (this.hash != location.hash) this.pop();
+ }
+ })();
+})();
+
+History.handleInitialState = function(base) {
+ if (!base) base = "";
+ var location = window.location, pathname = location.pathname.substr(base.length), hash = location.hash, hasPushState = History.hasPushState();
+ if (!hasPushState && pathname.length > 1) {
+ window.location = (base || "/") + "#" + pathname;
+ return true;
+ }
+ if (!hash || hash.length <= 1) return false;
+ if (hasPushState) {
+ (function() {
+ History.push(hash.substr(1));
+ }).delay(1);
+ return false;
+ }
+ if (!pathname || pathname == "/") return false;
+ window.location = (base || "/") + hash;
+ return true;
+};
+
+(function() {
+ var Color, DecomposedMatrix, DecomposedMatrix2D, InterpolableArray, InterpolableColor, InterpolableObject, InterpolableWithUnit, Matrix, Matrix2D, Set, Vector, addTimeout, animationTick, animations, animationsTimeouts, applyDefaults, applyFrame, applyProperties, baseSVG, cacheFn, cancelTimeout, clone, createInterpolable, defaultValueForKey, degProperties, dynamics, getCurrentProperties, interpolate, isDocumentVisible, isSVGElement, lastTime, leftDelayForTimeout, makeArrayFn, observeVisibilityChange, parseProperties, prefixFor, propertyWithPrefix, pxProperties, rAF, roundf, runLoopPaused, runLoopRunning, runLoopTick, setRealTimeout, slow, slowRatio, startAnimation, startRunLoop, svgProperties, timeBeforeVisibilityChange, timeoutLastId, timeouts, toDashed, transformProperties, transformValueForProperty, unitForProperty, __bind = function(fn, me) {
+ return function() {
+ return fn.apply(me, arguments);
+ };
+ };
+ isDocumentVisible = function() {
+ return document.visibilityState === "visible" || dynamics.tests != null;
+ };
+ observeVisibilityChange = function() {
+ var fns;
+ fns = [];
+ if (typeof document !== "undefined" && document !== null) {
+ document.addEventListener("visibilitychange", function() {
+ var fn, _i, _len, _results;
+ _results = [];
+ for (_i = 0, _len = fns.length; _i < _len; _i++) {
+ fn = fns[_i];
+ _results.push(fn(isDocumentVisible()));
+ }
+ return _results;
+ });
+ }
+ return function(fn) {
+ return fns.push(fn);
+ };
+ }();
+ clone = function(o) {
+ var k, newO, v;
+ newO = {};
+ for (k in o) {
+ v = o[k];
+ newO[k] = v;
+ }
+ return newO;
+ };
+ cacheFn = function(func) {
+ var data;
+ data = {};
+ return function() {
+ var k, key, result, _i, _len;
+ key = "";
+ for (_i = 0, _len = arguments.length; _i < _len; _i++) {
+ k = arguments[_i];
+ key += k.toString() + ",";
+ }
+ result = data[key];
+ if (!result) {
+ data[key] = result = func.apply(this, arguments);
+ }
+ return result;
+ };
+ };
+ makeArrayFn = function(fn) {
+ return function(el) {
+ var args, i, res;
+ if (el instanceof Array || el instanceof NodeList || el instanceof HTMLCollection) {
+ res = function() {
+ var _i, _ref, _results;
+ _results = [];
+ for (i = _i = 0, _ref = el.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
+ args = Array.prototype.slice.call(arguments, 1);
+ args.splice(0, 0, el[i]);
+ _results.push(fn.apply(this, args));
+ }
+ return _results;
+ }.apply(this, arguments);
+ return res;
+ }
+ return fn.apply(this, arguments);
+ };
+ };
+ applyDefaults = function(options, defaults) {
+ var k, v, _results;
+ _results = [];
+ for (k in defaults) {
+ v = defaults[k];
+ _results.push(options[k] != null ? options[k] : options[k] = v);
+ }
+ return _results;
+ };
+ applyFrame = function(el, properties) {
+ var k, v, _results;
+ if (el.style != null) {
+ return applyProperties(el, properties);
+ } else {
+ _results = [];
+ for (k in properties) {
+ v = properties[k];
+ _results.push(el[k] = v.format());
+ }
+ return _results;
+ }
+ };
+ applyProperties = function(el, properties) {
+ var isSVG, k, matrix, transforms, v;
+ properties = parseProperties(properties);
+ transforms = [];
+ isSVG = isSVGElement(el);
+ for (k in properties) {
+ v = properties[k];
+ if (transformProperties.contains(k)) {
+ transforms.push([ k, v ]);
+ } else {
+ if (v.format != null) {
+ v = v.format();
+ } else {
+ v = "" + v + unitForProperty(k, v);
+ }
+ if (isSVG && svgProperties.contains(k)) {
+ el.setAttribute(k, v);
+ } else {
+ el.style[propertyWithPrefix(k)] = v;
+ }
+ }
+ }
+ if (transforms.length > 0) {
+ if (isSVG) {
+ matrix = new Matrix2D();
+ matrix.applyProperties(transforms);
+ return el.setAttribute("transform", matrix.decompose().format());
+ } else {
+ v = transforms.map(function(transform) {
+ return transformValueForProperty(transform[0], transform[1]);
+ }).join(" ");
+ return el.style[propertyWithPrefix("transform")] = v;
+ }
+ }
+ };
+ isSVGElement = function(el) {
+ var _ref, _ref1;
+ if (typeof SVGElement !== "undefined" && SVGElement !== null && (typeof SVGSVGElement !== "undefined" && SVGSVGElement !== null)) {
+ return el instanceof SVGElement && !(el instanceof SVGSVGElement);
+ } else {
+ return (_ref = (_ref1 = dynamics.tests) != null ? typeof _ref1.isSVG === "function" ? _ref1.isSVG(el) : void 0 : void 0) != null ? _ref : false;
+ }
+ };
+ roundf = function(v, decimal) {
+ var d;
+ d = Math.pow(10, decimal);
+ return Math.round(v * d) / d;
+ };
+ Set = function() {
+ function Set(array) {
+ var v, _i, _len;
+ this.obj = {};
+ for (_i = 0, _len = array.length; _i < _len; _i++) {
+ v = array[_i];
+ this.obj[v] = 1;
+ }
+ }
+ Set.prototype.contains = function(v) {
+ return this.obj[v] === 1;
+ };
+ return Set;
+ }();
+ toDashed = function(str) {
+ return str.replace(/([A-Z])/g, function($1) {
+ return "-" + $1.toLowerCase();
+ });
+ };
+ pxProperties = new Set("marginTop,marginLeft,marginBottom,marginRight,paddingTop,paddingLeft,paddingBottom,paddingRight,top,left,bottom,right,translateX,translateY,translateZ,perspectiveX,perspectiveY,perspectiveZ,width,height,maxWidth,maxHeight,minWidth,minHeight,borderRadius".split(","));
+ degProperties = new Set("rotate,rotateX,rotateY,rotateZ,skew,skewX,skewY,skewZ".split(","));
+ transformProperties = new Set("translate,translateX,translateY,translateZ,scale,scaleX,scaleY,scaleZ,rotate,rotateX,rotateY,rotateZ,rotateC,rotateCX,rotateCY,skew,skewX,skewY,skewZ,perspective".split(","));
+ svgProperties = new Set("accent-height,ascent,azimuth,baseFrequency,baseline-shift,bias,cx,cy,d,diffuseConstant,divisor,dx,dy,elevation,filterRes,fx,fy,gradientTransform,height,k1,k2,k3,k4,kernelMatrix,kernelUnitLength,letter-spacing,limitingConeAngle,markerHeight,markerWidth,numOctaves,order,overline-position,overline-thickness,pathLength,points,pointsAtX,pointsAtY,pointsAtZ,r,radius,rx,ry,seed,specularConstant,specularExponent,stdDeviation,stop-color,stop-opacity,strikethrough-position,strikethrough-thickness,surfaceScale,target,targetX,targetY,transform,underline-position,underline-thickness,viewBox,width,x,x1,x2,y,y1,y2,z".split(","));
+ unitForProperty = function(k, v) {
+ if (typeof v !== "number") {
+ return "";
+ }
+ if (pxProperties.contains(k)) {
+ return "px";
+ } else if (degProperties.contains(k)) {
+ return "deg";
+ }
+ return "";
+ };
+ transformValueForProperty = function(k, v) {
+ var match, unit;
+ match = ("" + v).match(/^([0-9.-]*)([^0-9]*)$/);
+ if (match != null) {
+ v = match[1];
+ unit = match[2];
+ } else {
+ v = parseFloat(v);
+ }
+ v = roundf(parseFloat(v), 10);
+ if (unit == null || unit === "") {
+ unit = unitForProperty(k, v);
+ }
+ return "" + k + "(" + v + unit + ")";
+ };
+ parseProperties = function(properties) {
+ var axis, match, parsed, property, value, _i, _len, _ref;
+ parsed = {};
+ for (property in properties) {
+ value = properties[property];
+ if (transformProperties.contains(property)) {
+ match = property.match(/(translate|rotateC|rotate|skew|scale|perspective)(X|Y|Z|)/);
+ if (match && match[2].length > 0) {
+ parsed[property] = value;
+ } else {
+ _ref = [ "X", "Y", "Z" ];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ axis = _ref[_i];
+ parsed[match[1] + axis] = value;
+ }
+ }
+ } else {
+ parsed[property] = value;
+ }
+ }
+ return parsed;
+ };
+ defaultValueForKey = function(key) {
+ var v;
+ v = key === "opacity" ? 1 : 0;
+ return "" + v + unitForProperty(key, v);
+ };
+ getCurrentProperties = function(el, keys) {
+ var isSVG, key, matrix, properties, style, v, _i, _j, _len, _len1, _ref;
+ properties = {};
+ isSVG = isSVGElement(el);
+ if (el.style != null) {
+ style = window.getComputedStyle(el, null);
+ for (_i = 0, _len = keys.length; _i < _len; _i++) {
+ key = keys[_i];
+ if (transformProperties.contains(key)) {
+ if (properties["transform"] == null) {
+ if (isSVG) {
+ matrix = new Matrix2D((_ref = el.transform.baseVal.consolidate()) != null ? _ref.matrix : void 0);
+ } else {
+ matrix = Matrix.fromTransform(style[propertyWithPrefix("transform")]);
+ }
+ properties["transform"] = matrix.decompose();
+ }
+ } else {
+ v = style[key];
+ if (v == null && svgProperties.contains(key)) {
+ v = el.getAttribute(key);
+ }
+ if (v === "" || v == null) {
+ v = defaultValueForKey(key);
+ }
+ properties[key] = createInterpolable(v);
+ }
+ }
+ } else {
+ for (_j = 0, _len1 = keys.length; _j < _len1; _j++) {
+ key = keys[_j];
+ properties[key] = createInterpolable(el[key]);
+ }
+ }
+ return properties;
+ };
+ createInterpolable = function(value) {
+ var interpolable, klass, klasses, _i, _len;
+ klasses = [ InterpolableColor, InterpolableArray, InterpolableObject, InterpolableWithUnit ];
+ for (_i = 0, _len = klasses.length; _i < _len; _i++) {
+ klass = klasses[_i];
+ interpolable = klass.create(value);
+ if (interpolable != null) {
+ return interpolable;
+ }
+ }
+ return null;
+ };
+ InterpolableObject = function() {
+ function InterpolableObject(obj) {
+ this.format = __bind(this.format, this);
+ this.interpolate = __bind(this.interpolate, this);
+ this.obj = obj;
+ }
+ InterpolableObject.prototype.interpolate = function(endInterpolable, t) {
+ var end, k, newObj, start, v;
+ start = this.obj;
+ end = endInterpolable.obj;
+ newObj = {};
+ for (k in start) {
+ v = start[k];
+ if (v.interpolate != null) {
+ newObj[k] = v.interpolate(end[k], t);
+ } else {
+ newObj[k] = v;
+ }
+ }
+ return new InterpolableObject(newObj);
+ };
+ InterpolableObject.prototype.format = function() {
+ return this.obj;
+ };
+ InterpolableObject.create = function(value) {
+ var k, obj, v;
+ if (value instanceof Object) {
+ obj = {};
+ for (k in value) {
+ v = value[k];
+ obj[k] = createInterpolable(v);
+ }
+ return new InterpolableObject(obj);
+ }
+ return null;
+ };
+ return InterpolableObject;
+ }();
+ InterpolableWithUnit = function() {
+ function InterpolableWithUnit(value, prefix, suffix) {
+ this.prefix = prefix;
+ this.suffix = suffix;
+ this.format = __bind(this.format, this);
+ this.interpolate = __bind(this.interpolate, this);
+ this.value = parseFloat(value);
+ }
+ InterpolableWithUnit.prototype.interpolate = function(endInterpolable, t) {
+ var end, start;
+ start = this.value;
+ end = endInterpolable.value;
+ return new InterpolableWithUnit((end - start) * t + start, endInterpolable.prefix || this.prefix, endInterpolable.suffix || this.suffix);
+ };
+ InterpolableWithUnit.prototype.format = function() {
+ if (this.prefix == null && this.suffix == null) {
+ return roundf(this.value, 5);
+ }
+ return this.prefix + roundf(this.value, 5) + this.suffix;
+ };
+ InterpolableWithUnit.create = function(value) {
+ var match;
+ if (typeof value !== "string") {
+ return new InterpolableWithUnit(value);
+ }
+ match = ("" + value).match("([^0-9.+-]*)([0-9.+-]+)([^0-9.+-]*)");
+ if (match != null) {
+ return new InterpolableWithUnit(match[2], match[1], match[3]);
+ }
+ return null;
+ };
+ return InterpolableWithUnit;
+ }();
+ InterpolableArray = function() {
+ function InterpolableArray(values, sep) {
+ this.values = values;
+ this.sep = sep;
+ this.format = __bind(this.format, this);
+ this.interpolate = __bind(this.interpolate, this);
+ }
+ InterpolableArray.prototype.interpolate = function(endInterpolable, t) {
+ var end, i, newValues, start, _i, _ref;
+ start = this.values;
+ end = endInterpolable.values;
+ newValues = [];
+ for (i = _i = 0, _ref = Math.min(start.length, end.length); 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
+ if (start[i].interpolate != null) {
+ newValues.push(start[i].interpolate(end[i], t));
+ } else {
+ newValues.push(start[i]);
+ }
+ }
+ return new InterpolableArray(newValues, this.sep);
+ };
+ InterpolableArray.prototype.format = function() {
+ var values;
+ values = this.values.map(function(val) {
+ if (val.format != null) {
+ return val.format();
+ } else {
+ return val;
+ }
+ });
+ if (this.sep != null) {
+ return values.join(this.sep);
+ } else {
+ return values;
+ }
+ };
+ InterpolableArray.createFromArray = function(arr, sep) {
+ var values;
+ values = arr.map(function(val) {
+ return createInterpolable(val) || val;
+ });
+ values = values.filter(function(val) {
+ return val != null;
+ });
+ return new InterpolableArray(values, sep);
+ };
+ InterpolableArray.create = function(value) {
+ var arr, sep, seps, _i, _len;
+ if (value instanceof Array) {
+ return InterpolableArray.createFromArray(value, null);
+ }
+ if (typeof value !== "string") {
+ return;
+ }
+ seps = [ " ", ",", "|", ";", "/", ":" ];
+ for (_i = 0, _len = seps.length; _i < _len; _i++) {
+ sep = seps[_i];
+ arr = value.split(sep);
+ if (arr.length > 1) {
+ return InterpolableArray.createFromArray(arr, sep);
+ }
+ }
+ return null;
+ };
+ return InterpolableArray;
+ }();
+ Color = function() {
+ function Color(rgb, format) {
+ this.rgb = rgb != null ? rgb : {};
+ this.format = format;
+ this.toRgba = __bind(this.toRgba, this);
+ this.toRgb = __bind(this.toRgb, this);
+ this.toHex = __bind(this.toHex, this);
+ }
+ Color.fromHex = function(hex) {
+ var hex3, result;
+ hex3 = hex.match(/^#([a-f\d]{1})([a-f\d]{1})([a-f\d]{1})$/i);
+ if (hex3 != null) {
+ hex = "#" + hex3[1] + hex3[1] + hex3[2] + hex3[2] + hex3[3] + hex3[3];
+ }
+ result = hex.match(/^#([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i);
+ if (result != null) {
+ return new Color({
+ r: parseInt(result[1], 16),
+ g: parseInt(result[2], 16),
+ b: parseInt(result[3], 16),
+ a: 1
+ }, "hex");
+ }
+ return null;
+ };
+ Color.fromRgb = function(rgb) {
+ var match, _ref;
+ match = rgb.match(/^rgba?\(([0-9.]*), ?([0-9.]*), ?([0-9.]*)(?:, ?([0-9.]*))?\)$/);
+ if (match != null) {
+ return new Color({
+ r: parseFloat(match[1]),
+ g: parseFloat(match[2]),
+ b: parseFloat(match[3]),
+ a: parseFloat((_ref = match[4]) != null ? _ref : 1)
+ }, match[4] != null ? "rgba" : "rgb");
+ }
+ return null;
+ };
+ Color.componentToHex = function(c) {
+ var hex;
+ hex = c.toString(16);
+ if (hex.length === 1) {
+ return "0" + hex;
+ } else {
+ return hex;
+ }
+ };
+ Color.prototype.toHex = function() {
+ return "#" + Color.componentToHex(this.rgb.r) + Color.componentToHex(this.rgb.g) + Color.componentToHex(this.rgb.b);
+ };
+ Color.prototype.toRgb = function() {
+ return "rgb(" + this.rgb.r + ", " + this.rgb.g + ", " + this.rgb.b + ")";
+ };
+ Color.prototype.toRgba = function() {
+ return "rgba(" + this.rgb.r + ", " + this.rgb.g + ", " + this.rgb.b + ", " + this.rgb.a + ")";
+ };
+ return Color;
+ }();
+ InterpolableColor = function() {
+ function InterpolableColor(color) {
+ this.color = color;
+ this.format = __bind(this.format, this);
+ this.interpolate = __bind(this.interpolate, this);
+ }
+ InterpolableColor.prototype.interpolate = function(endInterpolable, t) {
+ var end, k, rgb, start, v, _i, _len, _ref;
+ start = this.color;
+ end = endInterpolable.color;
+ rgb = {};
+ _ref = [ "r", "g", "b" ];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ k = _ref[_i];
+ v = Math.round((end.rgb[k] - start.rgb[k]) * t + start.rgb[k]);
+ rgb[k] = Math.min(255, Math.max(0, v));
+ }
+ k = "a";
+ v = roundf((end.rgb[k] - start.rgb[k]) * t + start.rgb[k], 5);
+ rgb[k] = Math.min(1, Math.max(0, v));
+ return new InterpolableColor(new Color(rgb, end.format));
+ };
+ InterpolableColor.prototype.format = function() {
+ if (this.color.format === "hex") {
+ return this.color.toHex();
+ } else if (this.color.format === "rgb") {
+ return this.color.toRgb();
+ } else if (this.color.format === "rgba") {
+ return this.color.toRgba();
+ }
+ };
+ InterpolableColor.create = function(value) {
+ var color;
+ if (typeof value !== "string") {
+ return;
+ }
+ color = Color.fromHex(value) || Color.fromRgb(value);
+ if (color != null) {
+ return new InterpolableColor(color);
+ }
+ return null;
+ };
+ return InterpolableColor;
+ }();
+ DecomposedMatrix2D = function() {
+ function DecomposedMatrix2D(props) {
+ this.props = props;
+ this.applyRotateCenter = __bind(this.applyRotateCenter, this);
+ this.format = __bind(this.format, this);
+ this.interpolate = __bind(this.interpolate, this);
+ }
+ DecomposedMatrix2D.prototype.interpolate = function(endMatrix, t) {
+ var i, k, newProps, _i, _j, _k, _l, _len, _len1, _ref, _ref1, _ref2;
+ newProps = {};
+ _ref = [ "translate", "scale", "rotate" ];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ k = _ref[_i];
+ newProps[k] = [];
+ for (i = _j = 0, _ref1 = this.props[k].length; 0 <= _ref1 ? _j < _ref1 : _j > _ref1; i = 0 <= _ref1 ? ++_j : --_j) {
+ newProps[k][i] = (endMatrix.props[k][i] - this.props[k][i]) * t + this.props[k][i];
+ }
+ }
+ for (i = _k = 1; _k <= 2; i = ++_k) {
+ newProps["rotate"][i] = endMatrix.props["rotate"][i];
+ }
+ _ref2 = [ "skew" ];
+ for (_l = 0, _len1 = _ref2.length; _l < _len1; _l++) {
+ k = _ref2[_l];
+ newProps[k] = (endMatrix.props[k] - this.props[k]) * t + this.props[k];
+ }
+ return new DecomposedMatrix2D(newProps);
+ };
+ DecomposedMatrix2D.prototype.format = function() {
+ return "translate(" + this.props.translate.join(",") + ") rotate(" + this.props.rotate.join(",") + ") skewX(" + this.props.skew + ") scale(" + this.props.scale.join(",") + ")";
+ };
+ DecomposedMatrix2D.prototype.applyRotateCenter = function(rotateC) {
+ var i, m, m2d, negativeTranslate, _i, _results;
+ m = baseSVG.createSVGMatrix();
+ m = m.translate(rotateC[0], rotateC[1]);
+ m = m.rotate(this.props.rotate[0]);
+ m = m.translate(-rotateC[0], -rotateC[1]);
+ m2d = new Matrix2D(m);
+ negativeTranslate = m2d.decompose().props.translate;
+ _results = [];
+ for (i = _i = 0; _i <= 1; i = ++_i) {
+ _results.push(this.props.translate[i] -= negativeTranslate[i]);
+ }
+ return _results;
+ };
+ return DecomposedMatrix2D;
+ }();
+ baseSVG = typeof document !== "undefined" && document !== null ? document.createElementNS("http://www.w3.org/2000/svg", "svg") : void 0;
+ Matrix2D = function() {
+ function Matrix2D(m) {
+ this.m = m;
+ this.applyProperties = __bind(this.applyProperties, this);
+ this.decompose = __bind(this.decompose, this);
+ if (!this.m) {
+ this.m = baseSVG.createSVGMatrix();
+ }
+ }
+ Matrix2D.prototype.decompose = function() {
+ var kx, ky, kz, r0, r1;
+ r0 = new Vector([ this.m.a, this.m.b ]);
+ r1 = new Vector([ this.m.c, this.m.d ]);
+ kx = r0.length();
+ kz = r0.dot(r1);
+ r0 = r0.normalize();
+ ky = r1.combine(r0, 1, -kz).length();
+ return new DecomposedMatrix2D({
+ translate: [ this.m.e, this.m.f ],
+ rotate: [ Math.atan2(this.m.b, this.m.a) * 180 / Math.PI, this.rotateCX, this.rotateCY ],
+ scale: [ kx, ky ],
+ skew: kz / ky * 180 / Math.PI
+ });
+ };
+ Matrix2D.prototype.applyProperties = function(properties) {
+ var hash, k, props, v, _i, _len, _ref, _ref1;
+ hash = {};
+ for (_i = 0, _len = properties.length; _i < _len; _i++) {
+ props = properties[_i];
+ hash[props[0]] = props[1];
+ }
+ for (k in hash) {
+ v = hash[k];
+ if (k === "translateX") {
+ this.m = this.m.translate(v, 0);
+ } else if (k === "translateY") {
+ this.m = this.m.translate(0, v);
+ } else if (k === "scaleX") {
+ this.m = this.m.scale(v, 1);
+ } else if (k === "scaleY") {
+ this.m = this.m.scale(1, v);
+ } else if (k === "rotateZ") {
+ this.m = this.m.rotate(v);
+ } else if (k === "skewX") {
+ this.m = this.m.skewX(v);
+ } else if (k === "skewY") {
+ this.m = this.m.skewY(v);
+ }
+ }
+ this.rotateCX = (_ref = hash.rotateCX) != null ? _ref : 0;
+ return this.rotateCY = (_ref1 = hash.rotateCY) != null ? _ref1 : 0;
+ };
+ return Matrix2D;
+ }();
+ Vector = function() {
+ function Vector(els) {
+ this.els = els;
+ this.combine = __bind(this.combine, this);
+ this.normalize = __bind(this.normalize, this);
+ this.length = __bind(this.length, this);
+ this.cross = __bind(this.cross, this);
+ this.dot = __bind(this.dot, this);
+ this.e = __bind(this.e, this);
+ }
+ Vector.prototype.e = function(i) {
+ if (i < 1 || i > this.els.length) {
+ return null;
+ } else {
+ return this.els[i - 1];
+ }
+ };
+ Vector.prototype.dot = function(vector) {
+ var V, n, product;
+ V = vector.els || vector;
+ product = 0;
+ n = this.els.length;
+ if (n !== V.length) {
+ return null;
+ }
+ n += 1;
+ while (--n) {
+ product += this.els[n - 1] * V[n - 1];
+ }
+ return product;
+ };
+ Vector.prototype.cross = function(vector) {
+ var A, B;
+ B = vector.els || vector;
+ if (this.els.length !== 3 || B.length !== 3) {
+ return null;
+ }
+ A = this.els;
+ return new Vector([ A[1] * B[2] - A[2] * B[1], A[2] * B[0] - A[0] * B[2], A[0] * B[1] - A[1] * B[0] ]);
+ };
+ Vector.prototype.length = function() {
+ var a, e, _i, _len, _ref;
+ a = 0;
+ _ref = this.els;
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ e = _ref[_i];
+ a += Math.pow(e, 2);
+ }
+ return Math.sqrt(a);
+ };
+ Vector.prototype.normalize = function() {
+ var e, i, length, newElements, _ref;
+ length = this.length();
+ newElements = [];
+ _ref = this.els;
+ for (i in _ref) {
+ e = _ref[i];
+ newElements[i] = e / length;
+ }
+ return new Vector(newElements);
+ };
+ Vector.prototype.combine = function(b, ascl, bscl) {
+ var i, result, _i, _ref;
+ result = [];
+ for (i = _i = 0, _ref = this.els.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
+ result[i] = ascl * this.els[i] + bscl * b.els[i];
+ }
+ return new Vector(result);
+ };
+ return Vector;
+ }();
+ DecomposedMatrix = function() {
+ function DecomposedMatrix() {
+ this.toMatrix = __bind(this.toMatrix, this);
+ this.format = __bind(this.format, this);
+ this.interpolate = __bind(this.interpolate, this);
+ }
+ DecomposedMatrix.prototype.interpolate = function(decomposedB, t, only) {
+ var angle, decomposed, decomposedA, i, invscale, invth, k, qa, qb, scale, th, _i, _j, _k, _l, _len, _ref, _ref1;
+ if (only == null) {
+ only = null;
+ }
+ decomposedA = this;
+ decomposed = new DecomposedMatrix();
+ _ref = [ "translate", "scale", "skew", "perspective" ];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ k = _ref[_i];
+ decomposed[k] = [];
+ for (i = _j = 0, _ref1 = decomposedA[k].length - 1; 0 <= _ref1 ? _j <= _ref1 : _j >= _ref1; i = 0 <= _ref1 ? ++_j : --_j) {
+ if (only == null || only.indexOf(k) > -1 || only.indexOf("" + k + [ "x", "y", "z" ][i]) > -1) {
+ decomposed[k][i] = (decomposedB[k][i] - decomposedA[k][i]) * t + decomposedA[k][i];
+ } else {
+ decomposed[k][i] = decomposedA[k][i];
+ }
+ }
+ }
+ if (only == null || only.indexOf("rotate") !== -1) {
+ qa = decomposedA.quaternion;
+ qb = decomposedB.quaternion;
+ angle = qa[0] * qb[0] + qa[1] * qb[1] + qa[2] * qb[2] + qa[3] * qb[3];
+ if (angle < 0) {
+ for (i = _k = 0; _k <= 3; i = ++_k) {
+ qa[i] = -qa[i];
+ }
+ angle = -angle;
+ }
+ if (angle + 1 > .05) {
+ if (1 - angle >= .05) {
+ th = Math.acos(angle);
+ invth = 1 / Math.sin(th);
+ scale = Math.sin(th * (1 - t)) * invth;
+ invscale = Math.sin(th * t) * invth;
+ } else {
+ scale = 1 - t;
+ invscale = t;
+ }
+ } else {
+ qb[0] = -qa[1];
+ qb[1] = qa[0];
+ qb[2] = -qa[3];
+ qb[3] = qa[2];
+ scale = Math.sin(piDouble * (.5 - t));
+ invscale = Math.sin(piDouble * t);
+ }
+ decomposed.quaternion = [];
+ for (i = _l = 0; _l <= 3; i = ++_l) {
+ decomposed.quaternion[i] = qa[i] * scale + qb[i] * invscale;
+ }
+ } else {
+ decomposed.quaternion = decomposedA.quaternion;
+ }
+ return decomposed;
+ };
+ DecomposedMatrix.prototype.format = function() {
+ return this.toMatrix().toString();
+ };
+ DecomposedMatrix.prototype.toMatrix = function() {
+ var decomposedMatrix, i, j, match, matrix, quaternion, skew, temp, w, x, y, z, _i, _j, _k, _l;
+ decomposedMatrix = this;
+ matrix = Matrix.I(4);
+ for (i = _i = 0; _i <= 3; i = ++_i) {
+ matrix.els[i][3] = decomposedMatrix.perspective[i];
+ }
+ quaternion = decomposedMatrix.quaternion;
+ x = quaternion[0];
+ y = quaternion[1];
+ z = quaternion[2];
+ w = quaternion[3];
+ skew = decomposedMatrix.skew;
+ match = [ [ 1, 0 ], [ 2, 0 ], [ 2, 1 ] ];
+ for (i = _j = 2; _j >= 0; i = --_j) {
+ if (skew[i]) {
+ temp = Matrix.I(4);
+ temp.els[match[i][0]][match[i][1]] = skew[i];
+ matrix = matrix.multiply(temp);
+ }
+ }
+ matrix = matrix.multiply(new Matrix([ [ 1 - 2 * (y * y + z * z), 2 * (x * y - z * w), 2 * (x * z + y * w), 0 ], [ 2 * (x * y + z * w), 1 - 2 * (x * x + z * z), 2 * (y * z - x * w), 0 ], [ 2 * (x * z - y * w), 2 * (y * z + x * w), 1 - 2 * (x * x + y * y), 0 ], [ 0, 0, 0, 1 ] ]));
+ for (i = _k = 0; _k <= 2; i = ++_k) {
+ for (j = _l = 0; _l <= 2; j = ++_l) {
+ matrix.els[i][j] *= decomposedMatrix.scale[i];
+ }
+ matrix.els[3][i] = decomposedMatrix.translate[i];
+ }
+ return matrix;
+ };
+ return DecomposedMatrix;
+ }();
+ Matrix = function() {
+ function Matrix(els) {
+ this.els = els;
+ this.toString = __bind(this.toString, this);
+ this.decompose = __bind(this.decompose, this);
+ this.inverse = __bind(this.inverse, this);
+ this.augment = __bind(this.augment, this);
+ this.toRightTriangular = __bind(this.toRightTriangular, this);
+ this.transpose = __bind(this.transpose, this);
+ this.multiply = __bind(this.multiply, this);
+ this.dup = __bind(this.dup, this);
+ this.e = __bind(this.e, this);
+ }
+ Matrix.prototype.e = function(i, j) {
+ if (i < 1 || i > this.els.length || j < 1 || j > this.els[0].length) {
+ return null;
+ }
+ return this.els[i - 1][j - 1];
+ };
+ Matrix.prototype.dup = function() {
+ return new Matrix(this.els);
+ };
+ Matrix.prototype.multiply = function(matrix) {
+ var M, c, cols, elements, i, j, ki, kj, nc, ni, nj, returnVector, sum;
+ returnVector = matrix.modulus ? true : false;
+ M = matrix.els || matrix;
+ if (typeof M[0][0] === "undefined") {
+ M = new Matrix(M).els;
+ }
+ ni = this.els.length;
+ ki = ni;
+ kj = M[0].length;
+ cols = this.els[0].length;
+ elements = [];
+ ni += 1;
+ while (--ni) {
+ i = ki - ni;
+ elements[i] = [];
+ nj = kj;
+ nj += 1;
+ while (--nj) {
+ j = kj - nj;
+ sum = 0;
+ nc = cols;
+ nc += 1;
+ while (--nc) {
+ c = cols - nc;
+ sum += this.els[i][c] * M[c][j];
+ }
+ elements[i][j] = sum;
+ }
+ }
+ M = new Matrix(elements);
+ if (returnVector) {
+ return M.col(1);
+ } else {
+ return M;
+ }
+ };
+ Matrix.prototype.transpose = function() {
+ var cols, elements, i, j, ni, nj, rows;
+ rows = this.els.length;
+ cols = this.els[0].length;
+ elements = [];
+ ni = cols;
+ ni += 1;
+ while (--ni) {
+ i = cols - ni;
+ elements[i] = [];
+ nj = rows;
+ nj += 1;
+ while (--nj) {
+ j = rows - nj;
+ elements[i][j] = this.els[j][i];
+ }
+ }
+ return new Matrix(elements);
+ };
+ Matrix.prototype.toRightTriangular = function() {
+ var M, els, i, j, k, kp, multiplier, n, np, p, _i, _j, _ref, _ref1;
+ M = this.dup();
+ n = this.els.length;
+ k = n;
+ kp = this.els[0].length;
+ while (--n) {
+ i = k - n;
+ if (M.els[i][i] === 0) {
+ for (j = _i = _ref = i + 1; _ref <= k ? _i < k : _i > k; j = _ref <= k ? ++_i : --_i) {
+ if (M.els[j][i] !== 0) {
+ els = [];
+ np = kp;
+ np += 1;
+ while (--np) {
+ p = kp - np;
+ els.push(M.els[i][p] + M.els[j][p]);
+ }
+ M.els[i] = els;
+ break;
+ }
+ }
+ }
+ if (M.els[i][i] !== 0) {
+ for (j = _j = _ref1 = i + 1; _ref1 <= k ? _j < k : _j > k; j = _ref1 <= k ? ++_j : --_j) {
+ multiplier = M.els[j][i] / M.els[i][i];
+ els = [];
+ np = kp;
+ np += 1;
+ while (--np) {
+ p = kp - np;
+ els.push(p <= i ? 0 : M.els[j][p] - M.els[i][p] * multiplier);
+ }
+ M.els[j] = els;
+ }
+ }
+ }
+ return M;
+ };
+ Matrix.prototype.augment = function(matrix) {
+ var M, T, cols, i, j, ki, kj, ni, nj;
+ M = matrix.els || matrix;
+ if (typeof M[0][0] === "undefined") {
+ M = new Matrix(M).els;
+ }
+ T = this.dup();
+ cols = T.els[0].length;
+ ni = T.els.length;
+ ki = ni;
+ kj = M[0].length;
+ if (ni !== M.length) {
+ return null;
+ }
+ ni += 1;
+ while (--ni) {
+ i = ki - ni;
+ nj = kj;
+ nj += 1;
+ while (--nj) {
+ j = kj - nj;
+ T.els[i][cols + j] = M[i][j];
+ }
+ }
+ return T;
+ };
+ Matrix.prototype.inverse = function() {
+ var M, divisor, els, i, inverse_elements, j, ki, kp, new_element, ni, np, p, _i;
+ ni = this.els.length;
+ ki = ni;
+ M = this.augment(Matrix.I(ni)).toRightTriangular();
+ kp = M.els[0].length;
+ inverse_elements = [];
+ ni += 1;
+ while (--ni) {
+ i = ni - 1;
+ els = [];
+ np = kp;
+ inverse_elements[i] = [];
+ divisor = M.els[i][i];
+ np += 1;
+ while (--np) {
+ p = kp - np;
+ new_element = M.els[i][p] / divisor;
+ els.push(new_element);
+ if (p >= ki) {
+ inverse_elements[i].push(new_element);
+ }
+ }
+ M.els[i] = els;
+ for (j = _i = 0; 0 <= i ? _i < i : _i > i; j = 0 <= i ? ++_i : --_i) {
+ els = [];
+ np = kp;
+ np += 1;
+ while (--np) {
+ p = kp - np;
+ els.push(M.els[j][p] - M.els[i][p] * M.els[j][i]);
+ }
+ M.els[j] = els;
+ }
+ }
+ return new Matrix(inverse_elements);
+ };
+ Matrix.I = function(n) {
+ var els, i, j, k, nj;
+ els = [];
+ k = n;
+ n += 1;
+ while (--n) {
+ i = k - n;
+ els[i] = [];
+ nj = k;
+ nj += 1;
+ while (--nj) {
+ j = k - nj;
+ els[i][j] = i === j ? 1 : 0;
+ }
+ }
+ return new Matrix(els);
+ };
+ Matrix.prototype.decompose = function() {
+ var els, i, inversePerspectiveMatrix, j, k, matrix, pdum3, perspective, perspectiveMatrix, quaternion, result, rightHandSide, rotate, row, rowElement, s, scale, skew, t, translate, transposedInversePerspectiveMatrix, type, typeKey, v, w, x, y, z, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
+ matrix = this;
+ translate = [];
+ scale = [];
+ skew = [];
+ quaternion = [];
+ perspective = [];
+ els = [];
+ for (i = _i = 0; _i <= 3; i = ++_i) {
+ els[i] = [];
+ for (j = _j = 0; _j <= 3; j = ++_j) {
+ els[i][j] = matrix.els[i][j];
+ }
+ }
+ if (els[3][3] === 0) {
+ return false;
+ }
+ for (i = _k = 0; _k <= 3; i = ++_k) {
+ for (j = _l = 0; _l <= 3; j = ++_l) {
+ els[i][j] /= els[3][3];
+ }
+ }
+ perspectiveMatrix = matrix.dup();
+ for (i = _m = 0; _m <= 2; i = ++_m) {
+ perspectiveMatrix.els[i][3] = 0;
+ }
+ perspectiveMatrix.els[3][3] = 1;
+ if (els[0][3] !== 0 || els[1][3] !== 0 || els[2][3] !== 0) {
+ rightHandSide = new Vector(els.slice(0, 4)[3]);
+ inversePerspectiveMatrix = perspectiveMatrix.inverse();
+ transposedInversePerspectiveMatrix = inversePerspectiveMatrix.transpose();
+ perspective = transposedInversePerspectiveMatrix.multiply(rightHandSide).els;
+ for (i = _n = 0; _n <= 2; i = ++_n) {
+ els[i][3] = 0;
+ }
+ els[3][3] = 1;
+ } else {
+ perspective = [ 0, 0, 0, 1 ];
+ }
+ for (i = _o = 0; _o <= 2; i = ++_o) {
+ translate[i] = els[3][i];
+ els[3][i] = 0;
+ }
+ row = [];
+ for (i = _p = 0; _p <= 2; i = ++_p) {
+ row[i] = new Vector(els[i].slice(0, 3));
+ }
+ scale[0] = row[0].length();
+ row[0] = row[0].normalize();
+ skew[0] = row[0].dot(row[1]);
+ row[1] = row[1].combine(row[0], 1, -skew[0]);
+ scale[1] = row[1].length();
+ row[1] = row[1].normalize();
+ skew[0] /= scale[1];
+ skew[1] = row[0].dot(row[2]);
+ row[2] = row[2].combine(row[0], 1, -skew[1]);
+ skew[2] = row[1].dot(row[2]);
+ row[2] = row[2].combine(row[1], 1, -skew[2]);
+ scale[2] = row[2].length();
+ row[2] = row[2].normalize();
+ skew[1] /= scale[2];
+ skew[2] /= scale[2];
+ pdum3 = row[1].cross(row[2]);
+ if (row[0].dot(pdum3) < 0) {
+ for (i = _q = 0; _q <= 2; i = ++_q) {
+ scale[i] *= -1;
+ for (j = _r = 0; _r <= 2; j = ++_r) {
+ row[i].els[j] *= -1;
+ }
+ }
+ }
+ rowElement = function(index, elementIndex) {
+ return row[index].els[elementIndex];
+ };
+ rotate = [];
+ rotate[1] = Math.asin(-rowElement(0, 2));
+ if (Math.cos(rotate[1]) !== 0) {
+ rotate[0] = Math.atan2(rowElement(1, 2), rowElement(2, 2));
+ rotate[2] = Math.atan2(rowElement(0, 1), rowElement(0, 0));
+ } else {
+ rotate[0] = Math.atan2(-rowElement(2, 0), rowElement(1, 1));
+ rotate[1] = 0;
+ }
+ t = rowElement(0, 0) + rowElement(1, 1) + rowElement(2, 2) + 1;
+ if (t > 1e-4) {
+ s = .5 / Math.sqrt(t);
+ w = .25 / s;
+ x = (rowElement(2, 1) - rowElement(1, 2)) * s;
+ y = (rowElement(0, 2) - rowElement(2, 0)) * s;
+ z = (rowElement(1, 0) - rowElement(0, 1)) * s;
+ } else if (rowElement(0, 0) > rowElement(1, 1) && rowElement(0, 0) > rowElement(2, 2)) {
+ s = Math.sqrt(1 + rowElement(0, 0) - rowElement(1, 1) - rowElement(2, 2)) * 2;
+ x = .25 * s;
+ y = (rowElement(0, 1) + rowElement(1, 0)) / s;
+ z = (rowElement(0, 2) + rowElement(2, 0)) / s;
+ w = (rowElement(2, 1) - rowElement(1, 2)) / s;
+ } else if (rowElement(1, 1) > rowElement(2, 2)) {
+ s = Math.sqrt(1 + rowElement(1, 1) - rowElement(0, 0) - rowElement(2, 2)) * 2;
+ x = (rowElement(0, 1) + rowElement(1, 0)) / s;
+ y = .25 * s;
+ z = (rowElement(1, 2) + rowElement(2, 1)) / s;
+ w = (rowElement(0, 2) - rowElement(2, 0)) / s;
+ } else {
+ s = Math.sqrt(1 + rowElement(2, 2) - rowElement(0, 0) - rowElement(1, 1)) * 2;
+ x = (rowElement(0, 2) + rowElement(2, 0)) / s;
+ y = (rowElement(1, 2) + rowElement(2, 1)) / s;
+ z = .25 * s;
+ w = (rowElement(1, 0) - rowElement(0, 1)) / s;
+ }
+ quaternion = [ x, y, z, w ];
+ result = new DecomposedMatrix();
+ result.translate = translate;
+ result.scale = scale;
+ result.skew = skew;
+ result.quaternion = quaternion;
+ result.perspective = perspective;
+ result.rotate = rotate;
+ for (typeKey in result) {
+ type = result[typeKey];
+ for (k in type) {
+ v = type[k];
+ if (isNaN(v)) {
+ type[k] = 0;
+ }
+ }
+ }
+ return result;
+ };
+ Matrix.prototype.toString = function() {
+ var i, j, str, _i, _j;
+ str = "matrix3d(";
+ for (i = _i = 0; _i <= 3; i = ++_i) {
+ for (j = _j = 0; _j <= 3; j = ++_j) {
+ str += roundf(this.els[i][j], 10);
+ if (!(i === 3 && j === 3)) {
+ str += ",";
+ }
+ }
+ }
+ str += ")";
+ return str;
+ };
+ Matrix.matrixForTransform = cacheFn(function(transform) {
+ var matrixEl, result, style, _ref, _ref1, _ref2;
+ matrixEl = document.createElement("div");
+ matrixEl.style.position = "absolute";
+ matrixEl.style.visibility = "hidden";
+ matrixEl.style[propertyWithPrefix("transform")] = transform;
+ document.body.appendChild(matrixEl);
+ style = window.getComputedStyle(matrixEl, null);
+ result = (_ref = (_ref1 = style.transform) != null ? _ref1 : style[propertyWithPrefix("transform")]) != null ? _ref : (_ref2 = dynamics.tests) != null ? _ref2.matrixForTransform(transform) : void 0;
+ document.body.removeChild(matrixEl);
+ return result;
+ });
+ Matrix.fromTransform = function(transform) {
+ var digits, elements, i, match, matrixElements, _i;
+ match = transform != null ? transform.match(/matrix3?d?\(([-0-9,e \.]*)\)/) : void 0;
+ if (match) {
+ digits = match[1].split(",");
+ digits = digits.map(parseFloat);
+ if (digits.length === 6) {
+ elements = [ digits[0], digits[1], 0, 0, digits[2], digits[3], 0, 0, 0, 0, 1, 0, digits[4], digits[5], 0, 1 ];
+ } else {
+ elements = digits;
+ }
+ } else {
+ elements = [ 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 ];
+ }
+ matrixElements = [];
+ for (i = _i = 0; _i <= 3; i = ++_i) {
+ matrixElements.push(elements.slice(i * 4, i * 4 + 4));
+ }
+ return new Matrix(matrixElements);
+ };
+ return Matrix;
+ }();
+ prefixFor = cacheFn(function(property) {
+ var k, prefix, prop, propArray, propertyName, _i, _j, _len, _len1, _ref;
+ if (document.body.style[property] !== void 0) {
+ return "";
+ }
+ propArray = property.split("-");
+ propertyName = "";
+ for (_i = 0, _len = propArray.length; _i < _len; _i++) {
+ prop = propArray[_i];
+ propertyName += prop.substring(0, 1).toUpperCase() + prop.substring(1);
+ }
+ _ref = [ "Webkit", "Moz", "ms" ];
+ for (_j = 0, _len1 = _ref.length; _j < _len1; _j++) {
+ prefix = _ref[_j];
+ k = prefix + propertyName;
+ if (document.body.style[k] !== void 0) {
+ return prefix;
+ }
+ }
+ return "";
+ });
+ propertyWithPrefix = cacheFn(function(property) {
+ var prefix;
+ prefix = prefixFor(property);
+ if (prefix === "Moz") {
+ return "" + prefix + (property.substring(0, 1).toUpperCase() + property.substring(1));
+ }
+ if (prefix !== "") {
+ return "-" + prefix.toLowerCase() + "-" + toDashed(property);
+ }
+ return toDashed(property);
+ });
+ rAF = typeof window !== "undefined" && window !== null ? window.requestAnimationFrame : void 0;
+ animations = [];
+ animationsTimeouts = [];
+ slow = false;
+ slowRatio = 1;
+ if (typeof window !== "undefined" && window !== null) {
+ window.addEventListener("keyup", function(e) {
+ if (e.keyCode === 68 && e.shiftKey && e.ctrlKey) {
+ return dynamics.toggleSlow();
+ }
+ });
+ }
+ if (rAF == null) {
+ lastTime = 0;
+ rAF = function(callback) {
+ var currTime, id, timeToCall;
+ currTime = Date.now();
+ timeToCall = Math.max(0, 16 - (currTime - lastTime));
+ id = window.setTimeout(function() {
+ return callback(currTime + timeToCall);
+ }, timeToCall);
+ lastTime = currTime + timeToCall;
+ return id;
+ };
+ }
+ runLoopRunning = false;
+ runLoopPaused = false;
+ startRunLoop = function() {
+ if (!runLoopRunning) {
+ runLoopRunning = true;
+ return rAF(runLoopTick);
+ }
+ };
+ runLoopTick = function(t) {
+ var animation, toRemoveAnimations, _i, _len;
+ if (runLoopPaused) {
+ rAF(runLoopTick);
+ return;
+ }
+ toRemoveAnimations = [];
+ for (_i = 0, _len = animations.length; _i < _len; _i++) {
+ animation = animations[_i];
+ if (!animationTick(t, animation)) {
+ toRemoveAnimations.push(animation);
+ }
+ }
+ animations = animations.filter(function(animation) {
+ return toRemoveAnimations.indexOf(animation) === -1;
+ });
+ if (animations.length === 0) {
+ return runLoopRunning = false;
+ } else {
+ return rAF(runLoopTick);
+ }
+ };
+ animationTick = function(t, animation) {
+ var key, properties, property, tt, y, _base, _base1, _ref;
+ if (animation.tStart == null) {
+ animation.tStart = t;
+ }
+ tt = (t - animation.tStart) / animation.options.duration;
+ y = animation.curve(tt);
+ properties = {};
+ if (tt >= 1) {
+ if (animation.curve.initialForce) {
+ properties = animation.properties.start;
+ } else {
+ properties = animation.properties.end;
+ }
+ } else {
+ _ref = animation.properties.start;
+ for (key in _ref) {
+ property = _ref[key];
+ properties[key] = interpolate(property, animation.properties.end[key], y);
+ }
+ }
+ applyFrame(animation.el, properties);
+ if (typeof (_base = animation.options).change === "function") {
+ _base.change(animation.el);
+ }
+ if (tt >= 1) {
+ if (typeof (_base1 = animation.options).complete === "function") {
+ _base1.complete(animation.el);
+ }
+ }
+ return tt < 1;
+ };
+ interpolate = function(start, end, y) {
+ if (start != null && start.interpolate != null) {
+ return start.interpolate(end, y);
+ }
+ return null;
+ };
+ startAnimation = function(el, properties, options, timeoutId) {
+ var endProperties, isSVG, k, matrix, startProperties, transforms, v, _base;
+ if (timeoutId != null) {
+ animationsTimeouts = animationsTimeouts.filter(function(timeout) {
+ return timeout.id !== timeoutId;
+ });
+ }
+ dynamics.stop(el, {
+ timeout: false
+ });
+ if (!options.animated) {
+ dynamics.css(el, properties);
+ if (typeof options.complete === "function") {
+ options.complete(this);
+ }
+ return;
+ }
+ properties = parseProperties(properties);
+ startProperties = getCurrentProperties(el, Object.keys(properties));
+ endProperties = {};
+ transforms = [];
+ for (k in properties) {
+ v = properties[k];
+ if (transformProperties.contains(k)) {
+ transforms.push([ k, v ]);
+ } else {
+ endProperties[k] = createInterpolable(v);
+ if (endProperties[k] instanceof InterpolableWithUnit && el.style != null) {
+ endProperties[k].prefix = "";
+ if ((_base = endProperties[k]).suffix == null) {
+ _base.suffix = unitForProperty(k, 0);
+ }
+ }
+ }
+ }
+ if (transforms.length > 0) {
+ isSVG = isSVGElement(el);
+ if (isSVG) {
+ matrix = new Matrix2D();
+ matrix.applyProperties(transforms);
+ } else {
+ v = transforms.map(function(transform) {
+ return transformValueForProperty(transform[0], transform[1]);
+ }).join(" ");
+ matrix = Matrix.fromTransform(Matrix.matrixForTransform(v));
+ }
+ endProperties["transform"] = matrix.decompose();
+ if (isSVG) {
+ startProperties.transform.applyRotateCenter([ endProperties.transform.props.rotate[1], endProperties.transform.props.rotate[2] ]);
+ }
+ }
+ animations.push({
+ el: el,
+ properties: {
+ start: startProperties,
+ end: endProperties
+ },
+ options: options,
+ curve: options.type.call(options.type, options)
+ });
+ return startRunLoop();
+ };
+ timeouts = [];
+ timeoutLastId = 0;
+ setRealTimeout = function(timeout) {
+ if (!isDocumentVisible()) {
+ return;
+ }
+ return timeout.realTimeoutId = setTimeout(function() {
+ timeout.fn();
+ return cancelTimeout(timeout.id);
+ }, timeout.delay);
+ };
+ addTimeout = function(fn, delay) {
+ var timeout;
+ timeoutLastId += 1;
+ timeout = {
+ id: timeoutLastId,
+ tStart: Date.now(),
+ fn: fn,
+ delay: delay,
+ originalDelay: delay
+ };
+ setRealTimeout(timeout);
+ timeouts.push(timeout);
+ return timeoutLastId;
+ };
+ cancelTimeout = function(id) {
+ return timeouts = timeouts.filter(function(timeout) {
+ if (timeout.id === id) {
+ clearTimeout(timeout.realTimeoutId);
+ }
+ return timeout.id !== id;
+ });
+ };
+ leftDelayForTimeout = function(time, timeout) {
+ var consumedDelay;
+ if (time != null) {
+ consumedDelay = time - timeout.tStart;
+ return timeout.originalDelay - consumedDelay;
+ } else {
+ return timeout.originalDelay;
+ }
+ };
+ if (typeof window !== "undefined" && window !== null) {
+ window.addEventListener("unload", function() {});
+ }
+ timeBeforeVisibilityChange = null;
+ observeVisibilityChange(function(visible) {
+ var animation, difference, timeout, _i, _j, _k, _len, _len1, _len2, _results;
+ runLoopPaused = !visible;
+ if (!visible) {
+ timeBeforeVisibilityChange = Date.now();
+ _results = [];
+ for (_i = 0, _len = timeouts.length; _i < _len; _i++) {
+ timeout = timeouts[_i];
+ _results.push(clearTimeout(timeout.realTimeoutId));
+ }
+ return _results;
+ } else {
+ if (runLoopRunning) {
+ difference = Date.now() - timeBeforeVisibilityChange;
+ for (_j = 0, _len1 = animations.length; _j < _len1; _j++) {
+ animation = animations[_j];
+ if (animation.tStart != null) {
+ animation.tStart += difference;
+ }
+ }
+ }
+ for (_k = 0, _len2 = timeouts.length; _k < _len2; _k++) {
+ timeout = timeouts[_k];
+ timeout.delay = leftDelayForTimeout(timeBeforeVisibilityChange, timeout);
+ setRealTimeout(timeout);
+ }
+ return timeBeforeVisibilityChange = null;
+ }
+ });
+ dynamics = {};
+ dynamics.linear = function() {
+ return function(t) {
+ return t;
+ };
+ };
+ dynamics.spring = function(options) {
+ var A1, A2, decal, frequency, friction, s;
+ if (options == null) {
+ options = {};
+ }
+ applyDefaults(options, arguments.callee.defaults);
+ frequency = Math.max(1, options.frequency / 20);
+ friction = Math.pow(20, options.friction / 100);
+ s = options.anticipationSize / 1e3;
+ decal = Math.max(0, s);
+ A1 = function(t) {
+ var M, a, b, x0, x1;
+ M = .8;
+ x0 = s / (1 - s);
+ x1 = 0;
+ b = (x0 - M * x1) / (x0 - x1);
+ a = (M - b) / x0;
+ return a * t * options.anticipationStrength / 100 + b;
+ };
+ A2 = function(t) {
+ return Math.pow(friction / 10, -t) * (1 - t);
+ };
+ return function(t) {
+ var A, At, a, angle, b, frictionT, y0, yS;
+ frictionT = t / (1 - s) - s / (1 - s);
+ if (t < s) {
+ yS = s / (1 - s) - s / (1 - s);
+ y0 = 0 / (1 - s) - s / (1 - s);
+ b = Math.acos(1 / A1(yS));
+ a = (Math.acos(1 / A1(y0)) - b) / (frequency * -s);
+ A = A1;
+ } else {
+ A = A2;
+ b = 0;
+ a = 1;
+ }
+ At = A(frictionT);
+ angle = frequency * (t - s) * a + b;
+ return 1 - At * Math.cos(angle);
+ };
+ };
+ dynamics.bounce = function(options) {
+ var A, fn, frequency, friction;
+ if (options == null) {
+ options = {};
+ }
+ applyDefaults(options, arguments.callee.defaults);
+ frequency = Math.max(1, options.frequency / 20);
+ friction = Math.pow(20, options.friction / 100);
+ A = function(t) {
+ return Math.pow(friction / 10, -t) * (1 - t);
+ };
+ fn = function(t) {
+ var At, a, angle, b;
+ b = -3.14 / 2;
+ a = 1;
+ At = A(t);
+ angle = frequency * t * a + b;
+ return At * Math.cos(angle);
+ };
+ fn.initialForce = true;
+ return fn;
+ };
+ dynamics.gravity = function(options) {
+ var L, bounciness, curves, elasticity, fn, getPointInCurve, gravity;
+ if (options == null) {
+ options = {};
+ }
+ applyDefaults(options, arguments.callee.defaults);
+ bounciness = Math.min(options.bounciness / 1250, .8);
+ elasticity = options.elasticity / 1e3;
+ gravity = 100;
+ curves = [];
+ L = function() {
+ var b, curve;
+ b = Math.sqrt(2 / gravity);
+ curve = {
+ a: -b,
+ b: b,
+ H: 1
+ };
+ if (options.initialForce) {
+ curve.a = 0;
+ curve.b = curve.b * 2;
+ }
+ while (curve.H > .001) {
+ L = curve.b - curve.a;
+ curve = {
+ a: curve.b,
+ b: curve.b + L * bounciness,
+ H: curve.H * bounciness * bounciness
+ };
+ }
+ return curve.b;
+ }();
+ getPointInCurve = function(a, b, H, t) {
+ var c, t2;
+ L = b - a;
+ t2 = 2 / L * t - 1 - a * 2 / L;
+ c = t2 * t2 * H - H + 1;
+ if (options.initialForce) {
+ c = 1 - c;
+ }
+ return c;
+ };
+ (function() {
+ var L2, b, curve, _results;
+ b = Math.sqrt(2 / (gravity * L * L));
+ curve = {
+ a: -b,
+ b: b,
+ H: 1
+ };
+ if (options.initialForce) {
+ curve.a = 0;
+ curve.b = curve.b * 2;
+ }
+ curves.push(curve);
+ L2 = L;
+ _results = [];
+ while (curve.b < 1 && curve.H > .001) {
+ L2 = curve.b - curve.a;
+ curve = {
+ a: curve.b,
+ b: curve.b + L2 * bounciness,
+ H: curve.H * elasticity
+ };
+ _results.push(curves.push(curve));
+ }
+ return _results;
+ })();
+ fn = function(t) {
+ var curve, i, v;
+ i = 0;
+ curve = curves[i];
+ while (!(t >= curve.a && t <= curve.b)) {
+ i += 1;
+ curve = curves[i];
+ if (!curve) {
+ break;
+ }
+ }
+ if (!curve) {
+ v = options.initialForce ? 0 : 1;
+ } else {
+ v = getPointInCurve(curve.a, curve.b, curve.H, t);
+ }
+ return v;
+ };
+ fn.initialForce = options.initialForce;
+ return fn;
+ };
+ dynamics.forceWithGravity = function(options) {
+ if (options == null) {
+ options = {};
+ }
+ applyDefaults(options, arguments.callee.defaults);
+ options.initialForce = true;
+ return dynamics.gravity(options);
+ };
+ dynamics.bezier = function() {
+ var Bezier, Bezier_, yForX;
+ Bezier_ = function(t, p0, p1, p2, p3) {
+ return Math.pow(1 - t, 3) * p0 + 3 * Math.pow(1 - t, 2) * t * p1 + 3 * (1 - t) * Math.pow(t, 2) * p2 + Math.pow(t, 3) * p3;
+ };
+ Bezier = function(t, p0, p1, p2, p3) {
+ return {
+ x: Bezier_(t, p0.x, p1.x, p2.x, p3.x),
+ y: Bezier_(t, p0.y, p1.y, p2.y, p3.y)
+ };
+ };
+ yForX = function(xTarget, Bs, returnsToSelf) {
+ var B, aB, i, lower, percent, upper, x, xTolerance, _i, _len;
+ B = null;
+ for (_i = 0, _len = Bs.length; _i < _len; _i++) {
+ aB = Bs[_i];
+ if (xTarget >= aB(0).x && xTarget <= aB(1).x) {
+ B = aB;
+ }
+ if (B !== null) {
+ break;
+ }
+ }
+ if (!B) {
+ if (returnsToSelf) {
+ return 0;
+ } else {
+ return 1;
+ }
+ }
+ xTolerance = 1e-4;
+ lower = 0;
+ upper = 1;
+ percent = (upper + lower) / 2;
+ x = B(percent).x;
+ i = 0;
+ while (Math.abs(xTarget - x) > xTolerance && i < 100) {
+ if (xTarget > x) {
+ lower = percent;
+ } else {
+ upper = percent;
+ }
+ percent = (upper + lower) / 2;
+ x = B(percent).x;
+ i += 1;
+ }
+ return B(percent).y;
+ };
+ return function(options) {
+ var Bs, points, returnsToSelf;
+ if (options == null) {
+ options = {};
+ }
+ points = options.points;
+ returnsToSelf = false;
+ Bs = function() {
+ var i, k, _fn;
+ Bs = [];
+ _fn = function(pointA, pointB) {
+ var B2;
+ B2 = function(t) {
+ return Bezier(t, pointA, pointA.cp[pointA.cp.length - 1], pointB.cp[0], pointB);
+ };
+ return Bs.push(B2);
+ };
+ for (i in points) {
+ k = parseInt(i);
+ if (k >= points.length - 1) {
+ break;
+ }
+ _fn(points[k], points[k + 1]);
+ }
+ return Bs;
+ }();
+ return function(t) {
+ if (t === 0) {
+ return 0;
+ } else if (t === 1) {
+ return 1;
+ } else {
+ return yForX(t, Bs, returnsToSelf);
+ }
+ };
+ };
+ }();
+ dynamics.easeInOut = function(options) {
+ var friction, _ref;
+ if (options == null) {
+ options = {};
+ }
+ friction = (_ref = options.friction) != null ? _ref : arguments.callee.defaults.friction;
+ return dynamics.bezier({
+ points: [ {
+ x: 0,
+ y: 0,
+ cp: [ {
+ x: .92 - friction / 1e3,
+ y: 0
+ } ]
+ }, {
+ x: 1,
+ y: 1,
+ cp: [ {
+ x: .08 + friction / 1e3,
+ y: 1
+ } ]
+ } ]
+ });
+ };
+ dynamics.easeIn = function(options) {
+ var friction, _ref;
+ if (options == null) {
+ options = {};
+ }
+ friction = (_ref = options.friction) != null ? _ref : arguments.callee.defaults.friction;
+ return dynamics.bezier({
+ points: [ {
+ x: 0,
+ y: 0,
+ cp: [ {
+ x: .92 - friction / 1e3,
+ y: 0
+ } ]
+ }, {
+ x: 1,
+ y: 1,
+ cp: [ {
+ x: 1,
+ y: 1
+ } ]
+ } ]
+ });
+ };
+ dynamics.easeOut = function(options) {
+ var friction, _ref;
+ if (options == null) {
+ options = {};
+ }
+ friction = (_ref = options.friction) != null ? _ref : arguments.callee.defaults.friction;
+ return dynamics.bezier({
+ points: [ {
+ x: 0,
+ y: 0,
+ cp: [ {
+ x: 0,
+ y: 0
+ } ]
+ }, {
+ x: 1,
+ y: 1,
+ cp: [ {
+ x: .08 + friction / 1e3,
+ y: 1
+ } ]
+ } ]
+ });
+ };
+ dynamics.spring.defaults = {
+ frequency: 300,
+ friction: 200,
+ anticipationSize: 0,
+ anticipationStrength: 0
+ };
+ dynamics.bounce.defaults = {
+ frequency: 300,
+ friction: 200
+ };
+ dynamics.forceWithGravity.defaults = dynamics.gravity.defaults = {
+ bounciness: 400,
+ elasticity: 200
+ };
+ dynamics.easeInOut.defaults = dynamics.easeIn.defaults = dynamics.easeOut.defaults = {
+ friction: 500
+ };
+ dynamics.css = makeArrayFn(function(el, properties) {
+ return applyProperties(el, properties, true);
+ });
+ dynamics.animate = makeArrayFn(function(el, properties, options) {
+ var id;
+ if (options == null) {
+ options = {};
+ }
+ options = clone(options);
+ applyDefaults(options, {
+ type: dynamics.easeInOut,
+ duration: 1e3,
+ delay: 0,
+ animated: true
+ });
+ options.duration = Math.max(0, options.duration * slowRatio);
+ options.delay = Math.max(0, options.delay);
+ if (options.delay === 0) {
+ return startAnimation(el, properties, options);
+ } else {
+ id = dynamics.setTimeout(function() {
+ return startAnimation(el, properties, options, id);
+ }, options.delay);
+ return animationsTimeouts.push({
+ id: id,
+ el: el
+ });
+ }
+ });
+ dynamics.stop = makeArrayFn(function(el, options) {
+ if (options == null) {
+ options = {};
+ }
+ if (options.timeout == null) {
+ options.timeout = true;
+ }
+ if (options.timeout) {
+ animationsTimeouts = animationsTimeouts.filter(function(timeout) {
+ if (timeout.el === el && (options.filter == null || options.filter(timeout))) {
+ dynamics.clearTimeout(timeout.id);
+ return true;
+ }
+ return false;
+ });
+ }
+ return animations = animations.filter(function(animation) {
+ return animation.el !== el;
+ });
+ });
+ dynamics.setTimeout = function(fn, delay) {
+ return addTimeout(fn, delay * slowRatio);
+ };
+ dynamics.clearTimeout = function(id) {
+ return cancelTimeout(id);
+ };
+ dynamics.toggleSlow = function() {
+ slow = !slow;
+ if (slow) {
+ slowRatio = 3;
+ } else {
+ slowRatio = 1;
+ }
+ return typeof console !== "undefined" && console !== null ? typeof console.log === "function" ? console.log("dynamics.js: slow animations " + (slow ? "enabled" : "disabled")) : void 0 : void 0;
+ };
+ if (typeof module === "object" && typeof module.exports === "object") {
+ module.exports = dynamics;
+ } else if (typeof define === "function") {
+ define("dynamics", function() {
+ return dynamics;
+ });
+ } else {
+ window.dynamics = dynamics;
+ }
+}).call(this);
+
+(function() {
+ "use strict";
+ function FastClick(layer, options) {
+ var oldOnClick;
+ options = options || {};
+ this.trackingClick = false;
+ this.trackingClickStart = 0;
+ this.targetElement = null;
+ this.touchStartX = 0;
+ this.touchStartY = 0;
+ this.lastTouchIdentifier = 0;
+ this.touchBoundary = options.touchBoundary || 10;
+ this.layer = layer;
+ this.tapDelay = options.tapDelay || 200;
+ this.tapTimeout = options.tapTimeout || 700;
+ if (FastClick.notNeeded(layer)) {
+ return;
+ }
+ function bind(method, context) {
+ return function() {
+ return method.apply(context, arguments);
+ };
+ }
+ var methods = [ "onMouse", "onClick", "onTouchStart", "onTouchMove", "onTouchEnd", "onTouchCancel" ];
+ var context = this;
+ for (var i = 0, l = methods.length; i < l; i++) {
+ context[methods[i]] = bind(context[methods[i]], context);
+ }
+ if (deviceIsAndroid) {
+ layer.addEventListener("mouseover", this.onMouse, true);
+ layer.addEventListener("mousedown", this.onMouse, true);
+ layer.addEventListener("mouseup", this.onMouse, true);
+ }
+ layer.addEventListener("click", this.onClick, true);
+ layer.addEventListener("touchstart", this.onTouchStart, false);
+ layer.addEventListener("touchmove", this.onTouchMove, false);
+ layer.addEventListener("touchend", this.onTouchEnd, false);
+ layer.addEventListener("touchcancel", this.onTouchCancel, false);
+ if (!Event.prototype.stopImmediatePropagation) {
+ layer.removeEventListener = function(type, callback, capture) {
+ var rmv = Node.prototype.removeEventListener;
+ if (type === "click") {
+ rmv.call(layer, type, callback.hijacked || callback, capture);
+ } else {
+ rmv.call(layer, type, callback, capture);
+ }
+ };
+ layer.addEventListener = function(type, callback, capture) {
+ var adv = Node.prototype.addEventListener;
+ if (type === "click") {
+ adv.call(layer, type, callback.hijacked || (callback.hijacked = function(event) {
+ if (!event.propagationStopped) {
+ callback(event);
+ }
+ }), capture);
+ } else {
+ adv.call(layer, type, callback, capture);
+ }
+ };
+ }
+ if (typeof layer.onclick === "function") {
+ oldOnClick = layer.onclick;
+ layer.addEventListener("click", function(event) {
+ oldOnClick(event);
+ }, false);
+ layer.onclick = null;
+ }
+ }
+ var deviceIsWindowsPhone = navigator.userAgent.indexOf("Windows Phone") >= 0;
+ var deviceIsAndroid = navigator.userAgent.indexOf("Android") > 0 && !deviceIsWindowsPhone;
+ var deviceIsIOS = /iP(ad|hone|od)/.test(navigator.userAgent) && !deviceIsWindowsPhone;
+ var deviceIsIOS4 = deviceIsIOS && /OS 4_\d(_\d)?/.test(navigator.userAgent);
+ var deviceIsIOSWithBadTarget = deviceIsIOS && /OS [6-7]_\d/.test(navigator.userAgent);
+ var deviceIsBlackBerry10 = navigator.userAgent.indexOf("BB10") > 0;
+ FastClick.prototype.needsClick = function(target) {
+ switch (target.nodeName.toLowerCase()) {
+ case "button":
+ case "select":
+ case "textarea":
+ if (target.disabled) {
+ return true;
+ }
+ break;
+
+ case "input":
+ if (deviceIsIOS && target.type === "file" || target.disabled) {
+ return true;
+ }
+ break;
+
+ case "label":
+ case "iframe":
+ case "video":
+ return true;
+ }
+ return /\bneedsclick\b/.test(target.className);
+ };
+ FastClick.prototype.needsFocus = function(target) {
+ switch (target.nodeName.toLowerCase()) {
+ case "textarea":
+ return true;
+
+ case "select":
+ return !deviceIsAndroid;
+
+ case "input":
+ switch (target.type) {
+ case "button":
+ case "checkbox":
+ case "file":
+ case "image":
+ case "radio":
+ case "submit":
+ return false;
+ }
+ return !target.disabled && !target.readOnly;
+
+ default:
+ return /\bneedsfocus\b/.test(target.className);
+ }
+ };
+ FastClick.prototype.sendClick = function(targetElement, event) {
+ var clickEvent, touch;
+ if (document.activeElement && document.activeElement !== targetElement) {
+ document.activeElement.blur();
+ }
+ touch = event.changedTouches[0];
+ clickEvent = document.createEvent("MouseEvents");
+ clickEvent.initMouseEvent(this.determineEventType(targetElement), true, true, window, 1, touch.screenX, touch.screenY, touch.clientX, touch.clientY, false, false, false, false, 0, null);
+ clickEvent.forwardedTouchEvent = true;
+ targetElement.dispatchEvent(clickEvent);
+ };
+ FastClick.prototype.determineEventType = function(targetElement) {
+ if (deviceIsAndroid && targetElement.tagName.toLowerCase() === "select") {
+ return "mousedown";
+ }
+ return "click";
+ };
+ FastClick.prototype.focus = function(targetElement) {
+ var length;
+ if (deviceIsIOS && targetElement.setSelectionRange && targetElement.type.indexOf("date") !== 0 && targetElement.type !== "time" && targetElement.type !== "month") {
+ length = targetElement.value.length;
+ targetElement.setSelectionRange(length, length);
+ } else {
+ targetElement.focus();
+ }
+ };
+ FastClick.prototype.updateScrollParent = function(targetElement) {
+ var scrollParent, parentElement;
+ scrollParent = targetElement.fastClickScrollParent;
+ if (!scrollParent || !scrollParent.contains(targetElement)) {
+ parentElement = targetElement;
+ do {
+ if (parentElement.scrollHeight > parentElement.offsetHeight) {
+ scrollParent = parentElement;
+ targetElement.fastClickScrollParent = parentElement;
+ break;
+ }
+ parentElement = parentElement.parentElement;
+ } while (parentElement);
+ }
+ if (scrollParent) {
+ scrollParent.fastClickLastScrollTop = scrollParent.scrollTop;
+ }
+ };
+ FastClick.prototype.getTargetElementFromEventTarget = function(eventTarget) {
+ if (eventTarget.nodeType === Node.TEXT_NODE) {
+ return eventTarget.parentNode;
+ }
+ return eventTarget;
+ };
+ FastClick.prototype.onTouchStart = function(event) {
+ var targetElement, touch, selection;
+ if (event.targetTouches.length > 1) {
+ return true;
+ }
+ targetElement = this.getTargetElementFromEventTarget(event.target);
+ touch = event.targetTouches[0];
+ if (deviceIsIOS) {
+ selection = window.getSelection();
+ if (selection.rangeCount && !selection.isCollapsed) {
+ return true;
+ }
+ if (!deviceIsIOS4) {
+ if (touch.identifier && touch.identifier === this.lastTouchIdentifier) {
+ event.preventDefault();
+ return false;
+ }
+ this.lastTouchIdentifier = touch.identifier;
+ this.updateScrollParent(targetElement);
+ }
+ }
+ this.trackingClick = true;
+ this.trackingClickStart = event.timeStamp;
+ this.targetElement = targetElement;
+ this.touchStartX = touch.pageX;
+ this.touchStartY = touch.pageY;
+ if (event.timeStamp - this.lastClickTime < this.tapDelay) {
+ event.preventDefault();
+ }
+ return true;
+ };
+ FastClick.prototype.touchHasMoved = function(event) {
+ var touch = event.changedTouches[0], boundary = this.touchBoundary;
+ if (Math.abs(touch.pageX - this.touchStartX) > boundary || Math.abs(touch.pageY - this.touchStartY) > boundary) {
+ return true;
+ }
+ return false;
+ };
+ FastClick.prototype.onTouchMove = function(event) {
+ if (!this.trackingClick) {
+ return true;
+ }
+ if (this.targetElement !== this.getTargetElementFromEventTarget(event.target) || this.touchHasMoved(event)) {
+ this.trackingClick = false;
+ this.targetElement = null;
+ }
+ return true;
+ };
+ FastClick.prototype.findControl = function(labelElement) {
+ if (labelElement.control !== undefined) {
+ return labelElement.control;
+ }
+ if (labelElement.htmlFor) {
+ return document.getElementById(labelElement.htmlFor);
+ }
+ return labelElement.querySelector("button, input:not([type=hidden]), keygen, meter, output, progress, select, textarea");
+ };
+ FastClick.prototype.onTouchEnd = function(event) {
+ var forElement, trackingClickStart, targetTagName, scrollParent, touch, targetElement = this.targetElement;
+ if (!this.trackingClick) {
+ return true;
+ }
+ if (event.timeStamp - this.lastClickTime < this.tapDelay) {
+ this.cancelNextClick = true;
+ return true;
+ }
+ if (event.timeStamp - this.trackingClickStart > this.tapTimeout) {
+ return true;
+ }
+ this.cancelNextClick = false;
+ this.lastClickTime = event.timeStamp;
+ trackingClickStart = this.trackingClickStart;
+ this.trackingClick = false;
+ this.trackingClickStart = 0;
+ if (deviceIsIOSWithBadTarget) {
+ touch = event.changedTouches[0];
+ targetElement = document.elementFromPoint(touch.pageX - window.pageXOffset, touch.pageY - window.pageYOffset) || targetElement;
+ targetElement.fastClickScrollParent = this.targetElement.fastClickScrollParent;
+ }
+ targetTagName = targetElement.tagName.toLowerCase();
+ if (targetTagName === "label") {
+ forElement = this.findControl(targetElement);
+ if (forElement) {
+ this.focus(targetElement);
+ if (deviceIsAndroid) {
+ return false;
+ }
+ targetElement = forElement;
+ }
+ } else if (this.needsFocus(targetElement)) {
+ if (event.timeStamp - trackingClickStart > 100 || deviceIsIOS && window.top !== window && targetTagName === "input") {
+ this.targetElement = null;
+ return false;
+ }
+ this.focus(targetElement);
+ this.sendClick(targetElement, event);
+ if (!deviceIsIOS || targetTagName !== "select") {
+ this.targetElement = null;
+ event.preventDefault();
+ }
+ return false;
+ }
+ if (deviceIsIOS && !deviceIsIOS4) {
+ scrollParent = targetElement.fastClickScrollParent;
+ if (scrollParent && scrollParent.fastClickLastScrollTop !== scrollParent.scrollTop) {
+ return true;
+ }
+ }
+ if (!this.needsClick(targetElement)) {
+ event.preventDefault();
+ this.sendClick(targetElement, event);
+ }
+ return false;
+ };
+ FastClick.prototype.onTouchCancel = function() {
+ this.trackingClick = false;
+ this.targetElement = null;
+ };
+ FastClick.prototype.onMouse = function(event) {
+ if (!this.targetElement) {
+ return true;
+ }
+ if (event.forwardedTouchEvent) {
+ return true;
+ }
+ if (!event.cancelable) {
+ return true;
+ }
+ if (!this.needsClick(this.targetElement) || this.cancelNextClick) {
+ if (event.stopImmediatePropagation) {
+ event.stopImmediatePropagation();
+ } else {
+ event.propagationStopped = true;
+ }
+ event.stopPropagation();
+ event.preventDefault();
+ return false;
+ }
+ return true;
+ };
+ FastClick.prototype.onClick = function(event) {
+ var permitted;
+ if (this.trackingClick) {
+ this.targetElement = null;
+ this.trackingClick = false;
+ return true;
+ }
+ if (event.target.type === "submit" && event.detail === 0) {
+ return true;
+ }
+ permitted = this.onMouse(event);
+ if (!permitted) {
+ this.targetElement = null;
+ }
+ return permitted;
+ };
+ FastClick.prototype.destroy = function() {
+ var layer = this.layer;
+ if (deviceIsAndroid) {
+ layer.removeEventListener("mouseover", this.onMouse, true);
+ layer.removeEventListener("mousedown", this.onMouse, true);
+ layer.removeEventListener("mouseup", this.onMouse, true);
+ }
+ layer.removeEventListener("click", this.onClick, true);
+ layer.removeEventListener("touchstart", this.onTouchStart, false);
+ layer.removeEventListener("touchmove", this.onTouchMove, false);
+ layer.removeEventListener("touchend", this.onTouchEnd, false);
+ layer.removeEventListener("touchcancel", this.onTouchCancel, false);
+ };
+ FastClick.notNeeded = function(layer) {
+ var metaViewport;
+ var chromeVersion;
+ var blackberryVersion;
+ var firefoxVersion;
+ if (typeof window.ontouchstart === "undefined") {
+ return true;
+ }
+ chromeVersion = +(/Chrome\/([0-9]+)/.exec(navigator.userAgent) || [ , 0 ])[1];
+ if (chromeVersion) {
+ if (deviceIsAndroid) {
+ metaViewport = document.querySelector("meta[name=viewport]");
+ if (metaViewport) {
+ if (metaViewport.content.indexOf("user-scalable=no") !== -1) {
+ return true;
+ }
+ if (chromeVersion > 31 && document.documentElement.scrollWidth <= window.outerWidth) {
+ return true;
+ }
+ }
+ } else {
+ return true;
+ }
+ }
+ if (deviceIsBlackBerry10) {
+ blackberryVersion = navigator.userAgent.match(/Version\/([0-9]*)\.([0-9]*)/);
+ if (blackberryVersion[1] >= 10 && blackberryVersion[2] >= 3) {
+ metaViewport = document.querySelector("meta[name=viewport]");
+ if (metaViewport) {
+ if (metaViewport.content.indexOf("user-scalable=no") !== -1) {
+ return true;
+ }
+ if (document.documentElement.scrollWidth <= window.outerWidth) {
+ return true;
+ }
+ }
+ }
+ }
+ if (layer.style.msTouchAction === "none" || layer.style.touchAction === "manipulation") {
+ return true;
+ }
+ firefoxVersion = +(/Firefox\/([0-9]+)/.exec(navigator.userAgent) || [ , 0 ])[1];
+ if (firefoxVersion >= 27) {
+ metaViewport = document.querySelector("meta[name=viewport]");
+ if (metaViewport && (metaViewport.content.indexOf("user-scalable=no") !== -1 || document.documentElement.scrollWidth <= window.outerWidth)) {
+ return true;
+ }
+ }
+ if (layer.style.touchAction === "none" || layer.style.touchAction === "manipulation") {
+ return true;
+ }
+ return false;
+ };
+ FastClick.attach = function(layer, options) {
+ return new FastClick(layer, options);
+ };
+ if (typeof define === "function" && typeof define.amd === "object" && define.amd) {
+ define(function() {
+ return FastClick;
+ });
+ } else if (typeof module !== "undefined" && module.exports) {
+ module.exports = FastClick.attach;
+ module.exports.FastClick = FastClick;
+ } else {
+ window.FastClick = FastClick;
+ }
+})();
+
+window.requestAnimFrame = function() {
+ return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || window.oRequestAnimationFrame || window.msRequestAnimationFrame || function(callback, element) {
+ window.setTimeout(callback, 1e3 / 60);
+ };
+}();
+
+window.requestInterval = function(fn, delay) {
+ if (!window.requestAnimationFrame && !window.webkitRequestAnimationFrame && !(window.mozRequestAnimationFrame && window.mozCancelRequestAnimationFrame) && !window.oRequestAnimationFrame && !window.msRequestAnimationFrame) return window.setInterval(fn, delay);
+ var start = new Date().getTime(), handle = new Object();
+ function loop() {
+ var current = new Date().getTime(), delta = current - start;
+ if (delta >= delay) {
+ fn.call();
+ start = new Date().getTime();
+ }
+ handle.value = requestAnimFrame(loop);
+ }
+ handle.value = requestAnimFrame(loop);
+ return handle;
+};
+
+window.clearRequestInterval = function(handle) {
+ window.cancelAnimationFrame ? window.cancelAnimationFrame(handle.value) : window.webkitCancelAnimationFrame ? window.webkitCancelAnimationFrame(handle.value) : window.webkitCancelRequestAnimationFrame ? window.webkitCancelRequestAnimationFrame(handle.value) : window.mozCancelRequestAnimationFrame ? window.mozCancelRequestAnimationFrame(handle.value) : window.oCancelRequestAnimationFrame ? window.oCancelRequestAnimationFrame(handle.value) : window.msCancelRequestAnimationFrame ? window.msCancelRequestAnimationFrame(handle.value) : clearInterval(handle);
+};
+
+window.requestTimeout = function(fn, delay) {
+ if (!window.requestAnimationFrame && !window.webkitRequestAnimationFrame && !(window.mozRequestAnimationFrame && window.mozCancelRequestAnimationFrame) && !window.oRequestAnimationFrame && !window.msRequestAnimationFrame) return window.setTimeout(fn, delay);
+ var start = new Date().getTime(), handle = new Object();
+ function loop() {
+ var current = new Date().getTime(), delta = current - start;
+ delta >= delay ? fn.call() : handle.value = requestAnimFrame(loop);
+ }
+ handle.value = requestAnimFrame(loop);
+ return handle;
+};
+
+window.clearRequestTimeout = function(handle) {
+ window.cancelAnimationFrame ? window.cancelAnimationFrame(handle.value) : window.webkitCancelAnimationFrame ? window.webkitCancelAnimationFrame(handle.value) : window.webkitCancelRequestAnimationFrame ? window.webkitCancelRequestAnimationFrame(handle.value) : window.mozCancelRequestAnimationFrame ? window.mozCancelRequestAnimationFrame(handle.value) : window.oCancelRequestAnimationFrame ? window.oCancelRequestAnimationFrame(handle.value) : window.msCancelRequestAnimationFrame ? window.msCancelRequestAnimationFrame(handle.value) : clearTimeout(handle);
+};
\ No newline at end of file
diff --git a/couchpotato/static/scripts/couchpotato.js b/couchpotato/static/scripts/couchpotato.js
index d2e8fa0017..5d63155963 100644
--- a/couchpotato/static/scripts/couchpotato.js
+++ b/couchpotato/static/scripts/couchpotato.js
@@ -1,4 +1,4 @@
-var CouchPotato = new Class({
+О╩©var CouchPotato = new Class({
Implements: [Events, Options],
@@ -11,13 +11,17 @@ var CouchPotato = new Class({
pages: [],
block: [],
+ initialize: function(){
+ var self = this;
+
+ self.global_events = {};
+ },
+
setup: function(options) {
var self = this;
self.setOptions(options);
- self.c = $(document.body)
-
- self.route = new Route(self.defaults);
+ self.c = $(document.body);
self.createLayout();
self.createPages();
@@ -28,8 +32,59 @@ var CouchPotato = new Class({
self.openPage(window.location.pathname);
History.addEvent('change', self.openPage.bind(self));
+ self.c.addEvent('click:relay(.header a, .navigation a, .movie_details a, .list_list .movie)', self.ripple.bind(self));
self.c.addEvent('click:relay(a[href^=/]:not([target]))', self.pushState.bind(self));
self.c.addEvent('click:relay(a[href^=http])', self.openDerefered.bind(self));
+
+ // Check if device is touchenabled
+ self.touch_device = 'ontouchstart' in window || navigator.msMaxTouchPoints;
+ if(self.touch_device){
+ self.c.addClass('touch_enabled');
+ FastClick.attach(document.body);
+ }
+
+ window.addEvent('resize', self.resize.bind(self));
+ self.resize();
+
+ self.checkCache();
+
+ },
+
+ checkCache: function(){
+ window.addEventListener('load', function() {
+ window.applicationCache.addEventListener('updateready', function(e) {
+ if (window.applicationCache.status == window.applicationCache.UPDATEREADY) {
+ window.applicationCache.swapCache();
+ window.location.reload();
+ }
+ }, false);
+
+ }, false);
+ },
+
+ resize: function(){
+ var self = this;
+
+ self.mobile_screen = Math.max(document.documentElement.clientWidth, window.innerWidth || 0) <= 480;
+ self.c[self.mobile_screen ? 'addClass' : 'removeClass']('mobile');
+ },
+
+ ripple: function(e, el){
+ var self = this,
+ button = el.getCoordinates(),
+ x = e.page.x - button.left,
+ y = e.page.y - button.top,
+ ripple = new Element('div.ripple', {
+ 'styles': {
+ 'left': x,
+ 'top': y
+ }
+ });
+
+ ripple.inject(el);
+
+ requestTimeout(function(){ ripple.addClass('animate'); }, 0);
+ requestTimeout(function(){ ripple.dispose(); }, 2100);
},
getOption: function(name){
@@ -37,110 +92,158 @@ var CouchPotato = new Class({
return this.options[name];
}
catch(e){
- return null
+ return null;
}
},
- pushState: function(e){
+ pushState: function(e, el){
var self = this;
- if((!e.meta && Browser.Platform.mac) || (!e.control && !Browser.Platform.mac)){
+
+ if((!e.meta && App.isMac()) || (!e.control && !App.isMac())){
(e).preventDefault();
- var url = e.target.get('href');
- if(History.getPath() != url)
+ var url = el.get('href');
+
+ // Middle click
+ if(e.event && e.event.button === 1)
+ window.open(url);
+ else if(History.getPath() != url)
History.push(url);
+
}
+
+ self.fireEvent('history.push');
+ },
+
+ isMac: function(){
+ return Browser.platform == 'mac';
},
createLayout: function(){
var self = this;
- self.block.header = new Block();
+ self.block.header = new BlockBase();
self.c.adopt(
$(self.block.header).addClass('header').adopt(
- new Element('div').adopt(
- self.block.navigation = new Block.Navigation(self, {}),
- self.block.search = new Block.Search(self, {}),
- self.block.more = new Block.Menu(self, {})
- )
+ self.block.navigation = new BlockHeader(self, {}),
+ self.block.search = new BlockSearch(self, {}),
+ self.support = new Element('a.donate.icon-donate', {
+ 'href': 'https://couchpota.to/support/',
+ 'target': '_blank'
+ }).grab(
+ new Element('span', {
+ 'text': 'Donate'
+ })
+ ),
+ self.block.more = new BlockMenu(self, {'button_class': 'icon-settings'})
),
- self.content = new Element('div.content'),
- self.block.footer = new Block.Footer(self, {})
+ new Element('div.corner_background'),
+ self.content = new Element('div.content').adopt(
+ self.pages_container = new Element('div.pages'),
+ self.block.footer = new BlockFooter(self, {})
+ )
);
- [new Element('a.orange', {
- 'text': 'Restart',
- 'events': {
- 'click': self.restartQA.bind(self)
- }
- }),
- new Element('a.red', {
- 'text': 'Shutdown',
- 'events': {
- 'click': self.shutdownQA.bind(self)
- }
- }),
- new Element('a', {
- 'text': 'Update to latest',
- 'events': {
- 'click': self.checkForUpdate.bind(self, null)
- }
- }),
- new Element('a', {
- 'text': 'Run install wizard',
- 'href': App.createUrl('wizard')
- })].each(function(a){
- self.block.more.addLink(a)
- })
-
-
- new ScrollSpy({
- min: 10,
- onLeave: function(){
- $(self.block.header).removeClass('with_shadow')
- },
- onEnter: function(){
- $(self.block.header).addClass('with_shadow')
- }
- })
+ var setting_links = [
+ new Element('a', {
+ 'text': 'About CouchPotato',
+ 'href': App.createUrl('settings/about')
+ }),
+ new Element('a', {
+ 'text': 'Check for Updates',
+ 'events': {
+ 'click': self.checkForUpdate.bind(self, null)
+ }
+ }),
+ new Element('a', {
+ 'text': 'Settings',
+ 'href': App.createUrl('settings/general')
+ }),
+ new Element('a', {
+ 'text': 'Logs',
+ 'href': App.createUrl('log')
+ }),
+ new Element('a', {
+ 'text': 'Restart',
+ 'events': {
+ 'click': self.restartQA.bind(self)
+ }
+ }),
+ new Element('a', {
+ 'text': 'Shutdown',
+ 'events': {
+ 'click': self.shutdownQA.bind(self)
+ }
+ })
+ ];
+
+ setting_links.each(function(a){
+ self.block.more.addLink(a);
+ });
+
+ // Set theme
+ self.addEvent('setting.save.core.dark_theme', function(enabled){
+ document.html[enabled ? 'addClass' : 'removeClass']('dark');
+ });
+
},
createPages: function(){
var self = this;
+ var pages = [];
Object.each(Page, function(page_class, class_name){
- pg = new Page[class_name](self, {});
+ var pg = new Page[class_name](self, {
+ 'level': 1
+ });
self.pages[class_name] = pg;
- $(pg).inject(self.content);
+ pages.include({
+ 'order': pg.order,
+ 'name': class_name,
+ 'class': pg
+ });
+ });
+
+ pages.stableSort(self.sortPageByOrder).each(function(page){
+ page['class'].load();
+ self.fireEvent('load'+page.name);
+ $(page['class']).inject(self.getPageContainer());
});
self.fireEvent('load');
},
+ sortPageByOrder: function(a, b){
+ return (a.order || 100) - (b.order || 100);
+ },
+
openPage: function(url) {
- var self = this;
+ var self = this,
+ route = new Route(self.defaults);
+
+ route.parse(rep(History.getPath()));
- self.route.parse();
- var page_name = self.route.getPage().capitalize();
- var action = self.route.getAction();
- var params = self.route.getParams();
+ var page_name = route.getPage().capitalize(),
+ action = route.getAction(),
+ params = route.getParams(),
+ current_url = route.getCurrentUrl(),
+ page;
- var current_url = self.route.getCurrentUrl();
if(current_url == self.current_url)
return;
if(self.current_page)
- self.current_page.hide()
+ self.current_page.hide();
try {
- var page = self.pages[page_name] || self.pages.Home;
+ page = self.pages[page_name] || self.pages.Home;
page.open(action, params, current_url);
page.show();
}
catch(e){
- console.error("Can't open page:" + url, e)
+ console.error("Can't open page:" + url, e);
}
self.current_page = page;
@@ -149,24 +252,28 @@ var CouchPotato = new Class({
},
getBlock: function(block_name){
- return this.block[block_name]
+ return this.block[block_name];
},
getPage: function(name){
- return this.pages[name]
+ return this.pages[name];
+ },
+
+ getPageContainer: function(){
+ return this.pages_container;
},
shutdown: function(){
var self = this;
- self.blockPage('You have shutdown. This is what suppose to happen ;)');
+ self.blockPage('You have shutdown. This is what is supposed to happen ;)');
Api.request('app.shutdown', {
'onComplete': self.blockPage.bind(self)
});
self.checkAvailable(1000);
},
- shutdownQA: function(e){
+ shutdownQA: function(){
var self = this;
var q = new Question('Are you sure you want to shutdown CouchPotato?', '', [{
@@ -176,7 +283,7 @@ var CouchPotato = new Class({
'click': function(e){
(e).preventDefault();
self.shutdown();
- q.close.delay(100, q);
+ requestTimeout(q.close.bind(q), 100);
}
}
}, {
@@ -203,7 +310,7 @@ var CouchPotato = new Class({
'click': function(e){
(e).preventDefault();
self.restart(message, title);
- q.close.delay(100, q);
+ requestTimeout(q.close.bind(q), 100);
}
}
}, {
@@ -215,7 +322,7 @@ var CouchPotato = new Class({
checkForUpdate: function(onComplete){
var self = this;
- Updater.check(onComplete)
+ Updater.check(onComplete);
self.blockPage('Please wait. If this takes too long, something must have gone wrong.', 'Checking for updates');
self.checkAvailable(3000);
@@ -224,22 +331,31 @@ var CouchPotato = new Class({
checkAvailable: function(delay, onAvailable){
var self = this;
- (function(){
+ requestTimeout(function(){
- Api.request('app.available', {
- 'onFailure': function(){
- self.checkAvailable.delay(1000, self, [delay, onAvailable]);
- self.fireEvent('unload');
+ var onFailure = function(){
+ requestTimeout(function(){
+ self.checkAvailable(delay, onAvailable);
+ }, 1000);
+ self.fireEvent('unload');
+ };
+
+ var request = Api.request('app.available', {
+ 'timeout': 2000,
+ 'onTimeout': function(){
+ request.cancel();
+ onFailure();
},
+ 'onFailure': onFailure,
'onSuccess': function(){
if(onAvailable)
- onAvailable()
+ onAvailable();
self.unBlockPage();
self.fireEvent('reload');
}
});
- }).delay(delay || 0)
+ }, delay || 0);
},
blockPage: function(message, title){
@@ -247,37 +363,42 @@ var CouchPotato = new Class({
self.unBlockPage();
- var body = $(document.body);
- self.mask = new Element('div.mask').adopt(
- new Element('div').adopt(
+ self.mask = new Element('div.mask.with_message').adopt(
+ new Element('div.message').adopt(
new Element('h1', {'text': title || 'Unavailable'}),
new Element('div', {'text': message || 'Something must have crashed.. check the logs ;)'})
)
- ).fade('hide').inject(document.body).fade('in');
+ ).inject(document.body);
- createSpinner(self.mask, {
- 'top': -50
- });
+ createSpinner(self.mask);
+
+ requestTimeout(function(){
+ self.mask.addClass('show');
+ }, 10);
},
unBlockPage: function(){
var self = this;
if(self.mask)
self.mask.get('tween').start('opacity', 0).chain(function(){
- this.element.destroy()
+ this.element.destroy();
});
},
createUrl: function(action, params){
- return this.options.base_url + (action ? action+'/' : '') + (params ? '?'+Object.toQueryString(params) : '')
+ return this.options.base_url + (action ? action+'/' : '') + (params ? '?'+Object.toQueryString(params) : '');
},
openDerefered: function(e, el){
+ var self = this;
(e).stop();
- var url = 'http://www.dereferer.org/?' + el.get('href');
+ var url = el.get('href');
+ if(self.getOption('dereferer')){
+ url = self.getOption('dereferer') + el.get('href');
+ }
- if(el.get('target') == '_blank' || (e.meta && Browser.Platform.mac) || (e.control && !Browser.Platform.mac))
+ if(el.get('target') == '_blank' || (e.meta && self.isMac()) || (e.control && !self.isMac()))
window.open(url);
else
window.location = url;
@@ -285,43 +406,94 @@ var CouchPotato = new Class({
createUserscriptButtons: function(){
- var userscript = false;
- try {
- if(Components.interfaces.gmIGreasemonkeyService)
- userscript = true
- }
- catch(e){
- userscript = Browser.chrome === true;
- }
-
var host_url = window.location.protocol + '//' + window.location.host;
return new Element('div.group_userscript').adopt(
- (userscript ? [new Element('a.userscript.button', {
- 'text': 'Install userscript',
- 'href': Api.createUrl('userscript.get')+randomString()+'/couchpotato.user.js',
- 'target': '_self'
- }), new Element('span.or[text=or]')] : null),
- new Element('span.bookmarklet').adopt(
- new Element('a.button.orange', {
- 'text': '+CouchPotato',
- 'href': "javascript:void((function(){var e=document.createElement('script');e.setAttribute('type','text/javascript');e.setAttribute('charset','UTF-8');e.setAttribute('src','" +
- host_url + Api.createUrl('userscript.bookmark') +
- "?host="+ encodeURI(host_url + Api.createUrl('userscript.get')+randomString()+'/') +
- "&r='+Math.random()*99999999);document.body.appendChild(e)})());",
- 'target': '',
- 'events': {
- 'click': function(e){
- (e).stop()
- alert('Drag it to your bookmark ;)')
- }
- }
+ new Element('div').adopt(
+ new Element('a.userscript.button', {
+ 'text': 'Install extension',
+ 'href': 'https://couchpota.to/extension/',
+ 'target': '_blank'
}),
- new Element('span', {
- 'text': 'Б┤╫ Drag this to your bookmarks'
- })
- )
+ new Element('span.or[text=or]'),
+ new Element('span.bookmarklet').adopt(
+ new Element('a.button', {
+ 'text': '+CouchPotato',
+ /* jshint ignore:start */
+ 'href': "javascript:void((function(){var e=document.createElement('script');e.setAttribute('type','text/javascript');e.setAttribute('charset','UTF-8');e.setAttribute('src','" +
+ host_url + Api.createUrl('userscript.bookmark') +
+ "?host="+ encodeURI(host_url + Api.createUrl('userscript.get')+randomString()+'/') +
+ "&r='+Math.random()*99999999);document.body.appendChild(e)})());",
+ /* jshint ignore:end */
+ 'target': '',
+ 'events': {
+ 'click': function(e){
+ (e).stop();
+ alert('Drag it to your bookmark ;)');
+ }
+ }
+ }),
+ new Element('span', {
+ 'text': 'Б┤╫ Drag this to your bookmarks'
+ })
+ )
+ ),
+ new Element('img', {
+ 'src': 'https://couchpota.to/media/images/userscript.gif'
+ })
);
+ },
+
+ /*
+ * Global events
+ */
+ on: function(name, handle){
+ var self = this;
+
+ if(!self.global_events[name])
+ self.global_events[name] = [];
+
+ self.global_events[name].push(handle);
+
+ },
+
+ trigger: function(name, args, on_complete){
+ var self = this;
+
+ if(!self.global_events[name]){ return; }
+
+ if(!on_complete && typeOf(args) == 'function'){
+ on_complete = args;
+ args = [];
+ }
+
+ // Create parallel callback
+ self.global_events[name].each(function(handle){
+
+ requestTimeout(function(){
+ var results = handle.apply(handle, args || []);
+
+ if(on_complete)
+ on_complete(results);
+ }, 0);
+ });
+
+ },
+
+ off: function(name, handle){
+ var self = this;
+
+ if(!self.global_events[name]) return;
+
+ // Remove single
+ if(handle){
+ self.global_events[name] = self.global_events[name].erase(handle);
+ }
+ // Reset full event
+ else {
+ self.global_events[name] = [];
+ }
+
}
});
@@ -329,77 +501,72 @@ window.App = new CouchPotato();
var Route = new Class({
- defaults: {},
+ defaults: null,
page: '',
action: 'index',
params: {},
initialize: function(defaults){
- var self = this
- self.defaults = defaults
+ var self = this;
+ self.defaults = defaults || {};
},
- parse: function(){
+ parse: function(path){
var self = this;
- var rep = function(pa){
- return pa.replace(Api.getOption('url'), '/').replace(App.getOption('base_url'), '/')
- }
-
- var path = rep(History.getPath())
if(path == '/' && location.hash){
- path = rep(location.hash.replace('#', '/'))
+ path = rep(location.hash.replace('#', '/'));
}
- self.current = path.replace(/^\/+|\/+$/g, '')
- var url = self.current.split('/')
+ self.current = path.replace(/^\/+|\/+$/g, '');
+ var url = self.current.split('/');
- self.page = (url.length > 0) ? url.shift() : self.defaults.page
- self.action = (url.length > 0) ? url.shift() : self.defaults.action
+ self.page = (url.length > 0) ? url.shift() : self.defaults.page;
+ self.action = (url.length > 0) ? url.join('/') : self.defaults.action;
self.params = Object.merge({}, self.defaults.params);
if(url.length > 1){
- var key
+ var key;
url.each(function(el, nr){
- if(nr%2 == 0)
- key = el
+ if(nr%2 === 0)
+ key = el;
else if(key) {
- self.params[key] = el
- key = null
+ self.params[key] = el;
+ key = null;
}
- })
+ });
}
else if(url.length == 1){
self.params[url] = true;
}
- return self
+ return self;
},
getPage: function(){
- return this.page
+ return this.page;
},
getAction: function(){
- return this.action
+ return this.action;
},
getParams: function(){
- return this.params
+ return this.params;
},
getCurrentUrl: function(){
- return this.current
+ return this.current;
},
get: function(param){
- return this.params[param]
+ return this.params[param];
}
});
var p = function(){
- if(typeof(console) !== 'undefined' && console != null)
- console.log(arguments)
+ if(typeof(console) !== 'undefined' && console !== null)
+ console.log(arguments);
};
@@ -442,14 +609,14 @@ var p = function(){
function randomString(length, extra) {
- var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz" + (extra ? '-._!@#$%^&*()+=' : '');
- var stringLength = length || 8;
- var randomString = '';
- for (var i = 0; i < stringLength; i++) {
+ var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz" + (extra ? '-._!@#$%^&*()+=' : ''),
+ string_length = length || 8,
+ random_string = '';
+ for (var i = 0; i < string_length; i++) {
var rnum = Math.floor(Math.random() * chars.length);
- randomString += chars.charAt(rnum);
+ random_string += chars.charAt(rnum);
}
- return randomString;
+ return random_string;
}
(function(){
@@ -465,14 +632,14 @@ function randomString(length, extra) {
var valueOf = function(object, path) {
var ptr = object;
- path.each(function(key) { ptr = ptr[key] });
+ path.each(function(key) { ptr = ptr[key]; });
return ptr;
};
var comparer = function(a, b) {
for (var i = 0, l = keyPaths.length; i < l; i++) {
- aVal = valueOf(a, keyPaths[i].path);
- bVal = valueOf(b, keyPaths[i].path);
+ var aVal = valueOf(a, keyPaths[i].path),
+ bVal = valueOf(b, keyPaths[i].path);
if (aVal > bVal) return keyPaths[i].sign;
if (aVal < bVal) return -keyPaths[i].sign;
}
@@ -489,28 +656,18 @@ function randomString(length, extra) {
case "string": saveKeyPath(argument.match(/[+-]|[^.]+/g)); break;
}
});
- return this.sort(comparer);
+ return this.stableSort(comparer);
}
});
})();
-var createSpinner = function(target, options){
- var opts = Object.merge({
- lines: 12,
- length: 5,
- width: 4,
- radius: 9,
- color: '#fff',
- speed: 1.9,
- trail: 53,
- shadow: false,
- hwaccel: true,
- className: 'spinner',
- zIndex: 2e9,
- top: 'auto',
- left: 'auto'
- }, options);
-
- return new Spinner(opts).spin(target);
-}
\ No newline at end of file
+var createSpinner = function(container){
+ var spinner = new Element('div.spinner');
+ container.grab(spinner);
+ return spinner;
+};
+
+var rep = function (pa) {
+ return pa.replace(Api.getOption('url'), '/').replace(App.getOption('base_url'), '/');
+};
diff --git a/couchpotato/static/scripts/library/form_replacement/form_check.js b/couchpotato/static/scripts/library/form_replacement/form_check.js
deleted file mode 100644
index 4c240f6aee..0000000000
--- a/couchpotato/static/scripts/library/form_replacement/form_check.js
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
----
-name: Form.Check
-description: Class to represent a checkbox
-authors: Bryan J Swift (@bryanjswift)
-license: MIT-style license.
-requires: [Core/Class.Extras, Core/Element, Core/Element.Event]
-provides: Form.Check
-...
-*/
-if (typeof window.Form === 'undefined') { window.Form = {}; }
-
-Form.Check = new Class({
- Implements: [Events, Options],
- options: {
- checked: false,
- disabled: false
- },
- bound: {},
- checked: false,
- config: {
- checkedClass: 'checked',
- disabledClass: 'disabled',
- elementClass: 'check',
- highlightedClass: 'highlighted',
- storage: 'Form.Check::data'
- },
- disabled: false,
- element: null,
- input: null,
- label: null,
- value: null,
- initialize: function(input, options) {
- this.setOptions(options);
- this.bound = {
- disable: this.disable.bind(this),
- enable: this.enable.bind(this),
- highlight: this.highlight.bind(this),
- removeHighlight: this.removeHighlight.bind(this),
- keyToggle: this.keyToggle.bind(this),
- toggle: this.toggle.bind(this)
- };
- var bound = this.bound;
- input = this.input = $(input);
- var id = input.get('id');
- this.label = document.getElement('label[for=' + id + ']');
- this.element = new Element('div', {
- 'class': input.get('class') + ' ' + this.config.elementClass,
- id: id ? id + 'Check' : '',
- events: {
- click: bound.toggle,
- mouseenter: bound.highlight,
- mouseleave: bound.removeHighlight
- }
- });
- this.input.addEvents({
- keypress: bound.keyToggle,
- keydown: bound.keyToggle,
- keyup: bound.keyToggle
- });
- if (this.label) { this.label.addEvent('click', bound.toggle); }
- this.element.wraps(input);
- this.value = input.get('value');
- if (this.input.checked) { this.check(); } else { this.uncheck(); }
- if (this.input.disabled) { this.disable(); } else { this.enable(); }
- input.store(this.config.storage, this).addEvents({
- blur: bound.removeHighlight,
- focus: bound.highlight
- });
- this.fireEvent('create', this);
- },
- check: function() {
- this.element.addClass(this.config.checkedClass);
- this.input.set('checked', 'checked').focus();
- this.checked = true;
- this.fireEvent('check', this);
- },
- disable: function() {
- this.element.addClass(this.config.disabledClass);
- this.input.set('disabled', 'disabled');
- this.disabled = true;
- this.fireEvent('disable', this);
- },
- enable: function() {
- this.element.removeClass(this.config.disabledClass);
- this.input.erase('disabled');
- this.disabled = false;
- this.fireEvent('enable', this);
- },
- highlight: function() {
- this.element.addClass(this.config.highlightedClass);
- this.fireEvent('highlight', this);
- },
- removeHighlight: function() {
- this.element.removeClass(this.config.highlightedClass);
- this.fireEvent('removeHighlight', this);
- },
- keyToggle: function(e) {
- var evt = (e);
- if (evt.key === 'space') { this.toggle(e); }
- },
- toggle: function(e) {
- var evt;
- if (this.disabled) { return this; }
- if (e) {
- evt = (e).stopPropagation();
- if (evt.target.tagName.toLowerCase() !== 'a') {
- evt.stop();
- }
- }
- if (this.checked) {
- this.uncheck();
- } else {
- this.check();
- }
- this.fireEvent('change', this);
- this.input.fireEvent('change', this);
- return this;
- },
- uncheck: function() {
- this.element.removeClass(this.config.checkedClass);
- this.input.erase('checked');
- this.checked = false;
- this.fireEvent('uncheck', this);
- }
-});
diff --git a/couchpotato/static/scripts/library/form_replacement/form_checkgroup.js b/couchpotato/static/scripts/library/form_replacement/form_checkgroup.js
deleted file mode 100644
index 002fd6ed37..0000000000
--- a/couchpotato/static/scripts/library/form_replacement/form_checkgroup.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
----
-name: Form.CheckGroup
-description: Class to represent a group of Form.Check wrapped checkboxes
-authors: Bryan J Swift (@bryanjswift)
-license: MIT-style license.
-requires: [Core/Class.Extras, Core/Element, Core/Element.Event, Form-Replacement/Form.Check]
-provides: Form.CheckGroup
-...
-*/
-if (typeof window.Form === 'undefined') { window.Form = {}; }
-
-Form.CheckGroup = new Class({
- Implements: [Events,Options],
- options: {
- checkOptions: {},
- initialValues: {}
- },
- checks: [],
- initialize: function(group,options) {
- if (!Form.Check) { throw 'required Class Form.Check not found'; }
- this.setOptions(options);
- group = $(group);
- if (!group) { return this; }
- var checkboxes = group.getElements('input[type=checkbox]');
- checkboxes.each(this.addCheck,this);
- },
- addCheck: function(checkbox) {
- var initialValues = this.options.initialValues[checkbox.get('name')];
- var checkOptions = {};
- checkOptions.checked = initialValues ? initialValues.contains(checkbox.get('value')) : checkbox.get('checked');
- checkOptions.disabled = checkbox.get('disabled');
- checkbox.store('Form.CheckGroup::data',this);
- var check = checkbox.retrieve('Form.Check::data') || new Form.Check(checkbox, Object.append(checkOptions,this.options.checkOptions));
- this.checks.push(check);
- },
- checkAll: function() {
- this.checks.each(function(check) { if (!check.checked) { check.toggle(); } });
- },
- disable: function() {
- this.checks.each(function(check) { check.disable(); });
- this.fireEvent('disable',this);
- },
- enable: function() {
- this.checks.each(function(check) { check.enable(); });
- this.fireEvent('enable',this);
- },
- uncheckAll: function() {
- this.checks.each(function(check) { if (check.checked) { check.toggle(); } });
- }
-});
diff --git a/couchpotato/static/scripts/library/form_replacement/form_dropdown.js b/couchpotato/static/scripts/library/form_replacement/form_dropdown.js
deleted file mode 100644
index 86c2c3c8da..0000000000
--- a/couchpotato/static/scripts/library/form_replacement/form_dropdown.js
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
----
-name: Form.Dropdown
-description: Class to represent a select input
-authors: Bryan J Swift (@bryanjswift)
-license: MIT-style license.
-requires: [Core/Class.Extras, Core/Element, Core/Element.Event, Form-Replacement/Form.SelectOption]
-provides: Form.Dropdown
-...
-*/
-if (typeof window.Form === 'undefined') { window.Form = {}; }
-
-Form.Dropdown = new Class({
- Implements: [Events,Options],
- options: {
- excludedValues: [],
- initialValue: null,
- mouseLeaveDelay: 350,
- selectOptions: {},
- typeDelay: 500
- },
- bound: {},
- dropdownOptions: [],
- element: null,
- events: {},
- highlighted: null,
- input: null,
- open: true,
- selected: null,
- selection: null,
- typed: { lastKey: null, value: null, timer: null, pressed: null, shortlist: [], startkey: null },
- value: null,
- initialize: function(select,options) {
- this.setOptions(options);
- select = $(select);
- this.bound = {
- collapse: this.collapse.bind(this),
- expand: this.expand.bind(this),
- focus: this.focus.bind(this),
- highlightOption: this.highlightOption.bind(this),
- keydown: this.keydown.bind(this),
- keypress: this.keypress.bind(this),
- mouseenterDropdown: this.mouseenterDropdown.bind(this),
- mouseleaveDropdown: this.mouseleaveDropdown.bind(this),
- mousemove: this.mousemove.bind(this),
- removeHighlightOption: this.removeHighlightOption.bind(this),
- select: this.select.bind(this),
- toggle: this.toggle.bind(this)
- };
- this.events = { mouseenter: this.bound.mouseenterDropdown, mouseleave: this.bound.mouseleaveDropdown };
- this.value = this.options.initialValue;
- this.initializeCreateElements(select);
- var optionElements = select.getElements('option');
- this.updateOptions(optionElements);
- this.element.replaces(select);
- document.addEvent('click', this.bound.collapse);
- var eventName = Browser.ie || Browser.webkit ? 'keydown' : 'keypress';
- var target = Browser.ie ? $(document.body) : window;
- target.addEvent('keydown',this.bound.keydown).addEvent(eventName,this.bound.keypress);
- },
- initializeCreateElements: function(select) {
- var id = select.get('id');
- var dropdown = new Element('div', {
- 'class': (select.get('class') + ' select').trim(),
- 'id': (id && id !== '') ? id + 'Dropdown' : ''
- });
- var menu = new Element('div', {'class': 'menu'});
- var list = new Element('div', {'class': 'list'});
- var options = new Element('ul', {'class': 'options'});
- dropdown.adopt(menu.adopt(list.adopt(options)));
- var dropdownSelection = new Element('div', {
- 'class': 'selection',
- events: {click: this.bound.toggle}
- });
- var dropdownBackground = new Element('div', { 'class': 'dropdownBackground' });
- var selection = new Element('span', { 'class': 'selectionDisplay' });
- var input = new Element('input', {
- type:'text',
- id: id,
- name: select.get('name'),
- events: {
- focus: this.bound.focus
- }
- });
- dropdownSelection.adopt(dropdownBackground, selection, input);
- dropdown.adopt(dropdownSelection);
- this.element = dropdown;
- this.selection = selection;
- this.input = input;
- return options;
- },
- collapse: function(e) {
- this.open = false;
- this.element.removeClass('active').removeClass('dropdown-active');
- if (this.selected) { this.selected.removeHighlight(); }
- this.element.removeEvents(this.events);
- this.fireEvent('collapse', [this, e]);
- },
- deselect: function(option) {
- option.deselect();
- },
- destroy: function() {
- this.element = null;
- this.selection = null;
- this.input = null;
- },
- disable: function() {
- this.collapse();
- this.input.set('disabled', 'disabled').removeEvents({blur:this.bound.blur, focus:this.bound.focus});
- this.selection.getParent().removeEvent('click', this.bound.toggle);
- this.fireEvent('disable', this);
- },
- enable: function() {
- this.input.erase('disabled').addEvents({blur:this.bound.blur, focus:this.bound.focus});
- this.selection.getParent().addEvent('click', this.bound.toggle);
- this.fireEvent('enable', this);
- },
- expand: function(e) {
- clearTimeout(this.collapseInterval);
- var evt = e ? (e).stop() : null;
- this.open = true;
- this.input.focus();
- this.element.addClass('active').addClass('dropdown-active');
- if (this.selected) { this.selected.highlight(); }
- this.element.addEvents(this.events);
- this.fireEvent('expand', [this, e]);
- },
- focus: function(e) {
- this.expand();
- },
- foundMatch: function(e) {
- var typed = this.typed;
- var shortlist = typed.shortlist;
- var value = typed.value;
- var i = 0;
- var optionsLength = shortlist.length;
- var excludedValues = this.options.excludedValues;
- var found = false;
- if (!optionsLength) { return; }
- var option;
- do {
- option = shortlist[i];
- if (option.text.toLowerCase().indexOf(value) === 0 && !excludedValues.contains(option.value)) {
- found = true;
- option.highlight(e);
- typed.pressed = i + 1;
- i = optionsLength;
- }
- i = i + 1;
- } while(i < optionsLength);
- return found;
- },
- highlightOption: function(option) {
- if (this.highlighted) { this.highlighted.removeHighlight(); }
- this.highlighted = option;
- },
- isOpen: function() {
- return this.open;
- },
- keydown: function(e) {
- if (!this.open) { return; }
- this.dropdownOptions.each(function(option) { option.disable(); });
- document.addEvent('mousemove', this.bound.mousemove);
- },
- keypress: function(e) {
- if (!this.open) { return; }
- (e).stop();
-
- var code = e.code, key = e.key;
-
- var typed = this.typed;
- var match, i, options, option, optionsLength, found, first, excludedValues, shortlist;
- switch(code) {
- case 38: // up
- case 37: // left
- if (typed.pressed > 0) { typed.pressed = typed.pressed - 1; }
- if (!this.highlighted) { this.dropdownOptions.getLast().highlight(e); break; }
- match = this.highlighted.element.getPrevious();
- match = match ? match.retrieve('Form.SelectOption::data') : this.dropdownOptions.getLast();
- match.highlight(e);
- break;
- case 40: // down
- case 39: // right
- if (typed.shortlist.length > 0) { typed.pressed = typed.pressed + 1; }
- if (!this.highlighted) { this.dropdownOptions[0].highlight(e); break; }
- match = this.highlighted.element.getNext();
- match = match ? match.retrieve('Form.SelectOption::data') : this.dropdownOptions[0];
- match.highlight(e);
- break;
- case 13: // enter
- e.stop();
- case 9: // tab - skips the stop event but selects the item
- this.highlighted.select();
- break;
- case 27: // esc
- e.stop();
- this.toggle();
- break;
- case 32: // space
- default: // anything else
- if (!(code >= 48 && code <= 122 && (code <= 57 || (code >= 65 && code <= 90) || code >=97) || code === 32)) {
- break;
- }
- if (evt.control || evt.alt || evt.meta) { return; }
- // alphanumeric or space
- key = code === 32 ? ' ' : key;
- clearTimeout(typed.timer);
- options = this.dropdownOptions;
- optionsLength = options.length;
- excludedValues = this.options.excludedValues;
- if (typed.timer === null) { // timer is expired
- typed.shortlist = [];
- if (key === typed.lastKey || key === typed.startkey) { // get next
- typed.pressed = typed.pressed + 1;
- typed.value = key;
- } else { // get first
- typed = this.resetTyped();
- typed.value = key;
- typed.startkey = key;
- typed.pressed = 1;
- }
- typed.timer = this.resetTyped.delay(500, this);
- } else {
- if (key === typed.lastKey) { // check for match, if no match get next
- typed.value = typed.value + key;
- if (this.foundMatch(e)) { // got a match so break
- typed.timer = this.resetTyped.delay(500, this);
- break;
- } else { // no match fall through
- typed.shortlist = [];
- typed.value = key;
- typed.pressed = typed.pressed + 1;
- typed.timer = null;
- }
- } else { // reset timer, get first match, set pressed to found position
- typed.timer = this.resetTyped.delay(500, this);
- typed.value = typed.value + key;
- typed.startkey = typed.value.substring(0, 1);
- typed.lastKey = key;
- this.foundMatch(e);
- break;
- }
- }
- typed.lastKey = key;
- shortlist = typed.shortlist;
- i = 0;
- found = 0;
- do {
- option = options[i];
- if (option.text.toLowerCase().indexOf(key) === 0 && !excludedValues.contains(option.value)) {
- if (found === 0) { first = option; }
- found = found + 1;
- if (found === typed.pressed) { option.highlight(e); }
- shortlist.push(option);
- }
- i = i + 1;
- } while(i < optionsLength);
- if (typed.pressed > found) {
- first.highlight(e);
- typed.pressed = 1;
- }
- break;
- }
- },
- mouseenterDropdown: function() {
- clearTimeout(this.collapseInterval);
- },
- mouseleaveDropdown: function() {
- this.collapseInterval = this.options.mouseLeaveDelay ? this.collapse.delay(this.options.mouseLeaveDelay,this) : null;
- },
- mousemove: function() {
- this.dropdownOptions.each(function(option) { option.enable(); });
- document.removeEvent('mousemove', this.bound.mousemove);
- },
- removeHighlightOption: function(option) {
- this.highlighted = null;
- },
- reset: function() {
- if (this.options.initialValue) {
- this.dropdownOptions.each(function(o) {
- if (o.value === this.options.initialValue) { o.select(); }
- }, this);
- } else {
- this.dropdownOptions[0].select();
- }
- },
- resetTyped: function() {
- var typed = this.typed;
- typed.value = null;
- typed.timer = null;
- return typed;
- },
- select: function(option, e) {
- this.dropdownOptions.each(this.deselect);
- this.selection.set('html', option.element.get('html'));
- var oldValue = this.value;
- this.value = option.value;
- this.input.set('value', option.value);
- this.selected = option;
- this.fireEvent('select', [this, e]);
- if (oldValue && oldValue !== this.value) { this.fireEvent('change', [this, e]); }
- this.collapse(e);
- },
- toggle: function(e) {
- if (this.open) { this.collapse(e); }
- else { this.expand(e); }
- },
- updateOptions: function(optionElements) {
- var optionsList = this.element.getElement('ul').empty(),
- dropdownOptions = this.dropdownOptions.empty(),
- selectOptions = this.options.selectOptions;
- optionElements.each(function(opt) {
- var option = new Form.SelectOption(opt, selectOptions);
- option.addEvents({
- 'onHighlight':this.bound.highlightOption,
- 'onRemoveHighlight':this.bound.removeHighlightOption,
- 'onSelect':this.bound.select
- }).owner = this;
- if (option.value === this.options.initialValue || opt.get('selected')) { this.select(option); }
- dropdownOptions.push(option);
- optionsList.adopt(option.element);
- }, this);
- if (!this.selected && optionElements[0]) { optionElements[0].retrieve('Form.SelectOption::data').select(); }
- }
-});
diff --git a/couchpotato/static/scripts/library/form_replacement/form_radio.js b/couchpotato/static/scripts/library/form_replacement/form_radio.js
deleted file mode 100644
index 245aa4d370..0000000000
--- a/couchpotato/static/scripts/library/form_replacement/form_radio.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
----
-name: Form.Radio
-description: Class to represent a radio button
-authors: Bryan J Swift (@bryanjswift)
-license: MIT-style license.
-requires: [Core/Class.Extras, Core/Element, Core/Element.Event, Form-Replacement/Form.Check]
-provides: Form.Radio
-...
-*/
-if (typeof window.Form === 'undefined') { window.Form = {}; }
-
-Form.Radio = new Class({
- Extends: Form.Check,
- config: {
- elementClass: 'radio',
- storage: 'Form.Radio::data'
- },
- initialize: function(input,options) {
- this.parent(input,options);
- },
- toggle: function(e) {
- if (this.element.hasClass('checked') || this.disabled) { return; }
- var evt;
- if (e) { evt = (e).stop(); }
- if (this.checked) {
- this.uncheck();
- } else {
- this.check();
- }
- this.fireEvent(this.checked ? 'onCheck' : 'onUncheck',this);
- this.fireEvent('onChange',this);
- }
-});
\ No newline at end of file
diff --git a/couchpotato/static/scripts/library/form_replacement/form_radiogroup.js b/couchpotato/static/scripts/library/form_replacement/form_radiogroup.js
deleted file mode 100644
index f0000b5327..0000000000
--- a/couchpotato/static/scripts/library/form_replacement/form_radiogroup.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
----
-name: Form.RadioGroup
-description: Class to represent a group of Form.Radio buttons
-authors: Bryan J Swift (@bryanjswift)
-license: MIT-style license.
-requires: [Core/Class.Extras, Core/Element, Core/Element.Event, Form-Replacement/Form.Radio]
-provides: Form.RadioGroup
-...
-*/
-if (typeof window.Form === 'undefined') { window.Form = {}; }
-
-Form.RadioGroup = new Class({
- Implements: [Events,Options],
- options: {
- radioOptions: {},
- initialValues: {}
- },
- bound: {},
- radios: [],
- value: null,
- initialize: function(group,options) {
- if (!Form.Radio) { throw 'required Class Form.Radio not found'; }
- this.setOptions(options);
- this.bound = { select: this.select.bind(this) };
- group = $(group);
- if (!group) { return this; }
- var radios = group.getElements('input[type=radio]');
- radios.each(this.addCheck,this);
- },
- addCheck: function(radio,i) {
- var initialValues = this.options.initialValues[radio.get('name')];
- var radioOptions = {};
- radioOptions.checked = initialValues ? initialValues.contains(radio.get('value')) : radio.get('checked');
- radioOptions.disabled = radio.get('disabled');
- var check = (radio.retrieve('Form.Radio::data')
- || new Form.Radio(radio,Object.append(radioOptions,this.options.radioOptions)));
- check.addEvent('onCheck',this.bound.select);
- if (check.checked) { i ? this.changed(check) : this.value = check.value; }
- radio.store('Form.RadioGroup::data',this);
- this.radios.push(check);
- },
- changed: function(radio) {
- this.value = radio.value;
- this.fireEvent('onChange',this);
- },
- disable: function() {
- this.radios.each(function(radio) { radio.disable(); });
- },
- enable: function() {
- this.radios.each(function(radio) { radio.enable(); });
- },
- select: function(checkedRadio) {
- this.radios.each(function(radio) {
- if (radio.checked && radio.value !== checkedRadio.value) { radio.uncheck(); }
- });
- if (checkedRadio.value !== this.value) { this.changed(checkedRadio); }
- }
-});
diff --git a/couchpotato/static/scripts/library/form_replacement/form_selectoption.js b/couchpotato/static/scripts/library/form_replacement/form_selectoption.js
deleted file mode 100644
index 2b81140367..0000000000
--- a/couchpotato/static/scripts/library/form_replacement/form_selectoption.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
----
-name: Form.SelectOption
-description: Class to represent an option for Form.Dropdown
-authors: Bryan J Swift (@bryanjswift)
-license: MIT-style license.
-requires: [Core/Class.Extras, Core/Element, Core/Element.Event]
-provides: Form.SelectOption
-...
-*/
-if (typeof window.Form === 'undefined') { window.Form = {}; }
-
-Form.SelectOption = new Class({
- Implements: [Events, Options],
- options: {
- optionTag: 'li',
- selected: false
- },
- config: {
- highlightedClass: 'highlighted',
- optionClass: 'option',
- selectedClass: 'selected'
- },
- element: null,
- bound: {},
- option: null,
- selected: false,
- text: null,
- value: null,
- initialize: function(option, options) {
- this.setOptions(options);
- option = $(option);
- this.option = option;
- this.bound = {
- deselect: this.deselect.bind(this),
- highlight: this.highlight.bind(this),
- removeHighlight: this.removeHighlight.bind(this),
- select: this.select.bind(this)
- };
- this.text = option.get('text');
- this.value = option.get('value');
- this.element = new Element(this.options.optionTag, {
- 'class': (option.get('class') + ' ' + this.config.optionClass).trim(),
- 'html': option.get('html'),
- 'events': {
- click: this.bound.select,
- mouseenter: this.bound.highlight,
- mouseleave: this.bound.removeHighlight
- }
- });
- this.element.store('Form.SelectOption::data', this);
- option.store('Form.SelectOption::data', this);
- },
- deselect: function(e) {
- this.fireEvent('onDeselect', [this, e]);
- this.element.removeClass(this.config.selectedClass).addEvent('click', this.bound.select);
- this.selected = false;
- },
- destroy: function() {
- this.element = null;
- this.bound = null;
- this.option = null;
- },
- disable: function() {
- this.element.removeEvents({
- mouseenter: this.bound.highlight,
- mouseleave: this.bound.removeHighlight
- });
- this.fireEvent('onDisable', this);
- },
- enable: function() {
- this.element.addEvents({
- mouseenter: this.bound.highlight,
- mouseleave: this.bound.removeHighlight
- });
- this.fireEvent('onEnable', this);
- },
- highlight: function(e) {
- this.fireEvent('onHighlight', [this, e]);
- this.element.addClass(this.config.highlightedClass);
- return this;
- },
- removeHighlight: function(e) {
- this.fireEvent('onRemoveHighlight', [this, e]);
- this.element.removeClass(this.config.highlightedClass);
- return this;
- },
- select: function(e) {
- this.fireEvent('onSelect', [this, e]);
- this.element.addClass(this.config.selectedClass).removeEvent('click', this.bound.select);
- this.selected = true;
- }
-});
diff --git a/couchpotato/static/scripts/library/mootools_tween_css3.js b/couchpotato/static/scripts/library/mootools_tween_css3.js
deleted file mode 100644
index 8f6460b4a2..0000000000
--- a/couchpotato/static/scripts/library/mootools_tween_css3.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
----
-name: Fx.Tween.CSS3.Replacement
-script: Fx.Tween.CSS3.Replacement.js
-license: MIT-style license.
-description: Same behavior like Fx.Tween but tries to use native CSS3 transition if possible (Overwrites Fx.Tween).
-copyright: Copyright (c) 2010, Dipl.-Ing. (FH) Andrц╘ Fiedler <kontakt at visualdrugs dot net>, based on code by eskimoblood (mootools users group)
-authors: [Andrц╘ Fiedler, eskimoblood]
-
-requires: [Core/Class.Extras, Core/Element.Event, Core/Element.Style, Core/Fx.Tween]
-
-provides: [Fx.Tween]
-...
-*/
-
-Element.NativeEvents.transitionend = 2;
-Element.NativeEvents.webkitTransitionEnd = 2;
-Element.NativeEvents.oTransitionEnd = 2;
-Element.NativeEvents.msTransitionEnd = 2;
-
-Element.Events.transitionend = {
- base: Browser.safari || Browser.chrome ? 'webkitTransitionEnd' : (Browser.opera ? 'oTransitionEnd' : (Browser.ie && Browser.version > 8 ? 'msTransitionEnd' : 'transitionend'))
-};
-
-Event.implement({
-
- getPropertyName: function(){
- return this.event.propertyName;
- },
-
- getElapsedTime: function(nativeTime){
- return nativeTime ? this.event.elapsedTime : (this.event.elapsedTime * 1000).toInt();
- }
-
-});
-
-Element.implement({
-
- supportStyle: function(style){
- var value = this.style[style];
- return !!(value || value === '');
- },
-
- supportVendorStyle: function(style){
- var prefixedStyle = null;
- return this.supportStyle(style) ? style : ['webkit', 'Moz', 'o', 'ms'].some(function(prefix){
- prefixedStyle = prefix + style.capitalize();
- return this.supportStyle(prefixedStyle);
- }, this) ? prefixedStyle : null;
- }
-
-});
-
-Fx.TweenCSS2 = Fx.Tween;
-
-Fx.Tween = new Class({
-
- Extends: Fx.TweenCSS2,
-
- transitionTimings: {
- 'linear' : '0,0,1,1',
- 'expo:in' : '0.71,0.01,0.83,0',
- 'expo:out' : '0.14,1,0.32,0.99',
- 'expo:in:out' : '0.85,0,0.15,1',
- 'circ:in' : '0.34,0,0.96,0.23',
- 'circ:out' : '0,0.5,0.37,0.98',
- 'circ:in:out' : '0.88,0.1,0.12,0.9',
- 'sine:in' : '0.22,0.04,0.36,0',
- 'sine:out' : '0.04,0,0.5,1',
- 'sine:in:out' : '0.37,0.01,0.63,1',
- 'quad:in' : '0.14,0.01,0.49,0',
- 'quad:out' : '0.01,0,0.43,1',
- 'quad:in:out' : '0.47,0.04,0.53,0.96',
- 'cubic:in' : '0.35,0,0.65,0',
- 'cubic:out' : '0.09,0.25,0.24,1',
- 'cubic:in:out' : '0.66,0,0.34,1',
- 'quart:in' : '0.69,0,0.76,0.17',
- 'quart:out' : '0.26,0.96,0.44,1',
- 'quart:in:out' : '0.76,0,0.24,1',
- 'quint:in' : '0.64,0,0.78,0',
- 'quint:out' : '0.22,1,0.35,1',
- 'quint:in:out' : '0.9,0,0.1,1'
- },
-
- initialize: function(element, options){
- options.transition = options.transition || 'sine:in:out';
- this.parent(element, options);
- if (typeof this.options.transition != 'string') alert('Only short notated transitions (like \'sine:in\') are supported by Fx.Tween.CSS3');
- this.options.transition = this.options.transition.toLowerCase();
- this.transition = this.element.supportVendorStyle('transition');
- this.css3Supported = !!this.transition && !!this.transitionTimings[this.options.transition];
- },
-
- check: function(){
- if (!this.boundComplete) return true;
- return this.parent();
- },
-
- start: function(property, from, to){
- if (this.css3Supported){
- if (!this.check(property, from, to)) return this;
- var args = Array.flatten(arguments);
- this.property = this.options.property || args.shift();
- var parsed = this.prepare(this.element, this.property, args);
- this.from = parsed.from;
- this.to = parsed.to;
- this.boundComplete = function(event){
- if (event.getPropertyName() == this.property /* && event.getElapsedTime() == this.options.duration */ ){
- this.element.removeEvent('transitionend', this.boundComplete);
- this.boundComplete = null;
- this.fireEvent('complete', this);
- }
- }.bind(this);
- this.element.addEvent('transitionend', this.boundComplete);
- var trans = function(){
- this.element.setStyle(this.transition, this.property + ' ' + this.options.duration + 'ms cubic-bezier(' + this.transitionTimings[this.options.transition] + ')');
- this.element.setStyle(this.property, this.to[0].value + this.options.unit);
- }.bind(this);
- if (args[1]){
- this.element.setStyle(this.transition, 'none');
- this.element.setStyle(this.property, this.from[0].value + this.options.unit);
- trans.delay(0.1);
- } else
- trans();
- this.fireEvent('start', this);
- return this;
- }
- return this.parent(property, from, to);
- },
-
- cancel: function(){
- if (this.css3Supported){
- this.element.setStyle(this.transition, 'none');
- this.element.removeEvent('transitionend', this.boundComplete);
- this.boundComplete = null;
- }
- this.parent();
- return this;
- }
-
-});
diff --git a/couchpotato/static/scripts/library/prefix_free.js b/couchpotato/static/scripts/library/prefix_free.js
deleted file mode 100644
index b6d9812a0e..0000000000
--- a/couchpotato/static/scripts/library/prefix_free.js
+++ /dev/null
@@ -1,487 +0,0 @@
-/**
- * StyleFix 1.0.3 & PrefixFree 1.0.7
- * @author Lea Verou
- * MIT license
- */
-
-(function(){
-
-if(!window.addEventListener) {
- return;
-}
-
-var self = window.StyleFix = {
- link: function(link) {
- try {
- // Ignore stylesheets with data-noprefix attribute as well as alternate stylesheets
- if(link.rel !== 'stylesheet' || link.hasAttribute('data-noprefix')) {
- return;
- }
- }
- catch(e) {
- return;
- }
-
- var url = link.href || link.getAttribute('data-href'),
- base = url.replace(/[^\/]+$/, ''),
- base_scheme = (/^[a-z]{3,10}:/.exec(base) || [''])[0],
- base_domain = (/^[a-z]{3,10}:\/\/[^\/]+/.exec(base) || [''])[0],
- base_query = /^([^?]*)\??/.exec(url)[1],
- parent = link.parentNode,
- xhr = new XMLHttpRequest(),
- process;
-
- xhr.onreadystatechange = function() {
- if(xhr.readyState === 4) {
- process();
- }
- };
-
- process = function() {
- var css = xhr.responseText;
-
- if(css && link.parentNode && (!xhr.status || xhr.status < 400 || xhr.status > 600)) {
- css = self.fix(css, true, link);
-
- // Convert relative URLs to absolute, if needed
- if(base) {
- css = css.replace(/url\(\s*?((?:"|')?)(.+?)\1\s*?\)/gi, function($0, quote, url) {
- if(/^([a-z]{3,10}:|#)/i.test(url)) { // Absolute & or hash-relative
- return $0;
- }
- else if(/^\/\//.test(url)) { // Scheme-relative
- // May contain sequences like /../ and /./ but those DO work
- return 'url("' + base_scheme + url + '")';
- }
- else if(/^\//.test(url)) { // Domain-relative
- return 'url("' + base_domain + url + '")';
- }
- else if(/^\?/.test(url)) { // Query-relative
- return 'url("' + base_query + url + '")';
- }
- else {
- // Path-relative
- return 'url("' + base + url + '")';
- }
- });
-
- // behavior URLs shoudnБ─≥t be converted (Issue #19)
- // base should be escaped before added to RegExp (Issue #81)
- var escaped_base = base.replace(/([\\\^\$*+[\]?{}.=!:(|)])/g,"\\$1");
- css = css.replace(RegExp('\\b(behavior:\\s*?url\\(\'?"?)' + escaped_base, 'gi'), '$1');
- }
-
- var style = document.createElement('style');
- style.textContent = css;
- style.media = link.media;
- style.disabled = link.disabled;
- style.setAttribute('data-href', link.getAttribute('href'));
-
- parent.insertBefore(style, link);
- parent.removeChild(link);
-
- style.media = link.media; // Duplicate is intentional. See issue #31
- }
- };
-
- try {
- xhr.open('GET', url);
- xhr.send(null);
- } catch (e) {
- // Fallback to XDomainRequest if available
- if (typeof XDomainRequest != "undefined") {
- xhr = new XDomainRequest();
- xhr.onerror = xhr.onprogress = function() {};
- xhr.onload = process;
- xhr.open("GET", url);
- xhr.send(null);
- }
- }
-
- link.setAttribute('data-inprogress', '');
- },
-
- styleElement: function(style) {
- if (style.hasAttribute('data-noprefix')) {
- return;
- }
- var disabled = style.disabled;
-
- style.textContent = self.fix(style.textContent, true, style);
-
- style.disabled = disabled;
- },
-
- styleAttribute: function(element) {
- var css = element.getAttribute('style');
-
- css = self.fix(css, false, element);
-
- element.setAttribute('style', css);
- },
-
- process: function() {
- // Linked stylesheets
- $('link[rel="stylesheet"]:not([data-inprogress])').forEach(StyleFix.link);
-
- // Inline stylesheets
- $('style').forEach(StyleFix.styleElement);
-
- // Inline styles
- $('[style]').forEach(StyleFix.styleAttribute);
- },
-
- register: function(fixer, index) {
- (self.fixers = self.fixers || [])
- .splice(index === undefined? self.fixers.length : index, 0, fixer);
- },
-
- fix: function(css, raw, element) {
- for(var i=0; i<self.fixers.length; i++) {
- css = self.fixers[i](css, raw, element) || css;
- }
-
- return css;
- },
-
- camelCase: function(str) {
- return str.replace(/-([a-z])/g, function($0, $1) { return $1.toUpperCase(); }).replace('-','');
- },
-
- deCamelCase: function(str) {
- return str.replace(/[A-Z]/g, function($0) { return '-' + $0.toLowerCase() });
- }
-};
-
-/**************************************
- * Process styles
- **************************************/
-(function(){
- setTimeout(function(){
- $('link[rel="stylesheet"]').forEach(StyleFix.link);
- }, 10);
-
- document.addEventListener('DOMContentLoaded', StyleFix.process, false);
-})();
-
-function $(expr, con) {
- return [].slice.call((con || document).querySelectorAll(expr));
-}
-
-})();
-
-/**
- * PrefixFree
- */
-(function(root){
-
-if(!window.StyleFix || !window.getComputedStyle) {
- return;
-}
-
-// Private helper
-function fix(what, before, after, replacement, css) {
- what = self[what];
-
- if(what.length) {
- var regex = RegExp(before + '(' + what.join('|') + ')' + after, 'gi');
-
- css = css.replace(regex, replacement);
- }
-
- return css;
-}
-
-var self = window.PrefixFree = {
- prefixCSS: function(css, raw, element) {
- var prefix = self.prefix;
-
- // Gradient angles hotfix
- if(self.functions.indexOf('linear-gradient') > -1) {
- // Gradients are supported with a prefix, convert angles to legacy
- css = css.replace(/(\s|:|,)(repeating-)?linear-gradient\(\s*(-?\d*\.?\d*)deg/ig, function ($0, delim, repeating, deg) {
- return delim + (repeating || '') + 'linear-gradient(' + (90-deg) + 'deg';
- });
- }
-
- css = fix('functions', '(\\s|:|,)', '\\s*\\(', '$1' + prefix + '$2(', css);
- css = fix('keywords', '(\\s|:)', '(\\s|;|\\}|$)', '$1' + prefix + '$2$3', css);
- css = fix('properties', '(^|\\{|\\s|;)', '\\s*:', '$1' + prefix + '$2:', css);
-
- // Prefix properties *inside* values (issue #8)
- if (self.properties.length) {
- var regex = RegExp('\\b(' + self.properties.join('|') + ')(?!:)', 'gi');
-
- css = fix('valueProperties', '\\b', ':(.+?);', function($0) {
- return $0.replace(regex, prefix + "$1")
- }, css);
- }
-
- if(raw) {
- css = fix('selectors', '', '\\b', self.prefixSelector, css);
- css = fix('atrules', '@', '\\b', '@' + prefix + '$1', css);
- }
-
- // Fix double prefixing
- css = css.replace(RegExp('-' + prefix, 'g'), '-');
-
- // Prefix wildcard
- css = css.replace(/-\*-(?=[a-z]+)/gi, self.prefix);
-
- return css;
- },
-
- property: function(property) {
- return (self.properties.indexOf(property)? self.prefix : '') + property;
- },
-
- value: function(value, property) {
- value = fix('functions', '(^|\\s|,)', '\\s*\\(', '$1' + self.prefix + '$2(', value);
- value = fix('keywords', '(^|\\s)', '(\\s|$)', '$1' + self.prefix + '$2$3', value);
-
- // TODO properties inside values
-
- return value;
- },
-
- // Warning: Prefixes no matter what, even if the selector is supported prefix-less
- prefixSelector: function(selector) {
- return selector.replace(/^:{1,2}/, function($0) { return $0 + self.prefix })
- },
-
- // Warning: Prefixes no matter what, even if the property is supported prefix-less
- prefixProperty: function(property, camelCase) {
- var prefixed = self.prefix + property;
-
- return camelCase? StyleFix.camelCase(prefixed) : prefixed;
- }
-};
-
-/**************************************
- * Properties
- **************************************/
-(function() {
- var prefixes = {},
- properties = [],
- shorthands = {},
- style = getComputedStyle(document.documentElement, null),
- dummy = document.createElement('div').style;
-
- // Why are we doing this instead of iterating over properties in a .style object? Cause Webkit won't iterate over those.
- var iterate = function(property) {
- if(property.charAt(0) === '-') {
- properties.push(property);
-
- var parts = property.split('-'),
- prefix = parts[1];
-
- // Count prefix uses
- prefixes[prefix] = ++prefixes[prefix] || 1;
-
- // This helps determining shorthands
- while(parts.length > 3) {
- parts.pop();
-
- var shorthand = parts.join('-');
-
- if(supported(shorthand) && properties.indexOf(shorthand) === -1) {
- properties.push(shorthand);
- }
- }
- }
- },
- supported = function(property) {
- return StyleFix.camelCase(property) in dummy;
- }
-
- // Some browsers have numerical indices for the properties, some don't
- if(style.length > 0) {
- for(var i=0; i<style.length; i++) {
- iterate(style[i])
- }
- }
- else {
- for(var property in style) {
- iterate(StyleFix.deCamelCase(property));
- }
- }
-
- // Find most frequently used prefix
- var highest = {uses:0};
- for(var prefix in prefixes) {
- var uses = prefixes[prefix];
-
- if(highest.uses < uses) {
- highest = {prefix: prefix, uses: uses};
- }
- }
-
- self.prefix = '-' + highest.prefix + '-';
- self.Prefix = StyleFix.camelCase(self.prefix);
-
- self.properties = [];
-
- // Get properties ONLY supported with a prefix
- for(var i=0; i<properties.length; i++) {
- var property = properties[i];
-
- if(property.indexOf(self.prefix) === 0) { // we might have multiple prefixes, like Opera
- var unprefixed = property.slice(self.prefix.length);
-
- if(!supported(unprefixed)) {
- self.properties.push(unprefixed);
- }
- }
- }
-
- // IE fix
- if(self.Prefix == 'Ms'
- && !('transform' in dummy)
- && !('MsTransform' in dummy)
- && ('msTransform' in dummy)) {
- self.properties.push('transform', 'transform-origin');
- }
-
- self.properties.sort();
-})();
-
-/**************************************
- * Values
- **************************************/
-(function() {
-// Values that might need prefixing
-var functions = {
- 'linear-gradient': {
- property: 'backgroundImage',
- params: 'red, teal'
- },
- 'calc': {
- property: 'width',
- params: '1px + 5%'
- },
- 'element': {
- property: 'backgroundImage',
- params: '#foo'
- },
- 'cross-fade': {
- property: 'backgroundImage',
- params: 'url(a.png), url(b.png), 50%'
- }
-};
-
-
-functions['repeating-linear-gradient'] =
-functions['repeating-radial-gradient'] =
-functions['radial-gradient'] =
-functions['linear-gradient'];
-
-var keywords = {
- 'initial': 'color',
- 'zoom-in': 'cursor',
- 'zoom-out': 'cursor',
- 'box': 'display',
- 'flexbox': 'display',
- 'inline-flexbox': 'display',
- 'flex': 'display',
- 'inline-flex': 'display'
-};
-
-self.functions = [];
-self.keywords = [];
-
-var style = document.createElement('div').style;
-
-function supported(value, property) {
- style[property] = '';
- style[property] = value;
-
- return !!style[property];
-}
-
-for (var func in functions) {
- var test = functions[func],
- property = test.property,
- value = func + '(' + test.params + ')';
-
- if (!supported(value, property)
- && supported(self.prefix + value, property)) {
- // It's supported, but with a prefix
- self.functions.push(func);
- }
-}
-
-for (var keyword in keywords) {
- var property = keywords[keyword];
-
- if (!supported(keyword, property)
- && supported(self.prefix + keyword, property)) {
- // It's supported, but with a prefix
- self.keywords.push(keyword);
- }
-}
-
-})();
-
-/**************************************
- * Selectors and @-rules
- **************************************/
-(function() {
-
-var
-selectors = {
- ':read-only': null,
- ':read-write': null,
- ':any-link': null,
- '::selection': null
-},
-
-atrules = {
- 'keyframes': 'name',
- 'viewport': null,
- 'document': 'regexp(".")'
-};
-
-self.selectors = [];
-self.atrules = [];
-
-var style = root.appendChild(document.createElement('style'));
-
-function supported(selector) {
- style.textContent = selector + '{}'; // Safari 4 has issues with style.innerHTML
-
- return !!style.sheet.cssRules.length;
-}
-
-for(var selector in selectors) {
- var test = selector + (selectors[selector]? '(' + selectors[selector] + ')' : '');
-
- if(!supported(test) && supported(self.prefixSelector(test))) {
- self.selectors.push(selector);
- }
-}
-
-for(var atrule in atrules) {
- var test = atrule + ' ' + (atrules[atrule] || '');
-
- if(!supported('@' + test) && supported('@' + self.prefix + test)) {
- self.atrules.push(atrule);
- }
-}
-
-root.removeChild(style);
-
-})();
-
-// Properties that accept properties as their value
-self.valueProperties = [
- 'transition',
- 'transition-property'
-]
-
-// Add class for current prefix
-root.className += ' ' + self.prefix;
-
-StyleFix.register(self.prefixCSS);
-
-
-})(document.documentElement);
\ No newline at end of file
diff --git a/couchpotato/static/scripts/library/question.js b/couchpotato/static/scripts/library/question.js
index cab634657c..bcc3c9297c 100644
--- a/couchpotato/static/scripts/library/question.js
+++ b/couchpotato/static/scripts/library/question.js
@@ -1,54 +1,67 @@
var Question = new Class( {
initialize : function(question, hint, answers) {
- var self = this
+ var self = this;
- self.question = question
- self.hint = hint
- self.answers = answers
+ self.question = question;
+ self.hint = hint;
+ self.answers = answers;
- self.createQuestion()
+ self.createQuestion();
self.answers.each(function(answer) {
- self.createAnswer(answer)
- })
- self.createMask()
-
- },
-
- createMask : function() {
- var self = this
+ self.createAnswer(answer);
+ });
- self.mask = new Element('div.mask').fade('hide').inject(document.body).fade('in');
},
createQuestion : function() {
-
- this.container = new Element('div', {
- 'class' : 'question'
- }).adopt(
- new Element('h3', {
- 'html': this.question
- }),
- new Element('div.hint', {
- 'html': this.hint
- })
- ).inject(document.body)
-
- this.container.position( {
- 'position' : 'center'
- });
+ var self = this,
+ h3, hint;
+
+ self.container = new Element('div.mask.question')
+ .grab(self.inner = new Element('div.inner').adopt(
+ h3 = new Element('h3', {
+ 'html': this.question
+ }),
+ hint = this.hint ? new Element('div.hint', {
+ 'html': this.hint
+ }) : null
+ )
+ ).inject(document.body);
+
+ requestTimeout(function(){
+ self.container.addClass('show');
+
+ self.inner.getElements('> *').each(function(el, nr){
+ dynamics.css(el, {
+ opacity: 0,
+ translateY: 50
+ });
+
+ dynamics.animate(el, {
+ opacity: 1,
+ translateY: 0
+ }, {
+ type: dynamics.spring,
+ frequency: 200,
+ friction: 300,
+ duration: 800,
+ delay: 400 + (nr * 100)
+ });
+ });
+ }, 10);
},
createAnswer : function(options) {
- var self = this
+ var self = this;
var answer = new Element('a', Object.merge(options, {
- 'class' : 'answer button '+(options['class'] || '')+(options['cancel'] ? ' cancel' : '')
- })).inject(this.container)
+ 'class' : 'answer button '+(options['class'] || '')+(options.cancel ? ' cancel' : '')
+ })).inject(this.inner);
if (options.cancel) {
- answer.addEvent('click', self.close.bind(self))
+ answer.addEvent('click', self.close.bind(self));
}
else if (options.request) {
answer.addEvent('click', function(e){
@@ -56,24 +69,52 @@ var Question = new Class( {
new Request(Object.merge(options, {
'url': options.href,
'onComplete': function() {
- (options.onComplete || function(){})()
+ (options.onComplete || function(){})();
self.close();
}
- })).send();
+ })).send();
});
}
},
close : function() {
var self = this;
- self.mask.fade('out');
- (function(){self.mask.destroy()}).delay(1000);
-
- this.container.destroy();
+
+ var ended = function() {
+ self.container.dispose();
+ self.container.removeEventListener('transitionend', ended);
+ };
+ self.container.addEventListener('transitionend', ended, false);
+
+ // Hide items
+ self.inner.getElements('> *').reverse().each(function(el, nr){
+ dynamics.css(el, {
+ opacity: 1,
+ translateY: 0
+ });
+
+ dynamics.animate(el, {
+ opacity: 0,
+ translateY: 50
+ }, {
+ type: dynamics.spring,
+ frequency: 200,
+ friction: 300,
+ duration: 800,
+ anticipationSize: 175,
+ anticipationStrength: 400,
+ delay: nr * 100
+ });
+ });
+
+ // animate out
+ dynamics.setTimeout(function(){
+ self.container.removeClass('show');
+ }, 200);
},
toElement : function() {
- return this.container
+ return this.container;
}
-})
+});
diff --git a/couchpotato/static/scripts/library/scrollspy.js b/couchpotato/static/scripts/library/scrollspy.js
index 2120eb5232..053aab6021 100644
--- a/couchpotato/static/scripts/library/scrollspy.js
+++ b/couchpotato/static/scripts/library/scrollspy.js
@@ -50,7 +50,7 @@ var ScrollSpy = new Class({
min = typeOf(self.options.min) == 'function' ? self.options.min() : self.options.min,
max = typeOf(self.options.max) == 'function' ? self.options.max() : self.options.max;
- if(xy >= min && (max == 0 || xy <= max)) {
+ if(xy >= min && (max === 0 || xy <= max)) {
/* trigger enter event if necessary */
if(!self.inside) {
/* record as inside */
@@ -90,4 +90,4 @@ var ScrollSpy = new Class({
addListener: function() {
this.start();
}
-});
\ No newline at end of file
+});
diff --git a/couchpotato/static/scripts/library/spin.js b/couchpotato/static/scripts/library/spin.js
deleted file mode 100644
index 6c2d0d59a9..0000000000
--- a/couchpotato/static/scripts/library/spin.js
+++ /dev/null
@@ -1,301 +0,0 @@
-//fgnass.github.com/spin.js#v1.2.4
-(function(window, document, undefined) {
-
-/**
- * Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de]
- * Licensed under the MIT license
- */
-
- var prefixes = ['webkit', 'Moz', 'ms', 'O']; /* Vendor prefixes */
- var animations = {}; /* Animation rules keyed by their name */
- var useCssAnimations;
-
- /**
- * Utility function to create elements. If no tag name is given,
- * a DIV is created. Optionally properties can be passed.
- */
- function createEl(tag, prop) {
- var el = document.createElement(tag || 'div');
- var n;
-
- for(n in prop) {
- el[n] = prop[n];
- }
- return el;
- }
-
- /**
- * Appends children and returns the parent.
- */
- function ins(parent /* child1, child2, ...*/) {
- for (var i=1, n=arguments.length; i<n; i++) {
- parent.appendChild(arguments[i]);
- }
- return parent;
- }
-
- /**
- * Insert a new stylesheet to hold the @keyframe or VML rules.
- */
- var sheet = function() {
- var el = createEl('style');
- ins(document.getElementsByTagName('head')[0], el);
- return el.sheet || el.styleSheet;
- }();
-
- /**
- * Creates an opacity keyframe animation rule and returns its name.
- * Since most mobile Webkits have timing issues with animation-delay,
- * we create separate rules for each line/segment.
- */
- function addAnimation(alpha, trail, i, lines) {
- var name = ['opacity', trail, ~~(alpha*100), i, lines].join('-');
- var start = 0.01 + i/lines*100;
- var z = Math.max(1-(1-alpha)/trail*(100-start) , alpha);
- var prefix = useCssAnimations.substring(0, useCssAnimations.indexOf('Animation')).toLowerCase();
- var pre = prefix && '-'+prefix+'-' || '';
-
- if (!animations[name]) {
- sheet.insertRule(
- '@' + pre + 'keyframes ' + name + '{' +
- '0%{opacity:'+z+'}' +
- start + '%{opacity:'+ alpha + '}' +
- (start+0.01) + '%{opacity:1}' +
- (start+trail)%100 + '%{opacity:'+ alpha + '}' +
- '100%{opacity:'+ z + '}' +
- '}', 0);
- animations[name] = 1;
- }
- return name;
- }
-
- /**
- * Tries various vendor prefixes and returns the first supported property.
- **/
- function vendor(el, prop) {
- var s = el.style;
- var pp;
- var i;
-
- if(s[prop] !== undefined) return prop;
- prop = prop.charAt(0).toUpperCase() + prop.slice(1);
- for(i=0; i<prefixes.length; i++) {
- pp = prefixes[i]+prop;
- if(s[pp] !== undefined) return pp;
- }
- }
-
- /**
- * Sets multiple style properties at once.
- */
- function css(el, prop) {
- for (var n in prop) {
- el.style[vendor(el, n)||n] = prop[n];
- }
- return el;
- }
-
- /**
- * Fills in default values.
- */
- function merge(obj) {
- for (var i=1; i < arguments.length; i++) {
- var def = arguments[i];
- for (var n in def) {
- if (obj[n] === undefined) obj[n] = def[n];
- }
- }
- return obj;
- }
-
- /**
- * Returns the absolute page-offset of the given element.
- */
- function pos(el) {
- var o = {x:el.offsetLeft, y:el.offsetTop};
- while((el = el.offsetParent)) {
- o.x+=el.offsetLeft;
- o.y+=el.offsetTop;
- }
- return o;
- }
-
- var defaults = {
- lines: 12, // The number of lines to draw
- length: 7, // The length of each line
- width: 5, // The line thickness
- radius: 10, // The radius of the inner circle
- color: '#000', // #rgb or #rrggbb
- speed: 1, // Rounds per second
- trail: 100, // Afterglow percentage
- opacity: 1/4, // Opacity of the lines
- fps: 20, // Frames per second when using setTimeout()
- zIndex: 2e9, // Use a high z-index by default
- className: 'spinner', // CSS class to assign to the element
- top: 'auto', // center vertically
- left: 'auto' // center horizontally
- };
-
- /** The constructor */
- var Spinner = function Spinner(o) {
- if (!this.spin) return new Spinner(o);
- this.opts = merge(o || {}, Spinner.defaults, defaults);
- };
-
- Spinner.defaults = {};
- Spinner.prototype = {
- spin: function(target) {
- this.stop();
- var self = this;
- var o = self.opts;
- var el = self.el = css(createEl(0, {className: o.className}), {position: 'relative', zIndex: o.zIndex});
- var mid = o.radius+o.length+o.width;
- var ep; // element position
- var tp; // target position
-
- if (target) {
- target.insertBefore(el, target.firstChild||null);
- tp = pos(target);
- ep = pos(el);
- css(el, {
- left: (o.left == 'auto' ? tp.x-ep.x + (target.offsetWidth >> 1) : o.left+mid) + 'px',
- top: (o.top == 'auto' ? tp.y-ep.y + (target.offsetHeight >> 1) : o.top+mid) + 'px'
- });
- }
-
- el.setAttribute('aria-role', 'progressbar');
- self.lines(el, self.opts);
-
- if (!useCssAnimations) {
- // No CSS animation support, use setTimeout() instead
- var i = 0;
- var fps = o.fps;
- var f = fps/o.speed;
- var ostep = (1-o.opacity)/(f*o.trail / 100);
- var astep = f/o.lines;
-
- !function anim() {
- i++;
- for (var s=o.lines; s; s--) {
- var alpha = Math.max(1-(i+s*astep)%f * ostep, o.opacity);
- self.opacity(el, o.lines-s, alpha, o);
- }
- self.timeout = self.el && setTimeout(anim, ~~(1000/fps));
- }();
- }
- return self;
- },
- stop: function() {
- var el = this.el;
- if (el) {
- clearTimeout(this.timeout);
- if (el.parentNode) el.parentNode.removeChild(el);
- this.el = undefined;
- }
- return this;
- },
- lines: function(el, o) {
- var i = 0;
- var seg;
-
- function fill(color, shadow) {
- return css(createEl(), {
- position: 'absolute',
- width: (o.length+o.width) + 'px',
- height: o.width + 'px',
- background: color,
- boxShadow: shadow,
- transformOrigin: 'left',
- transform: 'rotate(' + ~~(360/o.lines*i) + 'deg) translate(' + o.radius+'px' +',0)',
- borderRadius: (o.width>>1) + 'px'
- });
- }
- for (; i < o.lines; i++) {
- seg = css(createEl(), {
- position: 'absolute',
- top: 1+~(o.width/2) + 'px',
- transform: o.hwaccel ? 'translate3d(0,0,0)' : '',
- opacity: o.opacity,
- animation: useCssAnimations && addAnimation(o.opacity, o.trail, i, o.lines) + ' ' + 1/o.speed + 's linear infinite'
- });
- if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'}));
- ins(el, ins(seg, fill(o.color, '0 0 1px rgba(0,0,0,.1)')));
- }
- return el;
- },
- opacity: function(el, i, val) {
- if (i < el.childNodes.length) el.childNodes[i].style.opacity = val;
- }
- };
-
- /////////////////////////////////////////////////////////////////////////
- // VML rendering for IE
- /////////////////////////////////////////////////////////////////////////
-
- /**
- * Check and init VML support
- */
- !function() {
- var s = css(createEl('group'), {behavior: 'url(#default#VML)'});
- var i;
-
- if (!vendor(s, 'transform') && s.adj) {
-
- // VML support detected. Insert CSS rules ...
- for (i=4; i--;) sheet.addRule(['group', 'roundrect', 'fill', 'stroke'][i], 'behavior:url(#default#VML)');
-
- Spinner.prototype.lines = function(el, o) {
- var r = o.length+o.width;
- var s = 2*r;
-
- function grp() {
- return css(createEl('group', {coordsize: s +' '+s, coordorigin: -r +' '+-r}), {width: s, height: s});
- }
-
- var margin = -(o.width+o.length)*2+'px';
- var g = css(grp(), {position: 'absolute', top: margin, left: margin});
-
- var i;
-
- function seg(i, dx, filter) {
- ins(g,
- ins(css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}),
- ins(css(createEl('roundrect', {arcsize: 1}), {
- width: r,
- height: o.width,
- left: o.radius,
- top: -o.width>>1,
- filter: filter
- }),
- createEl('fill', {color: o.color, opacity: o.opacity}),
- createEl('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
- )
- )
- );
- }
-
- if (o.shadow) {
- for (i = 1; i <= o.lines; i++) {
- seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)');
- }
- }
- for (i = 1; i <= o.lines; i++) seg(i);
- return ins(el, g);
- };
- Spinner.prototype.opacity = function(el, i, val, o) {
- var c = el.firstChild;
- o = o.shadow && o.lines || 0;
- if (c && i+o < c.childNodes.length) {
- c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild;
- if (c) c.opacity = val;
- }
- };
- }
- else {
- useCssAnimations = vendor(s, 'animation');
- }
- }();
-
- window.Spinner = Spinner;
-
-})(window, document);
diff --git a/couchpotato/static/scripts/page.js b/couchpotato/static/scripts/page.js
index 1af800e86d..355a0dd9e2 100644
--- a/couchpotato/static/scripts/page.js
+++ b/couchpotato/static/scripts/page.js
@@ -6,26 +6,95 @@ var PageBase = new Class({
},
+ order: 1,
has_tab: true,
name: '',
+ icon: null,
- initialize: function(options) {
+ parent_page: null,
+ sub_pages: null,
+
+ initialize: function(parent_page, options) {
var self = this;
- self.setOptions(options)
+ self.parent_page = parent_page;
+ self.setOptions(options);
// Create main page container
- self.el = new Element('div.page.'+self.name);
+ self.el = new Element('div', {
+ 'class': 'page ' + self.getPageClass() + (' level_' + (options.level || 0))
+ }).grab(
+ self.content = new Element('div.scroll_content')
+ );
+
+ // Stop hover events while scrolling
+ App.addEvent('load', function(){
+ requestTimeout(function(){
+ if(!App.mobile_screen && !App.getOption('dev')){
+ self.content.addEvent('scroll', self.preventHover.bind(self));
+ }
+ }, 100);
+ });
+ },
+
+ load: function(){
+ var self = this;
// Create tab for page
if(self.has_tab){
- var nav = App.getBlock('navigation');
+ var nav;
+
+ if(self.parent_page && self.parent_page.navigation){
+ nav = self.parent_page.navigation;
+ }
+ else {
+ nav = App.getBlock('navigation');
+ }
+
self.tab = nav.addTab(self.name, {
- 'href': App.createUrl(self.name),
+ 'href': App.createUrl(self.getPageUrl()),
'title': self.title,
- 'text': self.name.capitalize()
+ 'html': '<span>' + self.name.capitalize() + '</span>',
+ 'class': self.icon ? 'icon-' + self.icon : null
});
}
+
+ if(self.sub_pages){
+ self.loadSubPages();
+ }
+
+ },
+
+ loadSubPages: function(){
+ var self = this;
+
+ var sub_pages = self.sub_pages;
+
+ self.sub_pages = [];
+ sub_pages.each(function(class_name){
+ var pg = new window[self.name.capitalize()+class_name](self, {
+ 'level': 2
+ });
+ self.sub_pages[class_name] = pg;
+
+ self.sub_pages.include({
+ 'order': pg.order,
+ 'name': class_name,
+ 'class': pg
+ });
+ });
+
+ self.sub_pages.stableSort(self.sortPageByOrder).each(function(page){
+ page['class'].load();
+ self.fireEvent('load'+page.name);
+
+ $(page['class']).inject(App.getPageContainer());
+ });
+
+ },
+
+ sortPageByOrder: function(a, b){
+ return (a.order || 100) - (b.order || 100);
},
open: function(action, params){
@@ -33,10 +102,16 @@ var PageBase = new Class({
//p('Opening: ' +self.getName() + ', ' + action + ', ' + Object.toQueryString(params));
try {
- var elements = self[action+'Action'](params);
+ var elements;
+ if(!self[action+'Action']){
+ elements = self.defaultAction(action, params);
+ }
+ else {
+ elements = self[action+'Action'](params);
+ }
if(elements !== undefined){
- self.el.empty();
- self.el.adopt(elements);
+ self.content.empty();
+ self.content.adopt(elements);
}
App.getBlock('navigation').activate(self.name);
@@ -53,12 +128,22 @@ var PageBase = new Class({
History.push(url);
},
+ getPageUrl: function(){
+ var self = this;
+ return (self.parent_page && self.parent_page.getPageUrl ? self.parent_page.getPageUrl() + '/' : '') + self.name;
+ },
+
+ getPageClass: function(){
+ var self = this;
+ return (self.parent_page && self.parent_page.getPageClass ? self.parent_page.getPageClass() + '_' : '') + self.name;
+ },
+
errorAction: function(e){
p('Error, action not found', e);
},
getName: function(){
- return this.name
+ return this.name;
},
show: function(){
@@ -66,12 +151,31 @@ var PageBase = new Class({
},
hide: function(){
- this.el.removeClass('active');
+ var self = this;
+
+ self.el.removeClass('active');
+
+ if(self.sub_pages){
+ self.sub_pages.each(function(sub_page){
+ sub_page['class'].hide();
+ });
+ }
+ },
+
+ preventHover: function(){
+ var self = this;
+
+ if(self.hover_timer) clearRequestTimeout(self.hover_timer);
+ self.el.addClass('disable_hover');
+
+ self.hover_timer = requestTimeout(function(){
+ self.el.removeClass('disable_hover');
+ }, 200);
},
toElement: function(){
- return this.el
+ return this.el;
}
});
-var Page = {}
+var Page = {};
diff --git a/couchpotato/static/scripts/page/about.js b/couchpotato/static/scripts/page/about.js
index ba451c841a..80bf8041cb 100644
--- a/couchpotato/static/scripts/page/about.js
+++ b/couchpotato/static/scripts/page/about.js
@@ -6,14 +6,14 @@ var AboutSettingTab = new Class({
initialize: function(){
var self = this;
- App.addEvent('load', self.addSettings.bind(self))
+ App.addEvent('loadSettings', self.addSettings.bind(self));
},
addSettings: function(){
var self = this;
- self.settings = App.getPage('Settings')
+ self.settings = App.getPage('Settings');
self.settings.addEvent('create', function(){
var tab = self.settings.createTab('about', {
'label': 'About',
@@ -48,13 +48,13 @@ var AboutSettingTab = new Class({
'text': 'Getting version...',
'events': {
'click': App.checkForUpdate.bind(App, function(json){
- self.fillVersion(json.info)
+ self.fillVersion(json.info);
}),
'mouseenter': function(){
- this.set('text', 'Check for updates')
+ this.set('text', 'Check for updates');
},
'mouseleave': function(){
- self.fillVersion(Updater.getInfo())
+ self.fillVersion(Updater.getInfo());
}
}
}),
@@ -72,7 +72,7 @@ var AboutSettingTab = new Class({
);
if(!self.fillVersion(Updater.getInfo()))
- Updater.addEvent('loaded', self.fillVersion.bind(self))
+ Updater.addEvent('loaded', self.fillVersion.bind(self));
self.settings.createGroup({
'name': 'Help Support CouchPotato'
@@ -96,17 +96,17 @@ var AboutSettingTab = new Class({
'text': '. For as low as $7.95 per month, youБ─≥ll get:'
}),
new Element('ul').adopt(
- new Element('li', {
+ new Element('li.icon-ok', {
'text': Math.ceil((today.getTime()-millennium.getTime())/(one_day))+" days retention"
}),
- new Element('li[text=No speed or download limits]'),
- new Element('li[text=Free SSL Encrypted connections]')
+ new Element('li.icon-ok[text=No speed or download limits]'),
+ new Element('li.icon-ok[text=Free SSL Encrypted connections]')
)
),
new Element('div.donate', {
'html':
'Or support me via:' +
- '<iframe src="http://couchpota.to/donate.html" style="border:none; height: 200px;" scrolling="no"></iframe>'
+ '<iframe src="https://couchpota.to/donate.html" style="border:none; height: 200px;" scrolling="no"></iframe>'
})
);
@@ -117,11 +117,11 @@ var AboutSettingTab = new Class({
var self = this;
var date = new Date(json.version.date * 1000);
self.version_text.set('text', json.version.hash + (json.version.date ? ' ('+date.toLocaleString()+')' : ''));
- self.updater_type.set('text', json.version.type + ', ' + json.branch);
+ self.updater_type.set('text', (json.version.type != json.branch) ? (json.version.type + ', ' + json.branch) : json.branch);
}
});
window.addEvent('domready', function(){
new AboutSettingTab();
-});
\ No newline at end of file
+});
diff --git a/couchpotato/static/scripts/page/home.js b/couchpotato/static/scripts/page/home.js
index caf4d646ab..cddea44506 100644
--- a/couchpotato/static/scripts/page/home.js
+++ b/couchpotato/static/scripts/page/home.js
@@ -4,88 +4,187 @@ Page.Home = new Class({
name: 'home',
title: 'Manage new stuff for things and such',
+ icon: 'home',
- indexAction: function(param){
+ indexAction: function () {
var self = this;
- if(self.soon_list)
- return
+ if(self.soon_list){
+
+ // Reset lists
+ self.available_list.update();
+
+ if(self.late_list)
+ self.late_list.update();
+
+ return;
+ }
+
+ self.chain = new Chain();
+ self.chain.chain(
+ self.createAvailable.bind(self),
+ self.createBigsearch.bind(self),
+ self.createSoon.bind(self),
+ self.createSuggestions.bind(self),
+ self.createCharts.bind(self),
+ self.createLate.bind(self)
+ );
+
+ self.chain.callChain();
+
+ },
+
+ createBigsearch: function(){
+ var self = this;
+
+ new Element('.big_search').grab(
+ new BlockSearch(self, {
+ 'animate': false
+ })
+ ).inject(self.content);
+
+ self.chain.callChain();
+ },
+
+ createAvailable: function(){
+ var self = this;
- // Snatched
self.available_list = new MovieList({
'navigation': false,
'identifier': 'snatched',
'load_more': false,
'view': 'list',
- 'actions': MovieActions,
+ 'actions': [MA.MarkAsDone, MA.IMDB, MA.Release, MA.Trailer, MA.Refresh, MA.Readd, MA.Delete, MA.Category, MA.Profile],
'title': 'Snatched & Available',
+ 'description': 'These movies have been snatched or have finished downloading',
+ 'on_empty_element': new Element('div').adopt(
+ new Element('h2', {'text': 'Snatched & Available'}),
+ new Element('span.no_movies', {
+ 'html': 'No snatched movies or anything!? Damn.. <a href="#">Maybe add a movie.</a>',
+ 'events': {
+ 'click': function(e){
+ (e).preventDefault();
+ $(document.body).getElement('.big_search input').focus();
+ }
+ }
+ })
+ ),
'filter': {
- 'release_status': 'snatched,available'
+ 'release_status': 'snatched,missing,available,downloaded,done,seeding',
+ 'with_tags': 'recent'
+ },
+ 'limit': null,
+ 'onLoaded': function(){
+ self.chain.callChain();
+ },
+ 'onMovieAdded': function(notification){
+
+ // Track movie added
+ var after_search = function(data){
+ if(notification.data._id != data.data._id) return;
+
+ // Force update after search
+ self.available_list.update();
+ App.off('movie.searcher.ended', after_search);
+ };
+ App.on('movie.searcher.ended', after_search);
+
}
});
- // Downloaded
- // self.downloaded_list = new MovieList({
- // 'navigation': false,
- // 'identifier': 'downloaded',
- // 'load_more': false,
- // 'view': 'titles',
- // 'filter': {
- // 'release_status': 'done',
- // 'order': 'release_order'
- // }
- // });
- // self.el.adopt(
- // new Element('h2', {
- // 'text': 'Just downloaded'
- // }),
- // $(self.downloaded_list)
- // );
-
- // Comming Soon
+ $(self.available_list).inject(self.content);
+
+ },
+
+ createSoon: function(){
+ var self = this;
+
+ // Coming Soon
self.soon_list = new MovieList({
'navigation': false,
'identifier': 'soon',
- 'limit': 24,
- 'title': 'Soon',
+ 'limit': 12,
+ 'title': 'Available soon',
+ 'description': 'Should be available soon as they will be released on DVD/Blu-ray in the coming weeks.',
'filter': {
'random': true
},
+ 'actions': [MA.IMDB, MA.Release, MA.Trailer, MA.Refresh, MA.Delete, MA.Category, MA.Profile],
'load_more': false,
- 'view': 'thumbs',
- 'api_call': 'dashboard.soon'
+ 'view': 'thumb',
+ 'force_view': true,
+ 'api_call': 'dashboard.soon',
+ 'onLoaded': function(){
+ self.chain.callChain();
+ }
});
- self.el.adopt(
- $(self.available_list),
- $(self.soon_list)
- );
+ $(self.soon_list).inject(self.content);
+
+ },
+
+ createSuggestions: function(){
+ var self = this;
+
+ self.suggestions_list = new MovieList({
+ 'navigation': false,
+ 'identifier': 'suggest',
+ 'limit': 12,
+ 'title': 'Suggestions',
+ 'description': 'Based on your current wanted and managed items',
+ 'actions': [MA.Add, MA.SuggestIgnore, MA.SuggestSeen, MA.IMDB, MA.Trailer],
+ 'load_more': false,
+ 'view': 'thumb',
+ 'force_view': true,
+ 'api_call': 'suggestion.view',
+ 'onLoaded': function(){
+ self.chain.callChain();
+ }
+ });
+
+ $(self.suggestions_list).inject(self.content);
+
+ },
+
+ createCharts: function(){
+ var self = this;
+
+ // Charts
+ self.charts_list = new Charts({
+ 'onCreated': function(){
+ self.chain.callChain();
+ }
+ });
+
+ $(self.charts_list).inject(self.content);
+
+ },
+
+ createLate: function(){
+ var self = this;
+
+ // Still not available
+ self.late_list = new MovieList({
+ 'navigation': false,
+ 'identifier': 'late',
+ 'limit': 50,
+ 'title': 'Still not available',
+ 'description': 'Try another quality profile or maybe add more providers in <a href="' + App.createUrl('settings/searcher/providers/') + '">Settings</a>.',
+ 'filter': {
+ 'late': true
+ },
+ 'loader': false,
+ 'load_more': false,
+ 'view': 'list',
+ 'actions': [MA.IMDB, MA.Trailer, MA.Refresh, MA.Delete, MA.Category, MA.Profile],
+ 'api_call': 'dashboard.soon',
+ 'onLoaded': function(){
+ self.chain.callChain();
+ }
+ });
- // Suggest
- // self.suggestion_list = new MovieList({
- // 'navigation': false,
- // 'identifier': 'suggestions',
- // 'limit': 6,
- // 'load_more': false,
- // 'view': 'thumbs',
- // 'api_call': 'suggestion.suggest'
- // });
- // self.el.adopt(
- // new Element('h2', {
- // 'text': 'You might like'
- // }),
- // $(self.suggestion_list)
- // );
-
- // Recent
- // Snatched
- // Renamed
- // Added
-
- // Free space
-
- // Shortcuts
+ $(self.late_list).inject(self.content);
}
-})
\ No newline at end of file
+});
diff --git a/couchpotato/static/scripts/page/login.js b/couchpotato/static/scripts/page/login.js
new file mode 100644
index 0000000000..4e272c0415
--- /dev/null
+++ b/couchpotato/static/scripts/page/login.js
@@ -0,0 +1,31 @@
+window.addEvent('domready', function(){
+ var b = $(document.body),
+ login_page = b.hasClass('login');
+
+ if(login_page){
+
+ var form = b.getElement('form'),
+ els = b.getElements('h1, .username, .password, .remember_me, .button');
+ els.each(function(el, nr){
+
+ dynamics.css(el, {
+ opacity: 0,
+ translateY: 50
+ });
+
+ dynamics.animate(el, {
+ opacity: 1,
+ translateY: 0
+ }, {
+ type: dynamics.spring,
+ frequency: 200,
+ friction: 300,
+ duration: 800,
+ anticipationSize: 175,
+ anticipationStrength: 400,
+ delay: nr * 100
+ });
+
+ });
+ }
+});
diff --git a/couchpotato/static/scripts/page/manage.js b/couchpotato/static/scripts/page/manage.js
deleted file mode 100644
index ec293f860c..0000000000
--- a/couchpotato/static/scripts/page/manage.js
+++ /dev/null
@@ -1,122 +0,0 @@
-Page.Manage = new Class({
-
- Extends: PageBase,
-
- name: 'manage',
- title: 'Do stuff to your existing movies!',
-
- indexAction: function(param){
- var self = this;
-
- if(!self.list){
- self.refresh_button = new Element('a', {
- 'title': 'Rescan your library for new movies',
- 'text': 'Full library refresh',
- 'events':{
- 'click': self.refresh.bind(self, true)
- }
- });
-
- self.refresh_quick = new Element('a', {
- 'title': 'Just scan for recently changed',
- 'text': 'Quick library scan',
- 'events':{
- 'click': self.refresh.bind(self, false)
- }
- });
-
- self.list = new MovieList({
- 'identifier': 'manage',
- 'filter': {
- 'release_status': 'done'
- },
- 'actions': MovieActions,
- 'menu': [self.refresh_button, self.refresh_quick],
- 'on_empty_element': new Element('div.empty_manage').adopt(
- new Element('div', {
- 'text': 'Seems like you don\'t have anything in your library yet.'
- }),
- new Element('div', {
- 'text': 'Add your existing movie folders in '
- }).adopt(
- new Element('a', {
- 'text': 'Settings > Manage',
- 'href': App.createUrl('settings/manage')
- })
- ),
- new Element('div.after_manage', {
- 'text': 'When you\'ve done that, hit this button Б├▓ '
- }).adopt(
- new Element('a.button.green', {
- 'text': 'Hit me, but not too hard',
- 'events':{
- 'click': self.refresh.bind(self, true)
- }
- })
- )
- )
- });
- $(self.list).inject(self.el);
-
- // Check if search is in progress
- self.startProgressInterval();
- }
-
- },
-
- refresh: function(full){
- var self = this;
-
- if(!self.update_in_progress){
-
- Api.request('manage.update', {
- 'data': {
- 'full': +full
- }
- })
-
- self.startProgressInterval();
-
- }
-
- },
-
- startProgressInterval: function(){
- var self = this;
-
- self.progress_interval = setInterval(function(){
-
- Api.request('manage.progress', {
- 'onComplete': function(json){
- self.update_in_progress = true;
-
- if(!json || !json.progress){
- clearInterval(self.progress_interval);
- self.update_in_progress = false;
- if(self.progress_container){
- self.progress_container.destroy();
- self.list.update();
- }
- }
- else {
- if(!self.progress_container)
- self.progress_container = new Element('div.progress').inject(self.list.navigation, 'after')
-
- self.progress_container.empty();
-
- Object.each(json.progress, function(progress, folder){
- new Element('div').adopt(
- new Element('span.folder', {'text': folder}),
- new Element('span.percentage', {'text': progress.total ? (((progress.total-progress.to_go)/progress.total)*100).round() + '%' : '0%'})
- ).inject(self.progress_container)
- });
-
- }
- }
- })
-
- }, 1000);
-
- }
-
-});
diff --git a/couchpotato/static/scripts/page/settings.js b/couchpotato/static/scripts/page/settings.js
index ddb2abf18b..5768f19891 100644
--- a/couchpotato/static/scripts/page/settings.js
+++ b/couchpotato/static/scripts/page/settings.js
@@ -2,6 +2,7 @@ Page.Settings = new Class({
Extends: PageBase,
+ order: 50,
name: 'settings',
title: 'Change settings.',
wizard_only: false,
@@ -11,20 +12,6 @@ Page.Settings = new Class({
current: 'about',
has_tab: false,
- initialize: function(options){
- var self = this;
- self.parent(options);
-
- // Add to more menu
- if(self.name == 'settings')
- App.getBlock('more').addLink(new Element('a', {
- 'href': App.createUrl(self.name),
- 'text': self.name.capitalize(),
- 'title': self.title
- }), 'top')
-
- },
-
open: function(action, params){
var self = this;
self.action = action == 'index' ? self.default_action : action;
@@ -41,7 +28,7 @@ Page.Settings = new Class({
openTab: function(action){
var self = this;
- var action = (action == 'index' ? 'about' : action) || self.action;
+ action = (action == 'index' ? 'about' : action) || self.action;
if(self.current)
self.toggleTab(self.current, true);
@@ -57,19 +44,20 @@ Page.Settings = new Class({
var a = hide ? 'removeClass' : 'addClass';
var c = 'active';
+ tab_name = tab_name.split('/')[0];
var t = self.tabs[tab_name] || self.tabs[self.action] || self.tabs.general;
// Subtab
- var subtab = null
+ var subtab = null;
Object.each(self.params, function(param, subtab_name){
- subtab = subtab_name;
- })
+ subtab = param;
+ });
- self.el.getElements('li.'+c+' , .tab_content.'+c).each(function(active){
+ self.content.getElements('li.'+c+' , .tab_content.'+c).each(function(active){
active.removeClass(c);
});
- if (t.subtabs[subtab]){
+ if(t.subtabs[subtab]){
t.tab[a](c);
t.subtabs[subtab].tab[a](c);
t.subtabs[subtab].content[a](c);
@@ -85,7 +73,7 @@ Page.Settings = new Class({
t.content.fireEvent('activate');
}
- return t
+ return t;
},
getData: function(onComplete){
@@ -95,13 +83,13 @@ Page.Settings = new Class({
Api.request('settings', {
'useSpinner': true,
'spinnerOptions': {
- 'target': self.el
+ 'target': self.content
},
'onComplete': function(json){
self.data = json;
onComplete(json);
}
- })
+ });
return self.data;
},
@@ -112,7 +100,7 @@ Page.Settings = new Class({
return self.data.values[section][name];
}
catch(e){
- return ''
+ return '';
}
},
@@ -125,43 +113,54 @@ Page.Settings = new Class({
Cookie.write('advanced_toggle_checked', +self.advanced_toggle.checked, {'duration': 365});
},
+ sortByOrder: function(a, b){
+ return (a.order || 100) - (b.order || 100);
+ },
+
create: function(json){
var self = this;
- self.el.adopt(
- self.tabs_container = new Element('ul.tabs'),
- self.containers = new Element('form.uniForm.containers').adopt(
- new Element('label.advanced_toggle').adopt(
- new Element('span', {
- 'text': 'Show advanced settings'
- }),
- self.advanced_toggle = new Element('input[type=checkbox].inlay', {
+ self.navigation = new Element('div.navigation').adopt(
+ new Element('h2[text=Settings]'),
+ new Element('div.advanced_toggle').adopt(
+ new Element('span', {
+ 'text': 'Show advanced'
+ }),
+ new Element('label.switch').adopt(
+ self.advanced_toggle = new Element('input[type=checkbox]', {
'checked': +Cookie.read('advanced_toggle_checked'),
'events': {
'change': self.showAdvanced.bind(self)
}
- })
+ }),
+ new Element('div.toggle')
)
)
);
- self.showAdvanced();
- new Form.Check(self.advanced_toggle);
+ self.tabs_container = new Element('ul.tabs');
+
+ self.containers = new Element('form.uniForm.containers', {
+ 'events': {
+ 'click:relay(.enabler.disabled h2)': function(e, el){
+ el.getPrevious().getElements('.check').fireEvent('click');
+ }
+ }
+ });
+ self.showAdvanced();
// Add content to tabs
var options = [];
Object.each(json.options, function(section, section_name){
- section['section_name'] = section_name;
+ section.section_name = section_name;
options.include(section);
- })
+ });
- options.sort(function(a, b){
- return (a.order || 100) - (b.order || 100)
- }).each(function(section){
+ options.stableSort(self.sortByOrder).each(function(section){
var section_name = section.section_name;
// Add groups to content
- section.groups.sortBy('order').each(function(group){
+ section.groups.stableSort(self.sortByOrder).each(function(group){
if(group.hidden) return;
if(self.wizard_only && !group.wizard)
@@ -170,13 +169,13 @@ Page.Settings = new Class({
// Create tab
if(!self.tabs[group.tab] || !self.tabs[group.tab].groups)
self.createTab(group.tab, {});
- var content_container = self.tabs[group.tab].content
+ var content_container = self.tabs[group.tab].content;
// Create subtab
if(group.subtab){
- if (!self.tabs[group.tab].subtabs[group.subtab])
- self.createSubTab(group.subtab, {}, self.tabs[group.tab], group.tab);
- var content_container = self.tabs[group.tab].subtabs[group.subtab].content
+ if(!self.tabs[group.tab].subtabs[group.subtab])
+ self.createSubTab(group.subtab, group, self.tabs[group.tab], group.tab);
+ content_container = self.tabs[group.tab].subtabs[group.subtab].content;
}
if(group.list && !self.lists[group.list]){
@@ -184,12 +183,10 @@ Page.Settings = new Class({
}
// Create the group
- if(!self.tabs[group.tab].groups[group.name]){
- var group_el = self.createGroup(group)
+ if(!self.tabs[group.tab].groups[group.name])
+ self.tabs[group.tab].groups[group.name] = self.createGroup(group)
.inject(group.list ? self.lists[group.list] : content_container)
.addClass('section_'+section_name);
- self.tabs[group.tab].groups[group.name] = group_el;
- }
// Create list if needed
if(group.type && group.type == 'list'){
@@ -200,9 +197,7 @@ Page.Settings = new Class({
}
// Add options to group
- group.options.sort(function(a, b){
- return (a.order || 100) - (b.order || 100)
- }).each(function(option){
+ group.options.stableSort(self.sortByOrder).each(function(option){
if(option.hidden) return;
var class_name = (option.type || 'string').capitalize();
var input = new Option[class_name](section_name, option.name, self.getValue(section_name, option.name), option);
@@ -213,8 +208,19 @@ Page.Settings = new Class({
});
});
- self.fireEvent('create');
- self.openTab();
+ requestTimeout(function(){
+ self.el.grab(
+ self.navigation
+ );
+
+ self.content.adopt(
+ self.tabs_container,
+ self.containers
+ );
+
+ self.fireEvent('create');
+ self.openTab();
+ }, 0);
},
@@ -222,9 +228,9 @@ Page.Settings = new Class({
var self = this;
if(self.tabs[tab_name] && self.tabs[tab_name].tab)
- return self.tabs[tab_name].tab
+ return self.tabs[tab_name].tab;
- var label = tab.label || (tab.name || tab_name).capitalize()
+ var label = tab.label || (tab.name || tab_name).capitalize();
var tab_el = new Element('li.t_'+tab_name).adopt(
new Element('a', {
'href': App.createUrl(self.name+'/'+tab_name),
@@ -235,16 +241,16 @@ Page.Settings = new Class({
if(!self.tabs[tab_name])
self.tabs[tab_name] = {
'label': label
- }
+ };
self.tabs[tab_name] = Object.merge(self.tabs[tab_name], {
'tab': tab_el,
'subtabs': {},
- 'content': new Element('div.tab_content.tab_'+tab_name).inject(self.containers),
+ 'content': new Element('div.tab_content.tab_' + tab_name).inject(self.containers),
'groups': {}
- })
+ });
- return self.tabs[tab_name]
+ return self.tabs[tab_name];
},
@@ -252,12 +258,12 @@ Page.Settings = new Class({
var self = this;
if(parent_tab.subtabs[tab_name])
- return parent_tab.subtabs[tab_name]
+ return parent_tab.subtabs[tab_name];
if(!parent_tab.subtabs_el)
parent_tab.subtabs_el = new Element('ul.subtabs').inject(parent_tab.tab);
- var label = tab.label || (tab.name || tab_name.replace('_', ' ')).capitalize()
+ var label = tab.subtab_label || tab_name.replace('_', ' ').capitalize();
var tab_el = new Element('li.t_'+tab_name).adopt(
new Element('a', {
'href': App.createUrl(self.name+'/'+parent_tab_name+'/'+tab_name),
@@ -268,7 +274,7 @@ Page.Settings = new Class({
if(!parent_tab.subtabs[tab_name])
parent_tab.subtabs[tab_name] = {
'label': label
- }
+ };
parent_tab.subtabs[tab_name] = Object.merge(parent_tab.subtabs[tab_name], {
'tab': tab_el,
@@ -276,34 +282,47 @@ Page.Settings = new Class({
'groups': {}
});
- return parent_tab.subtabs[tab_name]
+ return parent_tab.subtabs[tab_name];
},
createGroup: function(group){
- var self = this;
+ var hint;
+
+ if((typeOf(group.description) == 'array')){
+ hint = new Element('span.hint.more_hint', {
+ 'html': group.description[0]
+ });
+
+ createTooltip(group.description[1]).inject(hint);
+ }
+ else {
+ hint = new Element('span.hint', {
+ 'html': group.description || ''
+ });
+ }
+
+ var icon;
+ if(group.icon){
+ icon = new Element('span.icon').grab(new Element('img', {
+ 'src': 'data:image/png;base64,' + group.icon
+ }));
+ }
+
+ var label = new Element('span.group_label', {
+ 'text': group.label || (group.name).capitalize()
+ });
- var group_el = new Element('fieldset', {
+ return new Element('fieldset', {
'class': (group.advanced ? 'inlineLabels advanced' : 'inlineLabels') + ' group_' + (group.name || '') + ' subtab_' + (group.subtab || '')
- }).adopt(
- new Element('h2', {
- 'text': group.label || (group.name).capitalize()
- }).adopt(
- new Element('span.hint', {
- 'html': group.description || ''
- })
- )
- )
+ }).grab(
+ new Element('h2').adopt(icon, label, hint)
+ );
- return group_el
},
-
+
createList: function(content_container){
- return new Element('div.option_list').grab(
- new Element('h3', {
- 'text': 'Enable another'
- })
- ).inject(content_container)
+ return new Element('div.option_list').inject(content_container);
}
});
@@ -312,13 +331,13 @@ var OptionBase = new Class({
Implements: [Options, Events],
- klass: 'textInput',
- focused_class : 'focused',
+ klass: '',
+ focused_class: 'focused',
save_on_change: true,
initialize: function(section, name, value, options){
- var self = this
- self.setOptions(options)
+ var self = this;
+ self.setOptions(options);
self.section = section;
self.name = name;
@@ -335,7 +354,7 @@ var OptionBase = new Class({
'keyup': self.changed.bind(self)
});
- self.addEvent('injected', self.afterInject.bind(self))
+ self.addEvent('injected', self.afterInject.bind(self));
},
@@ -343,32 +362,45 @@ var OptionBase = new Class({
* Create the element
*/
createBase: function(){
- var self = this
- self.el = new Element('div.ctrlHolder')
+ var self = this;
+ self.el = new Element('div.ctrlHolder.' + self.section + '_' + self.name + (self.klass ? '.' + self.klass : ''));
},
- create: function(){},
+ create: function(){
+ },
createLabel: function(){
var self = this;
return new Element('label', {
'text': (self.options.label || self.options.name.replace('_', ' ')).capitalize()
- })
+ });
},
setAdvanced: function(){
- this.el.addClass(this.options.advanced ? 'advanced': '')
+ this.el.addClass(this.options.advanced ? 'advanced' : '');
},
createHint: function(){
var self = this;
- if(self.options.description)
- new Element('p.formHint', {
- 'html': self.options.description
- }).inject(self.el);
+ if(self.options.description){
+
+ if((typeOf(self.options.description) == 'array')){
+ var hint = new Element('p.formHint.more_hint', {
+ 'html': self.options.description[0]
+ }).inject(self.el);
+
+ createTooltip(self.options.description[1]).inject(hint);
+ }
+ else {
+ new Element('p.formHint', {
+ 'html': self.options.description || ''
+ }).inject(self.el);
+ }
+ }
},
- afterInject: function(){},
+ afterInject: function(){
+ },
// Element has changed, do something
changed: function(){
@@ -376,22 +408,25 @@ var OptionBase = new Class({
if(self.getValue() != self.previous_value){
if(self.save_on_change){
- if(self.changed_timer) clearTimeout(self.changed_timer);
- self.changed_timer = self.save.delay(300, self);
+ if(self.changed_timer) clearRequestTimeout(self.changed_timer);
+ self.changed_timer = requestTimeout(self.save.bind(self), 300);
}
- self.fireEvent('change')
+ self.fireEvent('change');
}
},
save: function(){
- var self = this;
+ var self = this,
+ value = self.getValue();
+
+ App.fireEvent('setting.save.'+self.section+'.'+self.name, value);
Api.request('settings.save', {
'data': {
'section': self.section,
'name': self.name,
- 'value': self.getValue()
+ 'value': value
},
'useSpinner': true,
'spinnerOptions': {
@@ -410,9 +445,9 @@ var OptionBase = new Class({
self.previous_value = self.getValue();
self.el.addClass(sc);
- (function(){
+ requestTimeout(function(){
self.el.removeClass(sc);
- }).delay(3000, self);
+ }, 3000);
},
setName: function(name){
@@ -421,7 +456,7 @@ var OptionBase = new Class({
postName: function(){
var self = this;
- return self.section +'['+self.name+']';
+ return self.section + '[' + self.name + ']';
},
getValue: function(){
@@ -441,20 +476,20 @@ var OptionBase = new Class({
toElement: function(){
return this.el;
}
-})
+});
-var Option = {}
+var Option = {};
Option.String = new Class({
Extends: OptionBase,
type: 'string',
create: function(){
- var self = this
+ var self = this;
self.el.adopt(
self.createLabel(),
- self.input = new Element('input.inlay', {
+ self.input = new Element('input', {
'type': 'text',
'name': self.postName(),
'value': self.getSettingValue(),
@@ -464,7 +499,7 @@ Option.String = new Class({
},
getPlaceholder: function(){
- return this.options.placeholder
+ return this.options.placeholder;
}
});
@@ -472,28 +507,25 @@ Option.Dropdown = new Class({
Extends: OptionBase,
create: function(){
- var self = this
+ var self = this;
self.el.adopt(
self.createLabel(),
- self.input = new Element('select', {
- 'name': self.postName()
- })
- )
+ new Element('div.select_wrapper.icon-dropdown').grab(
+ self.input = new Element('select', {
+ 'name': self.postName()
+ })
+ )
+ );
Object.each(self.options.values, function(value){
new Element('option', {
'text': value[0],
'value': value[1]
- }).inject(self.input)
- })
+ }).inject(self.input);
+ });
self.input.set('value', self.getSettingValue());
-
- var dd = new Form.Dropdown(self.input, {
- 'onChange': self.changed.bind(self)
- });
- self.input = dd.input;
}
});
@@ -505,11 +537,11 @@ Option.Checkbox = new Class({
create: function(){
var self = this;
- var randomId = 'r-'+randomString()
+ var randomId = 'r-' + randomString();
self.el.adopt(
self.createLabel().set('for', randomId),
- self.input = new Element('input.inlay', {
+ self.input = new Element('input', {
'name': self.postName(),
'type': 'checkbox',
'checked': self.getSettingValue(),
@@ -517,8 +549,6 @@ Option.Checkbox = new Class({
})
);
- new Form.Check(self.input);
-
},
getValue: function(){
@@ -534,12 +564,20 @@ Option.Password = new Class({
create: function(){
var self = this;
- self.parent()
- self.input.set('type', 'password')
+ self.el.adopt(
+ self.createLabel(),
+ self.input = new Element('input', {
+ 'type': 'text',
+ 'name': self.postName(),
+ 'value': self.getSettingValue() ? '********' : '',
+ 'placeholder': self.getPlaceholder()
+ })
+ );
self.input.addEvent('focus', function(){
- self.input.set('value', '')
- })
+ self.input.set('value', '');
+ self.input.set('type', 'password');
+ });
}
});
@@ -555,14 +593,16 @@ Option.Enabler = new Class({
var self = this;
self.el.adopt(
- self.input = new Element('input.inlay', {
- 'type': 'checkbox',
- 'checked': self.getSettingValue(),
- 'id': 'r-'+randomString()
- })
+ new Element('label.switch').adopt(
+ self.input = new Element('input', {
+ 'type': 'checkbox',
+ 'checked': self.getSettingValue(),
+ 'id': 'r-'+randomString()
+ }),
+ new Element('div.toggle')
+ )
);
- new Form.Check(self.input);
},
changed: function(){
@@ -576,18 +616,18 @@ Option.Enabler = new Class({
self.parentFieldset[ enabled ? 'removeClass' : 'addClass']('disabled');
- if(self.parentList)
- self.parentFieldset.inject(self.parentList.getElement('h3'), enabled ? 'before' : 'after');
+ //if(self.parentList)
+ // self.parentFieldset.inject(self.parentList.getElement('h3'), enabled ? 'before' : 'after');
},
afterInject: function(){
var self = this;
- self.parentFieldset = self.el.getParent('fieldset').addClass('enabler')
+ self.parentFieldset = self.el.getParent('fieldset').addClass('enabler');
self.parentList = self.parentFieldset.getParent('.option_list');
- self.el.inject(self.parentFieldset, 'top')
- self.checkState()
+ self.el.inject(self.parentFieldset, 'top');
+ self.checkState();
}
});
@@ -608,19 +648,29 @@ Option.Directory = new Class({
browser: null,
save_on_change: false,
use_cache: false,
+ current_dir: '',
create: function(){
var self = this;
self.el.adopt(
self.createLabel(),
- self.directory_inlay = new Element('span.directory.inlay', {
+ self.directory_inlay = new Element('span.directory', {
'events': {
'click': self.showBrowser.bind(self)
}
}).adopt(
- self.input = new Element('span', {
- 'text': self.getSettingValue()
+ self.input = new Element('input', {
+ 'value': self.getSettingValue(),
+ 'events': {
+ 'change': self.filterDirectory.bind(self),
+ 'keydown': function(e){
+ if(e.key == 'enter' || e.key == 'tab')
+ (e).stop();
+ },
+ 'keyup': self.filterDirectory.bind(self),
+ 'paste': self.filterDirectory.bind(self)
+ }
})
)
);
@@ -628,92 +678,159 @@ Option.Directory = new Class({
self.cached = {};
},
+ filterDirectory: function(e){
+ var self = this,
+ value = self.getValue(),
+ path_sep = Api.getOption('path_sep'),
+ active_selector = 'li:not(.blur):not(.empty)',
+ first;
+
+ if(e.key == 'enter' || e.key == 'tab'){
+ (e).stop();
+
+ first = self.dir_list.getElement(active_selector);
+ if(first){
+ self.selectDirectory(first.get('data-value'));
+ }
+ }
+ else {
+
+ // New folder
+ if(value.substr(-1) == path_sep){
+ if(self.current_dir != value)
+ self.selectDirectory(value);
+ }
+ else {
+ var pd = self.getParentDir(value);
+ if(self.current_dir != pd)
+ self.getDirs(pd);
+
+ var folder_filter = value.split(path_sep).getLast();
+ self.dir_list.getElements('li').each(function(li){
+ var valid = li.get('text').substr(0, folder_filter.length).toLowerCase() != folder_filter.toLowerCase();
+ li[valid ? 'addClass' : 'removeClass']('blur');
+ });
+
+ first = self.dir_list.getElement(active_selector);
+ if(first){
+ if(!self.dir_list_scroll)
+ self.dir_list_scroll = new Fx.Scroll(self.dir_list, {
+ 'transition': 'quint:in:out'
+ });
+
+ self.dir_list_scroll.toElement(first);
+ }
+ }
+ }
+ },
+
selectDirectory: function(dir){
var self = this;
- self.input.set('text', dir);
+ self.input.set('value', dir);
+
+ self.getDirs();
+ },
+
+ previousDirectory: function(){
+ var self = this;
- self.getDirs()
+ self.selectDirectory(self.getParentDir());
},
- previousDirectory: function(e){
+ caretAtEnd: function(){
var self = this;
- self.selectDirectory(self.getParentDir())
+ self.input.focus();
+
+ if (typeof self.input.selectionStart == "number") {
+ self.input.selectionStart = self.input.selectionEnd = self.input.get('value').length;
+ } else if (typeof el.createTextRange != "undefined") {
+ self.input.focus();
+ var range = self.input.createTextRange();
+ range.collapse(false);
+ range.select();
+ }
},
showBrowser: function(){
var self = this;
+ // Move caret to back of the input
+ if(!self.browser || self.browser && !self.browser.isVisible())
+ self.caretAtEnd();
+
if(!self.browser){
self.browser = new Element('div.directory_list').adopt(
- new Element('div.pointer'),
- new Element('div.actions').adopt(
- self.back_button = new Element('a.back', {
- 'html': '',
- 'events': {
- 'click': self.previousDirectory.bind(self)
- }
- }),
- new Element('label', {
- 'text': 'Hidden folders'
- }).adopt(
- self.show_hidden = new Element('input[type=checkbox].inlay', {
+ self.pointer = new Element('div.pointer'),
+ new Element('div.wrapper').adopt(
+ new Element('div.actions').adopt(
+ self.back_button = new Element('a.back', {
+ 'html': '',
'events': {
- 'change': self.getDirs.bind(self)
+ 'click': self.previousDirectory.bind(self)
}
- })
- )
- ),
- self.dir_list = new Element('ul', {
- 'events': {
- 'click:relay(li:not(.empty))': function(e, el){
- (e).preventDefault();
- self.selectDirectory(el.get('data-value'))
- },
- 'mousewheel': function(e){
- (e).stopPropagation();
- }
- }
- }),
- new Element('div.actions').adopt(
- new Element('a.clear.button', {
- 'text': 'Clear',
+ }),
+ new Element('label', {
+ 'text': 'Hidden folders'
+ }).adopt(
+ self.show_hidden = new Element('input[type=checkbox]', {
+ 'events': {
+ 'change': function(){
+ self.getDirs();
+ }
+ }
+ })
+ )
+ ),
+ self.dir_list = new Element('ul', {
'events': {
- 'click': function(e){
- self.input.set('text', '');
- self.hideBrowser(e, true);
+ 'click:relay(li:not(.empty))': function(e, el){
+ (e).preventDefault();
+ self.selectDirectory(el.get('data-value'));
+ },
+ 'mousewheel': function(e){
+ (e).stopPropagation();
}
}
}),
- new Element('a.cancel', {
- 'text': 'Cancel',
- 'events': {
- 'click': self.hideBrowser.bind(self)
- }
- }),
- new Element('span', {
- 'text': 'or'
- }),
- self.save_button = new Element('a.button.save', {
- 'text': 'Save',
- 'events': {
- 'click': function(e){
- self.hideBrowser(e, true)
+ new Element('div.actions').adopt(
+ new Element('a.clear.button', {
+ 'text': 'Clear',
+ 'events': {
+ 'click': function(e){
+ self.input.set('value', '');
+ self.hideBrowser(e, true);
+ }
}
- }
- })
+ }),
+ new Element('a.cancel', {
+ 'text': 'Cancel',
+ 'events': {
+ 'click': self.hideBrowser.bind(self)
+ }
+ }),
+ new Element('span', {
+ 'text': 'or'
+ }),
+ self.save_button = new Element('a.button.save', {
+ 'text': 'Save',
+ 'events': {
+ 'click': function(e){
+ self.hideBrowser(e, true);
+ }
+ }
+ })
+ )
)
).inject(self.directory_inlay, 'before');
-
- new Form.Check(self.show_hidden);
}
- self.initial_directory = self.input.get('text');
+ self.initial_directory = self.input.get('value');
- self.getDirs()
- self.browser.show()
- self.el.addEvent('outerClick', self.hideBrowser.bind(self))
+ self.getDirs();
+ self.browser.show();
+ self.el.addEvent('outerClick', self.hideBrowser.bind(self));
},
hideBrowser: function(e, save){
@@ -721,40 +838,40 @@ Option.Directory = new Class({
(e).preventDefault();
if(save)
- self.save()
+ self.save();
else
- self.input.set('text', self.initial_directory);
+ self.input.set('value', self.initial_directory);
- self.browser.hide()
- self.el.removeEvents('outerClick')
+ self.browser.hide();
+ self.el.removeEvents('outerClick');
},
fillBrowser: function(json){
- var self = this;
+ var self = this,
+ v = self.getValue();
self.data = json;
- var v = self.getValue();
- var previous_dir = self.getParentDir();
+ var previous_dir = json.parent;
- if(v == '')
- self.input.set('text', json.home);
+ if(v === '')
+ self.input.set('value', json.home);
- if(previous_dir != v && previous_dir.length >= 1 && !json.is_root){
+ if(previous_dir.length >= 1 && !json.is_root){
var prev_dirname = self.getCurrentDirname(previous_dir);
if(previous_dir == json.home)
- prev_dirname = 'Home';
- else if (previous_dir == '/' && json.platform == 'nt')
+ prev_dirname = 'Home Folder';
+ else if(previous_dir == '/' && json.platform == 'nt')
prev_dirname = 'Computer';
- self.back_button.set('data-value', previous_dir)
- self.back_button.set('html', '« '+prev_dirname)
- self.back_button.show()
+ self.back_button.set('data-value', previous_dir);
+ self.back_button.set('html', '« ' + prev_dirname);
+ self.back_button.show();
}
else {
- self.back_button.hide()
+ self.back_button.hide();
}
if(self.use_cache)
@@ -769,21 +886,25 @@ Option.Directory = new Class({
new Element('li', {
'data-value': dir,
'text': self.getCurrentDirname(dir)
- }).inject(self.dir_list)
+ }).inject(self.dir_list);
});
else
new Element('li.empty', {
'text': 'Selected folder is empty'
- }).inject(self.dir_list)
- },
+ }).inject(self.dir_list);
- getDirs: function(){
- var self = this;
+ //fix for webkit type browsers to refresh the dom for the file browser
+ //http://stackoverflow.com/questions/3485365/how-can-i-force-webkit-to-redraw-repaint-to-propagate-style-changes
+ self.dir_list.setStyle('webkitTransform', 'scale(1)');
+ self.caretAtEnd();
+ },
- var c = self.getValue();
+ getDirs: function(dir){
+ var self = this,
+ c = dir || self.getValue();
if(self.cached[c] && self.use_cache){
- self.fillBrowser()
+ self.fillBrowser();
}
else {
Api.request('directory.list', {
@@ -791,8 +912,11 @@ Option.Directory = new Class({
'path': c,
'show_hidden': +self.show_hidden.checked
},
- 'onComplete': self.fillBrowser.bind(self)
- })
+ 'onComplete': function(json){
+ self.current_dir = c;
+ self.fillBrowser(json);
+ }
+ });
}
},
@@ -805,23 +929,21 @@ Option.Directory = new Class({
var v = dir || self.getValue();
var sep = Api.getOption('path_sep');
var dirs = v.split(sep);
- if(dirs.pop() == '')
- dirs.pop();
+ if(dirs.pop() === '')
+ dirs.pop();
- return dirs.join(sep) + sep
+ return dirs.join(sep) + sep;
},
getCurrentDirname: function(dir){
- var self = this;
-
var dir_split = dir.split(Api.getOption('path_sep'));
- return dir_split[dir_split.length-2] || Api.getOption('path_sep')
+ return dir_split[dir_split.length-2] || Api.getOption('path_sep');
},
getValue: function(){
var self = this;
- return self.input.get('text');
+ return self.input.get('value');
}
});
@@ -861,8 +983,8 @@ Option.Directories = new Class({
var parent = self.el.getParent('fieldset');
var dirs = parent.getElements('.multi_directory');
- if(dirs.length == 0)
- $(dir).inject(parent)
+ if(dirs.length === 0)
+ $(dir).inject(parent);
else
$(dir).inject(dirs.getLast(), 'after');
@@ -876,7 +998,7 @@ Option.Directories = new Class({
$(dir).addClass('is_empty');
// Add remove button
- new Element('a.icon.delete', {
+ new Element('a.icon-delete.delete', {
'events': {
'click': self.delItem.bind(self, dir)
}
@@ -899,7 +1021,7 @@ Option.Directories = new Class({
saveItems: function(){
var self = this;
- var dirs = []
+ var dirs = [];
self.directories.each(function(dir){
if(dir.getValue()){
$(dir).removeClass('is_empty');
@@ -921,16 +1043,20 @@ Option.Directories = new Class({
Option.Choice = new Class({
Extends: Option.String,
+ klass: 'choice',
afterInject: function(){
var self = this;
- self.tags = [];
- self.replaceInput();
-
- self.select = new Element('select').adopt(
- new Element('option[text=Add option]')
- ).inject(self.tag_input, 'after');
+ var wrapper = new Element('div.select_wrapper.icon-dropdown').grab(
+ self.select = new Element('select.select', {
+ 'events': {
+ 'change': self.addSelection.bind(self)
+ }
+ }).grab(
+ new Element('option[text=Add option]')
+ )
+ );
var o = self.options.options;
Object.each(o.choices, function(label, choice){
@@ -940,333 +1066,14 @@ Option.Choice = new Class({
}).inject(self.select);
});
- self.select = new Form.Dropdown(self.select, {
- 'onChange': self.addSelection.bind(self)
- });
- },
-
- replaceInput: function(){
- var self = this;
- self.initialized = self.initialized ? self.initialized+1 : 1;
-
- var value = self.getValue();
- var matches = value.match(/<([^>]*)>/g);
-
- self.tag_input = new Element('ul.inlay', {
- 'events': {
- 'click': function(e){
- if(e.target == self.tag_input){
- var input = self.tag_input.getElement('li:last-child input');
- input.fireEvent('focus');
- input.focus();
- input.setCaretPosition(input.get('value').length);
- }
-
- self.el.addEvent('outerClick', function(){
- self.reset();
- self.el.removeEvents('outerClick');
- })
- }
- }
- }).inject(self.input, 'after');
- self.el.addClass('tag_input');
-
- var mtches = []
- if(matches)
- matches.each(function(match, mnr){
- var pos = value.indexOf(match),
- msplit = [value.substr(0, pos), value.substr(pos, match.length), value.substr(pos+match.length)];
-
- msplit.each(function(matchsplit, snr){
- if(msplit.length-1 == snr){
- value = matchsplit;
-
- if(matches.length-1 == mnr)
- mtches.append([value]);
-
- return;
- }
- mtches.append([value == matchsplit ? match : matchsplit]);
- });
- });
-
- if(mtches.length == 0 && value != '')
- mtches.include(value);
-
- mtches.each(self.addTag.bind(self));
-
- self.addLastTag();
-
- // Sortable
- self.sortable = new Sortables(self.tag_input, {
- 'revert': true,
- 'handle': '',
- 'opacity': 0.5,
- 'onComplete': function(){
- self.setOrder();
- self.reset();
- }
- });
-
- // Calc width on show
- var input_group = self.tag_input.getParent('.tab_content');
- input_group.addEvent('activate', self.setAllWidth.bind(self));
- },
-
- addLastTag: function(){
- if(this.tag_input.getElement('li.choice:last-child') || !this.tag_input.getElement('li'))
- this.addTag('');
- },
-
- addTag: function(tag){
- var self = this;
- tag = new Option.Choice.Tag(tag, {
- 'onChange': self.setOrder.bind(self),
- 'onBlur': function(){
- self.addLastTag();
- },
- 'onGoLeft': function(){
- self.goLeft(this)
- },
- 'onGoRight': function(){
- self.goRight(this)
- }
- });
- $(tag).inject(self.tag_input);
-
- if(self.initialized > 1)
- tag.setWidth();
- else
- (function(){ tag.setWidth(); }).delay(10, self);
-
- self.tags.include(tag);
-
- return tag;
- },
-
- goLeft: function(from_tag){
- var self = this;
-
- from_tag.blur();
-
- var prev_index = self.tags.indexOf(from_tag)-1;
- if(prev_index >= 0)
- self.tags[prev_index].selectFrom('right')
- else
- from_tag.focus();
+ wrapper.inject(self.input, 'after');
},
- goRight: function(from_tag){
- var self = this;
-
- from_tag.blur();
-
- var next_index = self.tags.indexOf(from_tag)+1;
- if(next_index < self.tags.length)
- self.tags[next_index].selectFrom('left')
- else
- from_tag.focus();
- },
-
- setOrder: function(){
- var self = this;
-
- var value = '';
- self.tag_input.getElements('li').each(function(el){
- value += el.getElement('span').get('text');
- });
- self.addLastTag();
-
- self.input.set('value', value);
- self.input.fireEvent('change');
- self.setAllWidth();
- },
addSelection: function(){
var self = this;
-
- var tag = self.addTag(self.el.getElement('.selection input').get('value'));
- self.sortable.addItems($(tag));
- self.setOrder();
- self.setAllWidth();
- },
-
- reset: function(){
- var self = this;
-
- self.tag_input.destroy();
- self.sortable.detach();
-
- self.replaceInput();
- self.setAllWidth();
- },
-
- setAllWidth: function(){
- var self = this;
- self.tags.each(function(tag){
- tag.setWidth.delay(10, tag);
- });
- }
-
-});
-
-Option.Choice.Tag = new Class({
-
- Implements: [Options, Events],
-
- options: {
- 'pre': '<',
- 'post': '>'
- },
-
- initialize: function(tag, options){
- var self = this;
- self.setOptions(options);
-
- self.tag = tag;
- self.is_choice = tag.substr(0, 1) == self.options.pre && tag.substr(-1) == self.options.post;
-
- self.create();
- },
-
- create: function(){
- var self = this;
-
- self.el = new Element('li', {
- 'class': self.is_choice ? 'choice' : '',
- 'styles': {
- 'border': 0
- },
- 'events': {
- 'mouseover': !self.is_choice ? self.fireEvent.bind(self, 'focus') : function(){}
- }
- }).adopt(
- self.input = new Element(self.is_choice ? 'span' : 'input', {
- 'text': self.tag,
- 'value': self.tag,
- 'styles': {
- 'width': 0
- },
- 'events': {
- 'keyup': self.is_choice ? null : function(e){
- var current_caret_pos = self.input.getCaretPosition();
- if(e.key == 'left' && current_caret_pos == self.last_caret_pos){
- self.fireEvent('goLeft');
- }
- else if (e.key == 'right' && self.last_caret_pos === current_caret_pos){
- self.fireEvent('goRight');
- }
- self.last_caret_pos = self.input.getCaretPosition();
-
- self.setWidth();
- self.fireEvent('change');
- },
- 'focus': self.fireEvent.bind(self, 'focus'),
- 'blur': self.fireEvent.bind(self, 'blur')
- }
- }),
- self.span = !self.is_choice ? new Element('span', {
- 'text': self.tag
- }) : null,
- self.del_button = new Element('a.delete', {
- 'events': {
- 'click': self.del.bind(self)
- }
- })
- );
-
- self.addEvent('focus', self.setWidth.bind(self));
-
- },
-
- blur: function(){
- var self = this;
-
- self.input.blur();
-
- self.selected = false;
- self.el.removeClass('selected');
- self.input.removeEvents('outerClick');
- },
-
- focus: function(){
- var self = this;
- if(!self.is_choice){
- this.input.focus();
- }
- else {
- if(self.selected) return;
- self.selected = true;
- self.el.addClass('selected');
- self.input.addEvent('outerClick', self.blur.bind(self));
-
- var temp_input = new Element('input', {
- 'events': {
- 'keydown': function(e){
- e.stop();
-
- if(e.key == 'right'){
- self.fireEvent('goRight');
- this.destroy();
- }
- else if (e.key == 'left'){
- self.fireEvent('goLeft');
- this.destroy();
- }
- else if (e.key == 'backspace'){
- self.del();
- this.destroy();
- self.fireEvent('goLeft');
- }
- }
- },
- 'styles': {
- 'height': 0,
- 'width': 0,
- 'position': 'absolute',
- 'top': -200
- }
- });
- self.el.adopt(temp_input)
- temp_input.focus();
- }
- },
-
- selectFrom: function(direction){
- var self = this;
-
- if(!direction || self.is_choice){
- self.focus();
- }
- else {
- self.focus();
- var position = direction == 'left' ? 0 : self.input.get('value').length;
- self.input.setCaretPosition(position);
- }
-
- },
-
- setWidth: function(){
- var self = this;
-
- if(self.span && self.input){
- self.span.set('text', self.input.get('value'));
- self.input.setStyle('width', self.span.getSize().x+2);
- }
- },
-
- del: function(){
- var self = this;
- self.el.destroy();
- self.fireEvent('change');
- },
-
- getValue: function(){
- return this.span.get('text');
- },
-
- toElement: function(){
- return this.el;
+ self.input.set('value', self.input.get('value') + self.select.get('value'));
+ self.input.fireEvent('change');
}
});
@@ -1280,9 +1087,11 @@ Option.Combined = new Class({
self.fieldset = self.input.getParent('fieldset');
self.combined_list = new Element('div.combined_table').inject(self.fieldset.getElement('h2'), 'after');
- self.values = {}
- self.inputs = {}
- self.items = []
+ self.values = {};
+ self.inputs = {};
+ self.items = [];
+ self.labels = {};
+ self.descriptions = {};
self.options.combine.each(function(name){
@@ -1290,27 +1099,31 @@ Option.Combined = new Class({
var values = self.inputs[name].get('value').split(',');
values.each(function(value, nr){
- if (!self.values[nr]) self.values[nr] = {};
+ if(!self.values[nr]) self.values[nr] = {};
self.values[nr][name] = value.trim();
});
self.inputs[name].getParent('.ctrlHolder').setStyle('display', 'none');
- self.inputs[name].addEvent('change', self.addEmpty.bind(self))
+ self.inputs[name].addEvent('change', self.addEmpty.bind(self));
});
- var head = new Element('div.head').inject(self.combined_list)
+ var head = new Element('div.head').inject(self.combined_list);
Object.each(self.inputs, function(input, name){
+ var _in = input.getNext();
+ self.labels[name] = input.getPrevious().get('text');
+ self.descriptions[name] = _in ? _in.get('text') : '';
+
new Element('abbr', {
'class': name,
- 'text': input.getPrevious().get('text'),
- //'title': input.getNext().get('text')
- }).inject(head)
- })
+ 'text': self.labels[name],
+ 'title': self.descriptions[name]
+ }).inject(head);
+ });
- Object.each(self.values, function(item, nr){
+ Object.each(self.values, function(item){
self.createItem(item);
});
@@ -1322,22 +1135,22 @@ Option.Combined = new Class({
addEmpty: function(){
var self = this;
- if(self.add_empty_timeout) clearTimeout(self.add_empty_timeout);
+ if(self.add_empty_timeout) clearRequestTimeout(self.add_empty_timeout);
var has_empty = 0;
self.items.each(function(ctrl_holder){
var empty_count = 0;
self.options.combine.each(function(name){
- var input = ctrl_holder.getElement('input.'+name)
- if(input.get('value') == '' || input.get('type') == 'checkbox')
- empty_count++
+ var input = ctrl_holder.getElement('input.' + name);
+ if(input.get('value') === '' || input.get('type') == 'checkbox')
+ empty_count++;
});
has_empty += (empty_count == self.options.combine.length) ? 1 : 0;
ctrl_holder[(empty_count == self.options.combine.length) ? 'addClass' : 'removeClass']('is_empty');
});
if(has_empty > 0) return;
- self.add_empty_timeout = setTimeout(function(){
+ self.add_empty_timeout = requestTimeout(function(){
self.createItem({'use': true});
}, 10);
},
@@ -1350,24 +1163,22 @@ Option.Combined = new Class({
value_empty = 0;
self.options.combine.each(function(name){
- var value = values[name] || ''
+ var value = values[name] || '';
if(name.indexOf('use') != -1){
- var checkbox = new Element('input[type=checkbox].inlay.'+name, {
+ var checkbox = new Element('input[type=checkbox].'+name, {
'checked': +value,
'events': {
'click': self.saveCombined.bind(self),
'change': self.saveCombined.bind(self)
}
}).inject(item);
-
- new Form.Check(checkbox);
}
else {
value_count++;
- new Element('input[type=text].inlay.'+name, {
+ new Element('input[type=text].'+name, {
'value': value,
- 'placeholder': name,
+ 'placeholder': self.labels[name] || name,
'events': {
'keyup': self.saveCombined.bind(self),
'change': self.saveCombined.bind(self)
@@ -1383,11 +1194,11 @@ Option.Combined = new Class({
item[value_empty == value_count ? 'addClass' : 'removeClass']('is_empty');
- new Element('a.icon.delete', {
+ new Element('a.icon-cancel.delete', {
'events': {
'click': self.deleteCombinedItem.bind(self)
}
- }).inject(item)
+ }).inject(item);
self.items.include(item);
@@ -1395,10 +1206,9 @@ Option.Combined = new Class({
},
saveCombined: function(){
- var self = this;
-
+ var self = this,
+ temp = {};
- var temp = {}
self.items.each(function(item, nr){
self.options.combine.each(function(name){
var input = item.getElement('input.'+name);
@@ -1407,7 +1217,7 @@ Option.Combined = new Class({
if(!temp[name]) temp[name] = [];
temp[name][nr] = input.get('type') == 'checkbox' ? +input.get('checked') : input.get('value').trim();
- })
+ });
});
self.options.combine.each(function(name){
@@ -1415,7 +1225,7 @@ Option.Combined = new Class({
self.inputs[name].fireEvent('change');
});
- self.addEmpty()
+ self.addEmpty();
},
@@ -1431,4 +1241,25 @@ Option.Combined = new Class({
self.saveCombined();
}
-});
\ No newline at end of file
+});
+
+var createTooltip = function(description){
+
+ var tip = new Element('div.tooltip', {
+ 'events': {
+ 'mouseenter': function(){
+ tip.addClass('shown');
+ },
+ 'mouseleave': function(){
+ tip.removeClass('shown');
+ }
+ }
+ }).adopt(
+ new Element('a.icon-info.info'),
+ new Element('div.tip', {
+ 'html': description
+ })
+ );
+
+ return tip;
+};
diff --git a/couchpotato/static/scripts/page/wanted.js b/couchpotato/static/scripts/page/wanted.js
deleted file mode 100644
index a9e0bc71f5..0000000000
--- a/couchpotato/static/scripts/page/wanted.js
+++ /dev/null
@@ -1,353 +0,0 @@
-Page.Wanted = new Class({
-
- Extends: PageBase,
-
- name: 'wanted',
- title: 'Gimmy gimmy gimmy!',
-
- indexAction: function(param){
- var self = this;
-
- if(!self.wanted){
-
- self.manual_search = new Element('a', {
- 'title': 'Force a search for the full wanted list',
- 'text': 'Search all wanted',
- 'events':{
- 'click': self.doFullSearch.bind(self, true)
- }
- });
-
- // Wanted movies
- self.wanted = new MovieList({
- 'identifier': 'wanted',
- 'status': 'active',
- 'actions': MovieActions,
- 'add_new': true,
- 'menu': [self.manual_search],
- 'on_empty_element': App.createUserscriptButtons().addClass('empty_wanted')
- });
- $(self.wanted).inject(self.el);
-
- // Check if search is in progress
- self.startProgressInterval();
- }
-
- },
-
- doFullSearch: function(full){
- var self = this;
-
- if(!self.search_in_progress){
-
- Api.request('searcher.full_search');
- self.startProgressInterval();
-
- }
-
- },
-
- startProgressInterval: function(){
- var self = this;
-
- var start_text = self.manual_search.get('text');
- self.progress_interval = setInterval(function(){
- if(self.search_progress && self.search_progress.running) return;
- self.search_progress = Api.request('searcher.progress', {
- 'onComplete': function(json){
- self.search_in_progress = true;
- if(!json.progress){
- clearInterval(self.progress_interval);
- self.search_in_progress = false;
- self.manual_search.set('text', start_text);
- }
- else {
- var progress = json.progress;
- self.manual_search.set('text', 'Searching.. (' + (((progress.total-progress.to_go)/progress.total)*100).round() + '%)');
- }
- }
- });
- }, 1000);
-
- }
-
-});
-
-var MovieActions = {};
-window.addEvent('domready', function(){
-
- MovieActions.Wanted = {
- 'IMDB': IMDBAction
- ,'Trailer': TrailerAction
- ,'Releases': ReleaseAction
- ,'Edit': new Class({
-
- Extends: MovieAction,
-
- create: function(){
- var self = this;
-
- self.el = new Element('a.edit', {
- 'title': 'Change movie information, like title and quality.',
- 'events': {
- 'click': self.editMovie.bind(self)
- }
- });
-
- },
-
- editMovie: function(e){
- var self = this;
- (e).preventDefault();
-
- if(!self.options_container){
- self.options_container = new Element('div.options').adopt(
- new Element('div.form').adopt(
- self.title_select = new Element('select', {
- 'name': 'title'
- }),
- self.profile_select = new Element('select', {
- 'name': 'profile'
- }),
- new Element('a.button.edit', {
- 'text': 'Save & Search',
- 'events': {
- 'click': self.save.bind(self)
- }
- })
- )
- ).inject(self.movie, 'top');
-
- Array.each(self.movie.data.library.titles, function(alt){
- new Element('option', {
- 'text': alt.title
- }).inject(self.title_select);
-
- if(alt['default'])
- self.title_select.set('value', alt.title);
- });
-
-
- Quality.getActiveProfiles().each(function(profile){
-
- var profile_id = profile.id ? profile.id : profile.data.id;
-
- new Element('option', {
- 'value': profile_id,
- 'text': profile.label ? profile.label : profile.data.label
- }).inject(self.profile_select);
-
- if(self.movie.profile && self.movie.profile.data && self.movie.profile.data.id == profile_id)
- self.profile_select.set('value', profile_id);
- });
-
- }
-
- self.movie.slide('in', self.options_container);
- },
-
- save: function(e){
- (e).preventDefault();
- var self = this;
-
- Api.request('movie.edit', {
- 'data': {
- 'id': self.movie.get('id'),
- 'default_title': self.title_select.get('value'),
- 'profile_id': self.profile_select.get('value')
- },
- 'useSpinner': true,
- 'spinnerTarget': $(self.movie),
- 'onComplete': function(){
- self.movie.quality.set('text', self.profile_select.getSelected()[0].get('text'));
- self.movie.title.set('text', self.title_select.getSelected()[0].get('text'));
- }
- });
-
- self.movie.slide('out');
- }
-
- })
-
- ,'Refresh': new Class({
-
- Extends: MovieAction,
-
- create: function(){
- var self = this;
-
- self.el = new Element('a.refresh', {
- 'title': 'Refresh the movie info and do a forced search',
- 'events': {
- 'click': self.doRefresh.bind(self)
- }
- });
-
- },
-
- doRefresh: function(e){
- var self = this;
- (e).preventDefault();
-
- Api.request('movie.refresh', {
- 'data': {
- 'id': self.movie.get('id')
- }
- });
- }
-
- })
-
- ,'Delete': new Class({
-
- Extends: MovieAction,
-
- Implements: [Chain],
-
- create: function(){
- var self = this;
-
- self.el = new Element('a.delete', {
- 'title': 'Remove the movie from this CP list',
- 'events': {
- 'click': self.showConfirm.bind(self)
- }
- });
-
- },
-
- showConfirm: function(e){
- var self = this;
- (e).preventDefault();
-
- if(!self.delete_container){
- self.delete_container = new Element('div.buttons.delete_container').adopt(
- new Element('a.cancel', {
- 'text': 'Cancel',
- 'events': {
- 'click': self.hideConfirm.bind(self)
- }
- }),
- new Element('span.or', {
- 'text': 'or'
- }),
- new Element('a.button.delete', {
- 'text': 'Delete ' + self.movie.title.get('text'),
- 'events': {
- 'click': self.del.bind(self)
- }
- })
- ).inject(self.movie, 'top');
- }
-
- self.movie.slide('in', self.delete_container);
-
- },
-
- hideConfirm: function(e){
- var self = this;
- (e).preventDefault();
-
- self.movie.slide('out');
- },
-
- del: function(e){
- (e).preventDefault();
- var self = this;
-
- var movie = $(self.movie);
-
- self.chain(
- function(){
- self.callChain();
- },
- function(){
- Api.request('movie.delete', {
- 'data': {
- 'id': self.movie.get('id'),
- 'delete_from': self.movie.list.options.identifier
- },
- 'onComplete': function(){
- movie.set('tween', {
- 'duration': 300,
- 'onComplete': function(){
- self.movie.destroy()
- }
- });
- movie.tween('height', 0);
- }
- });
- }
- );
-
- self.callChain();
-
- }
-
- })
- };
-
- MovieActions.Snatched = {
- 'IMDB': IMDBAction
- ,'Delete': MovieActions.Wanted.Delete
- };
-
- MovieActions.Done = {
- 'IMDB': IMDBAction
- ,'Edit': MovieActions.Wanted.Edit
- ,'Trailer': TrailerAction
- ,'Files': new Class({
-
- Extends: MovieAction,
-
- create: function(){
- var self = this;
-
- self.el = new Element('a.directory', {
- 'title': 'Available files',
- 'events': {
- 'click': self.showFiles.bind(self)
- }
- });
-
- },
-
- showFiles: function(e){
- var self = this;
- (e).preventDefault();
-
- if(!self.options_container){
- self.options_container = new Element('div.options').adopt(
- self.files_container = new Element('div.files.table')
- ).inject(self.movie, 'top');
-
- // Header
- new Element('div.item.head').adopt(
- new Element('span.name', {'text': 'File'}),
- new Element('span.type', {'text': 'Type'}),
- new Element('span.is_available', {'text': 'Available'})
- ).inject(self.files_container)
-
- Array.each(self.movie.data.releases, function(release){
-
- var rel = new Element('div.release').inject(self.files_container);
-
- Array.each(release.files, function(file){
- new Element('div.file.item').adopt(
- new Element('span.name', {'text': file.path}),
- new Element('span.type', {'text': File.Type.get(file.type_id).name}),
- new Element('span.available', {'text': file.available})
- ).inject(rel)
- });
- });
-
- }
-
- self.movie.slide('in', self.options_container);
- },
-
- })
- ,'Delete': MovieActions.Wanted.Delete
- };
-
-})
\ No newline at end of file
diff --git a/couchpotato/static/scripts/vendor/Array.stableSort.js b/couchpotato/static/scripts/vendor/Array.stableSort.js
new file mode 100644
index 0000000000..062c756635
--- /dev/null
+++ b/couchpotato/static/scripts/vendor/Array.stableSort.js
@@ -0,0 +1,56 @@
+/*
+---
+
+script: Array.stableSort.js
+
+description: Add a stable sort algorithm for all browsers
+
+license: MIT-style license.
+
+authors:
+ - Yorick Sijsling
+
+requires:
+ core/1.3: '*'
+
+provides:
+ - [Array.stableSort, Array.mergeSort]
+
+...
+*/
+
+(function() {
+
+ var defaultSortFunction = function(a, b) {
+ return a > b ? 1 : (a < b ? -1 : 0);
+ }
+
+ Array.implement({
+
+ stableSort: function(compare) {
+ // I would love some real feature recognition. Problem is that an unstable algorithm sometimes/often gives the same result as an unstable algorithm.
+ return (Browser.chrome || Browser.firefox2 || Browser.opera9) ? this.mergeSort(compare) : this.sort(compare);
+ },
+
+ mergeSort: function(compare, token) {
+ compare = compare || defaultSortFunction;
+ if (this.length > 1) {
+ // Split and sort both parts
+ var right = this.splice(Math.floor(this.length / 2)).mergeSort(compare);
+ var left = this.splice(0).mergeSort(compare); // 'this' is now empty.
+
+ // Merge parts together
+ while (left.length > 0 || right.length > 0) {
+ this.push(
+ right.length === 0 ? left.shift()
+ : left.length === 0 ? right.shift()
+ : compare(left[0], right[0]) > 0 ? right.shift()
+ : left.shift());
+ }
+ }
+ return this;
+ }
+
+ });
+})();
+
diff --git a/couchpotato/static/scripts/vendor/dynamics.js b/couchpotato/static/scripts/vendor/dynamics.js
new file mode 100644
index 0000000000..5a065fc218
--- /dev/null
+++ b/couchpotato/static/scripts/vendor/dynamics.js
@@ -0,0 +1,1989 @@
+// Generated by CoffeeScript 1.7.1
+(function() {
+ var Color, DecomposedMatrix, DecomposedMatrix2D, InterpolableArray, InterpolableColor, InterpolableObject, InterpolableWithUnit, Matrix, Matrix2D, Set, Vector, addTimeout, animationTick, animations, animationsTimeouts, applyDefaults, applyFrame, applyProperties, baseSVG, cacheFn, cancelTimeout, clone, createInterpolable, defaultValueForKey, degProperties, dynamics, getCurrentProperties, interpolate, isDocumentVisible, isSVGElement, lastTime, leftDelayForTimeout, makeArrayFn, observeVisibilityChange, parseProperties, prefixFor, propertyWithPrefix, pxProperties, rAF, roundf, runLoopPaused, runLoopRunning, runLoopTick, setRealTimeout, slow, slowRatio, startAnimation, startRunLoop, svgProperties, timeBeforeVisibilityChange, timeoutLastId, timeouts, toDashed, transformProperties, transformValueForProperty, unitForProperty,
+ __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; };
+
+ isDocumentVisible = function() {
+ return document.visibilityState === "visible" || (dynamics.tests != null);
+ };
+
+ observeVisibilityChange = (function() {
+ var fns;
+ fns = [];
+ if (typeof document !== "undefined" && document !== null) {
+ document.addEventListener("visibilitychange", function() {
+ var fn, _i, _len, _results;
+ _results = [];
+ for (_i = 0, _len = fns.length; _i < _len; _i++) {
+ fn = fns[_i];
+ _results.push(fn(isDocumentVisible()));
+ }
+ return _results;
+ });
+ }
+ return function(fn) {
+ return fns.push(fn);
+ };
+ })();
+
+ clone = function(o) {
+ var k, newO, v;
+ newO = {};
+ for (k in o) {
+ v = o[k];
+ newO[k] = v;
+ }
+ return newO;
+ };
+
+ cacheFn = function(func) {
+ var data;
+ data = {};
+ return function() {
+ var k, key, result, _i, _len;
+ key = "";
+ for (_i = 0, _len = arguments.length; _i < _len; _i++) {
+ k = arguments[_i];
+ key += k.toString() + ",";
+ }
+ result = data[key];
+ if (!result) {
+ data[key] = result = func.apply(this, arguments);
+ }
+ return result;
+ };
+ };
+
+ makeArrayFn = function(fn) {
+ return function(el) {
+ var args, i, res;
+ if (el instanceof Array || el instanceof NodeList || el instanceof HTMLCollection) {
+ res = (function() {
+ var _i, _ref, _results;
+ _results = [];
+ for (i = _i = 0, _ref = el.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
+ args = Array.prototype.slice.call(arguments, 1);
+ args.splice(0, 0, el[i]);
+ _results.push(fn.apply(this, args));
+ }
+ return _results;
+ }).apply(this, arguments);
+ return res;
+ }
+ return fn.apply(this, arguments);
+ };
+ };
+
+ applyDefaults = function(options, defaults) {
+ var k, v, _results;
+ _results = [];
+ for (k in defaults) {
+ v = defaults[k];
+ _results.push(options[k] != null ? options[k] : options[k] = v);
+ }
+ return _results;
+ };
+
+ applyFrame = function(el, properties) {
+ var k, v, _results;
+ if ((el.style != null)) {
+ return applyProperties(el, properties);
+ } else {
+ _results = [];
+ for (k in properties) {
+ v = properties[k];
+ _results.push(el[k] = v.format());
+ }
+ return _results;
+ }
+ };
+
+ applyProperties = function(el, properties) {
+ var isSVG, k, matrix, transforms, v;
+ properties = parseProperties(properties);
+ transforms = [];
+ isSVG = isSVGElement(el);
+ for (k in properties) {
+ v = properties[k];
+ if (transformProperties.contains(k)) {
+ transforms.push([k, v]);
+ } else {
+ if (v.format != null) {
+ v = v.format();
+ } else {
+ v = "" + v + (unitForProperty(k, v));
+ }
+ if (isSVG && svgProperties.contains(k)) {
+ el.setAttribute(k, v);
+ } else {
+ el.style[propertyWithPrefix(k)] = v;
+ }
+ }
+ }
+ if (transforms.length > 0) {
+ if (isSVG) {
+ matrix = new Matrix2D();
+ matrix.applyProperties(transforms);
+ return el.setAttribute("transform", matrix.decompose().format());
+ } else {
+ v = (transforms.map(function(transform) {
+ return transformValueForProperty(transform[0], transform[1]);
+ })).join(" ");
+ return el.style[propertyWithPrefix("transform")] = v;
+ }
+ }
+ };
+
+ isSVGElement = function(el) {
+ var _ref, _ref1;
+ if ((typeof SVGElement !== "undefined" && SVGElement !== null) && (typeof SVGSVGElement !== "undefined" && SVGSVGElement !== null)) {
+ return el instanceof SVGElement && !(el instanceof SVGSVGElement);
+ } else {
+ return (_ref = (_ref1 = dynamics.tests) != null ? typeof _ref1.isSVG === "function" ? _ref1.isSVG(el) : void 0 : void 0) != null ? _ref : false;
+ }
+ };
+
+ roundf = function(v, decimal) {
+ var d;
+ d = Math.pow(10, decimal);
+ return Math.round(v * d) / d;
+ };
+
+ Set = (function() {
+ function Set(array) {
+ var v, _i, _len;
+ this.obj = {};
+ for (_i = 0, _len = array.length; _i < _len; _i++) {
+ v = array[_i];
+ this.obj[v] = 1;
+ }
+ }
+
+ Set.prototype.contains = function(v) {
+ return this.obj[v] === 1;
+ };
+
+ return Set;
+
+ })();
+
+ toDashed = function(str) {
+ return str.replace(/([A-Z])/g, function($1) {
+ return "-" + $1.toLowerCase();
+ });
+ };
+
+ pxProperties = new Set('marginTop,marginLeft,marginBottom,marginRight,paddingTop,paddingLeft,paddingBottom,paddingRight,top,left,bottom,right,translateX,translateY,translateZ,perspectiveX,perspectiveY,perspectiveZ,width,height,maxWidth,maxHeight,minWidth,minHeight,borderRadius'.split(','));
+
+ degProperties = new Set('rotate,rotateX,rotateY,rotateZ,skew,skewX,skewY,skewZ'.split(','));
+
+ transformProperties = new Set('translate,translateX,translateY,translateZ,scale,scaleX,scaleY,scaleZ,rotate,rotateX,rotateY,rotateZ,rotateC,rotateCX,rotateCY,skew,skewX,skewY,skewZ,perspective'.split(','));
+
+ svgProperties = new Set('accent-height,ascent,azimuth,baseFrequency,baseline-shift,bias,cx,cy,d,diffuseConstant,divisor,dx,dy,elevation,filterRes,fx,fy,gradientTransform,height,k1,k2,k3,k4,kernelMatrix,kernelUnitLength,letter-spacing,limitingConeAngle,markerHeight,markerWidth,numOctaves,order,overline-position,overline-thickness,pathLength,points,pointsAtX,pointsAtY,pointsAtZ,r,radius,rx,ry,seed,specularConstant,specularExponent,stdDeviation,stop-color,stop-opacity,strikethrough-position,strikethrough-thickness,surfaceScale,target,targetX,targetY,transform,underline-position,underline-thickness,viewBox,width,x,x1,x2,y,y1,y2,z'.split(','));
+
+ unitForProperty = function(k, v) {
+ if (typeof v !== 'number') {
+ return '';
+ }
+ if (pxProperties.contains(k)) {
+ return 'px';
+ } else if (degProperties.contains(k)) {
+ return 'deg';
+ }
+ return '';
+ };
+
+ transformValueForProperty = function(k, v) {
+ var match, unit;
+ match = ("" + v).match(/^([0-9.-]*)([^0-9]*)$/);
+ if (match != null) {
+ v = match[1];
+ unit = match[2];
+ } else {
+ v = parseFloat(v);
+ }
+ v = roundf(parseFloat(v), 10);
+ if ((unit == null) || unit === "") {
+ unit = unitForProperty(k, v);
+ }
+ return "" + k + "(" + v + unit + ")";
+ };
+
+ parseProperties = function(properties) {
+ var axis, match, parsed, property, value, _i, _len, _ref;
+ parsed = {};
+ for (property in properties) {
+ value = properties[property];
+ if (transformProperties.contains(property)) {
+ match = property.match(/(translate|rotateC|rotate|skew|scale|perspective)(X|Y|Z|)/);
+ if (match && match[2].length > 0) {
+ parsed[property] = value;
+ } else {
+ _ref = ['X', 'Y', 'Z'];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ axis = _ref[_i];
+ parsed[match[1] + axis] = value;
+ }
+ }
+ } else {
+ parsed[property] = value;
+ }
+ }
+ return parsed;
+ };
+
+ defaultValueForKey = function(key) {
+ var v;
+ v = key === 'opacity' ? 1 : 0;
+ return "" + v + (unitForProperty(key, v));
+ };
+
+ getCurrentProperties = function(el, keys) {
+ var isSVG, key, matrix, properties, style, v, _i, _j, _len, _len1, _ref;
+ properties = {};
+ isSVG = isSVGElement(el);
+ if (el.style != null) {
+ style = window.getComputedStyle(el, null);
+ for (_i = 0, _len = keys.length; _i < _len; _i++) {
+ key = keys[_i];
+ if (transformProperties.contains(key)) {
+ if (properties['transform'] == null) {
+ if (isSVG) {
+ matrix = new Matrix2D((_ref = el.transform.baseVal.consolidate()) != null ? _ref.matrix : void 0);
+ } else {
+ matrix = Matrix.fromTransform(style[propertyWithPrefix('transform')]);
+ }
+ properties['transform'] = matrix.decompose();
+ }
+ } else {
+ v = style[key];
+ if ((v == null) && svgProperties.contains(key)) {
+ v = el.getAttribute(key);
+ }
+ if (v === "" || (v == null)) {
+ v = defaultValueForKey(key);
+ }
+ properties[key] = createInterpolable(v);
+ }
+ }
+ } else {
+ for (_j = 0, _len1 = keys.length; _j < _len1; _j++) {
+ key = keys[_j];
+ properties[key] = createInterpolable(el[key]);
+ }
+ }
+ return properties;
+ };
+
+ createInterpolable = function(value) {
+ var interpolable, klass, klasses, _i, _len;
+ klasses = [InterpolableColor, InterpolableArray, InterpolableObject, InterpolableWithUnit];
+ for (_i = 0, _len = klasses.length; _i < _len; _i++) {
+ klass = klasses[_i];
+ interpolable = klass.create(value);
+ if (interpolable != null) {
+ return interpolable;
+ }
+ }
+ return null;
+ };
+
+ InterpolableObject = (function() {
+ function InterpolableObject(obj) {
+ this.format = __bind(this.format, this);
+ this.interpolate = __bind(this.interpolate, this);
+ this.obj = obj;
+ }
+
+ InterpolableObject.prototype.interpolate = function(endInterpolable, t) {
+ var end, k, newObj, start, v;
+ start = this.obj;
+ end = endInterpolable.obj;
+ newObj = {};
+ for (k in start) {
+ v = start[k];
+ if (v.interpolate != null) {
+ newObj[k] = v.interpolate(end[k], t);
+ } else {
+ newObj[k] = v;
+ }
+ }
+ return new InterpolableObject(newObj);
+ };
+
+ InterpolableObject.prototype.format = function() {
+ return this.obj;
+ };
+
+ InterpolableObject.create = function(value) {
+ var k, obj, v;
+ if (value instanceof Object) {
+ obj = {};
+ for (k in value) {
+ v = value[k];
+ obj[k] = createInterpolable(v);
+ }
+ return new InterpolableObject(obj);
+ }
+ return null;
+ };
+
+ return InterpolableObject;
+
+ })();
+
+ InterpolableWithUnit = (function() {
+ function InterpolableWithUnit(value, prefix, suffix) {
+ this.prefix = prefix;
+ this.suffix = suffix;
+ this.format = __bind(this.format, this);
+ this.interpolate = __bind(this.interpolate, this);
+ this.value = parseFloat(value);
+ }
+
+ InterpolableWithUnit.prototype.interpolate = function(endInterpolable, t) {
+ var end, start;
+ start = this.value;
+ end = endInterpolable.value;
+ return new InterpolableWithUnit((end - start) * t + start, endInterpolable.prefix || this.prefix, endInterpolable.suffix || this.suffix);
+ };
+
+ InterpolableWithUnit.prototype.format = function() {
+ if ((this.prefix == null) && (this.suffix == null)) {
+ return roundf(this.value, 5);
+ }
+ return this.prefix + roundf(this.value, 5) + this.suffix;
+ };
+
+ InterpolableWithUnit.create = function(value) {
+ var match;
+ if (typeof value !== "string") {
+ return new InterpolableWithUnit(value);
+ }
+ match = ("" + value).match("([^0-9.+-]*)([0-9.+-]+)([^0-9.+-]*)");
+ if (match != null) {
+ return new InterpolableWithUnit(match[2], match[1], match[3]);
+ }
+ return null;
+ };
+
+ return InterpolableWithUnit;
+
+ })();
+
+ InterpolableArray = (function() {
+ function InterpolableArray(values, sep) {
+ this.values = values;
+ this.sep = sep;
+ this.format = __bind(this.format, this);
+ this.interpolate = __bind(this.interpolate, this);
+ }
+
+ InterpolableArray.prototype.interpolate = function(endInterpolable, t) {
+ var end, i, newValues, start, _i, _ref;
+ start = this.values;
+ end = endInterpolable.values;
+ newValues = [];
+ for (i = _i = 0, _ref = Math.min(start.length, end.length); 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
+ if (start[i].interpolate != null) {
+ newValues.push(start[i].interpolate(end[i], t));
+ } else {
+ newValues.push(start[i]);
+ }
+ }
+ return new InterpolableArray(newValues, this.sep);
+ };
+
+ InterpolableArray.prototype.format = function() {
+ var values;
+ values = this.values.map(function(val) {
+ if (val.format != null) {
+ return val.format();
+ } else {
+ return val;
+ }
+ });
+ if (this.sep != null) {
+ return values.join(this.sep);
+ } else {
+ return values;
+ }
+ };
+
+ InterpolableArray.createFromArray = function(arr, sep) {
+ var values;
+ values = arr.map(function(val) {
+ return createInterpolable(val) || val;
+ });
+ values = values.filter(function(val) {
+ return val != null;
+ });
+ return new InterpolableArray(values, sep);
+ };
+
+ InterpolableArray.create = function(value) {
+ var arr, sep, seps, _i, _len;
+ if (value instanceof Array) {
+ return InterpolableArray.createFromArray(value, null);
+ }
+ if (typeof value !== "string") {
+ return;
+ }
+ seps = [' ', ',', '|', ';', '/', ':'];
+ for (_i = 0, _len = seps.length; _i < _len; _i++) {
+ sep = seps[_i];
+ arr = value.split(sep);
+ if (arr.length > 1) {
+ return InterpolableArray.createFromArray(arr, sep);
+ }
+ }
+ return null;
+ };
+
+ return InterpolableArray;
+
+ })();
+
+ Color = (function() {
+ function Color(rgb, format) {
+ this.rgb = rgb != null ? rgb : {};
+ this.format = format;
+ this.toRgba = __bind(this.toRgba, this);
+ this.toRgb = __bind(this.toRgb, this);
+ this.toHex = __bind(this.toHex, this);
+ }
+
+ Color.fromHex = function(hex) {
+ var hex3, result;
+ hex3 = hex.match(/^#([a-f\d]{1})([a-f\d]{1})([a-f\d]{1})$/i);
+ if (hex3 != null) {
+ hex = "#" + hex3[1] + hex3[1] + hex3[2] + hex3[2] + hex3[3] + hex3[3];
+ }
+ result = hex.match(/^#([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i);
+ if (result != null) {
+ return new Color({
+ r: parseInt(result[1], 16),
+ g: parseInt(result[2], 16),
+ b: parseInt(result[3], 16),
+ a: 1
+ }, "hex");
+ }
+ return null;
+ };
+
+ Color.fromRgb = function(rgb) {
+ var match, _ref;
+ match = rgb.match(/^rgba?\(([0-9.]*), ?([0-9.]*), ?([0-9.]*)(?:, ?([0-9.]*))?\)$/);
+ if (match != null) {
+ return new Color({
+ r: parseFloat(match[1]),
+ g: parseFloat(match[2]),
+ b: parseFloat(match[3]),
+ a: parseFloat((_ref = match[4]) != null ? _ref : 1)
+ }, match[4] != null ? "rgba" : "rgb");
+ }
+ return null;
+ };
+
+ Color.componentToHex = function(c) {
+ var hex;
+ hex = c.toString(16);
+ if (hex.length === 1) {
+ return "0" + hex;
+ } else {
+ return hex;
+ }
+ };
+
+ Color.prototype.toHex = function() {
+ return "#" + Color.componentToHex(this.rgb.r) + Color.componentToHex(this.rgb.g) + Color.componentToHex(this.rgb.b);
+ };
+
+ Color.prototype.toRgb = function() {
+ return "rgb(" + this.rgb.r + ", " + this.rgb.g + ", " + this.rgb.b + ")";
+ };
+
+ Color.prototype.toRgba = function() {
+ return "rgba(" + this.rgb.r + ", " + this.rgb.g + ", " + this.rgb.b + ", " + this.rgb.a + ")";
+ };
+
+ return Color;
+
+ })();
+
+ InterpolableColor = (function() {
+ function InterpolableColor(color) {
+ this.color = color;
+ this.format = __bind(this.format, this);
+ this.interpolate = __bind(this.interpolate, this);
+ }
+
+ InterpolableColor.prototype.interpolate = function(endInterpolable, t) {
+ var end, k, rgb, start, v, _i, _len, _ref;
+ start = this.color;
+ end = endInterpolable.color;
+ rgb = {};
+ _ref = ['r', 'g', 'b'];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ k = _ref[_i];
+ v = Math.round((end.rgb[k] - start.rgb[k]) * t + start.rgb[k]);
+ rgb[k] = Math.min(255, Math.max(0, v));
+ }
+ k = "a";
+ v = roundf((end.rgb[k] - start.rgb[k]) * t + start.rgb[k], 5);
+ rgb[k] = Math.min(1, Math.max(0, v));
+ return new InterpolableColor(new Color(rgb, end.format));
+ };
+
+ InterpolableColor.prototype.format = function() {
+ if (this.color.format === "hex") {
+ return this.color.toHex();
+ } else if (this.color.format === "rgb") {
+ return this.color.toRgb();
+ } else if (this.color.format === "rgba") {
+ return this.color.toRgba();
+ }
+ };
+
+ InterpolableColor.create = function(value) {
+ var color;
+ if (typeof value !== "string") {
+ return;
+ }
+ color = Color.fromHex(value) || Color.fromRgb(value);
+ if (color != null) {
+ return new InterpolableColor(color);
+ }
+ return null;
+ };
+
+ return InterpolableColor;
+
+ })();
+
+ DecomposedMatrix2D = (function() {
+ function DecomposedMatrix2D(props) {
+ this.props = props;
+ this.applyRotateCenter = __bind(this.applyRotateCenter, this);
+ this.format = __bind(this.format, this);
+ this.interpolate = __bind(this.interpolate, this);
+ }
+
+ DecomposedMatrix2D.prototype.interpolate = function(endMatrix, t) {
+ var i, k, newProps, _i, _j, _k, _l, _len, _len1, _ref, _ref1, _ref2;
+ newProps = {};
+ _ref = ['translate', 'scale', 'rotate'];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ k = _ref[_i];
+ newProps[k] = [];
+ for (i = _j = 0, _ref1 = this.props[k].length; 0 <= _ref1 ? _j < _ref1 : _j > _ref1; i = 0 <= _ref1 ? ++_j : --_j) {
+ newProps[k][i] = (endMatrix.props[k][i] - this.props[k][i]) * t + this.props[k][i];
+ }
+ }
+ for (i = _k = 1; _k <= 2; i = ++_k) {
+ newProps['rotate'][i] = endMatrix.props['rotate'][i];
+ }
+ _ref2 = ['skew'];
+ for (_l = 0, _len1 = _ref2.length; _l < _len1; _l++) {
+ k = _ref2[_l];
+ newProps[k] = (endMatrix.props[k] - this.props[k]) * t + this.props[k];
+ }
+ return new DecomposedMatrix2D(newProps);
+ };
+
+ DecomposedMatrix2D.prototype.format = function() {
+ return "translate(" + (this.props.translate.join(',')) + ") rotate(" + (this.props.rotate.join(',')) + ") skewX(" + this.props.skew + ") scale(" + (this.props.scale.join(',')) + ")";
+ };
+
+ DecomposedMatrix2D.prototype.applyRotateCenter = function(rotateC) {
+ var i, m, m2d, negativeTranslate, _i, _results;
+ m = baseSVG.createSVGMatrix();
+ m = m.translate(rotateC[0], rotateC[1]);
+ m = m.rotate(this.props.rotate[0]);
+ m = m.translate(-rotateC[0], -rotateC[1]);
+ m2d = new Matrix2D(m);
+ negativeTranslate = m2d.decompose().props.translate;
+ _results = [];
+ for (i = _i = 0; _i <= 1; i = ++_i) {
+ _results.push(this.props.translate[i] -= negativeTranslate[i]);
+ }
+ return _results;
+ };
+
+ return DecomposedMatrix2D;
+
+ })();
+
+ baseSVG = typeof document !== "undefined" && document !== null ? document.createElementNS("http://www.w3.org/2000/svg", "svg") : void 0;
+
+ Matrix2D = (function() {
+ function Matrix2D(m) {
+ this.m = m;
+ this.applyProperties = __bind(this.applyProperties, this);
+ this.decompose = __bind(this.decompose, this);
+ if (!this.m) {
+ this.m = baseSVG.createSVGMatrix();
+ }
+ }
+
+ Matrix2D.prototype.decompose = function() {
+ var kx, ky, kz, r0, r1;
+ r0 = new Vector([this.m.a, this.m.b]);
+ r1 = new Vector([this.m.c, this.m.d]);
+ kx = r0.length();
+ kz = r0.dot(r1);
+ r0 = r0.normalize();
+ ky = r1.combine(r0, 1, -kz).length();
+ return new DecomposedMatrix2D({
+ translate: [this.m.e, this.m.f],
+ rotate: [Math.atan2(this.m.b, this.m.a) * 180 / Math.PI, this.rotateCX, this.rotateCY],
+ scale: [kx, ky],
+ skew: kz / ky * 180 / Math.PI
+ });
+ };
+
+ Matrix2D.prototype.applyProperties = function(properties) {
+ var hash, k, props, v, _i, _len, _ref, _ref1;
+ hash = {};
+ for (_i = 0, _len = properties.length; _i < _len; _i++) {
+ props = properties[_i];
+ hash[props[0]] = props[1];
+ }
+ for (k in hash) {
+ v = hash[k];
+ if (k === "translateX") {
+ this.m = this.m.translate(v, 0);
+ } else if (k === "translateY") {
+ this.m = this.m.translate(0, v);
+ } else if (k === "scaleX") {
+ this.m = this.m.scale(v, 1);
+ } else if (k === "scaleY") {
+ this.m = this.m.scale(1, v);
+ } else if (k === "rotateZ") {
+ this.m = this.m.rotate(v);
+ } else if (k === "skewX") {
+ this.m = this.m.skewX(v);
+ } else if (k === "skewY") {
+ this.m = this.m.skewY(v);
+ }
+ }
+ this.rotateCX = (_ref = hash.rotateCX) != null ? _ref : 0;
+ return this.rotateCY = (_ref1 = hash.rotateCY) != null ? _ref1 : 0;
+ };
+
+ return Matrix2D;
+
+ })();
+
+ Vector = (function() {
+ function Vector(els) {
+ this.els = els;
+ this.combine = __bind(this.combine, this);
+ this.normalize = __bind(this.normalize, this);
+ this.length = __bind(this.length, this);
+ this.cross = __bind(this.cross, this);
+ this.dot = __bind(this.dot, this);
+ this.e = __bind(this.e, this);
+ }
+
+ Vector.prototype.e = function(i) {
+ if (i < 1 || i > this.els.length) {
+ return null;
+ } else {
+ return this.els[i - 1];
+ }
+ };
+
+ Vector.prototype.dot = function(vector) {
+ var V, n, product;
+ V = vector.els || vector;
+ product = 0;
+ n = this.els.length;
+ if (n !== V.length) {
+ return null;
+ }
+ n += 1;
+ while (--n) {
+ product += this.els[n - 1] * V[n - 1];
+ }
+ return product;
+ };
+
+ Vector.prototype.cross = function(vector) {
+ var A, B;
+ B = vector.els || vector;
+ if (this.els.length !== 3 || B.length !== 3) {
+ return null;
+ }
+ A = this.els;
+ return new Vector([(A[1] * B[2]) - (A[2] * B[1]), (A[2] * B[0]) - (A[0] * B[2]), (A[0] * B[1]) - (A[1] * B[0])]);
+ };
+
+ Vector.prototype.length = function() {
+ var a, e, _i, _len, _ref;
+ a = 0;
+ _ref = this.els;
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ e = _ref[_i];
+ a += Math.pow(e, 2);
+ }
+ return Math.sqrt(a);
+ };
+
+ Vector.prototype.normalize = function() {
+ var e, i, length, newElements, _ref;
+ length = this.length();
+ newElements = [];
+ _ref = this.els;
+ for (i in _ref) {
+ e = _ref[i];
+ newElements[i] = e / length;
+ }
+ return new Vector(newElements);
+ };
+
+ Vector.prototype.combine = function(b, ascl, bscl) {
+ var i, result, _i, _ref;
+ result = [];
+ for (i = _i = 0, _ref = this.els.length; 0 <= _ref ? _i < _ref : _i > _ref; i = 0 <= _ref ? ++_i : --_i) {
+ result[i] = (ascl * this.els[i]) + (bscl * b.els[i]);
+ }
+ return new Vector(result);
+ };
+
+ return Vector;
+
+ })();
+
+ DecomposedMatrix = (function() {
+ function DecomposedMatrix() {
+ this.toMatrix = __bind(this.toMatrix, this);
+ this.format = __bind(this.format, this);
+ this.interpolate = __bind(this.interpolate, this);
+ }
+
+ DecomposedMatrix.prototype.interpolate = function(decomposedB, t, only) {
+ var angle, decomposed, decomposedA, i, invscale, invth, k, qa, qb, scale, th, _i, _j, _k, _l, _len, _ref, _ref1;
+ if (only == null) {
+ only = null;
+ }
+ decomposedA = this;
+ decomposed = new DecomposedMatrix;
+ _ref = ['translate', 'scale', 'skew', 'perspective'];
+ for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+ k = _ref[_i];
+ decomposed[k] = [];
+ for (i = _j = 0, _ref1 = decomposedA[k].length - 1; 0 <= _ref1 ? _j <= _ref1 : _j >= _ref1; i = 0 <= _ref1 ? ++_j : --_j) {
+ if ((only == null) || only.indexOf(k) > -1 || only.indexOf("" + k + ['x', 'y', 'z'][i]) > -1) {
+ decomposed[k][i] = (decomposedB[k][i] - decomposedA[k][i]) * t + decomposedA[k][i];
+ } else {
+ decomposed[k][i] = decomposedA[k][i];
+ }
+ }
+ }
+ if ((only == null) || only.indexOf('rotate') !== -1) {
+ qa = decomposedA.quaternion;
+ qb = decomposedB.quaternion;
+ angle = qa[0] * qb[0] + qa[1] * qb[1] + qa[2] * qb[2] + qa[3] * qb[3];
+ if (angle < 0.0) {
+ for (i = _k = 0; _k <= 3; i = ++_k) {
+ qa[i] = -qa[i];
+ }
+ angle = -angle;
+ }
+ if (angle + 1.0 > .05) {
+ if (1.0 - angle >= .05) {
+ th = Math.acos(angle);
+ invth = 1.0 / Math.sin(th);
+ scale = Math.sin(th * (1.0 - t)) * invth;
+ invscale = Math.sin(th * t) * invth;
+ } else {
+ scale = 1.0 - t;
+ invscale = t;
+ }
+ } else {
+ qb[0] = -qa[1];
+ qb[1] = qa[0];
+ qb[2] = -qa[3];
+ qb[3] = qa[2];
+ scale = Math.sin(piDouble * (.5 - t));
+ invscale = Math.sin(piDouble * t);
+ }
+ decomposed.quaternion = [];
+ for (i = _l = 0; _l <= 3; i = ++_l) {
+ decomposed.quaternion[i] = qa[i] * scale + qb[i] * invscale;
+ }
+ } else {
+ decomposed.quaternion = decomposedA.quaternion;
+ }
+ return decomposed;
+ };
+
+ DecomposedMatrix.prototype.format = function() {
+ return this.toMatrix().toString();
+ };
+
+ DecomposedMatrix.prototype.toMatrix = function() {
+ var decomposedMatrix, i, j, match, matrix, quaternion, skew, temp, w, x, y, z, _i, _j, _k, _l;
+ decomposedMatrix = this;
+ matrix = Matrix.I(4);
+ for (i = _i = 0; _i <= 3; i = ++_i) {
+ matrix.els[i][3] = decomposedMatrix.perspective[i];
+ }
+ quaternion = decomposedMatrix.quaternion;
+ x = quaternion[0];
+ y = quaternion[1];
+ z = quaternion[2];
+ w = quaternion[3];
+ skew = decomposedMatrix.skew;
+ match = [[1, 0], [2, 0], [2, 1]];
+ for (i = _j = 2; _j >= 0; i = --_j) {
+ if (skew[i]) {
+ temp = Matrix.I(4);
+ temp.els[match[i][0]][match[i][1]] = skew[i];
+ matrix = matrix.multiply(temp);
+ }
+ }
+ matrix = matrix.multiply(new Matrix([[1 - 2 * (y * y + z * z), 2 * (x * y - z * w), 2 * (x * z + y * w), 0], [2 * (x * y + z * w), 1 - 2 * (x * x + z * z), 2 * (y * z - x * w), 0], [2 * (x * z - y * w), 2 * (y * z + x * w), 1 - 2 * (x * x + y * y), 0], [0, 0, 0, 1]]));
+ for (i = _k = 0; _k <= 2; i = ++_k) {
+ for (j = _l = 0; _l <= 2; j = ++_l) {
+ matrix.els[i][j] *= decomposedMatrix.scale[i];
+ }
+ matrix.els[3][i] = decomposedMatrix.translate[i];
+ }
+ return matrix;
+ };
+
+ return DecomposedMatrix;
+
+ })();
+
+ Matrix = (function() {
+ function Matrix(els) {
+ this.els = els;
+ this.toString = __bind(this.toString, this);
+ this.decompose = __bind(this.decompose, this);
+ this.inverse = __bind(this.inverse, this);
+ this.augment = __bind(this.augment, this);
+ this.toRightTriangular = __bind(this.toRightTriangular, this);
+ this.transpose = __bind(this.transpose, this);
+ this.multiply = __bind(this.multiply, this);
+ this.dup = __bind(this.dup, this);
+ this.e = __bind(this.e, this);
+ }
+
+ Matrix.prototype.e = function(i, j) {
+ if (i < 1 || i > this.els.length || j < 1 || j > this.els[0].length) {
+ return null;
+ }
+ return this.els[i - 1][j - 1];
+ };
+
+ Matrix.prototype.dup = function() {
+ return new Matrix(this.els);
+ };
+
+ Matrix.prototype.multiply = function(matrix) {
+ var M, c, cols, elements, i, j, ki, kj, nc, ni, nj, returnVector, sum;
+ returnVector = matrix.modulus ? true : false;
+ M = matrix.els || matrix;
+ if (typeof M[0][0] === 'undefined') {
+ M = new Matrix(M).els;
+ }
+ ni = this.els.length;
+ ki = ni;
+ kj = M[0].length;
+ cols = this.els[0].length;
+ elements = [];
+ ni += 1;
+ while (--ni) {
+ i = ki - ni;
+ elements[i] = [];
+ nj = kj;
+ nj += 1;
+ while (--nj) {
+ j = kj - nj;
+ sum = 0;
+ nc = cols;
+ nc += 1;
+ while (--nc) {
+ c = cols - nc;
+ sum += this.els[i][c] * M[c][j];
+ }
+ elements[i][j] = sum;
+ }
+ }
+ M = new Matrix(elements);
+ if (returnVector) {
+ return M.col(1);
+ } else {
+ return M;
+ }
+ };
+
+ Matrix.prototype.transpose = function() {
+ var cols, elements, i, j, ni, nj, rows;
+ rows = this.els.length;
+ cols = this.els[0].length;
+ elements = [];
+ ni = cols;
+ ni += 1;
+ while (--ni) {
+ i = cols - ni;
+ elements[i] = [];
+ nj = rows;
+ nj += 1;
+ while (--nj) {
+ j = rows - nj;
+ elements[i][j] = this.els[j][i];
+ }
+ }
+ return new Matrix(elements);
+ };
+
+ Matrix.prototype.toRightTriangular = function() {
+ var M, els, i, j, k, kp, multiplier, n, np, p, _i, _j, _ref, _ref1;
+ M = this.dup();
+ n = this.els.length;
+ k = n;
+ kp = this.els[0].length;
+ while (--n) {
+ i = k - n;
+ if (M.els[i][i] === 0) {
+ for (j = _i = _ref = i + 1; _ref <= k ? _i < k : _i > k; j = _ref <= k ? ++_i : --_i) {
+ if (M.els[j][i] !== 0) {
+ els = [];
+ np = kp;
+ np += 1;
+ while (--np) {
+ p = kp - np;
+ els.push(M.els[i][p] + M.els[j][p]);
+ }
+ M.els[i] = els;
+ break;
+ }
+ }
+ }
+ if (M.els[i][i] !== 0) {
+ for (j = _j = _ref1 = i + 1; _ref1 <= k ? _j < k : _j > k; j = _ref1 <= k ? ++_j : --_j) {
+ multiplier = M.els[j][i] / M.els[i][i];
+ els = [];
+ np = kp;
+ np += 1;
+ while (--np) {
+ p = kp - np;
+ els.push(p <= i ? 0 : M.els[j][p] - M.els[i][p] * multiplier);
+ }
+ M.els[j] = els;
+ }
+ }
+ }
+ return M;
+ };
+
+ Matrix.prototype.augment = function(matrix) {
+ var M, T, cols, i, j, ki, kj, ni, nj;
+ M = matrix.els || matrix;
+ if (typeof M[0][0] === 'undefined') {
+ M = new Matrix(M).els;
+ }
+ T = this.dup();
+ cols = T.els[0].length;
+ ni = T.els.length;
+ ki = ni;
+ kj = M[0].length;
+ if (ni !== M.length) {
+ return null;
+ }
+ ni += 1;
+ while (--ni) {
+ i = ki - ni;
+ nj = kj;
+ nj += 1;
+ while (--nj) {
+ j = kj - nj;
+ T.els[i][cols + j] = M[i][j];
+ }
+ }
+ return T;
+ };
+
+ Matrix.prototype.inverse = function() {
+ var M, divisor, els, i, inverse_elements, j, ki, kp, new_element, ni, np, p, _i;
+ ni = this.els.length;
+ ki = ni;
+ M = this.augment(Matrix.I(ni)).toRightTriangular();
+ kp = M.els[0].length;
+ inverse_elements = [];
+ ni += 1;
+ while (--ni) {
+ i = ni - 1;
+ els = [];
+ np = kp;
+ inverse_elements[i] = [];
+ divisor = M.els[i][i];
+ np += 1;
+ while (--np) {
+ p = kp - np;
+ new_element = M.els[i][p] / divisor;
+ els.push(new_element);
+ if (p >= ki) {
+ inverse_elements[i].push(new_element);
+ }
+ }
+ M.els[i] = els;
+ for (j = _i = 0; 0 <= i ? _i < i : _i > i; j = 0 <= i ? ++_i : --_i) {
+ els = [];
+ np = kp;
+ np += 1;
+ while (--np) {
+ p = kp - np;
+ els.push(M.els[j][p] - M.els[i][p] * M.els[j][i]);
+ }
+ M.els[j] = els;
+ }
+ }
+ return new Matrix(inverse_elements);
+ };
+
+ Matrix.I = function(n) {
+ var els, i, j, k, nj;
+ els = [];
+ k = n;
+ n += 1;
+ while (--n) {
+ i = k - n;
+ els[i] = [];
+ nj = k;
+ nj += 1;
+ while (--nj) {
+ j = k - nj;
+ els[i][j] = i === j ? 1 : 0;
+ }
+ }
+ return new Matrix(els);
+ };
+
+ Matrix.prototype.decompose = function() {
+ var els, i, inversePerspectiveMatrix, j, k, matrix, pdum3, perspective, perspectiveMatrix, quaternion, result, rightHandSide, rotate, row, rowElement, s, scale, skew, t, translate, transposedInversePerspectiveMatrix, type, typeKey, v, w, x, y, z, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r;
+ matrix = this;
+ translate = [];
+ scale = [];
+ skew = [];
+ quaternion = [];
+ perspective = [];
+ els = [];
+ for (i = _i = 0; _i <= 3; i = ++_i) {
+ els[i] = [];
+ for (j = _j = 0; _j <= 3; j = ++_j) {
+ els[i][j] = matrix.els[i][j];
+ }
+ }
+ if (els[3][3] === 0) {
+ return false;
+ }
+ for (i = _k = 0; _k <= 3; i = ++_k) {
+ for (j = _l = 0; _l <= 3; j = ++_l) {
+ els[i][j] /= els[3][3];
+ }
+ }
+ perspectiveMatrix = matrix.dup();
+ for (i = _m = 0; _m <= 2; i = ++_m) {
+ perspectiveMatrix.els[i][3] = 0;
+ }
+ perspectiveMatrix.els[3][3] = 1;
+ if (els[0][3] !== 0 || els[1][3] !== 0 || els[2][3] !== 0) {
+ rightHandSide = new Vector(els.slice(0, 4)[3]);
+ inversePerspectiveMatrix = perspectiveMatrix.inverse();
+ transposedInversePerspectiveMatrix = inversePerspectiveMatrix.transpose();
+ perspective = transposedInversePerspectiveMatrix.multiply(rightHandSide).els;
+ for (i = _n = 0; _n <= 2; i = ++_n) {
+ els[i][3] = 0;
+ }
+ els[3][3] = 1;
+ } else {
+ perspective = [0, 0, 0, 1];
+ }
+ for (i = _o = 0; _o <= 2; i = ++_o) {
+ translate[i] = els[3][i];
+ els[3][i] = 0;
+ }
+ row = [];
+ for (i = _p = 0; _p <= 2; i = ++_p) {
+ row[i] = new Vector(els[i].slice(0, 3));
+ }
+ scale[0] = row[0].length();
+ row[0] = row[0].normalize();
+ skew[0] = row[0].dot(row[1]);
+ row[1] = row[1].combine(row[0], 1.0, -skew[0]);
+ scale[1] = row[1].length();
+ row[1] = row[1].normalize();
+ skew[0] /= scale[1];
+ skew[1] = row[0].dot(row[2]);
+ row[2] = row[2].combine(row[0], 1.0, -skew[1]);
+ skew[2] = row[1].dot(row[2]);
+ row[2] = row[2].combine(row[1], 1.0, -skew[2]);
+ scale[2] = row[2].length();
+ row[2] = row[2].normalize();
+ skew[1] /= scale[2];
+ skew[2] /= scale[2];
+ pdum3 = row[1].cross(row[2]);
+ if (row[0].dot(pdum3) < 0) {
+ for (i = _q = 0; _q <= 2; i = ++_q) {
+ scale[i] *= -1;
+ for (j = _r = 0; _r <= 2; j = ++_r) {
+ row[i].els[j] *= -1;
+ }
+ }
+ }
+ rowElement = function(index, elementIndex) {
+ return row[index].els[elementIndex];
+ };
+ rotate = [];
+ rotate[1] = Math.asin(-rowElement(0, 2));
+ if (Math.cos(rotate[1]) !== 0) {
+ rotate[0] = Math.atan2(rowElement(1, 2), rowElement(2, 2));
+ rotate[2] = Math.atan2(rowElement(0, 1), rowElement(0, 0));
+ } else {
+ rotate[0] = Math.atan2(-rowElement(2, 0), rowElement(1, 1));
+ rotate[1] = 0;
+ }
+ t = rowElement(0, 0) + rowElement(1, 1) + rowElement(2, 2) + 1.0;
+ if (t > 1e-4) {
+ s = 0.5 / Math.sqrt(t);
+ w = 0.25 / s;
+ x = (rowElement(2, 1) - rowElement(1, 2)) * s;
+ y = (rowElement(0, 2) - rowElement(2, 0)) * s;
+ z = (rowElement(1, 0) - rowElement(0, 1)) * s;
+ } else if ((rowElement(0, 0) > rowElement(1, 1)) && (rowElement(0, 0) > rowElement(2, 2))) {
+ s = Math.sqrt(1.0 + rowElement(0, 0) - rowElement(1, 1) - rowElement(2, 2)) * 2.0;
+ x = 0.25 * s;
+ y = (rowElement(0, 1) + rowElement(1, 0)) / s;
+ z = (rowElement(0, 2) + rowElement(2, 0)) / s;
+ w = (rowElement(2, 1) - rowElement(1, 2)) / s;
+ } else if (rowElement(1, 1) > rowElement(2, 2)) {
+ s = Math.sqrt(1.0 + rowElement(1, 1) - rowElement(0, 0) - rowElement(2, 2)) * 2.0;
+ x = (rowElement(0, 1) + rowElement(1, 0)) / s;
+ y = 0.25 * s;
+ z = (rowElement(1, 2) + rowElement(2, 1)) / s;
+ w = (rowElement(0, 2) - rowElement(2, 0)) / s;
+ } else {
+ s = Math.sqrt(1.0 + rowElement(2, 2) - rowElement(0, 0) - rowElement(1, 1)) * 2.0;
+ x = (rowElement(0, 2) + rowElement(2, 0)) / s;
+ y = (rowElement(1, 2) + rowElement(2, 1)) / s;
+ z = 0.25 * s;
+ w = (rowElement(1, 0) - rowElement(0, 1)) / s;
+ }
+ quaternion = [x, y, z, w];
+ result = new DecomposedMatrix;
+ result.translate = translate;
+ result.scale = scale;
+ result.skew = skew;
+ result.quaternion = quaternion;
+ result.perspective = perspective;
+ result.rotate = rotate;
+ for (typeKey in result) {
+ type = result[typeKey];
+ for (k in type) {
+ v = type[k];
+ if (isNaN(v)) {
+ type[k] = 0;
+ }
+ }
+ }
+ return result;
+ };
+
+ Matrix.prototype.toString = function() {
+ var i, j, str, _i, _j;
+ str = 'matrix3d(';
+ for (i = _i = 0; _i <= 3; i = ++_i) {
+ for (j = _j = 0; _j <= 3; j = ++_j) {
+ str += roundf(this.els[i][j], 10);
+ if (!(i === 3 && j === 3)) {
+ str += ',';
+ }
+ }
+ }
+ str += ')';
+ return str;
+ };
+
+ Matrix.matrixForTransform = cacheFn(function(transform) {
+ var matrixEl, result, style, _ref, _ref1, _ref2;
+ matrixEl = document.createElement('div');
+ matrixEl.style.position = 'absolute';
+ matrixEl.style.visibility = 'hidden';
+ matrixEl.style[propertyWithPrefix("transform")] = transform;
+ document.body.appendChild(matrixEl);
+ style = window.getComputedStyle(matrixEl, null);
+ result = (_ref = (_ref1 = style.transform) != null ? _ref1 : style[propertyWithPrefix("transform")]) != null ? _ref : (_ref2 = dynamics.tests) != null ? _ref2.matrixForTransform(transform) : void 0;
+ document.body.removeChild(matrixEl);
+ return result;
+ });
+
+ Matrix.fromTransform = function(transform) {
+ var digits, elements, i, match, matrixElements, _i;
+ match = transform != null ? transform.match(/matrix3?d?\(([-0-9,e \.]*)\)/) : void 0;
+ if (match) {
+ digits = match[1].split(',');
+ digits = digits.map(parseFloat);
+ if (digits.length === 6) {
+ elements = [digits[0], digits[1], 0, 0, digits[2], digits[3], 0, 0, 0, 0, 1, 0, digits[4], digits[5], 0, 1];
+ } else {
+ elements = digits;
+ }
+ } else {
+ elements = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1];
+ }
+ matrixElements = [];
+ for (i = _i = 0; _i <= 3; i = ++_i) {
+ matrixElements.push(elements.slice(i * 4, i * 4 + 4));
+ }
+ return new Matrix(matrixElements);
+ };
+
+ return Matrix;
+
+ })();
+
+ prefixFor = cacheFn(function(property) {
+ var k, prefix, prop, propArray, propertyName, _i, _j, _len, _len1, _ref;
+ if (document.body.style[property] !== void 0) {
+ return '';
+ }
+ propArray = property.split('-');
+ propertyName = "";
+ for (_i = 0, _len = propArray.length; _i < _len; _i++) {
+ prop = propArray[_i];
+ propertyName += prop.substring(0, 1).toUpperCase() + prop.substring(1);
+ }
+ _ref = ["Webkit", "Moz", "ms"];
+ for (_j = 0, _len1 = _ref.length; _j < _len1; _j++) {
+ prefix = _ref[_j];
+ k = prefix + propertyName;
+ if (document.body.style[k] !== void 0) {
+ return prefix;
+ }
+ }
+ return '';
+ });
+
+ propertyWithPrefix = cacheFn(function(property) {
+ var prefix;
+ prefix = prefixFor(property);
+ if (prefix === 'Moz') {
+ return "" + prefix + (property.substring(0, 1).toUpperCase() + property.substring(1));
+ }
+ if (prefix !== '') {
+ return "-" + (prefix.toLowerCase()) + "-" + (toDashed(property));
+ }
+ return toDashed(property);
+ });
+
+ rAF = typeof window !== "undefined" && window !== null ? window.requestAnimationFrame : void 0;
+
+ animations = [];
+
+ animationsTimeouts = [];
+
+ slow = false;
+
+ slowRatio = 1;
+
+ if (typeof window !== "undefined" && window !== null) {
+ window.addEventListener('keyup', function(e) {
+ if (e.keyCode === 68 && e.shiftKey && e.ctrlKey) {
+ return dynamics.toggleSlow();
+ }
+ });
+ }
+
+ if (rAF == null) {
+ lastTime = 0;
+ rAF = function(callback) {
+ var currTime, id, timeToCall;
+ currTime = Date.now();
+ timeToCall = Math.max(0, 16 - (currTime - lastTime));
+ id = window.setTimeout(function() {
+ return callback(currTime + timeToCall);
+ }, timeToCall);
+ lastTime = currTime + timeToCall;
+ return id;
+ };
+ }
+
+ runLoopRunning = false;
+
+ runLoopPaused = false;
+
+ startRunLoop = function() {
+ if (!runLoopRunning) {
+ runLoopRunning = true;
+ return rAF(runLoopTick);
+ }
+ };
+
+ runLoopTick = function(t) {
+ var animation, toRemoveAnimations, _i, _len;
+ if (runLoopPaused) {
+ rAF(runLoopTick);
+ return;
+ }
+ toRemoveAnimations = [];
+ for (_i = 0, _len = animations.length; _i < _len; _i++) {
+ animation = animations[_i];
+ if (!animationTick(t, animation)) {
+ toRemoveAnimations.push(animation);
+ }
+ }
+ animations = animations.filter(function(animation) {
+ return toRemoveAnimations.indexOf(animation) === -1;
+ });
+ if (animations.length === 0) {
+ return runLoopRunning = false;
+ } else {
+ return rAF(runLoopTick);
+ }
+ };
+
+ animationTick = function(t, animation) {
+ var key, properties, property, tt, y, _base, _base1, _ref;
+ if (animation.tStart == null) {
+ animation.tStart = t;
+ }
+ tt = (t - animation.tStart) / animation.options.duration;
+ y = animation.curve(tt);
+ properties = {};
+ if (tt >= 1) {
+ if (animation.curve.initialForce) {
+ properties = animation.properties.start;
+ } else {
+ properties = animation.properties.end;
+ }
+ } else {
+ _ref = animation.properties.start;
+ for (key in _ref) {
+ property = _ref[key];
+ properties[key] = interpolate(property, animation.properties.end[key], y);
+ }
+ }
+ applyFrame(animation.el, properties);
+ if (typeof (_base = animation.options).change === "function") {
+ _base.change(animation.el);
+ }
+ if (tt >= 1) {
+ if (typeof (_base1 = animation.options).complete === "function") {
+ _base1.complete(animation.el);
+ }
+ }
+ return tt < 1;
+ };
+
+ interpolate = function(start, end, y) {
+ if ((start != null) && (start.interpolate != null)) {
+ return start.interpolate(end, y);
+ }
+ return null;
+ };
+
+ startAnimation = function(el, properties, options, timeoutId) {
+ var endProperties, isSVG, k, matrix, startProperties, transforms, v, _base;
+ if (timeoutId != null) {
+ animationsTimeouts = animationsTimeouts.filter(function(timeout) {
+ return timeout.id !== timeoutId;
+ });
+ }
+ dynamics.stop(el, {
+ timeout: false
+ });
+ if (!options.animated) {
+ dynamics.css(el, properties);
+ if (typeof options.complete === "function") {
+ options.complete(this);
+ }
+ return;
+ }
+ properties = parseProperties(properties);
+ startProperties = getCurrentProperties(el, Object.keys(properties));
+ endProperties = {};
+ transforms = [];
+ for (k in properties) {
+ v = properties[k];
+ if (transformProperties.contains(k)) {
+ transforms.push([k, v]);
+ } else {
+ endProperties[k] = createInterpolable(v);
+ if (endProperties[k] instanceof InterpolableWithUnit && (el.style != null)) {
+ endProperties[k].prefix = '';
+ if ((_base = endProperties[k]).suffix == null) {
+ _base.suffix = unitForProperty(k, 0);
+ }
+ }
+ }
+ }
+ if (transforms.length > 0) {
+ isSVG = isSVGElement(el);
+ if (isSVG) {
+ matrix = new Matrix2D();
+ matrix.applyProperties(transforms);
+ } else {
+ v = (transforms.map(function(transform) {
+ return transformValueForProperty(transform[0], transform[1]);
+ })).join(" ");
+ matrix = Matrix.fromTransform(Matrix.matrixForTransform(v));
+ }
+ endProperties['transform'] = matrix.decompose();
+ if (isSVG) {
+ startProperties.transform.applyRotateCenter([endProperties.transform.props.rotate[1], endProperties.transform.props.rotate[2]]);
+ }
+ }
+ animations.push({
+ el: el,
+ properties: {
+ start: startProperties,
+ end: endProperties
+ },
+ options: options,
+ curve: options.type.call(options.type, options)
+ });
+ return startRunLoop();
+ };
+
+ timeouts = [];
+
+ timeoutLastId = 0;
+
+ setRealTimeout = function(timeout) {
+ if (!isDocumentVisible()) {
+ return;
+ }
+ return timeout.realTimeoutId = setTimeout(function() {
+ timeout.fn();
+ return cancelTimeout(timeout.id);
+ }, timeout.delay);
+ };
+
+ addTimeout = function(fn, delay) {
+ var timeout;
+ timeoutLastId += 1;
+ timeout = {
+ id: timeoutLastId,
+ tStart: Date.now(),
+ fn: fn,
+ delay: delay,
+ originalDelay: delay
+ };
+ setRealTimeout(timeout);
+ timeouts.push(timeout);
+ return timeoutLastId;
+ };
+
+ cancelTimeout = function(id) {
+ return timeouts = timeouts.filter(function(timeout) {
+ if (timeout.id === id) {
+ clearTimeout(timeout.realTimeoutId);
+ }
+ return timeout.id !== id;
+ });
+ };
+
+ leftDelayForTimeout = function(time, timeout) {
+ var consumedDelay;
+ if (time != null) {
+ consumedDelay = time - timeout.tStart;
+ return timeout.originalDelay - consumedDelay;
+ } else {
+ return timeout.originalDelay;
+ }
+ };
+
+ if (typeof window !== "undefined" && window !== null) {
+ window.addEventListener('unload', function() {});
+ }
+
+ timeBeforeVisibilityChange = null;
+
+ observeVisibilityChange(function(visible) {
+ var animation, difference, timeout, _i, _j, _k, _len, _len1, _len2, _results;
+ runLoopPaused = !visible;
+ if (!visible) {
+ timeBeforeVisibilityChange = Date.now();
+ _results = [];
+ for (_i = 0, _len = timeouts.length; _i < _len; _i++) {
+ timeout = timeouts[_i];
+ _results.push(clearTimeout(timeout.realTimeoutId));
+ }
+ return _results;
+ } else {
+ if (runLoopRunning) {
+ difference = Date.now() - timeBeforeVisibilityChange;
+ for (_j = 0, _len1 = animations.length; _j < _len1; _j++) {
+ animation = animations[_j];
+ if (animation.tStart != null) {
+ animation.tStart += difference;
+ }
+ }
+ }
+ for (_k = 0, _len2 = timeouts.length; _k < _len2; _k++) {
+ timeout = timeouts[_k];
+ timeout.delay = leftDelayForTimeout(timeBeforeVisibilityChange, timeout);
+ setRealTimeout(timeout);
+ }
+ return timeBeforeVisibilityChange = null;
+ }
+ });
+
+ dynamics = {};
+
+ dynamics.linear = function() {
+ return function(t) {
+ return t;
+ };
+ };
+
+ dynamics.spring = function(options) {
+ var A1, A2, decal, frequency, friction, s;
+ if (options == null) {
+ options = {};
+ }
+ applyDefaults(options, arguments.callee.defaults);
+ frequency = Math.max(1, options.frequency / 20);
+ friction = Math.pow(20, options.friction / 100);
+ s = options.anticipationSize / 1000;
+ decal = Math.max(0, s);
+ A1 = function(t) {
+ var M, a, b, x0, x1;
+ M = 0.8;
+ x0 = s / (1 - s);
+ x1 = 0;
+ b = (x0 - (M * x1)) / (x0 - x1);
+ a = (M - b) / x0;
+ return (a * t * options.anticipationStrength / 100) + b;
+ };
+ A2 = function(t) {
+ return Math.pow(friction / 10, -t) * (1 - t);
+ };
+ return function(t) {
+ var A, At, a, angle, b, frictionT, y0, yS;
+ frictionT = (t / (1 - s)) - (s / (1 - s));
+ if (t < s) {
+ yS = (s / (1 - s)) - (s / (1 - s));
+ y0 = (0 / (1 - s)) - (s / (1 - s));
+ b = Math.acos(1 / A1(yS));
+ a = (Math.acos(1 / A1(y0)) - b) / (frequency * (-s));
+ A = A1;
+ } else {
+ A = A2;
+ b = 0;
+ a = 1;
+ }
+ At = A(frictionT);
+ angle = frequency * (t - s) * a + b;
+ return 1 - (At * Math.cos(angle));
+ };
+ };
+
+ dynamics.bounce = function(options) {
+ var A, fn, frequency, friction;
+ if (options == null) {
+ options = {};
+ }
+ applyDefaults(options, arguments.callee.defaults);
+ frequency = Math.max(1, options.frequency / 20);
+ friction = Math.pow(20, options.friction / 100);
+ A = function(t) {
+ return Math.pow(friction / 10, -t) * (1 - t);
+ };
+ fn = function(t) {
+ var At, a, angle, b;
+ b = -3.14 / 2;
+ a = 1;
+ At = A(t);
+ angle = frequency * t * a + b;
+ return At * Math.cos(angle);
+ };
+ fn.initialForce = true;
+ return fn;
+ };
+
+ dynamics.gravity = function(options) {
+ var L, bounciness, curves, elasticity, fn, getPointInCurve, gravity;
+ if (options == null) {
+ options = {};
+ }
+ applyDefaults(options, arguments.callee.defaults);
+ bounciness = Math.min(options.bounciness / 1250, 0.8);
+ elasticity = options.elasticity / 1000;
+ gravity = 100;
+ curves = [];
+ L = (function() {
+ var b, curve;
+ b = Math.sqrt(2 / gravity);
+ curve = {
+ a: -b,
+ b: b,
+ H: 1
+ };
+ if (options.initialForce) {
+ curve.a = 0;
+ curve.b = curve.b * 2;
+ }
+ while (curve.H > 0.001) {
+ L = curve.b - curve.a;
+ curve = {
+ a: curve.b,
+ b: curve.b + L * bounciness,
+ H: curve.H * bounciness * bounciness
+ };
+ }
+ return curve.b;
+ })();
+ getPointInCurve = function(a, b, H, t) {
+ var c, t2;
+ L = b - a;
+ t2 = (2 / L) * t - 1 - (a * 2 / L);
+ c = t2 * t2 * H - H + 1;
+ if (options.initialForce) {
+ c = 1 - c;
+ }
+ return c;
+ };
+ (function() {
+ var L2, b, curve, _results;
+ b = Math.sqrt(2 / (gravity * L * L));
+ curve = {
+ a: -b,
+ b: b,
+ H: 1
+ };
+ if (options.initialForce) {
+ curve.a = 0;
+ curve.b = curve.b * 2;
+ }
+ curves.push(curve);
+ L2 = L;
+ _results = [];
+ while (curve.b < 1 && curve.H > 0.001) {
+ L2 = curve.b - curve.a;
+ curve = {
+ a: curve.b,
+ b: curve.b + L2 * bounciness,
+ H: curve.H * elasticity
+ };
+ _results.push(curves.push(curve));
+ }
+ return _results;
+ })();
+ fn = function(t) {
+ var curve, i, v;
+ i = 0;
+ curve = curves[i];
+ while (!(t >= curve.a && t <= curve.b)) {
+ i += 1;
+ curve = curves[i];
+ if (!curve) {
+ break;
+ }
+ }
+ if (!curve) {
+ v = options.initialForce ? 0 : 1;
+ } else {
+ v = getPointInCurve(curve.a, curve.b, curve.H, t);
+ }
+ return v;
+ };
+ fn.initialForce = options.initialForce;
+ return fn;
+ };
+
+ dynamics.forceWithGravity = function(options) {
+ if (options == null) {
+ options = {};
+ }
+ applyDefaults(options, arguments.callee.defaults);
+ options.initialForce = true;
+ return dynamics.gravity(options);
+ };
+
+ dynamics.bezier = (function() {
+ var Bezier, Bezier_, yForX;
+ Bezier_ = function(t, p0, p1, p2, p3) {
+ return (Math.pow(1 - t, 3) * p0) + (3 * Math.pow(1 - t, 2) * t * p1) + (3 * (1 - t) * Math.pow(t, 2) * p2) + Math.pow(t, 3) * p3;
+ };
+ Bezier = function(t, p0, p1, p2, p3) {
+ return {
+ x: Bezier_(t, p0.x, p1.x, p2.x, p3.x),
+ y: Bezier_(t, p0.y, p1.y, p2.y, p3.y)
+ };
+ };
+ yForX = function(xTarget, Bs, returnsToSelf) {
+ var B, aB, i, lower, percent, upper, x, xTolerance, _i, _len;
+ B = null;
+ for (_i = 0, _len = Bs.length; _i < _len; _i++) {
+ aB = Bs[_i];
+ if (xTarget >= aB(0).x && xTarget <= aB(1).x) {
+ B = aB;
+ }
+ if (B !== null) {
+ break;
+ }
+ }
+ if (!B) {
+ if (returnsToSelf) {
+ return 0;
+ } else {
+ return 1;
+ }
+ }
+ xTolerance = 0.0001;
+ lower = 0;
+ upper = 1;
+ percent = (upper + lower) / 2;
+ x = B(percent).x;
+ i = 0;
+ while (Math.abs(xTarget - x) > xTolerance && i < 100) {
+ if (xTarget > x) {
+ lower = percent;
+ } else {
+ upper = percent;
+ }
+ percent = (upper + lower) / 2;
+ x = B(percent).x;
+ i += 1;
+ }
+ return B(percent).y;
+ };
+ return function(options) {
+ var Bs, points, returnsToSelf;
+ if (options == null) {
+ options = {};
+ }
+ points = options.points;
+ returnsToSelf = false;
+ Bs = (function() {
+ var i, k, _fn;
+ Bs = [];
+ _fn = function(pointA, pointB) {
+ var B2;
+ B2 = function(t) {
+ return Bezier(t, pointA, pointA.cp[pointA.cp.length - 1], pointB.cp[0], pointB);
+ };
+ return Bs.push(B2);
+ };
+ for (i in points) {
+ k = parseInt(i);
+ if (k >= points.length - 1) {
+ break;
+ }
+ _fn(points[k], points[k + 1]);
+ }
+ return Bs;
+ })();
+ return function(t) {
+ if (t === 0) {
+ return 0;
+ } else if (t === 1) {
+ return 1;
+ } else {
+ return yForX(t, Bs, returnsToSelf);
+ }
+ };
+ };
+ })();
+
+ dynamics.easeInOut = function(options) {
+ var friction, _ref;
+ if (options == null) {
+ options = {};
+ }
+ friction = (_ref = options.friction) != null ? _ref : arguments.callee.defaults.friction;
+ return dynamics.bezier({
+ points: [
+ {
+ x: 0,
+ y: 0,
+ cp: [
+ {
+ x: 0.92 - (friction / 1000),
+ y: 0
+ }
+ ]
+ }, {
+ x: 1,
+ y: 1,
+ cp: [
+ {
+ x: 0.08 + (friction / 1000),
+ y: 1
+ }
+ ]
+ }
+ ]
+ });
+ };
+
+ dynamics.easeIn = function(options) {
+ var friction, _ref;
+ if (options == null) {
+ options = {};
+ }
+ friction = (_ref = options.friction) != null ? _ref : arguments.callee.defaults.friction;
+ return dynamics.bezier({
+ points: [
+ {
+ x: 0,
+ y: 0,
+ cp: [
+ {
+ x: 0.92 - (friction / 1000),
+ y: 0
+ }
+ ]
+ }, {
+ x: 1,
+ y: 1,
+ cp: [
+ {
+ x: 1,
+ y: 1
+ }
+ ]
+ }
+ ]
+ });
+ };
+
+ dynamics.easeOut = function(options) {
+ var friction, _ref;
+ if (options == null) {
+ options = {};
+ }
+ friction = (_ref = options.friction) != null ? _ref : arguments.callee.defaults.friction;
+ return dynamics.bezier({
+ points: [
+ {
+ x: 0,
+ y: 0,
+ cp: [
+ {
+ x: 0,
+ y: 0
+ }
+ ]
+ }, {
+ x: 1,
+ y: 1,
+ cp: [
+ {
+ x: 0.08 + (friction / 1000),
+ y: 1
+ }
+ ]
+ }
+ ]
+ });
+ };
+
+ dynamics.spring.defaults = {
+ frequency: 300,
+ friction: 200,
+ anticipationSize: 0,
+ anticipationStrength: 0
+ };
+
+ dynamics.bounce.defaults = {
+ frequency: 300,
+ friction: 200
+ };
+
+ dynamics.forceWithGravity.defaults = dynamics.gravity.defaults = {
+ bounciness: 400,
+ elasticity: 200
+ };
+
+ dynamics.easeInOut.defaults = dynamics.easeIn.defaults = dynamics.easeOut.defaults = {
+ friction: 500
+ };
+
+ dynamics.css = makeArrayFn(function(el, properties) {
+ return applyProperties(el, properties, true);
+ });
+
+ dynamics.animate = makeArrayFn(function(el, properties, options) {
+ var id;
+ if (options == null) {
+ options = {};
+ }
+ options = clone(options);
+ applyDefaults(options, {
+ type: dynamics.easeInOut,
+ duration: 1000,
+ delay: 0,
+ animated: true
+ });
+ options.duration = Math.max(0, options.duration * slowRatio);
+ options.delay = Math.max(0, options.delay);
+ if (options.delay === 0) {
+ return startAnimation(el, properties, options);
+ } else {
+ id = dynamics.setTimeout(function() {
+ return startAnimation(el, properties, options, id);
+ }, options.delay);
+ return animationsTimeouts.push({
+ id: id,
+ el: el
+ });
+ }
+ });
+
+ dynamics.stop = makeArrayFn(function(el, options) {
+ if (options == null) {
+ options = {};
+ }
+ if (options.timeout == null) {
+ options.timeout = true;
+ }
+ if (options.timeout) {
+ animationsTimeouts = animationsTimeouts.filter(function(timeout) {
+ if (timeout.el === el && ((options.filter == null) || options.filter(timeout))) {
+ dynamics.clearTimeout(timeout.id);
+ return true;
+ }
+ return false;
+ });
+ }
+ return animations = animations.filter(function(animation) {
+ return animation.el !== el;
+ });
+ });
+
+ dynamics.setTimeout = function(fn, delay) {
+ return addTimeout(fn, delay * slowRatio);
+ };
+
+ dynamics.clearTimeout = function(id) {
+ return cancelTimeout(id);
+ };
+
+ dynamics.toggleSlow = function() {
+ slow = !slow;
+ if (slow) {
+ slowRatio = 3;
+ } else {
+ slowRatio = 1;
+ }
+ return typeof console !== "undefined" && console !== null ? typeof console.log === "function" ? console.log("dynamics.js: slow animations " + (slow ? "enabled" : "disabled")) : void 0 : void 0;
+ };
+
+ if (typeof module === "object" && typeof module.exports === "object") {
+ module.exports = dynamics;
+ } else if (typeof define === "function") {
+ define('dynamics', function() {
+ return dynamics;
+ });
+ } else {
+ window.dynamics = dynamics;
+ }
+
+}).call(this);
diff --git a/couchpotato/static/scripts/vendor/fastclick.js b/couchpotato/static/scripts/vendor/fastclick.js
new file mode 100644
index 0000000000..3af4f9d6f1
--- /dev/null
+++ b/couchpotato/static/scripts/vendor/fastclick.js
@@ -0,0 +1,841 @@
+;(function () {
+ 'use strict';
+
+ /**
+ * @preserve FastClick: polyfill to remove click delays on browsers with touch UIs.
+ *
+ * @codingstandard ftlabs-jsv2
+ * @copyright The Financial Times Limited [All Rights Reserved]
+ * @license MIT License (see LICENSE.txt)
+ */
+
+ /*jslint browser:true, node:true*/
+ /*global define, Event, Node*/
+
+
+ /**
+ * Instantiate fast-clicking listeners on the specified layer.
+ *
+ * @constructor
+ * @param {Element} layer The layer to listen on
+ * @param {Object} [options={}] The options to override the defaults
+ */
+ function FastClick(layer, options) {
+ var oldOnClick;
+
+ options = options || {};
+
+ /**
+ * Whether a click is currently being tracked.
+ *
+ * @type boolean
+ */
+ this.trackingClick = false;
+
+
+ /**
+ * Timestamp for when click tracking started.
+ *
+ * @type number
+ */
+ this.trackingClickStart = 0;
+
+
+ /**
+ * The element being tracked for a click.
+ *
+ * @type EventTarget
+ */
+ this.targetElement = null;
+
+
+ /**
+ * X-coordinate of touch start event.
+ *
+ * @type number
+ */
+ this.touchStartX = 0;
+
+
+ /**
+ * Y-coordinate of touch start event.
+ *
+ * @type number
+ */
+ this.touchStartY = 0;
+
+
+ /**
+ * ID of the last touch, retrieved from Touch.identifier.
+ *
+ * @type number
+ */
+ this.lastTouchIdentifier = 0;
+
+
+ /**
+ * Touchmove boundary, beyond which a click will be cancelled.
+ *
+ * @type number
+ */
+ this.touchBoundary = options.touchBoundary || 10;
+
+
+ /**
+ * The FastClick layer.
+ *
+ * @type Element
+ */
+ this.layer = layer;
+
+ /**
+ * The minimum time between tap(touchstart and touchend) events
+ *
+ * @type number
+ */
+ this.tapDelay = options.tapDelay || 200;
+
+ /**
+ * The maximum time for a tap
+ *
+ * @type number
+ */
+ this.tapTimeout = options.tapTimeout || 700;
+
+ if (FastClick.notNeeded(layer)) {
+ return;
+ }
+
+ // Some old versions of Android don't have Function.prototype.bind
+ function bind(method, context) {
+ return function() { return method.apply(context, arguments); };
+ }
+
+
+ var methods = ['onMouse', 'onClick', 'onTouchStart', 'onTouchMove', 'onTouchEnd', 'onTouchCancel'];
+ var context = this;
+ for (var i = 0, l = methods.length; i < l; i++) {
+ context[methods[i]] = bind(context[methods[i]], context);
+ }
+
+ // Set up event handlers as required
+ if (deviceIsAndroid) {
+ layer.addEventListener('mouseover', this.onMouse, true);
+ layer.addEventListener('mousedown', this.onMouse, true);
+ layer.addEventListener('mouseup', this.onMouse, true);
+ }
+
+ layer.addEventListener('click', this.onClick, true);
+ layer.addEventListener('touchstart', this.onTouchStart, false);
+ layer.addEventListener('touchmove', this.onTouchMove, false);
+ layer.addEventListener('touchend', this.onTouchEnd, false);
+ layer.addEventListener('touchcancel', this.onTouchCancel, false);
+
+ // Hack is required for browsers that don't support Event#stopImmediatePropagation (e.g. Android 2)
+ // which is how FastClick normally stops click events bubbling to callbacks registered on the FastClick
+ // layer when they are cancelled.
+ if (!Event.prototype.stopImmediatePropagation) {
+ layer.removeEventListener = function(type, callback, capture) {
+ var rmv = Node.prototype.removeEventListener;
+ if (type === 'click') {
+ rmv.call(layer, type, callback.hijacked || callback, capture);
+ } else {
+ rmv.call(layer, type, callback, capture);
+ }
+ };
+
+ layer.addEventListener = function(type, callback, capture) {
+ var adv = Node.prototype.addEventListener;
+ if (type === 'click') {
+ adv.call(layer, type, callback.hijacked || (callback.hijacked = function(event) {
+ if (!event.propagationStopped) {
+ callback(event);
+ }
+ }), capture);
+ } else {
+ adv.call(layer, type, callback, capture);
+ }
+ };
+ }
+
+ // If a handler is already declared in the element's onclick attribute, it will be fired before
+ // FastClick's onClick handler. Fix this by pulling out the user-defined handler function and
+ // adding it as listener.
+ if (typeof layer.onclick === 'function') {
+
+ // Android browser on at least 3.2 requires a new reference to the function in layer.onclick
+ // - the old one won't work if passed to addEventListener directly.
+ oldOnClick = layer.onclick;
+ layer.addEventListener('click', function(event) {
+ oldOnClick(event);
+ }, false);
+ layer.onclick = null;
+ }
+ }
+
+ /**
+ * Windows Phone 8.1 fakes user agent string to look like Android and iPhone.
+ *
+ * @type boolean
+ */
+ var deviceIsWindowsPhone = navigator.userAgent.indexOf("Windows Phone") >= 0;
+
+ /**
+ * Android requires exceptions.
+ *
+ * @type boolean
+ */
+ var deviceIsAndroid = navigator.userAgent.indexOf('Android') > 0 && !deviceIsWindowsPhone;
+
+
+ /**
+ * iOS requires exceptions.
+ *
+ * @type boolean
+ */
+ var deviceIsIOS = /iP(ad|hone|od)/.test(navigator.userAgent) && !deviceIsWindowsPhone;
+
+
+ /**
+ * iOS 4 requires an exception for select elements.
+ *
+ * @type boolean
+ */
+ var deviceIsIOS4 = deviceIsIOS && (/OS 4_\d(_\d)?/).test(navigator.userAgent);
+
+
+ /**
+ * iOS 6.0-7.* requires the target element to be manually derived
+ *
+ * @type boolean
+ */
+ var deviceIsIOSWithBadTarget = deviceIsIOS && (/OS [6-7]_\d/).test(navigator.userAgent);
+
+ /**
+ * BlackBerry requires exceptions.
+ *
+ * @type boolean
+ */
+ var deviceIsBlackBerry10 = navigator.userAgent.indexOf('BB10') > 0;
+
+ /**
+ * Determine whether a given element requires a native click.
+ *
+ * @param {EventTarget|Element} target Target DOM element
+ * @returns {boolean} Returns true if the element needs a native click
+ */
+ FastClick.prototype.needsClick = function(target) {
+ switch (target.nodeName.toLowerCase()) {
+
+ // Don't send a synthetic click to disabled inputs (issue #62)
+ case 'button':
+ case 'select':
+ case 'textarea':
+ if (target.disabled) {
+ return true;
+ }
+
+ break;
+ case 'input':
+
+ // File inputs need real clicks on iOS 6 due to a browser bug (issue #68)
+ if ((deviceIsIOS && target.type === 'file') || target.disabled) {
+ return true;
+ }
+
+ break;
+ case 'label':
+ case 'iframe': // iOS8 homescreen apps can prevent events bubbling into frames
+ case 'video':
+ return true;
+ }
+
+ return (/\bneedsclick\b/).test(target.className);
+ };
+
+
+ /**
+ * Determine whether a given element requires a call to focus to simulate click into element.
+ *
+ * @param {EventTarget|Element} target Target DOM element
+ * @returns {boolean} Returns true if the element requires a call to focus to simulate native click.
+ */
+ FastClick.prototype.needsFocus = function(target) {
+ switch (target.nodeName.toLowerCase()) {
+ case 'textarea':
+ return true;
+ case 'select':
+ return !deviceIsAndroid;
+ case 'input':
+ switch (target.type) {
+ case 'button':
+ case 'checkbox':
+ case 'file':
+ case 'image':
+ case 'radio':
+ case 'submit':
+ return false;
+ }
+
+ // No point in attempting to focus disabled inputs
+ return !target.disabled && !target.readOnly;
+ default:
+ return (/\bneedsfocus\b/).test(target.className);
+ }
+ };
+
+
+ /**
+ * Send a click event to the specified element.
+ *
+ * @param {EventTarget|Element} targetElement
+ * @param {Event} event
+ */
+ FastClick.prototype.sendClick = function(targetElement, event) {
+ var clickEvent, touch;
+
+ // On some Android devices activeElement needs to be blurred otherwise the synthetic click will have no effect (#24)
+ if (document.activeElement && document.activeElement !== targetElement) {
+ document.activeElement.blur();
+ }
+
+ touch = event.changedTouches[0];
+
+ // Synthesise a click event, with an extra attribute so it can be tracked
+ clickEvent = document.createEvent('MouseEvents');
+ clickEvent.initMouseEvent(this.determineEventType(targetElement), true, true, window, 1, touch.screenX, touch.screenY, touch.clientX, touch.clientY, false, false, false, false, 0, null);
+ clickEvent.forwardedTouchEvent = true;
+ targetElement.dispatchEvent(clickEvent);
+ };
+
+ FastClick.prototype.determineEventType = function(targetElement) {
+
+ //Issue #159: Android Chrome Select Box does not open with a synthetic click event
+ if (deviceIsAndroid && targetElement.tagName.toLowerCase() === 'select') {
+ return 'mousedown';
+ }
+
+ return 'click';
+ };
+
+
+ /**
+ * @param {EventTarget|Element} targetElement
+ */
+ FastClick.prototype.focus = function(targetElement) {
+ var length;
+
+ // Issue #160: on iOS 7, some input elements (e.g. date datetime month) throw a vague TypeError on setSelectionRange. These elements don't have an integer value for the selectionStart and selectionEnd properties, but unfortunately that can't be used for detection because accessing the properties also throws a TypeError. Just check the type instead. Filed as Apple bug #15122724.
+ if (deviceIsIOS && targetElement.setSelectionRange && targetElement.type.indexOf('date') !== 0 && targetElement.type !== 'time' && targetElement.type !== 'month') {
+ length = targetElement.value.length;
+ targetElement.setSelectionRange(length, length);
+ } else {
+ targetElement.focus();
+ }
+ };
+
+
+ /**
+ * Check whether the given target element is a child of a scrollable layer and if so, set a flag on it.
+ *
+ * @param {EventTarget|Element} targetElement
+ */
+ FastClick.prototype.updateScrollParent = function(targetElement) {
+ var scrollParent, parentElement;
+
+ scrollParent = targetElement.fastClickScrollParent;
+
+ // Attempt to discover whether the target element is contained within a scrollable layer. Re-check if the
+ // target element was moved to another parent.
+ if (!scrollParent || !scrollParent.contains(targetElement)) {
+ parentElement = targetElement;
+ do {
+ if (parentElement.scrollHeight > parentElement.offsetHeight) {
+ scrollParent = parentElement;
+ targetElement.fastClickScrollParent = parentElement;
+ break;
+ }
+
+ parentElement = parentElement.parentElement;
+ } while (parentElement);
+ }
+
+ // Always update the scroll top tracker if possible.
+ if (scrollParent) {
+ scrollParent.fastClickLastScrollTop = scrollParent.scrollTop;
+ }
+ };
+
+
+ /**
+ * @param {EventTarget} targetElement
+ * @returns {Element|EventTarget}
+ */
+ FastClick.prototype.getTargetElementFromEventTarget = function(eventTarget) {
+
+ // On some older browsers (notably Safari on iOS 4.1 - see issue #56) the event target may be a text node.
+ if (eventTarget.nodeType === Node.TEXT_NODE) {
+ return eventTarget.parentNode;
+ }
+
+ return eventTarget;
+ };
+
+
+ /**
+ * On touch start, record the position and scroll offset.
+ *
+ * @param {Event} event
+ * @returns {boolean}
+ */
+ FastClick.prototype.onTouchStart = function(event) {
+ var targetElement, touch, selection;
+
+ // Ignore multiple touches, otherwise pinch-to-zoom is prevented if both fingers are on the FastClick element (issue #111).
+ if (event.targetTouches.length > 1) {
+ return true;
+ }
+
+ targetElement = this.getTargetElementFromEventTarget(event.target);
+ touch = event.targetTouches[0];
+
+ if (deviceIsIOS) {
+
+ // Only trusted events will deselect text on iOS (issue #49)
+ selection = window.getSelection();
+ if (selection.rangeCount && !selection.isCollapsed) {
+ return true;
+ }
+
+ if (!deviceIsIOS4) {
+
+ // Weird things happen on iOS when an alert or confirm dialog is opened from a click event callback (issue #23):
+ // when the user next taps anywhere else on the page, new touchstart and touchend events are dispatched
+ // with the same identifier as the touch event that previously triggered the click that triggered the alert.
+ // Sadly, there is an issue on iOS 4 that causes some normal touch events to have the same identifier as an
+ // immediately preceeding touch event (issue #52), so this fix is unavailable on that platform.
+ // Issue 120: touch.identifier is 0 when Chrome dev tools 'Emulate touch events' is set with an iOS device UA string,
+ // which causes all touch events to be ignored. As this block only applies to iOS, and iOS identifiers are always long,
+ // random integers, it's safe to to continue if the identifier is 0 here.
+ if (touch.identifier && touch.identifier === this.lastTouchIdentifier) {
+ event.preventDefault();
+ return false;
+ }
+
+ this.lastTouchIdentifier = touch.identifier;
+
+ // If the target element is a child of a scrollable layer (using -webkit-overflow-scrolling: touch) and:
+ // 1) the user does a fling scroll on the scrollable layer
+ // 2) the user stops the fling scroll with another tap
+ // then the event.target of the last 'touchend' event will be the element that was under the user's finger
+ // when the fling scroll was started, causing FastClick to send a click event to that layer - unless a check
+ // is made to ensure that a parent layer was not scrolled before sending a synthetic click (issue #42).
+ this.updateScrollParent(targetElement);
+ }
+ }
+
+ this.trackingClick = true;
+ this.trackingClickStart = event.timeStamp;
+ this.targetElement = targetElement;
+
+ this.touchStartX = touch.pageX;
+ this.touchStartY = touch.pageY;
+
+ // Prevent phantom clicks on fast double-tap (issue #36)
+ if ((event.timeStamp - this.lastClickTime) < this.tapDelay) {
+ event.preventDefault();
+ }
+
+ return true;
+ };
+
+
+ /**
+ * Based on a touchmove event object, check whether the touch has moved past a boundary since it started.
+ *
+ * @param {Event} event
+ * @returns {boolean}
+ */
+ FastClick.prototype.touchHasMoved = function(event) {
+ var touch = event.changedTouches[0], boundary = this.touchBoundary;
+
+ if (Math.abs(touch.pageX - this.touchStartX) > boundary || Math.abs(touch.pageY - this.touchStartY) > boundary) {
+ return true;
+ }
+
+ return false;
+ };
+
+
+ /**
+ * Update the last position.
+ *
+ * @param {Event} event
+ * @returns {boolean}
+ */
+ FastClick.prototype.onTouchMove = function(event) {
+ if (!this.trackingClick) {
+ return true;
+ }
+
+ // If the touch has moved, cancel the click tracking
+ if (this.targetElement !== this.getTargetElementFromEventTarget(event.target) || this.touchHasMoved(event)) {
+ this.trackingClick = false;
+ this.targetElement = null;
+ }
+
+ return true;
+ };
+
+
+ /**
+ * Attempt to find the labelled control for the given label element.
+ *
+ * @param {EventTarget|HTMLLabelElement} labelElement
+ * @returns {Element|null}
+ */
+ FastClick.prototype.findControl = function(labelElement) {
+
+ // Fast path for newer browsers supporting the HTML5 control attribute
+ if (labelElement.control !== undefined) {
+ return labelElement.control;
+ }
+
+ // All browsers under test that support touch events also support the HTML5 htmlFor attribute
+ if (labelElement.htmlFor) {
+ return document.getElementById(labelElement.htmlFor);
+ }
+
+ // If no for attribute exists, attempt to retrieve the first labellable descendant element
+ // the list of which is defined here: http://www.w3.org/TR/html5/forms.html#category-label
+ return labelElement.querySelector('button, input:not([type=hidden]), keygen, meter, output, progress, select, textarea');
+ };
+
+
+ /**
+ * On touch end, determine whether to send a click event at once.
+ *
+ * @param {Event} event
+ * @returns {boolean}
+ */
+ FastClick.prototype.onTouchEnd = function(event) {
+ var forElement, trackingClickStart, targetTagName, scrollParent, touch, targetElement = this.targetElement;
+
+ if (!this.trackingClick) {
+ return true;
+ }
+
+ // Prevent phantom clicks on fast double-tap (issue #36)
+ if ((event.timeStamp - this.lastClickTime) < this.tapDelay) {
+ this.cancelNextClick = true;
+ return true;
+ }
+
+ if ((event.timeStamp - this.trackingClickStart) > this.tapTimeout) {
+ return true;
+ }
+
+ // Reset to prevent wrong click cancel on input (issue #156).
+ this.cancelNextClick = false;
+
+ this.lastClickTime = event.timeStamp;
+
+ trackingClickStart = this.trackingClickStart;
+ this.trackingClick = false;
+ this.trackingClickStart = 0;
+
+ // On some iOS devices, the targetElement supplied with the event is invalid if the layer
+ // is performing a transition or scroll, and has to be re-detected manually. Note that
+ // for this to function correctly, it must be called *after* the event target is checked!
+ // See issue #57; also filed as rdar://13048589 .
+ if (deviceIsIOSWithBadTarget) {
+ touch = event.changedTouches[0];
+
+ // In certain cases arguments of elementFromPoint can be negative, so prevent setting targetElement to null
+ targetElement = document.elementFromPoint(touch.pageX - window.pageXOffset, touch.pageY - window.pageYOffset) || targetElement;
+ targetElement.fastClickScrollParent = this.targetElement.fastClickScrollParent;
+ }
+
+ targetTagName = targetElement.tagName.toLowerCase();
+ if (targetTagName === 'label') {
+ forElement = this.findControl(targetElement);
+ if (forElement) {
+ this.focus(targetElement);
+ if (deviceIsAndroid) {
+ return false;
+ }
+
+ targetElement = forElement;
+ }
+ } else if (this.needsFocus(targetElement)) {
+
+ // Case 1: If the touch started a while ago (best guess is 100ms based on tests for issue #36) then focus will be triggered anyway. Return early and unset the target element reference so that the subsequent click will be allowed through.
+ // Case 2: Without this exception for input elements tapped when the document is contained in an iframe, then any inputted text won't be visible even though the value attribute is updated as the user types (issue #37).
+ if ((event.timeStamp - trackingClickStart) > 100 || (deviceIsIOS && window.top !== window && targetTagName === 'input')) {
+ this.targetElement = null;
+ return false;
+ }
+
+ this.focus(targetElement);
+ this.sendClick(targetElement, event);
+
+ // Select elements need the event to go through on iOS 4, otherwise the selector menu won't open.
+ // Also this breaks opening selects when VoiceOver is active on iOS6, iOS7 (and possibly others)
+ if (!deviceIsIOS || targetTagName !== 'select') {
+ this.targetElement = null;
+ event.preventDefault();
+ }
+
+ return false;
+ }
+
+ if (deviceIsIOS && !deviceIsIOS4) {
+
+ // Don't send a synthetic click event if the target element is contained within a parent layer that was scrolled
+ // and this tap is being used to stop the scrolling (usually initiated by a fling - issue #42).
+ scrollParent = targetElement.fastClickScrollParent;
+ if (scrollParent && scrollParent.fastClickLastScrollTop !== scrollParent.scrollTop) {
+ return true;
+ }
+ }
+
+ // Prevent the actual click from going though - unless the target node is marked as requiring
+ // real clicks or if it is in the whitelist in which case only non-programmatic clicks are permitted.
+ if (!this.needsClick(targetElement)) {
+ event.preventDefault();
+ this.sendClick(targetElement, event);
+ }
+
+ return false;
+ };
+
+
+ /**
+ * On touch cancel, stop tracking the click.
+ *
+ * @returns {void}
+ */
+ FastClick.prototype.onTouchCancel = function() {
+ this.trackingClick = false;
+ this.targetElement = null;
+ };
+
+
+ /**
+ * Determine mouse events which should be permitted.
+ *
+ * @param {Event} event
+ * @returns {boolean}
+ */
+ FastClick.prototype.onMouse = function(event) {
+
+ // If a target element was never set (because a touch event was never fired) allow the event
+ if (!this.targetElement) {
+ return true;
+ }
+
+ if (event.forwardedTouchEvent) {
+ return true;
+ }
+
+ // Programmatically generated events targeting a specific element should be permitted
+ if (!event.cancelable) {
+ return true;
+ }
+
+ // Derive and check the target element to see whether the mouse event needs to be permitted;
+ // unless explicitly enabled, prevent non-touch click events from triggering actions,
+ // to prevent ghost/doubleclicks.
+ if (!this.needsClick(this.targetElement) || this.cancelNextClick) {
+
+ // Prevent any user-added listeners declared on FastClick element from being fired.
+ if (event.stopImmediatePropagation) {
+ event.stopImmediatePropagation();
+ } else {
+
+ // Part of the hack for browsers that don't support Event#stopImmediatePropagation (e.g. Android 2)
+ event.propagationStopped = true;
+ }
+
+ // Cancel the event
+ event.stopPropagation();
+ event.preventDefault();
+
+ return false;
+ }
+
+ // If the mouse event is permitted, return true for the action to go through.
+ return true;
+ };
+
+
+ /**
+ * On actual clicks, determine whether this is a touch-generated click, a click action occurring
+ * naturally after a delay after a touch (which needs to be cancelled to avoid duplication), or
+ * an actual click which should be permitted.
+ *
+ * @param {Event} event
+ * @returns {boolean}
+ */
+ FastClick.prototype.onClick = function(event) {
+ var permitted;
+
+ // It's possible for another FastClick-like library delivered with third-party code to fire a click event before FastClick does (issue #44). In that case, set the click-tracking flag back to false and return early. This will cause onTouchEnd to return early.
+ if (this.trackingClick) {
+ this.targetElement = null;
+ this.trackingClick = false;
+ return true;
+ }
+
+ // Very odd behaviour on iOS (issue #18): if a submit element is present inside a form and the user hits enter in the iOS simulator or clicks the Go button on the pop-up OS keyboard the a kind of 'fake' click event will be triggered with the submit-type input element as the target.
+ if (event.target.type === 'submit' && event.detail === 0) {
+ return true;
+ }
+
+ permitted = this.onMouse(event);
+
+ // Only unset targetElement if the click is not permitted. This will ensure that the check for !targetElement in onMouse fails and the browser's click doesn't go through.
+ if (!permitted) {
+ this.targetElement = null;
+ }
+
+ // If clicks are permitted, return true for the action to go through.
+ return permitted;
+ };
+
+
+ /**
+ * Remove all FastClick's event listeners.
+ *
+ * @returns {void}
+ */
+ FastClick.prototype.destroy = function() {
+ var layer = this.layer;
+
+ if (deviceIsAndroid) {
+ layer.removeEventListener('mouseover', this.onMouse, true);
+ layer.removeEventListener('mousedown', this.onMouse, true);
+ layer.removeEventListener('mouseup', this.onMouse, true);
+ }
+
+ layer.removeEventListener('click', this.onClick, true);
+ layer.removeEventListener('touchstart', this.onTouchStart, false);
+ layer.removeEventListener('touchmove', this.onTouchMove, false);
+ layer.removeEventListener('touchend', this.onTouchEnd, false);
+ layer.removeEventListener('touchcancel', this.onTouchCancel, false);
+ };
+
+
+ /**
+ * Check whether FastClick is needed.
+ *
+ * @param {Element} layer The layer to listen on
+ */
+ FastClick.notNeeded = function(layer) {
+ var metaViewport;
+ var chromeVersion;
+ var blackberryVersion;
+ var firefoxVersion;
+
+ // Devices that don't support touch don't need FastClick
+ if (typeof window.ontouchstart === 'undefined') {
+ return true;
+ }
+
+ // Chrome version - zero for other browsers
+ chromeVersion = +(/Chrome\/([0-9]+)/.exec(navigator.userAgent) || [,0])[1];
+
+ if (chromeVersion) {
+
+ if (deviceIsAndroid) {
+ metaViewport = document.querySelector('meta[name=viewport]');
+
+ if (metaViewport) {
+ // Chrome on Android with user-scalable="no" doesn't need FastClick (issue #89)
+ if (metaViewport.content.indexOf('user-scalable=no') !== -1) {
+ return true;
+ }
+ // Chrome 32 and above with width=device-width or less don't need FastClick
+ if (chromeVersion > 31 && document.documentElement.scrollWidth <= window.outerWidth) {
+ return true;
+ }
+ }
+
+ // Chrome desktop doesn't need FastClick (issue #15)
+ } else {
+ return true;
+ }
+ }
+
+ if (deviceIsBlackBerry10) {
+ blackberryVersion = navigator.userAgent.match(/Version\/([0-9]*)\.([0-9]*)/);
+
+ // BlackBerry 10.3+ does not require Fastclick library.
+ // https://github.com/ftlabs/fastclick/issues/251
+ if (blackberryVersion[1] >= 10 && blackberryVersion[2] >= 3) {
+ metaViewport = document.querySelector('meta[name=viewport]');
+
+ if (metaViewport) {
+ // user-scalable=no eliminates click delay.
+ if (metaViewport.content.indexOf('user-scalable=no') !== -1) {
+ return true;
+ }
+ // width=device-width (or less than device-width) eliminates click delay.
+ if (document.documentElement.scrollWidth <= window.outerWidth) {
+ return true;
+ }
+ }
+ }
+ }
+
+ // IE10 with -ms-touch-action: none or manipulation, which disables double-tap-to-zoom (issue #97)
+ if (layer.style.msTouchAction === 'none' || layer.style.touchAction === 'manipulation') {
+ return true;
+ }
+
+ // Firefox version - zero for other browsers
+ firefoxVersion = +(/Firefox\/([0-9]+)/.exec(navigator.userAgent) || [,0])[1];
+
+ if (firefoxVersion >= 27) {
+ // Firefox 27+ does not have tap delay if the content is not zoomable - https://bugzilla.mozilla.org/show_bug.cgi?id=922896
+
+ metaViewport = document.querySelector('meta[name=viewport]');
+ if (metaViewport && (metaViewport.content.indexOf('user-scalable=no') !== -1 || document.documentElement.scrollWidth <= window.outerWidth)) {
+ return true;
+ }
+ }
+
+ // IE11: prefixed -ms-touch-action is no longer supported and it's recomended to use non-prefixed version
+ // http://msdn.microsoft.com/en-us/library/windows/apps/Hh767313.aspx
+ if (layer.style.touchAction === 'none' || layer.style.touchAction === 'manipulation') {
+ return true;
+ }
+
+ return false;
+ };
+
+
+ /**
+ * Factory method for creating a FastClick object
+ *
+ * @param {Element} layer The layer to listen on
+ * @param {Object} [options={}] The options to override the defaults
+ */
+ FastClick.attach = function(layer, options) {
+ return new FastClick(layer, options);
+ };
+
+
+ if (typeof define === 'function' && typeof define.amd === 'object' && define.amd) {
+
+ // AMD. Register as an anonymous module.
+ define(function() {
+ return FastClick;
+ });
+ } else if (typeof module !== 'undefined' && module.exports) {
+ module.exports = FastClick.attach;
+ module.exports.FastClick = FastClick;
+ } else {
+ window.FastClick = FastClick;
+ }
+}());
diff --git a/couchpotato/static/scripts/library/history.js b/couchpotato/static/scripts/vendor/history.js
similarity index 100%
rename from couchpotato/static/scripts/library/history.js
rename to couchpotato/static/scripts/vendor/history.js
diff --git a/couchpotato/static/scripts/library/mootools.js b/couchpotato/static/scripts/vendor/mootools.js
similarity index 89%
rename from couchpotato/static/scripts/library/mootools.js
rename to couchpotato/static/scripts/vendor/mootools.js
index 9917ad3255..1e816e02bc 100644
--- a/couchpotato/static/scripts/library/mootools.js
+++ b/couchpotato/static/scripts/vendor/mootools.js
@@ -1,16 +1,7 @@
+/* MooTools: the javascript framework. license: MIT-style license. copyright: Copyright (c) 2006-2014 [Valerio Proietti](http://mad4milk.net/).*/
/*
----
-MooTools: the javascript framework
-
-web build:
- - http://mootools.net/core/f42fb6d73ea1a13146c5ad9502b442f0
-
-packager build:
- - packager build Core/Class Core/Class.Extras Core/Element Core/Element.Style Core/Element.Delegation Core/Element.Dimensions Core/Fx.Tween Core/Fx.Morph Core/Fx.Transitions Core/Request.JSON Core/Cookie Core/DOMReady
-
-...
+Web Build: http://mootools.net/core/builder/90d9ff9fd02e4de69368c13d49be4022
*/
-
/*
---
@@ -20,7 +11,7 @@ description: The heart of MooTools.
license: MIT-style license.
-copyright: Copyright (c) 2006-2012 [Valerio Proietti](http://mad4milk.net/).
+copyright: Copyright (c) 2006-2014 [Valerio Proietti](http://mad4milk.net/).
authors: The MooTools production team (http://mootools.net/developers/)
@@ -32,12 +23,12 @@ provides: [Core, MooTools, Type, typeOf, instanceOf, Native]
...
*/
-
+/*! MooTools: the javascript framework. license: MIT-style license. copyright: Copyright (c) 2006-2014 [Valerio Proietti](http://mad4milk.net/).*/
(function(){
this.MooTools = {
- version: '1.4.5',
- build: 'ab8ea8824dc3b24b6666867a2c4ed58ebb762cf0'
+ version: '1.5.1',
+ build: '0542c135fdeb7feed7d9917e01447a408f22c876'
};
// typeOf, instanceOf
@@ -50,7 +41,7 @@ var typeOf = this.typeOf = function(item){
if (item.nodeType == 1) return 'element';
if (item.nodeType == 3) return (/\S/).test(item.nodeValue) ? 'textnode' : 'whitespace';
} else if (typeof item.length == 'number'){
- if (item.callee) return 'arguments';
+ if ('callee' in item) return 'arguments';
if ('item' in item) return 'collection';
}
@@ -267,7 +258,7 @@ var force = function(name, object, methods){
if (!methodsEnumerable) for (var i = 0, l = methods.length; i < l; i++){
fn.call(prototype, prototype[methods[i]], methods[i]);
}
- for (var key in prototype) fn.call(prototype, prototype[key], key)
+ for (var key in prototype) fn.call(prototype, prototype[key], key);
};
}
@@ -275,7 +266,7 @@ var force = function(name, object, methods){
};
force('String', String, [
- 'charAt', 'charCodeAt', 'concat', 'indexOf', 'lastIndexOf', 'match', 'quote', 'replace', 'search',
+ 'charAt', 'charCodeAt', 'concat', 'contains', 'indexOf', 'lastIndexOf', 'match', 'quote', 'replace', 'search',
'slice', 'split', 'substr', 'substring', 'trim', 'toLowerCase', 'toUpperCase'
])('Array', Array, [
'pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift', 'concat', 'join', 'slice',
@@ -325,11 +316,13 @@ Object.each = Object.forEach;
Array.implement({
+ /*<!ES5>*/
forEach: function(fn, bind){
for (var i = 0, l = this.length; i < l; i++){
if (i in this) fn.call(bind, this[i], i, this);
}
},
+ /*</!ES5>*/
each: function(fn, bind){
Array.forEach(this, fn, bind);
@@ -411,7 +404,6 @@ String.extend('uniqueID', function(){
})();
-
/*
---
@@ -421,7 +413,7 @@ description: Contains Array Prototypes like each, contains, and erase.
license: MIT-style license.
-requires: Type
+requires: [Type]
provides: Array
@@ -564,7 +556,7 @@ Array.implement({
if (this.length != 3) return null;
var rgb = this.map(function(value){
if (value.length == 1) value += value;
- return value.toInt(16);
+ return parseInt(value, 16);
});
return (array) ? rgb : 'rgb(' + rgb + ')';
},
@@ -584,7 +576,6 @@ Array.implement({
-
/*
---
@@ -594,7 +585,7 @@ description: Contains String Prototypes like camelCase, capitalize, test, and to
license: MIT-style license.
-requires: Type
+requires: [Type, Array]
provides: String
@@ -603,12 +594,14 @@ provides: String
String.implement({
- test: function(regex, params){
- return ((typeOf(regex) == 'regexp') ? regex : new RegExp('' + regex, params)).test(this);
+ //<!ES6>
+ contains: function(string, index){
+ return (index ? String(this).slice(index) : String(this)).indexOf(string) > -1;
},
+ //</!ES6>
- contains: function(string, separator){
- return (separator) ? (separator + this + separator).indexOf(separator + string + separator) > -1 : String(this).indexOf(string) > -1;
+ test: function(regex, params){
+ return ((typeOf(regex) == 'regexp') ? regex : new RegExp('' + regex, params)).test(this);
},
trim: function(){
@@ -669,6 +662,7 @@ String.implement({
});
+
/*
---
@@ -749,7 +743,6 @@ Function.implement({
-
/*
---
@@ -803,7 +796,6 @@ Number.alias('each', 'times');
Number.implement(methods);
})(['abs', 'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'exp', 'floor', 'log', 'max', 'min', 'pow', 'sin', 'sqrt', 'tan']);
-
/*
---
@@ -920,7 +912,6 @@ Class.Mutators = {
})();
-
/*
---
@@ -1000,7 +991,7 @@ this.Events = new Class({
type = removeOn(type);
var events = this.$events[type];
if (events && !fn.internal){
- var index = events.indexOf(fn);
+ var index = events.indexOf(fn);
if (index != -1) delete events[index];
}
return this;
@@ -1041,7 +1032,6 @@ this.Options = new Class({
})();
-
/*
---
@@ -1063,37 +1053,47 @@ provides: [Browser, Window, Document]
var document = this.document;
var window = document.window = this;
-var ua = navigator.userAgent.toLowerCase(),
- platform = navigator.platform.toLowerCase(),
- UA = ua.match(/(opera|ie|firefox|chrome|version)[\s\/:]([\w\d\.]+)?.*?(safari|version[\s\/:]([\w\d\.]+)|$)/) || [null, 'unknown', 0],
- mode = UA[1] == 'ie' && document.documentMode;
+var parse = function(ua, platform){
+ ua = ua.toLowerCase();
+ platform = (platform ? platform.toLowerCase() : '');
-var Browser = this.Browser = {
+ var UA = ua.match(/(opera|ie|firefox|chrome|trident|crios|version)[\s\/:]([\w\d\.]+)?.*?(safari|(?:rv[\s\/:]|version[\s\/:])([\w\d\.]+)|$)/) || [null, 'unknown', 0];
+
+ if (UA[1] == 'trident'){
+ UA[1] = 'ie';
+ if (UA[4]) UA[2] = UA[4];
+ } else if (UA[1] == 'crios'){
+ UA[1] = 'chrome';
+ }
- extend: Function.prototype.extend,
+ platform = ua.match(/ip(?:ad|od|hone)/) ? 'ios' : (ua.match(/(?:webos|android)/) || platform.match(/mac|win|linux/) || ['other'])[0];
+ if (platform == 'win') platform = 'windows';
- name: (UA[1] == 'version') ? UA[3] : UA[1],
+ return {
+ extend: Function.prototype.extend,
+ name: (UA[1] == 'version') ? UA[3] : UA[1],
+ version: parseFloat((UA[1] == 'opera' && UA[4]) ? UA[4] : UA[2]),
+ platform: platform
+ };
+};
- version: mode || parseFloat((UA[1] == 'opera' && UA[4]) ? UA[4] : UA[2]),
+var Browser = this.Browser = parse(navigator.userAgent, navigator.platform);
- Platform: {
- name: ua.match(/ip(?:ad|od|hone)/) ? 'ios' : (ua.match(/(?:webos|android)/) || platform.match(/mac|win|linux/) || ['other'])[0]
- },
+if (Browser.name == 'ie'){
+ Browser.version = document.documentMode;
+}
+Browser.extend({
Features: {
xpath: !!(document.evaluate),
air: !!(window.runtime),
query: !!(document.querySelector),
json: !!(window.JSON)
},
+ parseUA: parse
+});
- Plugins: {}
-
-};
-Browser[Browser.name] = true;
-Browser[Browser.name + parseInt(Browser.version, 10)] = true;
-Browser.Platform[Browser.Platform.name] = true;
// Request
@@ -1126,18 +1126,7 @@ Browser.Request = (function(){
Browser.Features.xhr = !!(Browser.Request);
-// Flash detection
-
-var version = (Function.attempt(function(){
- return navigator.plugins['Shockwave Flash'].description;
-}, function(){
- return new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version');
-}) || '0 r0').match(/\d+/g);
-Browser.Plugins.Flash = {
- version: Number(version[0] || '0.' + version[1]) || 0,
- build: Number(version[2]) || 0
-};
// String scripts
@@ -1203,6 +1192,7 @@ if (this.attachEvent && !this.addEventListener){
var unloadEvent = function(){
this.detachEvent('onunload', unloadEvent);
document.head = document.html = document.window = null;
+ window = this.Window = document = null;
};
this.attachEvent('onunload', unloadEvent);
}
@@ -1236,7 +1226,6 @@ try {
})();
-
/*
---
@@ -1359,7 +1348,6 @@ Object.extend({
-
/*
---
name: Slick.Parser
@@ -1591,7 +1579,6 @@ if (!this.Slick) this.Slick = Slick;
}).apply(/*<CommonJS>*/(typeof exports != 'undefined') ? exports : /*</CommonJS>*/this);
-
/*
---
name: Slick.Finder
@@ -1756,7 +1743,7 @@ local.setDocument = function(document){
// native matchesSelector function
- features.nativeMatchesSelector = root.matchesSelector || /*root.msMatchesSelector ||*/ root.mozMatchesSelector || root.webkitMatchesSelector;
+ features.nativeMatchesSelector = root.matches || /*root.msMatchesSelector ||*/ root.mozMatchesSelector || root.webkitMatchesSelector;
if (features.nativeMatchesSelector) try {
// if matchesSelector trows errors on incorrect sintaxes we can use it
features.nativeMatchesSelector.call(root, ':slick');
@@ -1769,7 +1756,7 @@ local.setDocument = function(document){
root.slick_expando = 1;
delete root.slick_expando;
features.getUID = this.getUIDHTML;
- } catch(e) {
+ } catch(e){
features.getUID = this.getUIDXML;
}
@@ -1790,9 +1777,9 @@ local.setDocument = function(document){
// hasAttribute
- features.hasAttribute = (root && this.isNativeCode(root.hasAttribute)) ? function(node, attribute) {
+ features.hasAttribute = (root && this.isNativeCode(root.hasAttribute)) ? function(node, attribute){
return node.hasAttribute(attribute);
- } : function(node, attribute) {
+ } : function(node, attribute){
node = node.getAttributeNode(attribute);
return !!(node && (node.specified || node.nodeValue));
};
@@ -1874,7 +1861,7 @@ local.search = function(context, expression, append, first){
/*<simple-selectors-override>*/
var simpleSelector = expression.match(reSimpleSelector);
- simpleSelectors: if (simpleSelector) {
+ simpleSelectors: if (simpleSelector){
var symbol = simpleSelector[1],
name = simpleSelector[2],
@@ -1927,7 +1914,7 @@ local.search = function(context, expression, append, first){
/*</simple-selectors-override>*/
/*<query-selector-override>*/
- querySelector: if (context.querySelectorAll) {
+ querySelector: if (context.querySelectorAll){
if (!this.isHTMLDocument
|| qsaFailExpCache[expression]
@@ -1956,7 +1943,7 @@ local.search = function(context, expression, append, first){
try {
if (first) return context.querySelector(_expression) || null;
else nodes = context.querySelectorAll(_expression);
- } catch(e) {
+ } catch(e){
qsaFailExpCache[expression] = 1;
break querySelector;
} finally {
@@ -2155,14 +2142,14 @@ local.matchNode = function(node, selector){
if (this.isHTMLDocument && this.nativeMatchesSelector){
try {
return this.nativeMatchesSelector.call(node, selector.replace(/\[([^=]+)=\s*([^'"\]]+?)\s*\]/g, '[$1="$2"]'));
- } catch(matchError) {}
+ } catch(matchError){}
}
var parsed = this.Slick.parse(selector);
if (!parsed) return true;
// simple (single) selectors
- var expressions = parsed.expressions, simpleExpCounter = 0, i;
+ var expressions = parsed.expressions, simpleExpCounter = 0, i, currentExpression;
for (i = 0; (currentExpression = expressions[i]); i++){
if (currentExpression.length == 1){
var exp = currentExpression[0];
@@ -2578,7 +2565,6 @@ if (!this.Slick) this.Slick = Slick;
}).apply(/*<CommonJS>*/(typeof exports != 'undefined') ? exports : /*</CommonJS>*/this);
-
/*
---
@@ -2590,12 +2576,12 @@ license: MIT-style license.
requires: [Window, Document, Array, String, Function, Object, Number, Slick.Parser, Slick.Finder]
-provides: [Element, Elements, $, $$, Iframe, Selectors]
+provides: [Element, Elements, $, $$, IFrame, Selectors]
...
*/
-var Element = function(tag, props){
+var Element = this.Element = function(tag, props){
var konstructor = Element.Constructors[tag];
if (konstructor) return konstructor(props);
if (typeof tag != 'string') return document.id(tag).set(props);
@@ -2779,7 +2765,7 @@ Array.mirror(Elements);
/*<ltIE8>*/
var createElementAcceptsHTML;
try {
- createElementAcceptsHTML = (document.createElement('<input name=x>').name == 'x');
+ createElementAcceptsHTML = (document.createElement('<input name=x>').name == 'x');
} catch (e){}
var escapeQuotes = function(html){
@@ -2787,20 +2773,44 @@ var escapeQuotes = function(html){
};
/*</ltIE8>*/
+/*<ltIE9>*/
+// #2479 - IE8 Cannot set HTML of style element
+var canChangeStyleHTML = (function(){
+ var div = document.createElement('style'),
+ flag = false;
+ try {
+ div.innerHTML = '#justTesing{margin: 0px;}';
+ flag = !!div.innerHTML;
+ } catch(e){}
+ return flag;
+})();
+/*</ltIE9>*/
+
Document.implement({
newElement: function(tag, props){
- if (props && props.checked != null) props.defaultChecked = props.checked;
- /*<ltIE8>*/// Fix for readonly name and type properties in IE < 8
- if (createElementAcceptsHTML && props){
- tag = '<' + tag;
- if (props.name) tag += ' name="' + escapeQuotes(props.name) + '"';
- if (props.type) tag += ' type="' + escapeQuotes(props.type) + '"';
- tag += '>';
- delete props.name;
- delete props.type;
- }
- /*</ltIE8>*/
+ if (props){
+ if (props.checked != null) props.defaultChecked = props.checked;
+ if ((props.type == 'checkbox' || props.type == 'radio') && props.value == null) props.value = 'on';
+ /*<ltIE9>*/ // IE needs the type to be set before changing content of style element
+ if (!canChangeStyleHTML && tag == 'style'){
+ var styleElement = document.createElement('style');
+ styleElement.setAttribute('type', 'text/css');
+ if (props.type) delete props.type;
+ return this.id(styleElement).set(props);
+ }
+ /*</ltIE9>*/
+ /*<ltIE8>*/// Fix for readonly name and type properties in IE < 8
+ if (createElementAcceptsHTML){
+ tag = '<' + tag;
+ if (props.name) tag += ' name="' + escapeQuotes(props.name) + '"';
+ if (props.type) tag += ' type="' + escapeQuotes(props.type) + '"';
+ tag += '>';
+ delete props.name;
+ delete props.type;
+ }
+ /*</ltIE8>*/
+ }
return this.id(this.createElement(tag)).set(props);
}
@@ -3035,6 +3045,21 @@ Object.forEach(properties, function(real, key){
};
});
+/*<ltIE9>*/
+propertySetters.text = (function(setter){
+ return function(node, value){
+ if (node.get('tag') == 'style') node.set('html', value);
+ else node[properties.text] = value;
+ };
+})(propertySetters.text);
+
+propertyGetters.text = (function(getter){
+ return function(node){
+ return (node.get('tag') == 'style') ? node.innerHTML : getter(node);
+ };
+})(propertyGetters.text);
+/*</ltIE9>*/
+
// Booleans
var bools = [
@@ -3093,15 +3118,42 @@ el = null;
/* </webkit> */
/*<IE>*/
-var input = document.createElement('input');
+
+/*<ltIE9>*/
+// #2479 - IE8 Cannot set HTML of style element
+var canChangeStyleHTML = (function(){
+ var div = document.createElement('style'),
+ flag = false;
+ try {
+ div.innerHTML = '#justTesing{margin: 0px;}';
+ flag = !!div.innerHTML;
+ } catch(e){}
+ return flag;
+})();
+/*</ltIE9>*/
+
+var input = document.createElement('input'), volatileInputValue, html5InputSupport;
+
+// #2178
input.value = 't';
input.type = 'submit';
-if (input.value != 't') propertySetters.type = function(node, type){
- var value = node.value;
- node.type = type;
- node.value = value;
-};
+volatileInputValue = input.value != 't';
+
+// #2443 - IE throws "Invalid Argument" when trying to use html5 input types
+try {
+ input.type = 'email';
+ html5InputSupport = input.type == 'email';
+} catch(e){}
+
input = null;
+
+if (volatileInputValue || !html5InputSupport) propertySetters.type = function(node, type){
+ try {
+ var value = node.value;
+ node.type = type;
+ node.value = value;
+ } catch (e){}
+};
/*</IE>*/
/* getProperty, setProperty */
@@ -3112,7 +3164,28 @@ var pollutesGetAttribute = (function(div){
return (div.getAttribute('random') == 'attribute');
})(document.createElement('div'));
-/* <ltIE9> */
+var hasCloneBug = (function(test){
+ test.innerHTML = '<object><param name="should_fix" value="the unknown" /></object>';
+ return test.cloneNode(true).firstChild.childNodes.length != 1;
+})(document.createElement('div'));
+/* </ltIE9> */
+
+var hasClassList = !!document.createElement('div').classList;
+
+var classes = function(className){
+ var classNames = (className || '').clean().split(" "), uniques = {};
+ return classNames.filter(function(className){
+ if (className !== "" && !uniques[className]) return uniques[className] = className;
+ });
+};
+
+var addToClassList = function(name){
+ this.classList.add(name);
+};
+
+var removeFromClassList = function(name){
+ this.classList.remove(name);
+};
Element.implement({
@@ -3122,7 +3195,8 @@ Element.implement({
setter(this, value);
} else {
/* <ltIE9> */
- if (pollutesGetAttribute) var attributeWhiteList = this.retrieve('$attributeWhiteList', {});
+ var attributeWhiteList;
+ if (pollutesGetAttribute) attributeWhiteList = this.retrieve('$attributeWhiteList', {});
/* </ltIE9> */
if (value == null){
@@ -3194,17 +3268,27 @@ Element.implement({
return this;
},
- hasClass: function(className){
- return this.className.clean().contains(className, ' ');
+ hasClass: hasClassList ? function(className){
+ return this.classList.contains(className);
+ } : function(className){
+ return classes(this.className).contains(className);
},
- addClass: function(className){
- if (!this.hasClass(className)) this.className = (this.className + ' ' + className).clean();
+ addClass: hasClassList ? function(className){
+ classes(className).forEach(addToClassList, this);
+ return this;
+ } : function(className){
+ this.className = classes(className + ' ' + this.className).join(' ');
return this;
},
- removeClass: function(className){
- this.className = this.className.replace(new RegExp('(^|\\s)' + className + '(?:\\s|$)'), '$1');
+ removeClass: hasClassList ? function(className){
+ classes(className).forEach(removeFromClassList, this);
+ return this;
+ } : function(className){
+ var classNames = classes(this.className);
+ classes(className).forEach(classNames.erase, classNames);
+ this.className = classNames.join(' ');
return this;
},
@@ -3279,6 +3363,37 @@ Element.implement({
});
+
+// appendHTML
+
+var appendInserters = {
+ before: 'beforeBegin',
+ after: 'afterEnd',
+ bottom: 'beforeEnd',
+ top: 'afterBegin',
+ inside: 'beforeEnd'
+};
+
+Element.implement('appendHTML', ('insertAdjacentHTML' in document.createElement('div')) ? function(html, where){
+ this.insertAdjacentHTML(appendInserters[where || 'bottom'], html);
+ return this;
+} : function(html, where){
+ var temp = new Element('div', {html: html}),
+ children = temp.childNodes,
+ fragment = temp.firstChild;
+
+ if (!fragment) return this;
+ if (children.length > 1){
+ fragment = document.createDocumentFragment();
+ for (var i = 0, l = children.length; i < l; i++){
+ fragment.appendChild(children[i]);
+ }
+ }
+
+ inserters[where || 'bottom'](fragment, this);
+ return this;
+});
+
var collected = {}, storage = {};
var get = function(uid){
@@ -3344,7 +3459,7 @@ Element.implement({
}
/*<ltIE9>*/
- if (Browser.ie){
+ if (hasCloneBug){
var co = clone.getElementsByTagName('object'), to = this.getElementsByTagName('object');
for (i = co.length; i--;) co[i].outerHTML = to[i].outerHTML;
}
@@ -3357,13 +3472,7 @@ Element.implement({
[Element, Window, Document].invoke('implement', {
addListener: function(type, fn){
- if (type == 'unload'){
- var old = fn, self = this;
- fn = function(){
- self.removeListener('unload', fn);
- old();
- };
- } else {
+ if (window.attachEvent && !window.addEventListener){
collected[Slick.uidOf(this)] = this;
}
if (this.addEventListener) this.addEventListener(type, fn, !!arguments[2]);
@@ -3398,10 +3507,14 @@ Element.implement({
});
/*<ltIE9>*/
-if (window.attachEvent && !window.addEventListener) window.addListener('unload', function(){
- Object.each(collected, clean);
- if (window.CollectGarbage) CollectGarbage();
-});
+if (window.attachEvent && !window.addEventListener){
+ var gc = function(){
+ Object.each(collected, clean);
+ if (window.CollectGarbage) CollectGarbage();
+ window.removeListener('unload', gc);
+ }
+ window.addListener('unload', gc);
+}
/*</ltIE9>*/
Element.Properties = {};
@@ -3437,20 +3550,24 @@ Element.Properties.html = {
set: function(html){
if (html == null) html = '';
else if (typeOf(html) == 'array') html = html.join('');
- this.innerHTML = html;
- },
+ /*<ltIE9>*/
+ if (this.styleSheet && !canChangeStyleHTML) this.styleSheet.cssText = html;
+ else /*</ltIE9>*/this.innerHTML = html;
+ },
erase: function(){
- this.innerHTML = '';
+ this.set('html', '');
}
};
+var supportsHTML5Elements = true, supportsTableInnerHTML = true, supportsTRInnerHTML = true;
+
/*<ltIE9>*/
// technique by jdbarlett - http://jdbartlett.com/innershiv/
var div = document.createElement('div');
div.innerHTML = '<nav></nav>';
-var supportsHTML5Elements = (div.childNodes.length == 1);
+supportsHTML5Elements = (div.childNodes.length == 1);
if (!supportsHTML5Elements){
var tags = 'abbr article aside audio canvas datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video'.split(' '),
fragment = document.createDocumentFragment(), l = tags.length;
@@ -3460,7 +3577,7 @@ div = null;
/*</ltIE9>*/
/*<IE>*/
-var supportsTableInnerHTML = Function.attempt(function(){
+supportsTableInnerHTML = Function.attempt(function(){
var table = document.createElement('table');
table.innerHTML = '<tr><td></td></tr>';
return true;
@@ -3469,7 +3586,7 @@ var supportsTableInnerHTML = Function.attempt(function(){
/*<ltFF4>*/
var tr = document.createElement('tr'), html = '<td></td>';
tr.innerHTML = html;
-var supportsTRInnerHTML = (tr.innerHTML == html);
+supportsTRInnerHTML = (tr.innerHTML == html);
tr = null;
/*</ltFF4>*/
@@ -3487,6 +3604,10 @@ if (!supportsTableInnerHTML || !supportsTRInnerHTML || !supportsHTML5Elements){
translations.thead = translations.tfoot = translations.tbody;
return function(html){
+
+ /*<ltIE9>*/
+ if (this.styleSheet) return set.call(this, html);
+ /*</ltIE9>*/
var wrap = translations[this.get('tag')];
if (!wrap && !supportsHTML5Elements) wrap = [0, '', ''];
if (!wrap) return set.call(this, html);
@@ -3514,11 +3635,12 @@ if (testForm.firstChild.value != 's') Element.Properties.value = {
var tag = this.get('tag');
if (tag != 'select') return this.setProperty('value', value);
var options = this.getElements('option');
+ value = String(value);
for (var i = 0; i < options.length; i++){
var option = options[i],
attr = option.getAttributeNode('value'),
optionValue = (attr && attr.specified) ? option.value : option.get('text');
- if (optionValue == value) return option.selected = true;
+ if (optionValue === value) return option.selected = true;
}
},
@@ -3553,300 +3675,120 @@ if (document.createElement('div').getAttributeNode('id')) Element.Properties.id
})();
-
/*
---
-name: Element.Style
+name: Event
-description: Contains methods for interacting with the styles of Elements in a fashionable way.
+description: Contains the Event Type, to make the event object cross-browser.
license: MIT-style license.
-requires: Element
+requires: [Window, Document, Array, Function, String, Object]
-provides: Element.Style
+provides: Event
...
*/
(function(){
-var html = document.html;
+var _keys = {};
+var normalizeWheelSpeed = function(event){
+ var normalized;
+ if (event.wheelDelta){
+ normalized = event.wheelDelta % 120 == 0 ? event.wheelDelta / 120 : event.wheelDelta / 12;
+ } else {
+ var rawAmount = event.deltaY || event.detail || 0;
+ normalized = -(rawAmount % 3 == 0 ? rawAmount / 3 : rawAmount * 10);
+ }
+ return normalized;
+}
-//<ltIE9>
-// Check for oldIE, which does not remove styles when they're set to null
-var el = document.createElement('div');
-el.style.color = 'red';
-el.style.color = null;
-var doesNotRemoveStyles = el.style.color == 'red';
-el = null;
-//</ltIE9>
+var DOMEvent = this.DOMEvent = new Type('DOMEvent', function(event, win){
+ if (!win) win = window;
+ event = event || win.event;
+ if (event.$extended) return event;
+ this.event = event;
+ this.$extended = true;
+ this.shift = event.shiftKey;
+ this.control = event.ctrlKey;
+ this.alt = event.altKey;
+ this.meta = event.metaKey;
+ var type = this.type = event.type;
+ var target = event.target || event.srcElement;
+ while (target && target.nodeType == 3) target = target.parentNode;
+ this.target = document.id(target);
-Element.Properties.styles = {set: function(styles){
- this.setStyles(styles);
-}};
+ if (type.indexOf('key') == 0){
+ var code = this.code = (event.which || event.keyCode);
+ this.key = _keys[code];
+ if (type == 'keydown' || type == 'keyup'){
+ if (code > 111 && code < 124) this.key = 'f' + (code - 111);
+ else if (code > 95 && code < 106) this.key = code - 96;
+ }
+ if (this.key == null) this.key = String.fromCharCode(code).toLowerCase();
+ } else if (type == 'click' || type == 'dblclick' || type == 'contextmenu' || type == 'wheel' || type == 'DOMMouseScroll' || type.indexOf('mouse') == 0){
+ var doc = win.document;
+ doc = (!doc.compatMode || doc.compatMode == 'CSS1Compat') ? doc.html : doc.body;
+ this.page = {
+ x: (event.pageX != null) ? event.pageX : event.clientX + doc.scrollLeft,
+ y: (event.pageY != null) ? event.pageY : event.clientY + doc.scrollTop
+ };
+ this.client = {
+ x: (event.pageX != null) ? event.pageX - win.pageXOffset : event.clientX,
+ y: (event.pageY != null) ? event.pageY - win.pageYOffset : event.clientY
+ };
+ if (type == 'DOMMouseScroll' || type == 'wheel' || type == 'mousewheel') this.wheel = normalizeWheelSpeed(event);
+ this.rightClick = (event.which == 3 || event.button == 2);
+ if (type == 'mouseover' || type == 'mouseout'){
+ var related = event.relatedTarget || event[(type == 'mouseover' ? 'from' : 'to') + 'Element'];
+ while (related && related.nodeType == 3) related = related.parentNode;
+ this.relatedTarget = document.id(related);
+ }
+ } else if (type.indexOf('touch') == 0 || type.indexOf('gesture') == 0){
+ this.rotation = event.rotation;
+ this.scale = event.scale;
+ this.targetTouches = event.targetTouches;
+ this.changedTouches = event.changedTouches;
+ var touches = this.touches = event.touches;
+ if (touches && touches[0]){
+ var touch = touches[0];
+ this.page = {x: touch.pageX, y: touch.pageY};
+ this.client = {x: touch.clientX, y: touch.clientY};
+ }
+ }
-var hasOpacity = (html.style.opacity != null),
- hasFilter = (html.style.filter != null),
- reAlpha = /alpha\(opacity=([\d.]+)\)/i;
+ if (!this.client) this.client = {};
+ if (!this.page) this.page = {};
+});
-var setVisibility = function(element, opacity){
- element.store('$opacity', opacity);
- element.style.visibility = opacity > 0 || opacity == null ? 'visible' : 'hidden';
-};
+DOMEvent.implement({
-var setOpacity = (hasOpacity ? function(element, opacity){
- element.style.opacity = opacity;
-} : (hasFilter ? function(element, opacity){
- var style = element.style;
- if (!element.currentStyle || !element.currentStyle.hasLayout) style.zoom = 1;
- if (opacity == null || opacity == 1) opacity = '';
- else opacity = 'alpha(opacity=' + (opacity * 100).limit(0, 100).round() + ')';
- var filter = style.filter || element.getComputedStyle('filter') || '';
- style.filter = reAlpha.test(filter) ? filter.replace(reAlpha, opacity) : filter + opacity;
- if (!style.filter) style.removeAttribute('filter');
-} : setVisibility));
+ stop: function(){
+ return this.preventDefault().stopPropagation();
+ },
-var getOpacity = (hasOpacity ? function(element){
- var opacity = element.style.opacity || element.getComputedStyle('opacity');
- return (opacity == '') ? 1 : opacity.toFloat();
-} : (hasFilter ? function(element){
- var filter = (element.style.filter || element.getComputedStyle('filter')),
- opacity;
- if (filter) opacity = filter.match(reAlpha);
- return (opacity == null || filter == null) ? 1 : (opacity[1] / 100);
-} : function(element){
- var opacity = element.retrieve('$opacity');
- if (opacity == null) opacity = (element.style.visibility == 'hidden' ? 0 : 1);
- return opacity;
-}));
+ stopPropagation: function(){
+ if (this.event.stopPropagation) this.event.stopPropagation();
+ else this.event.cancelBubble = true;
+ return this;
+ },
-var floatName = (html.style.cssFloat == null) ? 'styleFloat' : 'cssFloat';
+ preventDefault: function(){
+ if (this.event.preventDefault) this.event.preventDefault();
+ else this.event.returnValue = false;
+ return this;
+ }
-Element.implement({
+});
- getComputedStyle: function(property){
- if (this.currentStyle) return this.currentStyle[property.camelCase()];
- var defaultView = Element.getDocument(this).defaultView,
- computed = defaultView ? defaultView.getComputedStyle(this, null) : null;
- return (computed) ? computed.getPropertyValue((property == floatName) ? 'float' : property.hyphenate()) : null;
- },
+DOMEvent.defineKey = function(code, key){
+ _keys[code] = key;
+ return this;
+};
- setStyle: function(property, value){
- if (property == 'opacity'){
- if (value != null) value = parseFloat(value);
- setOpacity(this, value);
- return this;
- }
- property = (property == 'float' ? floatName : property).camelCase();
- if (typeOf(value) != 'string'){
- var map = (Element.Styles[property] || '@').split(' ');
- value = Array.from(value).map(function(val, i){
- if (!map[i]) return '';
- return (typeOf(val) == 'number') ? map[i].replace('@', Math.round(val)) : val;
- }).join(' ');
- } else if (value == String(Number(value))){
- value = Math.round(value);
- }
- this.style[property] = value;
- //<ltIE9>
- if ((value == '' || value == null) && doesNotRemoveStyles && this.style.removeAttribute){
- this.style.removeAttribute(property);
- }
- //</ltIE9>
- return this;
- },
-
- getStyle: function(property){
- if (property == 'opacity') return getOpacity(this);
- property = (property == 'float' ? floatName : property).camelCase();
- var result = this.style[property];
- if (!result || property == 'zIndex'){
- result = [];
- for (var style in Element.ShortStyles){
- if (property != style) continue;
- for (var s in Element.ShortStyles[style]) result.push(this.getStyle(s));
- return result.join(' ');
- }
- result = this.getComputedStyle(property);
- }
- if (result){
- result = String(result);
- var color = result.match(/rgba?\([\d\s,]+\)/);
- if (color) result = result.replace(color[0], color[0].rgbToHex());
- }
- if (Browser.opera || Browser.ie){
- if ((/^(height|width)$/).test(property) && !(/px$/.test(result))){
- var values = (property == 'width') ? ['left', 'right'] : ['top', 'bottom'], size = 0;
- values.each(function(value){
- size += this.getStyle('border-' + value + '-width').toInt() + this.getStyle('padding-' + value).toInt();
- }, this);
- return this['offset' + property.capitalize()] - size + 'px';
- }
- if (Browser.ie && (/^border(.+)Width|margin|padding/).test(property) && isNaN(parseFloat(result))){
- return '0px';
- }
- }
- return result;
- },
-
- setStyles: function(styles){
- for (var style in styles) this.setStyle(style, styles[style]);
- return this;
- },
-
- getStyles: function(){
- var result = {};
- Array.flatten(arguments).each(function(key){
- result[key] = this.getStyle(key);
- }, this);
- return result;
- }
-
-});
-
-Element.Styles = {
- left: '@px', top: '@px', bottom: '@px', right: '@px',
- width: '@px', height: '@px', maxWidth: '@px', maxHeight: '@px', minWidth: '@px', minHeight: '@px',
- backgroundColor: 'rgb(@, @, @)', backgroundPosition: '@px @px', color: 'rgb(@, @, @)',
- fontSize: '@px', letterSpacing: '@px', lineHeight: '@px', clip: 'rect(@px @px @px @px)',
- margin: '@px @px @px @px', padding: '@px @px @px @px', border: '@px @ rgb(@, @, @) @px @ rgb(@, @, @) @px @ rgb(@, @, @)',
- borderWidth: '@px @px @px @px', borderStyle: '@ @ @ @', borderColor: 'rgb(@, @, @) rgb(@, @, @) rgb(@, @, @) rgb(@, @, @)',
- zIndex: '@', 'zoom': '@', fontWeight: '@', textIndent: '@px', opacity: '@'
-};
-
-
-
-
-
-Element.ShortStyles = {margin: {}, padding: {}, border: {}, borderWidth: {}, borderStyle: {}, borderColor: {}};
-
-['Top', 'Right', 'Bottom', 'Left'].each(function(direction){
- var Short = Element.ShortStyles;
- var All = Element.Styles;
- ['margin', 'padding'].each(function(style){
- var sd = style + direction;
- Short[style][sd] = All[sd] = '@px';
- });
- var bd = 'border' + direction;
- Short.border[bd] = All[bd] = '@px @ rgb(@, @, @)';
- var bdw = bd + 'Width', bds = bd + 'Style', bdc = bd + 'Color';
- Short[bd] = {};
- Short.borderWidth[bdw] = Short[bd][bdw] = All[bdw] = '@px';
- Short.borderStyle[bds] = Short[bd][bds] = All[bds] = '@';
- Short.borderColor[bdc] = Short[bd][bdc] = All[bdc] = 'rgb(@, @, @)';
-});
-
-})();
-
-
-/*
----
-
-name: Event
-
-description: Contains the Event Type, to make the event object cross-browser.
-
-license: MIT-style license.
-
-requires: [Window, Document, Array, Function, String, Object]
-
-provides: Event
-
-...
-*/
-
-(function() {
-
-var _keys = {};
-
-var DOMEvent = this.DOMEvent = new Type('DOMEvent', function(event, win){
- if (!win) win = window;
- event = event || win.event;
- if (event.$extended) return event;
- this.event = event;
- this.$extended = true;
- this.shift = event.shiftKey;
- this.control = event.ctrlKey;
- this.alt = event.altKey;
- this.meta = event.metaKey;
- var type = this.type = event.type;
- var target = event.target || event.srcElement;
- while (target && target.nodeType == 3) target = target.parentNode;
- this.target = document.id(target);
-
- if (type.indexOf('key') == 0){
- var code = this.code = (event.which || event.keyCode);
- this.key = _keys[code];
- if (type == 'keydown'){
- if (code > 111 && code < 124) this.key = 'f' + (code - 111);
- else if (code > 95 && code < 106) this.key = code - 96;
- }
- if (this.key == null) this.key = String.fromCharCode(code).toLowerCase();
- } else if (type == 'click' || type == 'dblclick' || type == 'contextmenu' || type == 'DOMMouseScroll' || type.indexOf('mouse') == 0){
- var doc = win.document;
- doc = (!doc.compatMode || doc.compatMode == 'CSS1Compat') ? doc.html : doc.body;
- this.page = {
- x: (event.pageX != null) ? event.pageX : event.clientX + doc.scrollLeft,
- y: (event.pageY != null) ? event.pageY : event.clientY + doc.scrollTop
- };
- this.client = {
- x: (event.pageX != null) ? event.pageX - win.pageXOffset : event.clientX,
- y: (event.pageY != null) ? event.pageY - win.pageYOffset : event.clientY
- };
- if (type == 'DOMMouseScroll' || type == 'mousewheel')
- this.wheel = (event.wheelDelta) ? event.wheelDelta / 120 : -(event.detail || 0) / 3;
-
- this.rightClick = (event.which == 3 || event.button == 2);
- if (type == 'mouseover' || type == 'mouseout'){
- var related = event.relatedTarget || event[(type == 'mouseover' ? 'from' : 'to') + 'Element'];
- while (related && related.nodeType == 3) related = related.parentNode;
- this.relatedTarget = document.id(related);
- }
- } else if (type.indexOf('touch') == 0 || type.indexOf('gesture') == 0){
- this.rotation = event.rotation;
- this.scale = event.scale;
- this.targetTouches = event.targetTouches;
- this.changedTouches = event.changedTouches;
- var touches = this.touches = event.touches;
- if (touches && touches[0]){
- var touch = touches[0];
- this.page = {x: touch.pageX, y: touch.pageY};
- this.client = {x: touch.clientX, y: touch.clientY};
- }
- }
-
- if (!this.client) this.client = {};
- if (!this.page) this.page = {};
-});
-
-DOMEvent.implement({
-
- stop: function(){
- return this.preventDefault().stopPropagation();
- },
-
- stopPropagation: function(){
- if (this.event.stopPropagation) this.event.stopPropagation();
- else this.event.cancelBubble = true;
- return this;
- },
-
- preventDefault: function(){
- if (this.event.preventDefault) this.event.preventDefault();
- else this.event.returnValue = false;
- return this;
- }
-
-});
-
-DOMEvent.defineKey = function(code, key){
- _keys[code] = key;
- return this;
-};
-
-DOMEvent.defineKeys = DOMEvent.defineKey.overloadSetter(true);
+DOMEvent.defineKeys = DOMEvent.defineKey.overloadSetter(true);
DOMEvent.defineKeys({
'38': 'up', '40': 'down', '37': 'left', '39': 'right',
@@ -3860,7 +3802,6 @@ DOMEvent.defineKeys({
-
/*
---
@@ -3993,7 +3934,7 @@ Element.Properties.events = {set: function(events){
Element.NativeEvents = {
click: 2, dblclick: 2, mouseup: 2, mousedown: 2, contextmenu: 2, //mouse buttons
- mousewheel: 2, DOMMouseScroll: 2, //mouse wheel
+ wheel: 2, mousewheel: 2, DOMMouseScroll: 2, //mouse wheel
mouseover: 2, mouseout: 2, mousemove: 2, selectstart: 2, selectend: 2, //mouse movement
keydown: 2, keypress: 2, keyup: 2, //keyboard
orientationchange: 2, // mobile
@@ -4001,23 +3942,27 @@ Element.NativeEvents = {
gesturestart: 2, gesturechange: 2, gestureend: 2, // gesture
focus: 2, blur: 2, change: 2, reset: 2, select: 2, submit: 2, paste: 2, input: 2, //form elements
load: 2, unload: 1, beforeunload: 2, resize: 1, move: 1, DOMContentLoaded: 1, readystatechange: 1, //window
- error: 1, abort: 1, scroll: 1 //misc
+ hashchange: 1, popstate: 2, // history
+ error: 1, abort: 1, scroll: 1, message: 2 //misc
};
-Element.Events = {mousewheel: {
- base: (Browser.firefox) ? 'DOMMouseScroll' : 'mousewheel'
-}};
+Element.Events = {
+ mousewheel: {
+ base: 'onwheel' in document ? 'wheel' : 'onmousewheel' in document ? 'mousewheel' : 'DOMMouseScroll'
+ }
+};
+
+var check = function(event){
+ var related = event.relatedTarget;
+ if (related == null) return true;
+ if (!related) return false;
+ return (related != this && related.prefix != 'xul' && typeOf(this) != 'document' && !this.contains(related));
+};
if ('onmouseenter' in document.documentElement){
Element.NativeEvents.mouseenter = Element.NativeEvents.mouseleave = 2;
+ Element.MouseenterCheck = check;
} else {
- var check = function(event){
- var related = event.relatedTarget;
- if (related == null) return true;
- if (!related) return false;
- return (related != this && related.prefix != 'xul' && typeOf(this) != 'document' && !this.contains(related));
- };
-
Element.Events.mouseenter = {
base: 'mouseover',
condition: check
@@ -4035,12 +3980,12 @@ if (!window.addEventListener){
Element.Events.change = {
base: function(){
var type = this.type;
- return (this.get('tag') == 'input' && (type == 'radio' || type == 'checkbox')) ? 'propertychange' : 'change'
+ return (this.get('tag') == 'input' && (type == 'radio' || type == 'checkbox')) ? 'propertychange' : 'change';
},
condition: function(event){
- return this.type != 'radio' || (event.event.propertyName == 'checked' && this.checked);
+ return event.type != 'propertychange' || event.event.propertyName == 'checked';
}
- }
+ };
}
/*</ltIE9>*/
@@ -4048,7 +3993,6 @@ if (!window.addEventListener){
})();
-
/*
---
@@ -4080,10 +4024,12 @@ var bubbleUp = function(self, match, fn, event, target){
var map = {
mouseenter: {
- base: 'mouseover'
+ base: 'mouseover',
+ condition: Element.MouseenterCheck
},
mouseleave: {
- base: 'mouseout'
+ base: 'mouseout',
+ condition: Element.MouseenterCheck
},
focus: {
base: 'focus' + (eventListenerSupport ? '' : 'in'),
@@ -4106,7 +4052,10 @@ var formObserver = function(type){
remove: function(self, uid){
var list = self.retrieve(_key + type + 'listeners', {})[uid];
if (list && list.forms) for (var i = list.forms.length; i--;){
- list.forms[i].removeEvent(type, list.fns[i]);
+ // the form may have been destroyed, so it won't have the
+ // removeEvent method anymore. In that case the event was
+ // removed as well.
+ if (list.forms[i].removeEvent) list.forms[i].removeEvent(type, list.fns[i]);
}
},
@@ -4190,8 +4139,8 @@ var delegation = {
};
var elementEvent = Element.Events[_type];
- if (elementEvent && elementEvent.condition){
- var __match = match, condition = elementEvent.condition;
+ if (_map.condition || elementEvent && elementEvent.condition){
+ var __match = match, condition = _map.condition || elementEvent.condition;
match = function(target, event){
return __match(target, event) && condition.call(target, event, type);
};
@@ -4226,7 +4175,7 @@ var delegation = {
if (_map.remove) _map.remove(this, _uid);
delete stored[_uid];
storage[_type] = stored;
- return removeEvent.call(this, type, delegator);
+ return removeEvent.call(this, type, delegator, _map.capture);
}
var __uid, s;
@@ -4249,6 +4198,237 @@ var delegation = {
})();
+/*
+---
+
+name: Element.Style
+
+description: Contains methods for interacting with the styles of Elements in a fashionable way.
+
+license: MIT-style license.
+
+requires: Element
+
+provides: Element.Style
+
+...
+*/
+
+(function(){
+
+var html = document.html, el;
+
+//<ltIE9>
+// Check for oldIE, which does not remove styles when they're set to null
+el = document.createElement('div');
+el.style.color = 'red';
+el.style.color = null;
+var doesNotRemoveStyles = el.style.color == 'red';
+
+// check for oldIE, which returns border* shorthand styles in the wrong order (color-width-style instead of width-style-color)
+var border = '1px solid #123abc';
+el.style.border = border;
+var returnsBordersInWrongOrder = el.style.border != border;
+el = null;
+//</ltIE9>
+
+var hasGetComputedStyle = !!window.getComputedStyle,
+ supportBorderRadius = document.createElement('div').style.borderRadius != null;
+
+Element.Properties.styles = {set: function(styles){
+ this.setStyles(styles);
+}};
+
+var hasOpacity = (html.style.opacity != null),
+ hasFilter = (html.style.filter != null),
+ reAlpha = /alpha\(opacity=([\d.]+)\)/i;
+
+var setVisibility = function(element, opacity){
+ element.store('$opacity', opacity);
+ element.style.visibility = opacity > 0 || opacity == null ? 'visible' : 'hidden';
+};
+
+//<ltIE9>
+var setFilter = function(element, regexp, value){
+ var style = element.style,
+ filter = style.filter || element.getComputedStyle('filter') || '';
+ style.filter = (regexp.test(filter) ? filter.replace(regexp, value) : filter + ' ' + value).trim();
+ if (!style.filter) style.removeAttribute('filter');
+};
+//</ltIE9>
+
+var setOpacity = (hasOpacity ? function(element, opacity){
+ element.style.opacity = opacity;
+} : (hasFilter ? function(element, opacity){
+ if (!element.currentStyle || !element.currentStyle.hasLayout) element.style.zoom = 1;
+ if (opacity == null || opacity == 1){
+ setFilter(element, reAlpha, '');
+ if (opacity == 1 && getOpacity(element) != 1) setFilter(element, reAlpha, 'alpha(opacity=100)');
+ } else {
+ setFilter(element, reAlpha, 'alpha(opacity=' + (opacity * 100).limit(0, 100).round() + ')');
+ }
+} : setVisibility));
+
+var getOpacity = (hasOpacity ? function(element){
+ var opacity = element.style.opacity || element.getComputedStyle('opacity');
+ return (opacity == '') ? 1 : opacity.toFloat();
+} : (hasFilter ? function(element){
+ var filter = (element.style.filter || element.getComputedStyle('filter')),
+ opacity;
+ if (filter) opacity = filter.match(reAlpha);
+ return (opacity == null || filter == null) ? 1 : (opacity[1] / 100);
+} : function(element){
+ var opacity = element.retrieve('$opacity');
+ if (opacity == null) opacity = (element.style.visibility == 'hidden' ? 0 : 1);
+ return opacity;
+}));
+
+var floatName = (html.style.cssFloat == null) ? 'styleFloat' : 'cssFloat',
+ namedPositions = {left: '0%', top: '0%', center: '50%', right: '100%', bottom: '100%'},
+ hasBackgroundPositionXY = (html.style.backgroundPositionX != null);
+
+//<ltIE9>
+var removeStyle = function(style, property){
+ if (property == 'backgroundPosition'){
+ style.removeAttribute(property + 'X');
+ property += 'Y';
+ }
+ style.removeAttribute(property);
+};
+//</ltIE9>
+
+Element.implement({
+
+ getComputedStyle: function(property){
+ if (!hasGetComputedStyle && this.currentStyle) return this.currentStyle[property.camelCase()];
+ var defaultView = Element.getDocument(this).defaultView,
+ computed = defaultView ? defaultView.getComputedStyle(this, null) : null;
+ return (computed) ? computed.getPropertyValue((property == floatName) ? 'float' : property.hyphenate()) : '';
+ },
+
+ setStyle: function(property, value){
+ if (property == 'opacity'){
+ if (value != null) value = parseFloat(value);
+ setOpacity(this, value);
+ return this;
+ }
+ property = (property == 'float' ? floatName : property).camelCase();
+ if (typeOf(value) != 'string'){
+ var map = (Element.Styles[property] || '@').split(' ');
+ value = Array.from(value).map(function(val, i){
+ if (!map[i]) return '';
+ return (typeOf(val) == 'number') ? map[i].replace('@', Math.round(val)) : val;
+ }).join(' ');
+ } else if (value == String(Number(value))){
+ value = Math.round(value);
+ }
+ this.style[property] = value;
+ //<ltIE9>
+ if ((value == '' || value == null) && doesNotRemoveStyles && this.style.removeAttribute){
+ removeStyle(this.style, property);
+ }
+ //</ltIE9>
+ return this;
+ },
+
+ getStyle: function(property){
+ if (property == 'opacity') return getOpacity(this);
+ property = (property == 'float' ? floatName : property).camelCase();
+ if (supportBorderRadius && property.indexOf('borderRadius') != -1){
+ return ['borderTopLeftRadius', 'borderTopRightRadius', 'borderBottomRightRadius', 'borderBottomLeftRadius'].map(function(corner){
+ return this.style[corner] || '0px';
+ }, this).join(' ');
+ }
+ var result = this.style[property];
+ if (!result || property == 'zIndex'){
+ if (Element.ShortStyles.hasOwnProperty(property)){
+ result = [];
+ for (var s in Element.ShortStyles[property]) result.push(this.getStyle(s));
+ return result.join(' ');
+ }
+ result = this.getComputedStyle(property);
+ }
+ if (hasBackgroundPositionXY && /^backgroundPosition[XY]?$/.test(property)){
+ return result.replace(/(top|right|bottom|left)/g, function(position){
+ return namedPositions[position];
+ }) || '0px';
+ }
+ if (!result && property == 'backgroundPosition') return '0px 0px';
+ if (result){
+ result = String(result);
+ var color = result.match(/rgba?\([\d\s,]+\)/);
+ if (color) result = result.replace(color[0], color[0].rgbToHex());
+ }
+ if (!hasGetComputedStyle && !this.style[property]){
+ if ((/^(height|width)$/).test(property) && !(/px$/.test(result))){
+ var values = (property == 'width') ? ['left', 'right'] : ['top', 'bottom'], size = 0;
+ values.each(function(value){
+ size += this.getStyle('border-' + value + '-width').toInt() + this.getStyle('padding-' + value).toInt();
+ }, this);
+ return this['offset' + property.capitalize()] - size + 'px';
+ }
+ if ((/^border(.+)Width|margin|padding/).test(property) && isNaN(parseFloat(result))){
+ return '0px';
+ }
+ }
+ //<ltIE9>
+ if (returnsBordersInWrongOrder && /^border(Top|Right|Bottom|Left)?$/.test(property) && /^#/.test(result)){
+ return result.replace(/^(.+)\s(.+)\s(.+)$/, '$2 $3 $1');
+ }
+ //</ltIE9>
+
+ return result;
+ },
+
+ setStyles: function(styles){
+ for (var style in styles) this.setStyle(style, styles[style]);
+ return this;
+ },
+
+ getStyles: function(){
+ var result = {};
+ Array.flatten(arguments).each(function(key){
+ result[key] = this.getStyle(key);
+ }, this);
+ return result;
+ }
+
+});
+
+Element.Styles = {
+ left: '@px', top: '@px', bottom: '@px', right: '@px',
+ width: '@px', height: '@px', maxWidth: '@px', maxHeight: '@px', minWidth: '@px', minHeight: '@px',
+ backgroundColor: 'rgb(@, @, @)', backgroundSize: '@px', backgroundPosition: '@px @px', color: 'rgb(@, @, @)',
+ fontSize: '@px', letterSpacing: '@px', lineHeight: '@px', clip: 'rect(@px @px @px @px)',
+ margin: '@px @px @px @px', padding: '@px @px @px @px', border: '@px @ rgb(@, @, @) @px @ rgb(@, @, @) @px @ rgb(@, @, @)',
+ borderWidth: '@px @px @px @px', borderStyle: '@ @ @ @', borderColor: 'rgb(@, @, @) rgb(@, @, @) rgb(@, @, @) rgb(@, @, @)',
+ zIndex: '@', 'zoom': '@', fontWeight: '@', textIndent: '@px', opacity: '@', borderRadius: '@px @px @px @px'
+};
+
+
+
+
+
+Element.ShortStyles = {margin: {}, padding: {}, border: {}, borderWidth: {}, borderStyle: {}, borderColor: {}};
+
+['Top', 'Right', 'Bottom', 'Left'].each(function(direction){
+ var Short = Element.ShortStyles;
+ var All = Element.Styles;
+ ['margin', 'padding'].each(function(style){
+ var sd = style + direction;
+ Short[style][sd] = All[sd] = '@px';
+ });
+ var bd = 'border' + direction;
+ Short.border[bd] = All[bd] = '@px @ rgb(@, @, @)';
+ var bdw = bd + 'Width', bds = bd + 'Style', bdc = bd + 'Color';
+ Short[bd] = {};
+ Short.borderWidth[bdw] = Short[bd][bdw] = All[bdw] = '@px';
+ Short.borderStyle[bds] = Short[bd][bds] = All[bds] = '@';
+ Short.borderColor[bdc] = Short[bd][bdc] = All[bdc] = 'rgb(@, @, @)';
+});
+
+if (hasBackgroundPositionXY) Element.ShortStyles.backgroundPosition = {backgroundPositionX: '@', backgroundPositionY: '@'};
+})();
/*
---
@@ -4279,6 +4459,23 @@ element.appendChild(child);
var brokenOffsetParent = (child.offsetParent === element);
element = child = null;
+var heightComponents = ['height', 'paddingTop', 'paddingBottom', 'borderTopWidth', 'borderBottomWidth'],
+ widthComponents = ['width', 'paddingLeft', 'paddingRight', 'borderLeftWidth', 'borderRightWidth'];
+
+var svgCalculateSize = function(el){
+
+ var gCS = window.getComputedStyle(el),
+ bounds = {x: 0, y: 0};
+
+ heightComponents.each(function(css){
+ bounds.y += parseFloat(gCS[css]);
+ });
+ widthComponents.each(function(css){
+ bounds.x += parseFloat(gCS[css]);
+ });
+ return bounds;
+};
+
var isOffset = function(el){
return styleString(el, 'position') != 'static' || isBody(el);
};
@@ -4301,7 +4498,18 @@ Element.implement({
getSize: function(){
if (isBody(this)) return this.getWindow().getSize();
- return {x: this.offsetWidth, y: this.offsetHeight};
+
+ //<ltIE9>
+ // This if clause is because IE8- cannot calculate getBoundingClientRect of elements with visibility hidden.
+ if (!window.getComputedStyle) return {x: this.offsetWidth, y: this.offsetHeight};
+ //</ltIE9>
+
+ // This svg section under, calling `svgCalculateSize()`, can be removed when FF fixed the svg size bug.
+ // Bug info: https://bugzilla.mozilla.org/show_bug.cgi?id=530985
+ if (this.get('tag') == 'svg') return svgCalculateSize(this);
+
+ var bounds = this.getBoundingClientRect();
+ return {x: bounds.width, y: bounds.height};
},
getScrollSize: function(){
@@ -4339,12 +4547,14 @@ Element.implement({
try {
return element.offsetParent;
- } catch(e) {}
+ } catch(e){}
return null;
},
getOffsets: function(){
- if (this.getBoundingClientRect && !Browser.Platform.ios){
+ var hasGetBoundingClientRect = this.getBoundingClientRect;
+
+ if (hasGetBoundingClientRect){
var bound = this.getBoundingClientRect(),
html = document.id(this.getDocument().documentElement),
htmlScroll = html.getScroll(),
@@ -4353,7 +4563,7 @@ Element.implement({
return {
x: bound.left.toInt() + elemScrolls.x + ((isFixed) ? 0 : htmlScroll.x) - html.clientLeft,
- y: bound.top.toInt() + elemScrolls.y + ((isFixed) ? 0 : htmlScroll.y) - html.clientTop
+ y: bound.top.toInt() + elemScrolls.y + ((isFixed) ? 0 : htmlScroll.y) - html.clientTop
};
}
@@ -4362,29 +4572,11 @@ Element.implement({
while (element && !isBody(element)){
position.x += element.offsetLeft;
- position.y += element.offsetTop;
-
- if (Browser.firefox){
- if (!borderBox(element)){
- position.x += leftBorder(element);
- position.y += topBorder(element);
- }
- var parent = element.parentNode;
- if (parent && styleString(parent, 'overflow') != 'visible'){
- position.x += leftBorder(parent);
- position.y += topBorder(parent);
- }
- } else if (element != this && Browser.safari){
- position.x += leftBorder(element);
- position.y += topBorder(element);
- }
+ position.y += element.offsetTop;
element = element.offsetParent;
}
- if (Browser.firefox && !borderBox(this)){
- position.x -= leftBorder(this);
- position.y -= topBorder(this);
- }
+
return position;
},
@@ -4533,7 +4725,6 @@ Element.alias({position: 'setPosition'}); //compatability
});
-
/*
---
@@ -4666,13 +4857,17 @@ var Fx = this.Fx = new Class({
},
resume: function(){
- if ((this.frame < this.frames) && !this.isRunning()) pushInstance.call(this, this.options.fps);
+ if (this.isPaused()) pushInstance.call(this, this.options.fps);
return this;
},
isRunning: function(){
var list = instances[this.options.fps];
return list && list.contains(this);
+ },
+
+ isPaused: function(){
+ return (this.frame < this.frames) && !this.isRunning();
}
});
@@ -4714,7 +4909,6 @@ var pullInstance = function(fps){
})();
-
/*
---
@@ -4745,7 +4939,7 @@ Fx.CSS = new Class({
from = element.getStyle(property);
var unit = this.options.unit;
// adapted from: https://github.com/ryanmorr/fx/blob/master/fx.js#L299
- if (unit && from.slice(-unit.length) != unit && parseFloat(from) != 0){
+ if (unit && from && typeof from == 'string' && from.slice(-unit.length) != unit && parseFloat(from) != 0){
element.setStyle(property, to + unit);
var value = element.getComputedStyle(property);
// IE and Opera support pixelLeft or pixelWidth
@@ -4817,11 +5011,13 @@ Fx.CSS = new Class({
search: function(selector){
if (Fx.CSS.Cache[selector]) return Fx.CSS.Cache[selector];
var to = {}, selectorTest = new RegExp('^' + selector.escapeRegExp() + '$');
- Array.each(document.styleSheets, function(sheet, j){
- var href = sheet.href;
- if (href && href.contains('://') && !href.contains(document.domain)) return;
- var rules = sheet.rules || sheet.cssRules;
+
+ var searchStyles = function(rules){
Array.each(rules, function(rule, i){
+ if (rule.media){
+ searchStyles(rule.rules || rule.cssRules);
+ return;
+ }
if (!rule.style) return;
var selectorText = (rule.selectorText) ? rule.selectorText.replace(/^\w+/, function(m){
return m.toLowerCase();
@@ -4833,6 +5029,13 @@ Fx.CSS = new Class({
to[style] = ((/^rgb/).test(value)) ? value.rgbToHex() : value;
});
});
+ };
+
+ Array.each(document.styleSheets, function(sheet, j){
+ var href = sheet.href;
+ if (href && href.indexOf('://') > -1 && href.indexOf(document.domain) == -1) return;
+ var rules = sheet.rules || sheet.cssRules;
+ searchStyles(rules);
});
return Fx.CSS.Cache[selector] = to;
}
@@ -4880,120 +5083,6 @@ Fx.CSS.Parsers = {
-
-/*
----
-
-name: Fx.Tween
-
-description: Formerly Fx.Style, effect to transition any CSS property for an element.
-
-license: MIT-style license.
-
-requires: Fx.CSS
-
-provides: [Fx.Tween, Element.fade, Element.highlight]
-
-...
-*/
-
-Fx.Tween = new Class({
-
- Extends: Fx.CSS,
-
- initialize: function(element, options){
- this.element = this.subject = document.id(element);
- this.parent(options);
- },
-
- set: function(property, now){
- if (arguments.length == 1){
- now = property;
- property = this.property || this.options.property;
- }
- this.render(this.element, property, now, this.options.unit);
- return this;
- },
-
- start: function(property, from, to){
- if (!this.check(property, from, to)) return this;
- var args = Array.flatten(arguments);
- this.property = this.options.property || args.shift();
- var parsed = this.prepare(this.element, this.property, args);
- return this.parent(parsed.from, parsed.to);
- }
-
-});
-
-Element.Properties.tween = {
-
- set: function(options){
- this.get('tween').cancel().setOptions(options);
- return this;
- },
-
- get: function(){
- var tween = this.retrieve('tween');
- if (!tween){
- tween = new Fx.Tween(this, {link: 'cancel'});
- this.store('tween', tween);
- }
- return tween;
- }
-
-};
-
-Element.implement({
-
- tween: function(property, from, to){
- this.get('tween').start(property, from, to);
- return this;
- },
-
- fade: function(how){
- var fade = this.get('tween'), method, args = ['opacity'].append(arguments), toggle;
- if (args[1] == null) args[1] = 'toggle';
- switch (args[1]){
- case 'in': method = 'start'; args[1] = 1; break;
- case 'out': method = 'start'; args[1] = 0; break;
- case 'show': method = 'set'; args[1] = 1; break;
- case 'hide': method = 'set'; args[1] = 0; break;
- case 'toggle':
- var flag = this.retrieve('fade:flag', this.getStyle('opacity') == 1);
- method = 'start';
- args[1] = flag ? 0 : 1;
- this.store('fade:flag', !flag);
- toggle = true;
- break;
- default: method = 'start';
- }
- if (!toggle) this.eliminate('fade:flag');
- fade[method].apply(fade, args);
- var to = args[args.length - 1];
- if (method == 'set' || to != 0) this.setStyle('visibility', to == 0 ? 'hidden' : 'visible');
- else fade.chain(function(){
- this.element.setStyle('visibility', 'hidden');
- this.callChain();
- });
- return this;
- },
-
- highlight: function(start, end){
- if (!end){
- end = this.retrieve('highlight:original', this.getStyle('background-color'));
- end = (end == 'transparent') ? '#fff' : end;
- }
- var tween = this.get('tween');
- tween.start('background-color', start || '#ffff88', end).chain(function(){
- this.setStyle('background-color', this.retrieve('highlight:original'));
- tween.callChain();
- }.bind(this));
- return this;
- }
-
-});
-
-
/*
---
@@ -5072,7 +5161,6 @@ Element.implement({
});
-
/*
---
@@ -5183,6 +5271,117 @@ Fx.Transitions.extend({
});
});
+/*
+---
+
+name: Fx.Tween
+
+description: Formerly Fx.Style, effect to transition any CSS property for an element.
+
+license: MIT-style license.
+
+requires: Fx.CSS
+
+provides: [Fx.Tween, Element.fade, Element.highlight]
+
+...
+*/
+
+Fx.Tween = new Class({
+
+ Extends: Fx.CSS,
+
+ initialize: function(element, options){
+ this.element = this.subject = document.id(element);
+ this.parent(options);
+ },
+
+ set: function(property, now){
+ if (arguments.length == 1){
+ now = property;
+ property = this.property || this.options.property;
+ }
+ this.render(this.element, property, now, this.options.unit);
+ return this;
+ },
+
+ start: function(property, from, to){
+ if (!this.check(property, from, to)) return this;
+ var args = Array.flatten(arguments);
+ this.property = this.options.property || args.shift();
+ var parsed = this.prepare(this.element, this.property, args);
+ return this.parent(parsed.from, parsed.to);
+ }
+
+});
+
+Element.Properties.tween = {
+
+ set: function(options){
+ this.get('tween').cancel().setOptions(options);
+ return this;
+ },
+
+ get: function(){
+ var tween = this.retrieve('tween');
+ if (!tween){
+ tween = new Fx.Tween(this, {link: 'cancel'});
+ this.store('tween', tween);
+ }
+ return tween;
+ }
+
+};
+
+Element.implement({
+
+ tween: function(property, from, to){
+ this.get('tween').start(property, from, to);
+ return this;
+ },
+
+ fade: function(how){
+ var fade = this.get('tween'), method, args = ['opacity'].append(arguments), toggle;
+ if (args[1] == null) args[1] = 'toggle';
+ switch (args[1]){
+ case 'in': method = 'start'; args[1] = 1; break;
+ case 'out': method = 'start'; args[1] = 0; break;
+ case 'show': method = 'set'; args[1] = 1; break;
+ case 'hide': method = 'set'; args[1] = 0; break;
+ case 'toggle':
+ var flag = this.retrieve('fade:flag', this.getStyle('opacity') == 1);
+ method = 'start';
+ args[1] = flag ? 0 : 1;
+ this.store('fade:flag', !flag);
+ toggle = true;
+ break;
+ default: method = 'start';
+ }
+ if (!toggle) this.eliminate('fade:flag');
+ fade[method].apply(fade, args);
+ var to = args[args.length - 1];
+ if (method == 'set' || to != 0) this.setStyle('visibility', to == 0 ? 'hidden' : 'visible');
+ else fade.chain(function(){
+ this.element.setStyle('visibility', 'hidden');
+ this.callChain();
+ });
+ return this;
+ },
+
+ highlight: function(start, end){
+ if (!end){
+ end = this.retrieve('highlight:original', this.getStyle('background-color'));
+ end = (end == 'transparent') ? '#fff' : end;
+ }
+ var tween = this.get('tween');
+ tween.start('background-color', start || '#ffff88', end).chain(function(){
+ this.setStyle('background-color', this.retrieve('highlight:original'));
+ tween.callChain();
+ }.bind(this));
+ return this;
+ }
+
+});
/*
---
@@ -5220,7 +5419,8 @@ var Request = this.Request = new Class({
onException: function(headerName, value){},
onTimeout: function(){},
user: '',
- password: '',*/
+ password: '',
+ withCredentials: false,*/
url: '',
data: '',
headers: {
@@ -5258,7 +5458,10 @@ var Request = this.Request = new Class({
}.bind(this));
xhr.onreadystatechange = empty;
if (progressSupport) xhr.onprogress = xhr.onloadstart = empty;
- clearTimeout(this.timer);
+ if (this.timer){
+ clearTimeout(this.timer);
+ delete this.timer;
+ }
this.response = {text: this.xhr.responseText || '', xml: this.xhr.responseXML};
if (this.options.isSuccess.call(this, this.status))
@@ -5369,10 +5572,10 @@ var Request = this.Request = new Class({
if (trimPosition > -1 && (trimPosition = url.indexOf('#')) > -1) url = url.substr(0, trimPosition);
if (this.options.noCache)
- url += (url.contains('?') ? '&' : '?') + String.uniqueID();
+ url += (url.indexOf('?') > -1 ? '&' : '?') + String.uniqueID();
- if (data && method == 'get'){
- url += (url.contains('?') ? '&' : '?') + data;
+ if (data && (method == 'get' || method == 'delete')){
+ url += (url.indexOf('?') > -1 ? '&' : '?') + data;
data = null;
}
@@ -5383,7 +5586,7 @@ var Request = this.Request = new Class({
}
xhr.open(method.toUpperCase(), url, this.options.async, this.options.user, this.options.password);
- if (this.options.user && 'withCredentials' in xhr) xhr.withCredentials = true;
+ if ((this.options.withCredentials) && 'withCredentials' in xhr) xhr.withCredentials = true;
xhr.onreadystatechange = this.onStateChange.bind(this);
@@ -5407,7 +5610,10 @@ var Request = this.Request = new Class({
this.running = false;
var xhr = this.xhr;
xhr.abort();
- clearTimeout(this.timer);
+ if (this.timer){
+ clearTimeout(this.timer);
+ delete this.timer;
+ }
xhr.onreadystatechange = empty;
if (progressSupport) xhr.onprogress = xhr.onloadstart = empty;
this.xhr = new Browser.Request();
@@ -5418,7 +5624,7 @@ var Request = this.Request = new Class({
});
var methods = {};
-['get', 'post', 'put', 'delete', 'GET', 'POST', 'PUT', 'DELETE'].each(function(method){
+['get', 'post', 'put', 'delete', 'patch', 'head', 'GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD'].each(function(method){
methods[method] = function(data){
var object = {
method: method
@@ -5463,7 +5669,6 @@ Element.implement({
})();
-
/*
---
@@ -5526,10 +5731,14 @@ JSON.encode = JSON.stringify ? function(obj){
return null;
};
+JSON.secure = true;
+
+
JSON.decode = function(string, secure){
if (!string || typeOf(string) != 'string') return null;
-
- if (secure || JSON.secure){
+
+ if (secure == null) secure = JSON.secure;
+ if (secure){
if (JSON.parse) return JSON.parse(string);
if (!JSON.validate(string)) throw new Error('JSON could not decode the input; security is enabled and the value is not secure.');
}
@@ -5539,7 +5748,6 @@ JSON.decode = function(string, secure){
})();
-
/*
---
@@ -5587,7 +5795,6 @@ Request.JSON = new Class({
});
-
/*
---
@@ -5663,7 +5870,6 @@ Cookie.dispose = function(key, options){
return new Cookie(key, options).dispose();
};
-
/*
---
@@ -5691,12 +5897,14 @@ var ready,
var domready = function(){
clearTimeout(timer);
- if (ready) return;
- Browser.loaded = ready = true;
- document.removeListener('DOMContentLoaded', domready).removeListener('readystatechange', check);
-
- document.fireEvent('domready');
- window.fireEvent('domready');
+ if (!ready) {
+ Browser.loaded = ready = true;
+ document.removeListener('DOMContentLoaded', domready).removeListener('readystatechange', check);
+ document.fireEvent('domready');
+ window.fireEvent('domready');
+ }
+ // cleanup scope vars
+ document = window = testElement = null;
};
var check = function(){
@@ -5769,4 +5977,3 @@ window.addEvent('load', function(){
});
})(window, document);
-
diff --git a/couchpotato/static/scripts/library/mootools_more.js b/couchpotato/static/scripts/vendor/mootools_more.js
similarity index 94%
rename from couchpotato/static/scripts/library/mootools_more.js
rename to couchpotato/static/scripts/vendor/mootools_more.js
index d2d703692f..a2b00975e7 100644
--- a/couchpotato/static/scripts/library/mootools_more.js
+++ b/couchpotato/static/scripts/vendor/mootools_more.js
@@ -1,6 +1,7 @@
-// MooTools: the javascript framework.
-// Load this file's selection again by visiting: http://mootools.net/more/43db227db7a621ebb062ee621432ae3d
-// Or build this file again with packager using: packager build More/Events.Pseudos More/Date More/Date.Extras More/Element.Forms More/Element.Position More/Element.Shortcuts More/Fx.Scroll More/Fx.Slide More/Sortables More/Request.JSONP More/Request.Periodical
+/* MooTools: the javascript framework. license: MIT-style license. copyright: Copyright (c) 2006-2014 [Valerio Proietti](http://mad4milk.net/).*/
+/*
+Web Build: http://mootools.net/more/builder/c5d56f178d3e33908b4f47169e617a6c
+*/
/*
---
@@ -31,11 +32,10 @@ provides: [MooTools.More]
*/
MooTools.More = {
- 'version': '1.4.0.1',
- 'build': 'a4244edf2aa97ac8a196fc96082dd35af1abab87'
+ version: '1.5.1',
+ build: '2dd695ba957196ae4b0275a690765d6636a61ccd'
};
-
/*
---
@@ -48,7 +48,7 @@ license: MIT-style license
authors:
- Arian Stolwijk
-requires: [Core/Class.Extras, Core/Slick.Parser, More/MooTools.More]
+requires: [Core/Class.Extras, Core/Slick.Parser, MooTools.More]
provides: [Events.Pseudos]
@@ -194,993 +194,728 @@ Events.implement(Events.Pseudos(pseudos, proto.addEvent, proto.removeEvent));
})();
-
/*
---
-script: Object.Extras.js
+script: Drag.js
-name: Object.Extras
+name: Drag
-description: Extra Object generics, like getFromPath which allows a path notation to child elements.
+description: The base Drag Class. Can be used to drag and resize Elements using mouse events.
license: MIT-style license
authors:
- - Aaron Newton
+ - Valerio Proietti
+ - Tom Occhinno
+ - Jan Kassens
requires:
- - Core/Object
- - /MooTools.More
-
-provides: [Object.Extras]
+ - Core/Events
+ - Core/Options
+ - Core/Element.Event
+ - Core/Element.Style
+ - Core/Element.Dimensions
+ - MooTools.More
+provides: [Drag]
...
+
*/
-(function(){
+var Drag = new Class({
-var defined = function(value){
- return value != null;
-};
+ Implements: [Events, Options],
-var hasOwnProperty = Object.prototype.hasOwnProperty;
+ options: {/*
+ onBeforeStart: function(thisElement){},
+ onStart: function(thisElement, event){},
+ onSnap: function(thisElement){},
+ onDrag: function(thisElement, event){},
+ onCancel: function(thisElement){},
+ onComplete: function(thisElement, event){},*/
+ snap: 6,
+ unit: 'px',
+ grid: false,
+ style: true,
+ limit: false,
+ handle: false,
+ invert: false,
+ preventDefault: false,
+ stopPropagation: false,
+ compensateScroll: false,
+ modifiers: {x: 'left', y: 'top'}
+ },
-Object.extend({
+ initialize: function(){
+ var params = Array.link(arguments, {
+ 'options': Type.isObject,
+ 'element': function(obj){
+ return obj != null;
+ }
+ });
- getFromPath: function(source, parts){
- if (typeof parts == 'string') parts = parts.split('.');
- for (var i = 0, l = parts.length; i < l; i++){
- if (hasOwnProperty.call(source, parts[i])) source = source[parts[i]];
- else return null;
- }
- return source;
- },
+ this.element = document.id(params.element);
+ this.document = this.element.getDocument();
+ this.setOptions(params.options || {});
+ var htype = typeOf(this.options.handle);
+ this.handles = ((htype == 'array' || htype == 'collection') ? $$(this.options.handle) : document.id(this.options.handle)) || this.element;
+ this.mouse = {'now': {}, 'pos': {}};
+ this.value = {'start': {}, 'now': {}};
+ this.offsetParent = (function(el){
+ var offsetParent = el.getOffsetParent();
+ var isBody = !offsetParent || (/^(?:body|html)$/i).test(offsetParent.tagName);
+ return isBody ? window : document.id(offsetParent);
+ })(this.element);
+ this.selection = 'selectstart' in document ? 'selectstart' : 'mousedown';
- cleanValues: function(object, method){
- method = method || defined;
- for (var key in object) if (!method(object[key])){
- delete object[key];
+ this.compensateScroll = {start: {}, diff: {}, last: {}};
+
+ if ('ondragstart' in document && !('FileReader' in window) && !Drag.ondragstartFixed){
+ document.ondragstart = Function.from(false);
+ Drag.ondragstartFixed = true;
}
- return object;
- },
- erase: function(object, key){
- if (hasOwnProperty.call(object, key)) delete object[key];
- return object;
+ this.bound = {
+ start: this.start.bind(this),
+ check: this.check.bind(this),
+ drag: this.drag.bind(this),
+ stop: this.stop.bind(this),
+ cancel: this.cancel.bind(this),
+ eventStop: Function.from(false),
+ scrollListener: this.scrollListener.bind(this)
+ };
+ this.attach();
},
- run: function(object){
- var args = Array.slice(arguments, 1);
- for (var key in object) if (object[key].apply){
- object[key].apply(object, args);
- }
- return object;
- }
-
-});
+ attach: function(){
+ this.handles.addEvent('mousedown', this.bound.start);
+ if (this.options.compensateScroll) this.offsetParent.addEvent('scroll', this.bound.scrollListener);
+ return this;
+ },
-})();
+ detach: function(){
+ this.handles.removeEvent('mousedown', this.bound.start);
+ if (this.options.compensateScroll) this.offsetParent.removeEvent('scroll', this.bound.scrollListener);
+ return this;
+ },
+ scrollListener: function(){
-/*
----
+ if (!this.mouse.start) return;
+ var newScrollValue = this.offsetParent.getScroll();
-script: Locale.js
+ if (this.element.getStyle('position') == 'absolute'){
+ var scrollDiff = this.sumValues(newScrollValue, this.compensateScroll.last, -1);
+ this.mouse.now = this.sumValues(this.mouse.now, scrollDiff, 1);
+ } else {
+ this.compensateScroll.diff = this.sumValues(newScrollValue, this.compensateScroll.start, -1);
+ }
+ if (this.offsetParent != window) this.compensateScroll.diff = this.sumValues(this.compensateScroll.start, newScrollValue, -1);
+ this.compensateScroll.last = newScrollValue;
+ this.render(this.options);
+ },
-name: Locale
+ sumValues: function(alpha, beta, op){
+ var sum = {}, options = this.options;
+ for (z in options.modifiers){
+ if (!options.modifiers[z]) continue;
+ sum[z] = alpha[z] + beta[z] * op;
+ }
+ return sum;
+ },
-description: Provides methods for localization.
+ start: function(event){
+ var options = this.options;
-license: MIT-style license
+ if (event.rightClick) return;
-authors:
- - Aaron Newton
- - Arian Stolwijk
+ if (options.preventDefault) event.preventDefault();
+ if (options.stopPropagation) event.stopPropagation();
+ this.compensateScroll.start = this.compensateScroll.last = this.offsetParent.getScroll();
+ this.compensateScroll.diff = {x: 0, y: 0};
+ this.mouse.start = event.page;
+ this.fireEvent('beforeStart', this.element);
-requires:
- - Core/Events
- - /Object.Extras
- - /MooTools.More
+ var limit = options.limit;
+ this.limit = {x: [], y: []};
-provides: [Locale, Lang]
+ var z, coordinates, offsetParent = this.offsetParent == window ? null : this.offsetParent;
+ for (z in options.modifiers){
+ if (!options.modifiers[z]) continue;
-...
-*/
+ var style = this.element.getStyle(options.modifiers[z]);
-(function(){
+ // Some browsers (IE and Opera) don't always return pixels.
+ if (style && !style.match(/px$/)){
+ if (!coordinates) coordinates = this.element.getCoordinates(offsetParent);
+ style = coordinates[options.modifiers[z]];
+ }
-var current = null,
- locales = {},
- inherits = {};
+ if (options.style) this.value.now[z] = (style || 0).toInt();
+ else this.value.now[z] = this.element[options.modifiers[z]];
-var getSet = function(set){
- if (instanceOf(set, Locale.Set)) return set;
- else return locales[set];
-};
+ if (options.invert) this.value.now[z] *= -1;
-var Locale = this.Locale = {
+ this.mouse.pos[z] = event.page[z] - this.value.now[z];
- define: function(locale, set, key, value){
- var name;
- if (instanceOf(locale, Locale.Set)){
- name = locale.name;
- if (name) locales[name] = locale;
- } else {
- name = locale;
- if (!locales[name]) locales[name] = new Locale.Set(name);
- locale = locales[name];
+ if (limit && limit[z]){
+ var i = 2;
+ while (i--){
+ var limitZI = limit[z][i];
+ if (limitZI || limitZI === 0) this.limit[z][i] = (typeof limitZI == 'function') ? limitZI() : limitZI;
+ }
+ }
}
- if (set) locale.define(set, key, value);
-
-
+ if (typeOf(this.options.grid) == 'number') this.options.grid = {
+ x: this.options.grid,
+ y: this.options.grid
+ };
- if (!current) current = locale;
+ var events = {
+ mousemove: this.bound.check,
+ mouseup: this.bound.cancel
+ };
+ events[this.selection] = this.bound.eventStop;
+ this.document.addEvents(events);
+ },
- return locale;
+ check: function(event){
+ if (this.options.preventDefault) event.preventDefault();
+ var distance = Math.round(Math.sqrt(Math.pow(event.page.x - this.mouse.start.x, 2) + Math.pow(event.page.y - this.mouse.start.y, 2)));
+ if (distance > this.options.snap){
+ this.cancel();
+ this.document.addEvents({
+ mousemove: this.bound.drag,
+ mouseup: this.bound.stop
+ });
+ this.fireEvent('start', [this.element, event]).fireEvent('snap', this.element);
+ }
},
- use: function(locale){
- locale = getSet(locale);
+ drag: function(event){
+ var options = this.options;
+ if (options.preventDefault) event.preventDefault();
+ this.mouse.now = this.sumValues(event.page, this.compensateScroll.diff, -1);
- if (locale){
- current = locale;
+ this.render(options);
+ this.fireEvent('drag', [this.element, event]);
+ },
- this.fireEvent('change', locale);
+ render: function(options){
+ for (var z in options.modifiers){
+ if (!options.modifiers[z]) continue;
+ this.value.now[z] = this.mouse.now[z] - this.mouse.pos[z];
-
+ if (options.invert) this.value.now[z] *= -1;
+ if (options.limit && this.limit[z]){
+ if ((this.limit[z][1] || this.limit[z][1] === 0) && (this.value.now[z] > this.limit[z][1])){
+ this.value.now[z] = this.limit[z][1];
+ } else if ((this.limit[z][0] || this.limit[z][0] === 0) && (this.value.now[z] < this.limit[z][0])){
+ this.value.now[z] = this.limit[z][0];
+ }
+ }
+ if (options.grid[z]) this.value.now[z] -= ((this.value.now[z] - (this.limit[z][0]||0)) % options.grid[z]);
+ if (options.style) this.element.setStyle(options.modifiers[z], this.value.now[z] + options.unit);
+ else this.element[options.modifiers[z]] = this.value.now[z];
}
-
- return this;
},
- getCurrent: function(){
- return current;
+ cancel: function(event){
+ this.document.removeEvents({
+ mousemove: this.bound.check,
+ mouseup: this.bound.cancel
+ });
+ if (event){
+ this.document.removeEvent(this.selection, this.bound.eventStop);
+ this.fireEvent('cancel', this.element);
+ }
},
- get: function(key, args){
- return (current) ? current.get(key, args) : '';
- },
+ stop: function(event){
+ var events = {
+ mousemove: this.bound.drag,
+ mouseup: this.bound.stop
+ };
+ events[this.selection] = this.bound.eventStop;
+ this.document.removeEvents(events);
+ this.mouse.start = null;
+ if (event) this.fireEvent('complete', [this.element, event]);
+ }
- inherit: function(locale, inherits, set){
- locale = getSet(locale);
+});
- if (locale) locale.inherit(inherits, set);
- return this;
- },
+Element.implement({
- list: function(){
- return Object.keys(locales);
+ makeResizable: function(options){
+ var drag = new Drag(this, Object.merge({
+ modifiers: {
+ x: 'width',
+ y: 'height'
+ }
+ }, options));
+
+ this.store('resizer', drag);
+ return drag.addEvent('drag', function(){
+ this.fireEvent('resize', drag);
+ }.bind(this));
}
-};
+});
-Object.append(Locale, new Events);
+/*
+---
-Locale.Set = new Class({
+script: Drag.Move.js
- sets: {},
+name: Drag.Move
- inherits: {
- locales: [],
- sets: {}
- },
+description: A Drag extension that provides support for the constraining of draggables to containers and droppables.
- initialize: function(name){
- this.name = name || '';
+license: MIT-style license
+
+authors:
+ - Valerio Proietti
+ - Tom Occhinno
+ - Jan Kassens
+ - Aaron Newton
+ - Scott Kyle
+
+requires:
+ - Core/Element.Dimensions
+ - Drag
+
+provides: [Drag.Move]
+
+...
+*/
+
+Drag.Move = new Class({
+
+ Extends: Drag,
+
+ options: {/*
+ onEnter: function(thisElement, overed){},
+ onLeave: function(thisElement, overed){},
+ onDrop: function(thisElement, overed, event){},*/
+ droppables: [],
+ container: false,
+ precalculate: false,
+ includeMargins: true,
+ checkDroppables: true
},
- define: function(set, key, value){
- var defineData = this.sets[set];
- if (!defineData) defineData = {};
+ initialize: function(element, options){
+ this.parent(element, options);
+ element = this.element;
- if (key){
- if (typeOf(key) == 'object') defineData = Object.merge(defineData, key);
- else defineData[key] = value;
+ this.droppables = $$(this.options.droppables);
+ this.setContainer(this.options.container);
+
+ if (this.options.style){
+ if (this.options.modifiers.x == 'left' && this.options.modifiers.y == 'top'){
+ var parent = element.getOffsetParent(),
+ styles = element.getStyles('left', 'top');
+ if (parent && (styles.left == 'auto' || styles.top == 'auto')){
+ element.setPosition(element.getPosition(parent));
+ }
+ }
+
+ if (element.getStyle('position') == 'static') element.setStyle('position', 'absolute');
}
- this.sets[set] = defineData;
- return this;
+ this.addEvent('start', this.checkDroppables, true);
+ this.overed = null;
+ },
+
+ setContainer: function(container) {
+ this.container = document.id(container);
+ if (this.container && typeOf(this.container) != 'element'){
+ this.container = document.id(this.container.getDocument().body);
+ }
},
- get: function(key, args, _base){
- var value = Object.getFromPath(this.sets, key);
- if (value != null){
- var type = typeOf(value);
- if (type == 'function') value = value.apply(null, Array.from(args));
- else if (type == 'object') value = Object.clone(value);
- return value;
+ start: function(event){
+ if (this.container) this.options.limit = this.calculateLimit();
+
+ if (this.options.precalculate){
+ this.positions = this.droppables.map(function(el){
+ return el.getCoordinates();
+ });
}
- // get value of inherited locales
- var index = key.indexOf('.'),
- set = index < 0 ? key : key.substr(0, index),
- names = (this.inherits.sets[set] || []).combine(this.inherits.locales).include('en-US');
- if (!_base) _base = [];
+ this.parent(event);
+ },
- for (var i = 0, l = names.length; i < l; i++){
- if (_base.contains(names[i])) continue;
- _base.include(names[i]);
+ calculateLimit: function(){
+ var element = this.element,
+ container = this.container,
- var locale = locales[names[i]];
- if (!locale) continue;
+ offsetParent = document.id(element.getOffsetParent()) || document.body,
+ containerCoordinates = container.getCoordinates(offsetParent),
+ elementMargin = {},
+ elementBorder = {},
+ containerMargin = {},
+ containerBorder = {},
+ offsetParentPadding = {},
+ offsetScroll = offsetParent.getScroll();
- value = locale.get(key, args, _base);
- if (value != null) return value;
+ ['top', 'right', 'bottom', 'left'].each(function(pad){
+ elementMargin[pad] = element.getStyle('margin-' + pad).toInt();
+ elementBorder[pad] = element.getStyle('border-' + pad).toInt();
+ containerMargin[pad] = container.getStyle('margin-' + pad).toInt();
+ containerBorder[pad] = container.getStyle('border-' + pad).toInt();
+ offsetParentPadding[pad] = offsetParent.getStyle('padding-' + pad).toInt();
+ }, this);
+
+ var width = element.offsetWidth + elementMargin.left + elementMargin.right,
+ height = element.offsetHeight + elementMargin.top + elementMargin.bottom,
+ left = 0 + offsetScroll.x,
+ top = 0 + offsetScroll.y,
+ right = containerCoordinates.right - containerBorder.right - width + offsetScroll.x,
+ bottom = containerCoordinates.bottom - containerBorder.bottom - height + offsetScroll.y;
+
+ if (this.options.includeMargins){
+ left += elementMargin.left;
+ top += elementMargin.top;
+ } else {
+ right += elementMargin.right;
+ bottom += elementMargin.bottom;
}
- return '';
+ if (element.getStyle('position') == 'relative'){
+ var coords = element.getCoordinates(offsetParent);
+ coords.left -= element.getStyle('left').toInt();
+ coords.top -= element.getStyle('top').toInt();
+
+ left -= coords.left;
+ top -= coords.top;
+ if (container.getStyle('position') != 'relative'){
+ left += containerBorder.left;
+ top += containerBorder.top;
+ }
+ right += elementMargin.left - coords.left;
+ bottom += elementMargin.top - coords.top;
+
+ if (container != offsetParent){
+ left += containerMargin.left + offsetParentPadding.left;
+ if (!offsetParentPadding.left && left < 0) left = 0;
+ top += offsetParent == document.body ? 0 : containerMargin.top + offsetParentPadding.top;
+ if (!offsetParentPadding.top && top < 0) top = 0;
+ }
+ } else {
+ left -= elementMargin.left;
+ top -= elementMargin.top;
+ if (container != offsetParent){
+ left += containerCoordinates.left + containerBorder.left;
+ top += containerCoordinates.top + containerBorder.top;
+ }
+ }
+
+ return {
+ x: [left, right],
+ y: [top, bottom]
+ };
},
- inherit: function(names, set){
- names = Array.from(names);
+ getDroppableCoordinates: function(element){
+ var position = element.getCoordinates();
+ if (element.getStyle('position') == 'fixed'){
+ var scroll = window.getScroll();
+ position.left += scroll.x;
+ position.right += scroll.x;
+ position.top += scroll.y;
+ position.bottom += scroll.y;
+ }
+ return position;
+ },
- if (set && !this.inherits.sets[set]) this.inherits.sets[set] = [];
+ checkDroppables: function(){
+ var overed = this.droppables.filter(function(el, i){
+ el = this.positions ? this.positions[i] : this.getDroppableCoordinates(el);
+ var now = this.mouse.now;
+ return (now.x > el.left && now.x < el.right && now.y < el.bottom && now.y > el.top);
+ }, this).getLast();
- var l = names.length;
- while (l--) (set ? this.inherits.sets[set] : this.inherits.locales).unshift(names[l]);
+ if (this.overed != overed){
+ if (this.overed) this.fireEvent('leave', [this.element, this.overed]);
+ if (overed) this.fireEvent('enter', [this.element, overed]);
+ this.overed = overed;
+ }
+ },
- return this;
+ drag: function(event){
+ this.parent(event);
+ if (this.options.checkDroppables && this.droppables.length) this.checkDroppables();
+ },
+
+ stop: function(event){
+ this.checkDroppables();
+ this.fireEvent('drop', [this.element, this.overed, event]);
+ this.overed = null;
+ return this.parent(event);
}
});
+Element.implement({
+ makeDraggable: function(options){
+ var drag = new Drag.Move(this, options);
+ this.store('dragger', drag);
+ return drag;
+ }
-})();
-
+});
/*
---
-name: Locale.en-US.Date
+script: Sortables.js
-description: Date messages for US English.
+name: Sortables
+
+description: Class for creating a drag and drop sorting interface for lists of items.
license: MIT-style license
authors:
- - Aaron Newton
+ - Tom Occhino
requires:
- - /Locale
+ - Core/Fx.Morph
+ - Drag.Move
-provides: [Locale.en-US.Date]
+provides: [Sortables]
...
*/
-Locale.define('en-US', 'Date', {
-
- months: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
- months_abbr: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
- days: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
- days_abbr: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+var Sortables = new Class({
- // Culture's date order: MM/DD/YYYY
- dateOrder: ['month', 'date', 'year'],
- shortDate: '%m/%d/%Y',
- shortTime: '%I:%M%p',
- AM: 'AM',
- PM: 'PM',
- firstDayOfWeek: 0,
+ Implements: [Events, Options],
- // Date.Extras
- ordinal: function(dayOfMonth){
- // 1st, 2nd, 3rd, etc.
- return (dayOfMonth > 3 && dayOfMonth < 21) ? 'th' : ['th', 'st', 'nd', 'rd', 'th'][Math.min(dayOfMonth % 10, 4)];
+ options: {/*
+ onSort: function(element, clone){},
+ onStart: function(element, clone){},
+ onComplete: function(element){},*/
+ opacity: 1,
+ clone: false,
+ revert: false,
+ handle: false,
+ dragOptions: {},
+ unDraggableTags: ['button', 'input', 'a', 'textarea', 'select', 'option']
},
- lessThanMinuteAgo: 'less than a minute ago',
- minuteAgo: 'about a minute ago',
- minutesAgo: '{delta} minutes ago',
- hourAgo: 'about an hour ago',
- hoursAgo: 'about {delta} hours ago',
- dayAgo: '1 day ago',
- daysAgo: '{delta} days ago',
- weekAgo: '1 week ago',
- weeksAgo: '{delta} weeks ago',
- monthAgo: '1 month ago',
- monthsAgo: '{delta} months ago',
- yearAgo: '1 year ago',
- yearsAgo: '{delta} years ago',
-
- lessThanMinuteUntil: 'less than a minute from now',
- minuteUntil: 'about a minute from now',
- minutesUntil: '{delta} minutes from now',
- hourUntil: 'about an hour from now',
- hoursUntil: 'about {delta} hours from now',
- dayUntil: '1 day from now',
- daysUntil: '{delta} days from now',
- weekUntil: '1 week from now',
- weeksUntil: '{delta} weeks from now',
- monthUntil: '1 month from now',
- monthsUntil: '{delta} months from now',
- yearUntil: '1 year from now',
- yearsUntil: '{delta} years from now'
-
-});
-
-
-/*
----
-
-script: Date.js
-
-name: Date
-
-description: Extends the Date native object to include methods useful in managing dates.
-
-license: MIT-style license
-
-authors:
- - Aaron Newton
- - Nicholas Barthelemy - https://svn.nbarthelemy.com/date-js/
- - Harald Kirshner - mail [at] digitarald.de; http://digitarald.de
- - Scott Kyle - scott [at] appden.com; http://appden.com
-
-requires:
- - Core/Array
- - Core/String
- - Core/Number
- - MooTools.More
- - Locale
- - Locale.en-US.Date
-
-provides: [Date]
-
-...
-*/
-
-(function(){
-
-var Date = this.Date;
-
-var DateMethods = Date.Methods = {
- ms: 'Milliseconds',
- year: 'FullYear',
- min: 'Minutes',
- mo: 'Month',
- sec: 'Seconds',
- hr: 'Hours'
-};
-
-['Date', 'Day', 'FullYear', 'Hours', 'Milliseconds', 'Minutes', 'Month', 'Seconds', 'Time', 'TimezoneOffset',
- 'Week', 'Timezone', 'GMTOffset', 'DayOfYear', 'LastMonth', 'LastDayOfMonth', 'UTCDate', 'UTCDay', 'UTCFullYear',
- 'AMPM', 'Ordinal', 'UTCHours', 'UTCMilliseconds', 'UTCMinutes', 'UTCMonth', 'UTCSeconds', 'UTCMilliseconds'].each(function(method){
- Date.Methods[method.toLowerCase()] = method;
-});
-
-var pad = function(n, digits, string){
- if (digits == 1) return n;
- return n < Math.pow(10, digits - 1) ? (string || '0') + pad(n, digits - 1, string) : n;
-};
-
-Date.implement({
+ initialize: function(lists, options){
+ this.setOptions(options);
- set: function(prop, value){
- prop = prop.toLowerCase();
- var method = DateMethods[prop] && 'set' + DateMethods[prop];
- if (method && this[method]) this[method](value);
- return this;
- }.overloadSetter(),
+ this.elements = [];
+ this.lists = [];
+ this.idle = true;
- get: function(prop){
- prop = prop.toLowerCase();
- var method = DateMethods[prop] && 'get' + DateMethods[prop];
- if (method && this[method]) return this[method]();
- return null;
- }.overloadGetter(),
+ this.addLists($$(document.id(lists) || lists));
- clone: function(){
- return new Date(this.get('time'));
+ if (!this.options.clone) this.options.revert = false;
+ if (this.options.revert) this.effect = new Fx.Morph(null, Object.merge({
+ duration: 250,
+ link: 'cancel'
+ }, this.options.revert));
},
- increment: function(interval, times){
- interval = interval || 'day';
- times = times != null ? times : 1;
-
- switch (interval){
- case 'year':
- return this.increment('month', times * 12);
- case 'month':
- var d = this.get('date');
- this.set('date', 1).set('mo', this.get('mo') + times);
- return this.set('date', d.min(this.get('lastdayofmonth')));
- case 'week':
- return this.increment('day', times * 7);
- case 'day':
- return this.set('date', this.get('date') + times);
- }
-
- if (!Date.units[interval]) throw new Error(interval + ' is not a supported interval');
-
- return this.set('time', this.get('time') + times * Date.units[interval]());
+ attach: function(){
+ this.addLists(this.lists);
+ return this;
},
- decrement: function(interval, times){
- return this.increment(interval, -1 * (times != null ? times : 1));
+ detach: function(){
+ this.lists = this.removeLists(this.lists);
+ return this;
},
- isLeapYear: function(){
- return Date.isLeapYear(this.get('year'));
+ addItems: function(){
+ Array.flatten(arguments).each(function(element){
+ this.elements.push(element);
+ var start = element.retrieve('sortables:start', function(event){
+ this.start.call(this, event, element);
+ }.bind(this));
+ (this.options.handle ? element.getElement(this.options.handle) || element : element).addEvent('mousedown', start);
+ }, this);
+ return this;
},
- clearTime: function(){
- return this.set({hr: 0, min: 0, sec: 0, ms: 0});
+ addLists: function(){
+ Array.flatten(arguments).each(function(list){
+ this.lists.include(list);
+ this.addItems(list.getChildren());
+ }, this);
+ return this;
},
- diff: function(date, resolution){
- if (typeOf(date) == 'string') date = Date.parse(date);
+ removeItems: function(){
+ return $$(Array.flatten(arguments).map(function(element){
+ this.elements.erase(element);
+ var start = element.retrieve('sortables:start');
+ (this.options.handle ? element.getElement(this.options.handle) || element : element).removeEvent('mousedown', start);
- return ((date - this) / Date.units[resolution || 'day'](3, 3)).round(); // non-leap year, 30-day month
+ return element;
+ }, this));
},
- getLastDayOfMonth: function(){
- return Date.daysInMonth(this.get('mo'), this.get('year'));
- },
+ removeLists: function(){
+ return $$(Array.flatten(arguments).map(function(list){
+ this.lists.erase(list);
+ this.removeItems(list.getChildren());
- getDayOfYear: function(){
- return (Date.UTC(this.get('year'), this.get('mo'), this.get('date') + 1)
- - Date.UTC(this.get('year'), 0, 1)) / Date.units.day();
+ return list;
+ }, this));
},
+
+ getDroppableCoordinates: function (element){
+ var offsetParent = element.getOffsetParent();
+ var position = element.getPosition(offsetParent);
+ var scroll = {
+ w: window.getScroll(),
+ offsetParent: offsetParent.getScroll()
+ };
+ position.x += scroll.offsetParent.x;
+ position.y += scroll.offsetParent.y;
- setDay: function(day, firstDayOfWeek){
- if (firstDayOfWeek == null){
- firstDayOfWeek = Date.getMsg('firstDayOfWeek');
- if (firstDayOfWeek === '') firstDayOfWeek = 1;
+ if (offsetParent.getStyle('position') == 'fixed'){
+ position.x -= scroll.w.x;
+ position.y -= scroll.w.y;
}
- day = (7 + Date.parseDay(day, true) - firstDayOfWeek) % 7;
- var currentDay = (7 + this.get('day') - firstDayOfWeek) % 7;
-
- return this.increment('day', day - currentDay);
+ return position;
},
- getWeek: function(firstDayOfWeek){
- if (firstDayOfWeek == null){
- firstDayOfWeek = Date.getMsg('firstDayOfWeek');
- if (firstDayOfWeek === '') firstDayOfWeek = 1;
+ getClone: function(event, element){
+ if (!this.options.clone) return new Element(element.tagName).inject(document.body);
+ if (typeOf(this.options.clone) == 'function') return this.options.clone.call(this, event, element, this.list);
+ var clone = element.clone(true).setStyles({
+ margin: 0,
+ position: 'absolute',
+ visibility: 'hidden',
+ width: element.getStyle('width')
+ }).addEvent('mousedown', function(event){
+ element.fireEvent('mousedown', event);
+ });
+ //prevent the duplicated radio inputs from unchecking the real one
+ if (clone.get('html').test('radio')){
+ clone.getElements('input[type=radio]').each(function(input, i){
+ input.set('name', 'clone_' + i);
+ if (input.get('checked')) element.getElements('input[type=radio]')[i].set('checked', true);
+ });
}
- var date = this,
- dayOfWeek = (7 + date.get('day') - firstDayOfWeek) % 7,
- dividend = 0,
- firstDayOfYear;
-
- if (firstDayOfWeek == 1){
- // ISO-8601, week belongs to year that has the most days of the week (i.e. has the thursday of the week)
- var month = date.get('month'),
- startOfWeek = date.get('date') - dayOfWeek;
-
- if (month == 11 && startOfWeek > 28) return 1; // Week 1 of next year
+ return clone.inject(this.list).setPosition(this.getDroppableCoordinates(this.element));
+ },
- if (month == 0 && startOfWeek < -2){
- // Use a date from last year to determine the week
- date = new Date(date).decrement('day', dayOfWeek);
- dayOfWeek = 0;
- }
+ getDroppables: function(){
+ var droppables = this.list.getChildren().erase(this.clone).erase(this.element);
+ if (!this.options.constrain) droppables.append(this.lists).erase(this.list);
+ return droppables;
+ },
- firstDayOfYear = new Date(date.get('year'), 0, 1).get('day') || 7;
- if (firstDayOfYear > 4) dividend = -7; // First week of the year is not week 1
+ insert: function(dragging, element){
+ var where = 'inside';
+ if (this.lists.contains(element)){
+ this.list = element;
+ this.drag.droppables = this.getDroppables();
} else {
- // In other cultures the first week of the year is always week 1 and the last week always 53 or 54.
- // Days in the same week can have a different weeknumber if the week spreads across two years.
- firstDayOfYear = new Date(date.get('year'), 0, 1).get('day');
+ where = this.element.getAllPrevious().contains(element) ? 'before' : 'after';
}
+ this.element.inject(element, where);
+ this.fireEvent('sort', [this.element, this.clone]);
+ },
- dividend += date.get('dayofyear');
- dividend += 6 - dayOfWeek; // Add days so we calculate the current date's week as a full week
- dividend += (7 + firstDayOfYear - firstDayOfWeek) % 7; // Make up for first week of the year not being a full week
-
- return (dividend / 7);
- },
-
- getOrdinal: function(day){
- return Date.getMsg('ordinal', day || this.get('date'));
- },
-
- getTimezone: function(){
- return this.toString()
- .replace(/^.*? ([A-Z]{3}).[0-9]{4}.*$/, '$1')
- .replace(/^.*?\(([A-Z])[a-z]+ ([A-Z])[a-z]+ ([A-Z])[a-z]+\)$/, '$1$2$3');
- },
-
- getGMTOffset: function(){
- var off = this.get('timezoneOffset');
- return ((off > 0) ? '-' : '+') + pad((off.abs() / 60).floor(), 2) + pad(off % 60, 2);
- },
-
- setAMPM: function(ampm){
- ampm = ampm.toUpperCase();
- var hr = this.get('hr');
- if (hr > 11 && ampm == 'AM') return this.decrement('hour', 12);
- else if (hr < 12 && ampm == 'PM') return this.increment('hour', 12);
- return this;
- },
-
- getAMPM: function(){
- return (this.get('hr') < 12) ? 'AM' : 'PM';
- },
-
- parse: function(str){
- this.set('time', Date.parse(str));
- return this;
- },
-
- isValid: function(date){
- if (!date) date = this;
- return typeOf(date) == 'date' && !isNaN(date.valueOf());
- },
-
- format: function(format){
- if (!this.isValid()) return 'invalid date';
-
- if (!format) format = '%x %X';
- if (typeof format == 'string') format = formats[format.toLowerCase()] || format;
- if (typeof format == 'function') return format(this);
-
- var d = this;
- return format.replace(/%([a-z%])/gi,
- function($0, $1){
- switch ($1){
- case 'a': return Date.getMsg('days_abbr')[d.get('day')];
- case 'A': return Date.getMsg('days')[d.get('day')];
- case 'b': return Date.getMsg('months_abbr')[d.get('month')];
- case 'B': return Date.getMsg('months')[d.get('month')];
- case 'c': return d.format('%a %b %d %H:%M:%S %Y');
- case 'd': return pad(d.get('date'), 2);
- case 'e': return pad(d.get('date'), 2, ' ');
- case 'H': return pad(d.get('hr'), 2);
- case 'I': return pad((d.get('hr') % 12) || 12, 2);
- case 'j': return pad(d.get('dayofyear'), 3);
- case 'k': return pad(d.get('hr'), 2, ' ');
- case 'l': return pad((d.get('hr') % 12) || 12, 2, ' ');
- case 'L': return pad(d.get('ms'), 3);
- case 'm': return pad((d.get('mo') + 1), 2);
- case 'M': return pad(d.get('min'), 2);
- case 'o': return d.get('ordinal');
- case 'p': return Date.getMsg(d.get('ampm'));
- case 's': return Math.round(d / 1000);
- case 'S': return pad(d.get('seconds'), 2);
- case 'T': return d.format('%H:%M:%S');
- case 'U': return pad(d.get('week'), 2);
- case 'w': return d.get('day');
- case 'x': return d.format(Date.getMsg('shortDate'));
- case 'X': return d.format(Date.getMsg('shortTime'));
- case 'y': return d.get('year').toString().substr(2);
- case 'Y': return d.get('year');
- case 'z': return d.get('GMTOffset');
- case 'Z': return d.get('Timezone');
- }
- return $1;
- }
- );
- },
-
- toISOString: function(){
- return this.format('iso8601');
- }
-
-}).alias({
- toJSON: 'toISOString',
- compare: 'diff',
- strftime: 'format'
-});
-
-// The day and month abbreviations are standardized, so we cannot use simply %a and %b because they will get localized
-var rfcDayAbbr = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
- rfcMonthAbbr = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-
-var formats = {
- db: '%Y-%m-%d %H:%M:%S',
- compact: '%Y%m%dT%H%M%S',
- 'short': '%d %b %H:%M',
- 'long': '%B %d, %Y %H:%M',
- rfc822: function(date){
- return rfcDayAbbr[date.get('day')] + date.format(', %d ') + rfcMonthAbbr[date.get('month')] + date.format(' %Y %H:%M:%S %Z');
- },
- rfc2822: function(date){
- return rfcDayAbbr[date.get('day')] + date.format(', %d ') + rfcMonthAbbr[date.get('month')] + date.format(' %Y %H:%M:%S %z');
- },
- iso8601: function(date){
- return (
- date.getUTCFullYear() + '-' +
- pad(date.getUTCMonth() + 1, 2) + '-' +
- pad(date.getUTCDate(), 2) + 'T' +
- pad(date.getUTCHours(), 2) + ':' +
- pad(date.getUTCMinutes(), 2) + ':' +
- pad(date.getUTCSeconds(), 2) + '.' +
- pad(date.getUTCMilliseconds(), 3) + 'Z'
- );
- }
-};
-
-var parsePatterns = [],
- nativeParse = Date.parse;
-
-var parseWord = function(type, word, num){
- var ret = -1,
- translated = Date.getMsg(type + 's');
- switch (typeOf(word)){
- case 'object':
- ret = translated[word.get(type)];
- break;
- case 'number':
- ret = translated[word];
- if (!ret) throw new Error('Invalid ' + type + ' index: ' + word);
- break;
- case 'string':
- var match = translated.filter(function(name){
- return this.test(name);
- }, new RegExp('^' + word, 'i'));
- if (!match.length) throw new Error('Invalid ' + type + ' string');
- if (match.length > 1) throw new Error('Ambiguous ' + type);
- ret = match[0];
- }
-
- return (num) ? translated.indexOf(ret) : ret;
-};
-
-var startCentury = 1900,
- startYear = 70;
-
-Date.extend({
-
- getMsg: function(key, args){
- return Locale.get('Date.' + key, args);
- },
-
- units: {
- ms: Function.from(1),
- second: Function.from(1000),
- minute: Function.from(60000),
- hour: Function.from(3600000),
- day: Function.from(86400000),
- week: Function.from(608400000),
- month: function(month, year){
- var d = new Date;
- return Date.daysInMonth(month != null ? month : d.get('mo'), year != null ? year : d.get('year')) * 86400000;
- },
- year: function(year){
- year = year || new Date().get('year');
- return Date.isLeapYear(year) ? 31622400000 : 31536000000;
- }
- },
-
- daysInMonth: function(month, year){
- return [31, Date.isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month];
- },
-
- isLeapYear: function(year){
- return ((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0);
- },
-
- parse: function(from){
- var t = typeOf(from);
- if (t == 'number') return new Date(from);
- if (t != 'string') return from;
- from = from.clean();
- if (!from.length) return null;
-
- var parsed;
- parsePatterns.some(function(pattern){
- var bits = pattern.re.exec(from);
- return (bits) ? (parsed = pattern.handler(bits)) : false;
- });
-
- if (!(parsed && parsed.isValid())){
- parsed = new Date(nativeParse(from));
- if (!(parsed && parsed.isValid())) parsed = new Date(from.toInt());
- }
- return parsed;
- },
-
- parseDay: function(day, num){
- return parseWord('day', day, num);
- },
-
- parseMonth: function(month, num){
- return parseWord('month', month, num);
- },
-
- parseUTC: function(value){
- var localDate = new Date(value);
- var utcSeconds = Date.UTC(
- localDate.get('year'),
- localDate.get('mo'),
- localDate.get('date'),
- localDate.get('hr'),
- localDate.get('min'),
- localDate.get('sec'),
- localDate.get('ms')
- );
- return new Date(utcSeconds);
- },
-
- orderIndex: function(unit){
- return Date.getMsg('dateOrder').indexOf(unit) + 1;
- },
-
- defineFormat: function(name, format){
- formats[name] = format;
- return this;
- },
-
-
-
- defineParser: function(pattern){
- parsePatterns.push((pattern.re && pattern.handler) ? pattern : build(pattern));
- return this;
- },
-
- defineParsers: function(){
- Array.flatten(arguments).each(Date.defineParser);
- return this;
- },
-
- define2DigitYearStart: function(year){
- startYear = year % 100;
- startCentury = year - startYear;
- return this;
- }
-
-}).extend({
- defineFormats: Date.defineFormat.overloadSetter()
-});
-
-var regexOf = function(type){
- return new RegExp('(?:' + Date.getMsg(type).map(function(name){
- return name.substr(0, 3);
- }).join('|') + ')[a-z]*');
-};
-
-var replacers = function(key){
- switch (key){
- case 'T':
- return '%H:%M:%S';
- case 'x': // iso8601 covers yyyy-mm-dd, so just check if month is first
- return ((Date.orderIndex('month') == 1) ? '%m[-./]%d' : '%d[-./]%m') + '([-./]%y)?';
- case 'X':
- return '%H([.:]%M)?([.:]%S([.:]%s)?)? ?%p? ?%z?';
- }
- return null;
-};
-
-var keys = {
- d: /[0-2]?[0-9]|3[01]/,
- H: /[01]?[0-9]|2[0-3]/,
- I: /0?[1-9]|1[0-2]/,
- M: /[0-5]?\d/,
- s: /\d+/,
- o: /[a-z]*/,
- p: /[ap]\.?m\.?/,
- y: /\d{2}|\d{4}/,
- Y: /\d{4}/,
- z: /Z|[+-]\d{2}(?::?\d{2})?/
-};
-
-keys.m = keys.I;
-keys.S = keys.M;
-
-var currentLanguage;
-
-var recompile = function(language){
- currentLanguage = language;
-
- keys.a = keys.A = regexOf('days');
- keys.b = keys.B = regexOf('months');
-
- parsePatterns.each(function(pattern, i){
- if (pattern.format) parsePatterns[i] = build(pattern.format);
- });
-};
-
-var build = function(format){
- if (!currentLanguage) return {format: format};
-
- var parsed = [];
- var re = (format.source || format) // allow format to be regex
- .replace(/%([a-z])/gi,
- function($0, $1){
- return replacers($1) || $0;
- }
- ).replace(/\((?!\?)/g, '(?:') // make all groups non-capturing
- .replace(/ (?!\?|\*)/g, ',? ') // be forgiving with spaces and commas
- .replace(/%([a-z%])/gi,
- function($0, $1){
- var p = keys[$1];
- if (!p) return $1;
- parsed.push($1);
- return '(' + p.source + ')';
- }
- ).replace(/\[a-z\]/gi, '[a-z\\u00c0-\\uffff;\&]'); // handle unicode words
-
- return {
- format: format,
- re: new RegExp('^' + re + '$', 'i'),
- handler: function(bits){
- bits = bits.slice(1).associate(parsed);
- var date = new Date().clearTime(),
- year = bits.y || bits.Y;
-
- if (year != null) handle.call(date, 'y', year); // need to start in the right year
- if ('d' in bits) handle.call(date, 'd', 1);
- if ('m' in bits || bits.b || bits.B) handle.call(date, 'm', 1);
-
- for (var key in bits) handle.call(date, key, bits[key]);
- return date;
- }
- };
-};
-
-var handle = function(key, value){
- if (!value) return this;
-
- switch (key){
- case 'a': case 'A': return this.set('day', Date.parseDay(value, true));
- case 'b': case 'B': return this.set('mo', Date.parseMonth(value, true));
- case 'd': return this.set('date', value);
- case 'H': case 'I': return this.set('hr', value);
- case 'm': return this.set('mo', value - 1);
- case 'M': return this.set('min', value);
- case 'p': return this.set('ampm', value.replace(/\./g, ''));
- case 'S': return this.set('sec', value);
- case 's': return this.set('ms', ('0.' + value) * 1000);
- case 'w': return this.set('day', value);
- case 'Y': return this.set('year', value);
- case 'y':
- value = +value;
- if (value < 100) value += startCentury + (value < startYear ? 100 : 0);
- return this.set('year', value);
- case 'z':
- if (value == 'Z') value = '+00';
- var offset = value.match(/([+-])(\d{2}):?(\d{2})?/);
- offset = (offset[1] + '1') * (offset[2] * 60 + (+offset[3] || 0)) + this.getTimezoneOffset();
- return this.set('time', this - offset * 60000);
- }
-
- return this;
-};
-
-Date.defineParsers(
- '%Y([-./]%m([-./]%d((T| )%X)?)?)?', // "1999-12-31", "1999-12-31 11:59pm", "1999-12-31 23:59:59", ISO8601
- '%Y%m%d(T%H(%M%S?)?)?', // "19991231", "19991231T1159", compact
- '%x( %X)?', // "12/31", "12.31.99", "12-31-1999", "12/31/2008 11:59 PM"
- '%d%o( %b( %Y)?)?( %X)?', // "31st", "31st December", "31 Dec 1999", "31 Dec 1999 11:59pm"
- '%b( %d%o)?( %Y)?( %X)?', // Same as above with month and day switched
- '%Y %b( %d%o( %X)?)?', // Same as above with year coming first
- '%o %b %d %X %z %Y', // "Thu Oct 22 08:11:23 +0000 2009"
- '%T', // %H:%M:%S
- '%H:%M( ?%p)?' // "11:05pm", "11:05 am" and "11:05"
-);
-
-Locale.addEvent('change', function(language){
- if (Locale.get('Date')) recompile(language);
-}).fireEvent('change', Locale.getCurrent());
-
-})();
-
-
-/*
----
-
-script: Date.Extras.js
-
-name: Date.Extras
-
-description: Extends the Date native object to include extra methods (on top of those in Date.js).
-
-license: MIT-style license
-
-authors:
- - Aaron Newton
- - Scott Kyle
-
-requires:
- - /Date
-
-provides: [Date.Extras]
+ start: function(event, element){
+ if (
+ !this.idle ||
+ event.rightClick ||
+ (!this.options.handle && this.options.unDraggableTags.contains(event.target.get('tag')))
+ ) return;
-...
-*/
+ this.idle = false;
+ this.element = element;
+ this.opacity = element.getStyle('opacity');
+ this.list = element.getParent();
+ this.clone = this.getClone(event, element);
-Date.implement({
+ this.drag = new Drag.Move(this.clone, Object.merge({
+
+ droppables: this.getDroppables()
+ }, this.options.dragOptions)).addEvents({
+ onSnap: function(){
+ event.stop();
+ this.clone.setStyle('visibility', 'visible');
+ this.element.setStyle('opacity', this.options.opacity || 0);
+ this.fireEvent('start', [this.element, this.clone]);
+ }.bind(this),
+ onEnter: this.insert.bind(this),
+ onCancel: this.end.bind(this),
+ onComplete: this.end.bind(this)
+ });
- timeDiffInWords: function(to){
- return Date.distanceOfTimeInWords(this, to || new Date);
+ this.clone.inject(this.element, 'before');
+ this.drag.start(event);
},
- timeDiff: function(to, separator){
- if (to == null) to = new Date;
- var delta = ((to - this) / 1000).floor().abs();
+ end: function(){
+ this.drag.detach();
+ this.element.setStyle('opacity', this.opacity);
+ var self = this;
+ if (this.effect){
+ var dim = this.element.getStyles('width', 'height'),
+ clone = this.clone,
+ pos = clone.computePosition(this.getDroppableCoordinates(clone));
- var vals = [],
- durations = [60, 60, 24, 365, 0],
- names = ['s', 'm', 'h', 'd', 'y'],
- value, duration;
+ var destroy = function(){
+ this.removeEvent('cancel', destroy);
+ clone.destroy();
+ self.reset();
+ };
- for (var item = 0; item < durations.length; item++){
- if (item && !delta) break;
- value = delta;
- if ((duration = durations[item])){
- value = (delta % duration);
- delta = (delta / duration).floor();
- }
- vals.unshift(value + (names[item] || ''));
+ this.effect.element = clone;
+ this.effect.start({
+ top: pos.top,
+ left: pos.left,
+ width: dim.width,
+ height: dim.height,
+ opacity: 0.25
+ }).addEvent('cancel', destroy).chain(destroy);
+ } else {
+ this.clone.destroy();
+ self.reset();
}
-
- return vals.join(separator || ':');
- }
-
-}).extend({
-
- distanceOfTimeInWords: function(from, to){
- return Date.getTimePhrase(((to - from) / 1000).toInt());
+
},
- getTimePhrase: function(delta){
- var suffix = (delta < 0) ? 'Until' : 'Ago';
- if (delta < 0) delta *= -1;
-
- var units = {
- minute: 60,
- hour: 60,
- day: 24,
- week: 7,
- month: 52 / 12,
- year: 12,
- eon: Infinity
- };
-
- var msg = 'lessThanMinute';
-
- for (var unit in units){
- var interval = units[unit];
- if (delta < 1.5 * interval){
- if (delta > 0.75 * interval) msg = unit;
- break;
- }
- delta /= interval;
- msg = unit + 's';
- }
-
- delta = delta.round();
- return Date.getMsg(msg + suffix, delta).substitute({delta: delta});
- }
-
-}).defineParsers(
+ reset: function(){
+ this.idle = true;
+ this.fireEvent('complete', this.element);
+ },
- {
- // "today", "tomorrow", "yesterday"
- re: /^(?:tod|tom|yes)/i,
- handler: function(bits){
- var d = new Date().clearTime();
- switch (bits[0]){
- case 'tom': return d.increment();
- case 'yes': return d.decrement();
- default: return d;
+ serialize: function(){
+ var params = Array.link(arguments, {
+ modifier: Type.isFunction,
+ index: function(obj){
+ return obj != null;
}
- }
- },
+ });
+ var serial = this.lists.map(function(list){
+ return list.getChildren().map(params.modifier || function(element){
+ return element.get('id');
+ }, this);
+ }, this);
- {
- // "next Wednesday", "last Thursday"
- re: /^(next|last) ([a-z]+)$/i,
- handler: function(bits){
- var d = new Date().clearTime();
- var day = d.getDay();
- var newDay = Date.parseDay(bits[2], true);
- var addDays = newDay - day;
- if (newDay <= day) addDays += 7;
- if (bits[1] == 'last') addDays -= 7;
- return d.set('date', d.getDate() + addDays);
- }
+ var index = params.index;
+ if (this.lists.length == 1) index = 0;
+ return (index || index === 0) && index >= 0 && index < this.lists.length ? serial[index] : serial;
}
-).alias('timeAgoInWords', 'timeDiffInWords');
-
+});
/*
---
@@ -1235,10 +970,8 @@ var special = {
'S': /[е═е·е ]/g,
't': /[е╔её]/g,
'T': /[е╓е╒]/g,
- 'ue': /[ц╪]/g,
- 'UE': /[ц°]/g,
- 'u': /[ц╧ц╨ц╩е╞б╣]/g,
- 'U': /[ц≥ц ц⌡е╝]/g,
+ 'u': /[ц╧ц╨ц╩е╞ц╪б╣]/g,
+ 'U': /[ц≥ц ц⌡е╝ц°]/g,
'y': /[ц©ц╫]/g,
'Y': /[е╦ц²]/g,
'z': /[е╬е╨е╪]/g,
@@ -1263,7 +996,16 @@ tidy = {
'-': /[\u2013]/g,
// '--': /[\u2014]/g,
'»': /[\uFFFD]/g
-};
+},
+
+conversions = {
+ ms: 1,
+ s: 1000,
+ m: 6e4,
+ h: 36e5
+},
+
+findUnits = /(\d*.?\d+)([msh]+)/;
var walk = function(string, replacements){
var result = string, key;
@@ -1325,13 +1067,19 @@ String.implement({
if (trail) string += trail;
}
return string;
+ },
+
+ ms: function(){
+ // "Borrowed" from https://gist.github.com/1503944
+ var units = findUnits.exec(this);
+ if (units == null) return Number(this);
+ return Number(units[1]) * conversions[units[2]];
}
});
})();
-
/*
---
@@ -1348,8 +1096,8 @@ authors:
requires:
- Core/Element
- - /String.Extras
- - /MooTools.More
+ - String.Extras
+ - MooTools.More
provides: [Element.Forms]
@@ -1473,7 +1221,6 @@ Element.implement({
});
-
/*
---
@@ -1493,7 +1240,7 @@ authors:
requires:
- Core/Element.Style
- Core/Element.Dimensions
- - /MooTools.More
+ - MooTools.More
provides: [Element.Measure]
@@ -1642,7 +1389,6 @@ Element.implement({
})();
-
/*
---
@@ -1710,13 +1456,15 @@ var local = Element.Position = {
},
setOffsetOption: function(element, options){
- var parentOffset = {x: 0, y: 0},
- offsetParent = element.measure(function(){
- return document.id(this.getOffsetParent());
- }),
- parentScroll = offsetParent.getScroll();
+ var parentOffset = {x: 0, y: 0};
+ var parentScroll = {x: 0, y: 0};
+ var offsetParent = element.measure(function(){
+ return document.id(this.getOffsetParent());
+ });
if (!offsetParent || offsetParent == element.getDocument().body) return;
+
+ parentScroll = offsetParent.getScroll();
parentOffset = offsetParent.measure(function(){
var position = this.getPosition();
if (this.getStyle('position') == 'fixed'){
@@ -1879,7 +1627,6 @@ Element.implement({
})(Element.prototype.position);
-
/*
---
@@ -1896,7 +1643,7 @@ authors:
requires:
- Core/Element.Style
- - /MooTools.More
+ - MooTools.More
provides: [Element.Shortcuts]
@@ -1957,1014 +1704,1212 @@ Document.implement({
});
+/*
+---
+
+script: Object.Extras.js
+
+name: Object.Extras
+
+description: Extra Object generics, like getFromPath which allows a path notation to child elements.
+
+license: MIT-style license
+
+authors:
+ - Aaron Newton
+
+requires:
+ - Core/Object
+ - MooTools.More
+
+provides: [Object.Extras]
+
+...
+*/
+
+(function(){
+
+var defined = function(value){
+ return value != null;
+};
+
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+
+Object.extend({
+
+ getFromPath: function(source, parts){
+ if (typeof parts == 'string') parts = parts.split('.');
+ for (var i = 0, l = parts.length; i < l; i++){
+ if (hasOwnProperty.call(source, parts[i])) source = source[parts[i]];
+ else return null;
+ }
+ return source;
+ },
+
+ cleanValues: function(object, method){
+ method = method || defined;
+ for (var key in object) if (!method(object[key])){
+ delete object[key];
+ }
+ return object;
+ },
+
+ erase: function(object, key){
+ if (hasOwnProperty.call(object, key)) delete object[key];
+ return object;
+ },
+
+ run: function(object){
+ var args = Array.slice(arguments, 1);
+ for (var key in object) if (object[key].apply){
+ object[key].apply(object, args);
+ }
+ return object;
+ }
+
+});
+
+})();
/*
---
-script: Fx.Scroll.js
+script: Locale.js
-name: Fx.Scroll
+name: Locale
-description: Effect to smoothly scroll any element, including the window.
+description: Provides methods for localization.
license: MIT-style license
authors:
- - Valerio Proietti
+ - Aaron Newton
+ - Arian Stolwijk
requires:
- - Core/Fx
- - Core/Element.Event
- - Core/Element.Dimensions
- - /MooTools.More
+ - Core/Events
+ - Object.Extras
+ - MooTools.More
-provides: [Fx.Scroll]
+provides: [Locale, Lang]
...
*/
(function(){
-Fx.Scroll = new Class({
+var current = null,
+ locales = {},
+ inherits = {};
- Extends: Fx,
+var getSet = function(set){
+ if (instanceOf(set, Locale.Set)) return set;
+ else return locales[set];
+};
- options: {
- offset: {x: 0, y: 0},
- wheelStops: true
+var Locale = this.Locale = {
+
+ define: function(locale, set, key, value){
+ var name;
+ if (instanceOf(locale, Locale.Set)){
+ name = locale.name;
+ if (name) locales[name] = locale;
+ } else {
+ name = locale;
+ if (!locales[name]) locales[name] = new Locale.Set(name);
+ locale = locales[name];
+ }
+
+ if (set) locale.define(set, key, value);
+
+
+
+ if (!current) current = locale;
+
+ return locale;
},
- initialize: function(element, options){
- this.element = this.subject = document.id(element);
- this.parent(options);
+ use: function(locale){
+ locale = getSet(locale);
- if (typeOf(this.element) != 'element') this.element = document.id(this.element.getDocument().body);
+ if (locale){
+ current = locale;
- if (this.options.wheelStops){
- var stopper = this.element,
- cancel = this.cancel.pass(false, this);
- this.addEvent('start', function(){
- stopper.addEvent('mousewheel', cancel);
- }, true);
- this.addEvent('complete', function(){
- stopper.removeEvent('mousewheel', cancel);
- }, true);
+ this.fireEvent('change', locale);
+
+
}
+
+ return this;
},
- set: function(){
- var now = Array.flatten(arguments);
- if (Browser.firefox) now = [Math.round(now[0]), Math.round(now[1])]; // not needed anymore in newer firefox versions
- this.element.scrollTo(now[0], now[1]);
+ getCurrent: function(){
+ return current;
+ },
+
+ get: function(key, args){
+ return (current) ? current.get(key, args) : '';
+ },
+
+ inherit: function(locale, inherits, set){
+ locale = getSet(locale);
+
+ if (locale) locale.inherit(inherits, set);
return this;
},
- compute: function(from, to, delta){
- return [0, 1].map(function(i){
- return Fx.compute(from[i], to[i], delta);
- });
+ list: function(){
+ return Object.keys(locales);
+ }
+
+};
+
+Object.append(Locale, new Events);
+
+Locale.Set = new Class({
+
+ sets: {},
+
+ inherits: {
+ locales: [],
+ sets: {}
},
- start: function(x, y){
- if (!this.check(x, y)) return this;
- var scroll = this.element.getScroll();
- return this.parent([scroll.x, scroll.y], [x, y]);
+ initialize: function(name){
+ this.name = name || '';
},
- calculateScroll: function(x, y){
- var element = this.element,
- scrollSize = element.getScrollSize(),
- scroll = element.getScroll(),
- size = element.getSize(),
- offset = this.options.offset,
- values = {x: x, y: y};
+ define: function(set, key, value){
+ var defineData = this.sets[set];
+ if (!defineData) defineData = {};
+
+ if (key){
+ if (typeOf(key) == 'object') defineData = Object.merge(defineData, key);
+ else defineData[key] = value;
+ }
+ this.sets[set] = defineData;
+
+ return this;
+ },
+
+ get: function(key, args, _base){
+ var value = Object.getFromPath(this.sets, key);
+ if (value != null){
+ var type = typeOf(value);
+ if (type == 'function') value = value.apply(null, Array.from(args));
+ else if (type == 'object') value = Object.clone(value);
+ return value;
+ }
+
+ // get value of inherited locales
+ var index = key.indexOf('.'),
+ set = index < 0 ? key : key.substr(0, index),
+ names = (this.inherits.sets[set] || []).combine(this.inherits.locales).include('en-US');
+ if (!_base) _base = [];
+
+ for (var i = 0, l = names.length; i < l; i++){
+ if (_base.contains(names[i])) continue;
+ _base.include(names[i]);
+
+ var locale = locales[names[i]];
+ if (!locale) continue;
- for (var z in values){
- if (!values[z] && values[z] !== 0) values[z] = scroll[z];
- if (typeOf(values[z]) != 'number') values[z] = scrollSize[z] - size[z];
- values[z] += offset[z];
+ value = locale.get(key, args, _base);
+ if (value != null) return value;
}
- return [values.x, values.y];
+ return '';
},
- toTop: function(){
- return this.start.apply(this, this.calculateScroll(false, 0));
- },
+ inherit: function(names, set){
+ names = Array.from(names);
- toLeft: function(){
- return this.start.apply(this, this.calculateScroll(0, false));
- },
+ if (set && !this.inherits.sets[set]) this.inherits.sets[set] = [];
- toRight: function(){
- return this.start.apply(this, this.calculateScroll('right', false));
- },
+ var l = names.length;
+ while (l--) (set ? this.inherits.sets[set] : this.inherits.locales).unshift(names[l]);
- toBottom: function(){
- return this.start.apply(this, this.calculateScroll(false, 'bottom'));
- },
+ return this;
+ }
- toElement: function(el, axes){
- axes = axes ? Array.from(axes) : ['x', 'y'];
- var scroll = isBody(this.element) ? {x: 0, y: 0} : this.element.getScroll();
- var position = Object.map(document.id(el).getPosition(this.element), function(value, axis){
- return axes.contains(axis) ? value + scroll[axis] : false;
- });
- return this.start.apply(this, this.calculateScroll(position.x, position.y));
- },
+});
- toElementEdge: function(el, axes, offset){
- axes = axes ? Array.from(axes) : ['x', 'y'];
- el = document.id(el);
- var to = {},
- position = el.getPosition(this.element),
- size = el.getSize(),
- scroll = this.element.getScroll(),
- containerSize = this.element.getSize(),
- edge = {
- x: position.x + size.x,
- y: position.y + size.y
- };
- ['x', 'y'].each(function(axis){
- if (axes.contains(axis)){
- if (edge[axis] > scroll[axis] + containerSize[axis]) to[axis] = edge[axis] - containerSize[axis];
- if (position[axis] < scroll[axis]) to[axis] = position[axis];
- }
- if (to[axis] == null) to[axis] = scroll[axis];
- if (offset && offset[axis]) to[axis] = to[axis] + offset[axis];
- }, this);
- if (to.x != scroll.x || to.y != scroll.y) this.start(to.x, to.y);
- return this;
- },
+})();
- toElementCenter: function(el, axes, offset){
- axes = axes ? Array.from(axes) : ['x', 'y'];
- el = document.id(el);
- var to = {},
- position = el.getPosition(this.element),
- size = el.getSize(),
- scroll = this.element.getScroll(),
- containerSize = this.element.getSize();
+/*
+---
- ['x', 'y'].each(function(axis){
- if (axes.contains(axis)){
- to[axis] = position[axis] - (containerSize[axis] - size[axis]) / 2;
- }
- if (to[axis] == null) to[axis] = scroll[axis];
- if (offset && offset[axis]) to[axis] = to[axis] + offset[axis];
- }, this);
+name: Locale.en-US.Date
- if (to.x != scroll.x || to.y != scroll.y) this.start(to.x, to.y);
- return this;
- }
+description: Date messages for US English.
-});
+license: MIT-style license
+authors:
+ - Aaron Newton
+requires:
+ - Locale
-function isBody(element){
- return (/^(?:body|html)$/i).test(element.tagName);
-}
+provides: [Locale.en-US.Date]
-})();
+...
+*/
+
+Locale.define('en-US', 'Date', {
+
+ months: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
+ months_abbr: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+ days: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+ days_abbr: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+
+ // Culture's date order: MM/DD/YYYY
+ dateOrder: ['month', 'date', 'year'],
+ shortDate: '%m/%d/%Y',
+ shortTime: '%I:%M%p',
+ AM: 'AM',
+ PM: 'PM',
+ firstDayOfWeek: 0,
+
+ // Date.Extras
+ ordinal: function(dayOfMonth){
+ // 1st, 2nd, 3rd, etc.
+ return (dayOfMonth > 3 && dayOfMonth < 21) ? 'th' : ['th', 'st', 'nd', 'rd', 'th'][Math.min(dayOfMonth % 10, 4)];
+ },
+
+ lessThanMinuteAgo: 'less than a minute ago',
+ minuteAgo: 'about a minute ago',
+ minutesAgo: '{delta} minutes ago',
+ hourAgo: 'about an hour ago',
+ hoursAgo: 'about {delta} hours ago',
+ dayAgo: '1 day ago',
+ daysAgo: '{delta} days ago',
+ weekAgo: '1 week ago',
+ weeksAgo: '{delta} weeks ago',
+ monthAgo: '1 month ago',
+ monthsAgo: '{delta} months ago',
+ yearAgo: '1 year ago',
+ yearsAgo: '{delta} years ago',
+
+ lessThanMinuteUntil: 'less than a minute from now',
+ minuteUntil: 'about a minute from now',
+ minutesUntil: '{delta} minutes from now',
+ hourUntil: 'about an hour from now',
+ hoursUntil: 'about {delta} hours from now',
+ dayUntil: '1 day from now',
+ daysUntil: '{delta} days from now',
+ weekUntil: '1 week from now',
+ weeksUntil: '{delta} weeks from now',
+ monthUntil: '1 month from now',
+ monthsUntil: '{delta} months from now',
+ yearUntil: '1 year from now',
+ yearsUntil: '{delta} years from now'
+});
/*
---
-script: Fx.Slide.js
+script: Date.js
-name: Fx.Slide
+name: Date
-description: Effect to slide an element in and out of view.
+description: Extends the Date native object to include methods useful in managing dates.
license: MIT-style license
authors:
- - Valerio Proietti
+ - Aaron Newton
+ - Nicholas Barthelemy - https://svn.nbarthelemy.com/date-js/
+ - Harald Kirshner - mail [at] digitarald.de; http://digitarald.de
+ - Scott Kyle - scott [at] appden.com; http://appden.com
requires:
- - Core/Fx
- - Core/Element.Style
- - /MooTools.More
+ - Core/Array
+ - Core/String
+ - Core/Number
+ - MooTools.More
+ - Locale
+ - Locale.en-US.Date
-provides: [Fx.Slide]
+provides: [Date]
...
*/
-Fx.Slide = new Class({
-
- Extends: Fx,
+(function(){
- options: {
- mode: 'vertical',
- wrapper: false,
- hideOverflow: true,
- resetHeight: false
- },
+var Date = this.Date;
- initialize: function(element, options){
- element = this.element = this.subject = document.id(element);
- this.parent(options);
- options = this.options;
+var DateMethods = Date.Methods = {
+ ms: 'Milliseconds',
+ year: 'FullYear',
+ min: 'Minutes',
+ mo: 'Month',
+ sec: 'Seconds',
+ hr: 'Hours'
+};
- var wrapper = element.retrieve('wrapper'),
- styles = element.getStyles('margin', 'position', 'overflow');
+['Date', 'Day', 'FullYear', 'Hours', 'Milliseconds', 'Minutes', 'Month', 'Seconds', 'Time', 'TimezoneOffset',
+ 'Week', 'Timezone', 'GMTOffset', 'DayOfYear', 'LastMonth', 'LastDayOfMonth', 'UTCDate', 'UTCDay', 'UTCFullYear',
+ 'AMPM', 'Ordinal', 'UTCHours', 'UTCMilliseconds', 'UTCMinutes', 'UTCMonth', 'UTCSeconds', 'UTCMilliseconds'].each(function(method){
+ Date.Methods[method.toLowerCase()] = method;
+});
- if (options.hideOverflow) styles = Object.append(styles, {overflow: 'hidden'});
- if (options.wrapper) wrapper = document.id(options.wrapper).setStyles(styles);
+var pad = function(n, digits, string){
+ if (digits == 1) return n;
+ return n < Math.pow(10, digits - 1) ? (string || '0') + pad(n, digits - 1, string) : n;
+};
- if (!wrapper) wrapper = new Element('div', {
- styles: styles
- }).wraps(element);
+Date.implement({
- element.store('wrapper', wrapper).setStyle('margin', 0);
- if (element.getStyle('overflow') == 'visible') element.setStyle('overflow', 'hidden');
+ set: function(prop, value){
+ prop = prop.toLowerCase();
+ var method = DateMethods[prop] && 'set' + DateMethods[prop];
+ if (method && this[method]) this[method](value);
+ return this;
+ }.overloadSetter(),
- this.now = [];
- this.open = true;
- this.wrapper = wrapper;
+ get: function(prop){
+ prop = prop.toLowerCase();
+ var method = DateMethods[prop] && 'get' + DateMethods[prop];
+ if (method && this[method]) return this[method]();
+ return null;
+ }.overloadGetter(),
- this.addEvent('complete', function(){
- this.open = (wrapper['offset' + this.layout.capitalize()] != 0);
- if (this.open && this.options.resetHeight) wrapper.setStyle('height', '');
- }, true);
+ clone: function(){
+ return new Date(this.get('time'));
},
- vertical: function(){
- this.margin = 'margin-top';
- this.layout = 'height';
- this.offset = this.element.offsetHeight;
- },
+ increment: function(interval, times){
+ interval = interval || 'day';
+ times = times != null ? times : 1;
- horizontal: function(){
- this.margin = 'margin-left';
- this.layout = 'width';
- this.offset = this.element.offsetWidth;
- },
+ switch (interval){
+ case 'year':
+ return this.increment('month', times * 12);
+ case 'month':
+ var d = this.get('date');
+ this.set('date', 1).set('mo', this.get('mo') + times);
+ return this.set('date', d.min(this.get('lastdayofmonth')));
+ case 'week':
+ return this.increment('day', times * 7);
+ case 'day':
+ return this.set('date', this.get('date') + times);
+ }
+
+ if (!Date.units[interval]) throw new Error(interval + ' is not a supported interval');
- set: function(now){
- this.element.setStyle(this.margin, now[0]);
- this.wrapper.setStyle(this.layout, now[1]);
- return this;
+ return this.set('time', this.get('time') + times * Date.units[interval]());
},
- compute: function(from, to, delta){
- return [0, 1].map(function(i){
- return Fx.compute(from[i], to[i], delta);
- });
+ decrement: function(interval, times){
+ return this.increment(interval, -1 * (times != null ? times : 1));
},
- start: function(how, mode){
- if (!this.check(how, mode)) return this;
- this[mode || this.options.mode]();
-
- var margin = this.element.getStyle(this.margin).toInt(),
- layout = this.wrapper.getStyle(this.layout).toInt(),
- caseIn = [[margin, layout], [0, this.offset]],
- caseOut = [[margin, layout], [-this.offset, 0]],
- start;
-
- switch (how){
- case 'in': start = caseIn; break;
- case 'out': start = caseOut; break;
- case 'toggle': start = (layout == 0) ? caseIn : caseOut;
- }
- return this.parent(start[0], start[1]);
+ isLeapYear: function(){
+ return Date.isLeapYear(this.get('year'));
},
- slideIn: function(mode){
- return this.start('in', mode);
+ clearTime: function(){
+ return this.set({hr: 0, min: 0, sec: 0, ms: 0});
},
- slideOut: function(mode){
- return this.start('out', mode);
- },
+ diff: function(date, resolution){
+ if (typeOf(date) == 'string') date = Date.parse(date);
- hide: function(mode){
- this[mode || this.options.mode]();
- this.open = false;
- return this.set([-this.offset, 0]);
+ return ((date - this) / Date.units[resolution || 'day'](3, 3)).round(); // non-leap year, 30-day month
},
- show: function(mode){
- this[mode || this.options.mode]();
- this.open = true;
- return this.set([0, this.offset]);
+ getLastDayOfMonth: function(){
+ return Date.daysInMonth(this.get('mo'), this.get('year'));
},
- toggle: function(mode){
- return this.start('toggle', mode);
- }
+ getDayOfYear: function(){
+ return (Date.UTC(this.get('year'), this.get('mo'), this.get('date') + 1)
+ - Date.UTC(this.get('year'), 0, 1)) / Date.units.day();
+ },
-});
+ setDay: function(day, firstDayOfWeek){
+ if (firstDayOfWeek == null){
+ firstDayOfWeek = Date.getMsg('firstDayOfWeek');
+ if (firstDayOfWeek === '') firstDayOfWeek = 1;
+ }
-Element.Properties.slide = {
+ day = (7 + Date.parseDay(day, true) - firstDayOfWeek) % 7;
+ var currentDay = (7 + this.get('day') - firstDayOfWeek) % 7;
- set: function(options){
- this.get('slide').cancel().setOptions(options);
- return this;
+ return this.increment('day', day - currentDay);
},
- get: function(){
- var slide = this.retrieve('slide');
- if (!slide){
- slide = new Fx.Slide(this, {link: 'cancel'});
- this.store('slide', slide);
+ getWeek: function(firstDayOfWeek){
+ if (firstDayOfWeek == null){
+ firstDayOfWeek = Date.getMsg('firstDayOfWeek');
+ if (firstDayOfWeek === '') firstDayOfWeek = 1;
}
- return slide;
- }
-};
+ var date = this,
+ dayOfWeek = (7 + date.get('day') - firstDayOfWeek) % 7,
+ dividend = 0,
+ firstDayOfYear;
-Element.implement({
+ if (firstDayOfWeek == 1){
+ // ISO-8601, week belongs to year that has the most days of the week (i.e. has the thursday of the week)
+ var month = date.get('month'),
+ startOfWeek = date.get('date') - dayOfWeek;
- slide: function(how, mode){
- how = how || 'toggle';
- var slide = this.get('slide'), toggle;
- switch (how){
- case 'hide': slide.hide(mode); break;
- case 'show': slide.show(mode); break;
- case 'toggle':
- var flag = this.retrieve('slide:flag', slide.open);
- slide[flag ? 'slideOut' : 'slideIn'](mode);
- this.store('slide:flag', !flag);
- toggle = true;
- break;
- default: slide.start(how, mode);
+ if (month == 11 && startOfWeek > 28) return 1; // Week 1 of next year
+
+ if (month == 0 && startOfWeek < -2){
+ // Use a date from last year to determine the week
+ date = new Date(date).decrement('day', dayOfWeek);
+ dayOfWeek = 0;
+ }
+
+ firstDayOfYear = new Date(date.get('year'), 0, 1).get('day') || 7;
+ if (firstDayOfYear > 4) dividend = -7; // First week of the year is not week 1
+ } else {
+ // In other cultures the first week of the year is always week 1 and the last week always 53 or 54.
+ // Days in the same week can have a different weeknumber if the week spreads across two years.
+ firstDayOfYear = new Date(date.get('year'), 0, 1).get('day');
}
- if (!toggle) this.eliminate('slide:flag');
- return this;
- }
-});
+ dividend += date.get('dayofyear');
+ dividend += 6 - dayOfWeek; // Add days so we calculate the current date's week as a full week
+ dividend += (7 + firstDayOfYear - firstDayOfWeek) % 7; // Make up for first week of the year not being a full week
+ return (dividend / 7);
+ },
-/*
----
+ getOrdinal: function(day){
+ return Date.getMsg('ordinal', day || this.get('date'));
+ },
-script: Drag.js
+ getTimezone: function(){
+ return this.toString()
+ .replace(/^.*? ([A-Z]{3}).[0-9]{4}.*$/, '$1')
+ .replace(/^.*?\(([A-Z])[a-z]+ ([A-Z])[a-z]+ ([A-Z])[a-z]+\)$/, '$1$2$3');
+ },
-name: Drag
+ getGMTOffset: function(){
+ var off = this.get('timezoneOffset');
+ return ((off > 0) ? '-' : '+') + pad((off.abs() / 60).floor(), 2) + pad(off % 60, 2);
+ },
-description: The base Drag Class. Can be used to drag and resize Elements using mouse events.
+ setAMPM: function(ampm){
+ ampm = ampm.toUpperCase();
+ var hr = this.get('hr');
+ if (hr > 11 && ampm == 'AM') return this.decrement('hour', 12);
+ else if (hr < 12 && ampm == 'PM') return this.increment('hour', 12);
+ return this;
+ },
-license: MIT-style license
+ getAMPM: function(){
+ return (this.get('hr') < 12) ? 'AM' : 'PM';
+ },
-authors:
- - Valerio Proietti
- - Tom Occhinno
- - Jan Kassens
+ parse: function(str){
+ this.set('time', Date.parse(str));
+ return this;
+ },
-requires:
- - Core/Events
- - Core/Options
- - Core/Element.Event
- - Core/Element.Style
- - Core/Element.Dimensions
- - /MooTools.More
+ isValid: function(date){
+ if (!date) date = this;
+ return typeOf(date) == 'date' && !isNaN(date.valueOf());
+ },
-provides: [Drag]
-...
+ format: function(format){
+ if (!this.isValid()) return 'invalid date';
-*/
+ if (!format) format = '%x %X';
+ if (typeof format == 'string') format = formats[format.toLowerCase()] || format;
+ if (typeof format == 'function') return format(this);
-var Drag = new Class({
+ var d = this;
+ return format.replace(/%([a-z%])/gi,
+ function($0, $1){
+ switch ($1){
+ case 'a': return Date.getMsg('days_abbr')[d.get('day')];
+ case 'A': return Date.getMsg('days')[d.get('day')];
+ case 'b': return Date.getMsg('months_abbr')[d.get('month')];
+ case 'B': return Date.getMsg('months')[d.get('month')];
+ case 'c': return d.format('%a %b %d %H:%M:%S %Y');
+ case 'd': return pad(d.get('date'), 2);
+ case 'e': return pad(d.get('date'), 2, ' ');
+ case 'H': return pad(d.get('hr'), 2);
+ case 'I': return pad((d.get('hr') % 12) || 12, 2);
+ case 'j': return pad(d.get('dayofyear'), 3);
+ case 'k': return pad(d.get('hr'), 2, ' ');
+ case 'l': return pad((d.get('hr') % 12) || 12, 2, ' ');
+ case 'L': return pad(d.get('ms'), 3);
+ case 'm': return pad((d.get('mo') + 1), 2);
+ case 'M': return pad(d.get('min'), 2);
+ case 'o': return d.get('ordinal');
+ case 'p': return Date.getMsg(d.get('ampm'));
+ case 's': return Math.round(d / 1000);
+ case 'S': return pad(d.get('seconds'), 2);
+ case 'T': return d.format('%H:%M:%S');
+ case 'U': return pad(d.get('week'), 2);
+ case 'w': return d.get('day');
+ case 'x': return d.format(Date.getMsg('shortDate'));
+ case 'X': return d.format(Date.getMsg('shortTime'));
+ case 'y': return d.get('year').toString().substr(2);
+ case 'Y': return d.get('year');
+ case 'z': return d.get('GMTOffset');
+ case 'Z': return d.get('Timezone');
+ }
+ return $1;
+ }
+ );
+ },
- Implements: [Events, Options],
+ toISOString: function(){
+ return this.format('iso8601');
+ }
- options: {/*
- onBeforeStart: function(thisElement){},
- onStart: function(thisElement, event){},
- onSnap: function(thisElement){},
- onDrag: function(thisElement, event){},
- onCancel: function(thisElement){},
- onComplete: function(thisElement, event){},*/
- snap: 6,
- unit: 'px',
- grid: false,
- style: true,
- limit: false,
- handle: false,
- invert: false,
- preventDefault: false,
- stopPropagation: false,
- modifiers: {x: 'left', y: 'top'}
+}).alias({
+ toJSON: 'toISOString',
+ compare: 'diff',
+ strftime: 'format'
+});
+
+// The day and month abbreviations are standardized, so we cannot use simply %a and %b because they will get localized
+var rfcDayAbbr = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+ rfcMonthAbbr = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+
+var formats = {
+ db: '%Y-%m-%d %H:%M:%S',
+ compact: '%Y%m%dT%H%M%S',
+ 'short': '%d %b %H:%M',
+ 'long': '%B %d, %Y %H:%M',
+ rfc822: function(date){
+ return rfcDayAbbr[date.get('day')] + date.format(', %d ') + rfcMonthAbbr[date.get('month')] + date.format(' %Y %H:%M:%S %Z');
+ },
+ rfc2822: function(date){
+ return rfcDayAbbr[date.get('day')] + date.format(', %d ') + rfcMonthAbbr[date.get('month')] + date.format(' %Y %H:%M:%S %z');
},
+ iso8601: function(date){
+ return (
+ date.getUTCFullYear() + '-' +
+ pad(date.getUTCMonth() + 1, 2) + '-' +
+ pad(date.getUTCDate(), 2) + 'T' +
+ pad(date.getUTCHours(), 2) + ':' +
+ pad(date.getUTCMinutes(), 2) + ':' +
+ pad(date.getUTCSeconds(), 2) + '.' +
+ pad(date.getUTCMilliseconds(), 3) + 'Z'
+ );
+ }
+};
- initialize: function(){
- var params = Array.link(arguments, {
- 'options': Type.isObject,
- 'element': function(obj){
- return obj != null;
- }
- });
+var parsePatterns = [],
+ nativeParse = Date.parse;
- this.element = document.id(params.element);
- this.document = this.element.getDocument();
- this.setOptions(params.options || {});
- var htype = typeOf(this.options.handle);
- this.handles = ((htype == 'array' || htype == 'collection') ? $$(this.options.handle) : document.id(this.options.handle)) || this.element;
- this.mouse = {'now': {}, 'pos': {}};
- this.value = {'start': {}, 'now': {}};
+var parseWord = function(type, word, num){
+ var ret = -1,
+ translated = Date.getMsg(type + 's');
+ switch (typeOf(word)){
+ case 'object':
+ ret = translated[word.get(type)];
+ break;
+ case 'number':
+ ret = translated[word];
+ if (!ret) throw new Error('Invalid ' + type + ' index: ' + word);
+ break;
+ case 'string':
+ var match = translated.filter(function(name){
+ return this.test(name);
+ }, new RegExp('^' + word, 'i'));
+ if (!match.length) throw new Error('Invalid ' + type + ' string');
+ if (match.length > 1) throw new Error('Ambiguous ' + type);
+ ret = match[0];
+ }
- this.selection = (Browser.ie) ? 'selectstart' : 'mousedown';
+ return (num) ? translated.indexOf(ret) : ret;
+};
+var startCentury = 1900,
+ startYear = 70;
- if (Browser.ie && !Drag.ondragstartFixed){
- document.ondragstart = Function.from(false);
- Drag.ondragstartFixed = true;
- }
+Date.extend({
- this.bound = {
- start: this.start.bind(this),
- check: this.check.bind(this),
- drag: this.drag.bind(this),
- stop: this.stop.bind(this),
- cancel: this.cancel.bind(this),
- eventStop: Function.from(false)
- };
- this.attach();
+ getMsg: function(key, args){
+ return Locale.get('Date.' + key, args);
},
- attach: function(){
- this.handles.addEvent('mousedown', this.bound.start);
- return this;
+ units: {
+ ms: Function.from(1),
+ second: Function.from(1000),
+ minute: Function.from(60000),
+ hour: Function.from(3600000),
+ day: Function.from(86400000),
+ week: Function.from(608400000),
+ month: function(month, year){
+ var d = new Date;
+ return Date.daysInMonth(month != null ? month : d.get('mo'), year != null ? year : d.get('year')) * 86400000;
+ },
+ year: function(year){
+ year = year || new Date().get('year');
+ return Date.isLeapYear(year) ? 31622400000 : 31536000000;
+ }
},
- detach: function(){
- this.handles.removeEvent('mousedown', this.bound.start);
- return this;
+ daysInMonth: function(month, year){
+ return [31, Date.isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month];
},
- start: function(event){
- var options = this.options;
+ isLeapYear: function(year){
+ return ((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0);
+ },
- if (event.rightClick) return;
+ parse: function(from){
+ var t = typeOf(from);
+ if (t == 'number') return new Date(from);
+ if (t != 'string') return from;
+ from = from.clean();
+ if (!from.length) return null;
- if (options.preventDefault) event.preventDefault();
- if (options.stopPropagation) event.stopPropagation();
- this.mouse.start = event.page;
+ var parsed;
+ parsePatterns.some(function(pattern){
+ var bits = pattern.re.exec(from);
+ return (bits) ? (parsed = pattern.handler(bits)) : false;
+ });
- this.fireEvent('beforeStart', this.element);
+ if (!(parsed && parsed.isValid())){
+ parsed = new Date(nativeParse(from));
+ if (!(parsed && parsed.isValid())) parsed = new Date(from.toInt());
+ }
+ return parsed;
+ },
- var limit = options.limit;
- this.limit = {x: [], y: []};
+ parseDay: function(day, num){
+ return parseWord('day', day, num);
+ },
- var z, coordinates;
- for (z in options.modifiers){
- if (!options.modifiers[z]) continue;
+ parseMonth: function(month, num){
+ return parseWord('month', month, num);
+ },
- var style = this.element.getStyle(options.modifiers[z]);
+ parseUTC: function(value){
+ var localDate = new Date(value);
+ var utcSeconds = Date.UTC(
+ localDate.get('year'),
+ localDate.get('mo'),
+ localDate.get('date'),
+ localDate.get('hr'),
+ localDate.get('min'),
+ localDate.get('sec'),
+ localDate.get('ms')
+ );
+ return new Date(utcSeconds);
+ },
- // Some browsers (IE and Opera) don't always return pixels.
- if (style && !style.match(/px$/)){
- if (!coordinates) coordinates = this.element.getCoordinates(this.element.getOffsetParent());
- style = coordinates[options.modifiers[z]];
- }
+ orderIndex: function(unit){
+ return Date.getMsg('dateOrder').indexOf(unit) + 1;
+ },
- if (options.style) this.value.now[z] = (style || 0).toInt();
- else this.value.now[z] = this.element[options.modifiers[z]];
+ defineFormat: function(name, format){
+ formats[name] = format;
+ return this;
+ },
- if (options.invert) this.value.now[z] *= -1;
+
- this.mouse.pos[z] = event.page[z] - this.value.now[z];
+ defineParser: function(pattern){
+ parsePatterns.push((pattern.re && pattern.handler) ? pattern : build(pattern));
+ return this;
+ },
- if (limit && limit[z]){
- var i = 2;
- while (i--){
- var limitZI = limit[z][i];
- if (limitZI || limitZI === 0) this.limit[z][i] = (typeof limitZI == 'function') ? limitZI() : limitZI;
- }
- }
- }
+ defineParsers: function(){
+ Array.flatten(arguments).each(Date.defineParser);
+ return this;
+ },
- if (typeOf(this.options.grid) == 'number') this.options.grid = {
- x: this.options.grid,
- y: this.options.grid
- };
+ define2DigitYearStart: function(year){
+ startYear = year % 100;
+ startCentury = year - startYear;
+ return this;
+ }
- var events = {
- mousemove: this.bound.check,
- mouseup: this.bound.cancel
- };
- events[this.selection] = this.bound.eventStop;
- this.document.addEvents(events);
- },
+}).extend({
+ defineFormats: Date.defineFormat.overloadSetter()
+});
- check: function(event){
- if (this.options.preventDefault) event.preventDefault();
- var distance = Math.round(Math.sqrt(Math.pow(event.page.x - this.mouse.start.x, 2) + Math.pow(event.page.y - this.mouse.start.y, 2)));
- if (distance > this.options.snap){
- this.cancel();
- this.document.addEvents({
- mousemove: this.bound.drag,
- mouseup: this.bound.stop
- });
- this.fireEvent('start', [this.element, event]).fireEvent('snap', this.element);
- }
- },
+var regexOf = function(type){
+ return new RegExp('(?:' + Date.getMsg(type).map(function(name){
+ return name.substr(0, 3);
+ }).join('|') + ')[a-z]*');
+};
- drag: function(event){
- var options = this.options;
+var replacers = function(key){
+ switch (key){
+ case 'T':
+ return '%H:%M:%S';
+ case 'x': // iso8601 covers yyyy-mm-dd, so just check if month is first
+ return ((Date.orderIndex('month') == 1) ? '%m[-./]%d' : '%d[-./]%m') + '([-./]%y)?';
+ case 'X':
+ return '%H([.:]%M)?([.:]%S([.:]%s)?)? ?%p? ?%z?';
+ }
+ return null;
+};
- if (options.preventDefault) event.preventDefault();
- this.mouse.now = event.page;
+var keys = {
+ d: /[0-2]?[0-9]|3[01]/,
+ H: /[01]?[0-9]|2[0-3]/,
+ I: /0?[1-9]|1[0-2]/,
+ M: /[0-5]?\d/,
+ s: /\d+/,
+ o: /[a-z]*/,
+ p: /[ap]\.?m\.?/,
+ y: /\d{2}|\d{4}/,
+ Y: /\d{4}/,
+ z: /Z|[+-]\d{2}(?::?\d{2})?/
+};
- for (var z in options.modifiers){
- if (!options.modifiers[z]) continue;
- this.value.now[z] = this.mouse.now[z] - this.mouse.pos[z];
+keys.m = keys.I;
+keys.S = keys.M;
- if (options.invert) this.value.now[z] *= -1;
+var currentLanguage;
- if (options.limit && this.limit[z]){
- if ((this.limit[z][1] || this.limit[z][1] === 0) && (this.value.now[z] > this.limit[z][1])){
- this.value.now[z] = this.limit[z][1];
- } else if ((this.limit[z][0] || this.limit[z][0] === 0) && (this.value.now[z] < this.limit[z][0])){
- this.value.now[z] = this.limit[z][0];
- }
- }
+var recompile = function(language){
+ currentLanguage = language;
- if (options.grid[z]) this.value.now[z] -= ((this.value.now[z] - (this.limit[z][0]||0)) % options.grid[z]);
+ keys.a = keys.A = regexOf('days');
+ keys.b = keys.B = regexOf('months');
- if (options.style) this.element.setStyle(options.modifiers[z], this.value.now[z] + options.unit);
- else this.element[options.modifiers[z]] = this.value.now[z];
- }
+ parsePatterns.each(function(pattern, i){
+ if (pattern.format) parsePatterns[i] = build(pattern.format);
+ });
+};
- this.fireEvent('drag', [this.element, event]);
- },
+var build = function(format){
+ if (!currentLanguage) return {format: format};
- cancel: function(event){
- this.document.removeEvents({
- mousemove: this.bound.check,
- mouseup: this.bound.cancel
- });
- if (event){
- this.document.removeEvent(this.selection, this.bound.eventStop);
- this.fireEvent('cancel', this.element);
+ var parsed = [];
+ var re = (format.source || format) // allow format to be regex
+ .replace(/%([a-z])/gi,
+ function($0, $1){
+ return replacers($1) || $0;
}
- },
+ ).replace(/\((?!\?)/g, '(?:') // make all groups non-capturing
+ .replace(/ (?!\?|\*)/g, ',? ') // be forgiving with spaces and commas
+ .replace(/%([a-z%])/gi,
+ function($0, $1){
+ var p = keys[$1];
+ if (!p) return $1;
+ parsed.push($1);
+ return '(' + p.source + ')';
+ }
+ ).replace(/\[a-z\]/gi, '[a-z\\u00c0-\\uffff;\&]'); // handle unicode words
- stop: function(event){
- var events = {
- mousemove: this.bound.drag,
- mouseup: this.bound.stop
- };
- events[this.selection] = this.bound.eventStop;
- this.document.removeEvents(events);
- if (event) this.fireEvent('complete', [this.element, event]);
- }
+ return {
+ format: format,
+ re: new RegExp('^' + re + '$', 'i'),
+ handler: function(bits){
+ bits = bits.slice(1).associate(parsed);
+ var date = new Date().clearTime(),
+ year = bits.y || bits.Y;
-});
+ if (year != null) handle.call(date, 'y', year); // need to start in the right year
+ if ('d' in bits) handle.call(date, 'd', 1);
+ if ('m' in bits || bits.b || bits.B) handle.call(date, 'm', 1);
-Element.implement({
+ for (var key in bits) handle.call(date, key, bits[key]);
+ return date;
+ }
+ };
+};
- makeResizable: function(options){
- var drag = new Drag(this, Object.merge({
- modifiers: {
- x: 'width',
- y: 'height'
- }
- }, options));
+var handle = function(key, value){
+ if (!value) return this;
- this.store('resizer', drag);
- return drag.addEvent('drag', function(){
- this.fireEvent('resize', drag);
- }.bind(this));
+ switch (key){
+ case 'a': case 'A': return this.set('day', Date.parseDay(value, true));
+ case 'b': case 'B': return this.set('mo', Date.parseMonth(value, true));
+ case 'd': return this.set('date', value);
+ case 'H': case 'I': return this.set('hr', value);
+ case 'm': return this.set('mo', value - 1);
+ case 'M': return this.set('min', value);
+ case 'p': return this.set('ampm', value.replace(/\./g, ''));
+ case 'S': return this.set('sec', value);
+ case 's': return this.set('ms', ('0.' + value) * 1000);
+ case 'w': return this.set('day', value);
+ case 'Y': return this.set('year', value);
+ case 'y':
+ value = +value;
+ if (value < 100) value += startCentury + (value < startYear ? 100 : 0);
+ return this.set('year', value);
+ case 'z':
+ if (value == 'Z') value = '+00';
+ var offset = value.match(/([+-])(\d{2}):?(\d{2})?/);
+ offset = (offset[1] + '1') * (offset[2] * 60 + (+offset[3] || 0)) + this.getTimezoneOffset();
+ return this.set('time', this - offset * 60000);
}
-});
+ return this;
+};
+
+Date.defineParsers(
+ '%Y([-./]%m([-./]%d((T| )%X)?)?)?', // "1999-12-31", "1999-12-31 11:59pm", "1999-12-31 23:59:59", ISO8601
+ '%Y%m%d(T%H(%M%S?)?)?', // "19991231", "19991231T1159", compact
+ '%x( %X)?', // "12/31", "12.31.99", "12-31-1999", "12/31/2008 11:59 PM"
+ '%d%o( %b( %Y)?)?( %X)?', // "31st", "31st December", "31 Dec 1999", "31 Dec 1999 11:59pm"
+ '%b( %d%o)?( %Y)?( %X)?', // Same as above with month and day switched
+ '%Y %b( %d%o( %X)?)?', // Same as above with year coming first
+ '%o %b %d %X %z %Y', // "Thu Oct 22 08:11:23 +0000 2009"
+ '%T', // %H:%M:%S
+ '%H:%M( ?%p)?' // "11:05pm", "11:05 am" and "11:05"
+);
+
+Locale.addEvent('change', function(language){
+ if (Locale.get('Date')) recompile(language);
+}).fireEvent('change', Locale.getCurrent());
+})();
/*
---
-script: Drag.Move.js
+script: Fx.Scroll.js
-name: Drag.Move
+name: Fx.Scroll
-description: A Drag extension that provides support for the constraining of draggables to containers and droppables.
+description: Effect to smoothly scroll any element, including the window.
license: MIT-style license
authors:
- Valerio Proietti
- - Tom Occhinno
- - Jan Kassens
- - Aaron Newton
- - Scott Kyle
requires:
+ - Core/Fx
+ - Core/Element.Event
- Core/Element.Dimensions
- - /Drag
+ - MooTools.More
-provides: [Drag.Move]
+provides: [Fx.Scroll]
...
*/
-Drag.Move = new Class({
+(function(){
- Extends: Drag,
+Fx.Scroll = new Class({
- options: {/*
- onEnter: function(thisElement, overed){},
- onLeave: function(thisElement, overed){},
- onDrop: function(thisElement, overed, event){},*/
- droppables: [],
- container: false,
- precalculate: false,
- includeMargins: true,
- checkDroppables: true
+ Extends: Fx,
+
+ options: {
+ offset: {x: 0, y: 0},
+ wheelStops: true
},
initialize: function(element, options){
- this.parent(element, options);
- element = this.element;
-
- this.droppables = $$(this.options.droppables);
- this.container = document.id(this.options.container);
-
- if (this.container && typeOf(this.container) != 'element')
- this.container = document.id(this.container.getDocument().body);
+ this.element = this.subject = document.id(element);
+ this.parent(options);
- if (this.options.style){
- if (this.options.modifiers.x == 'left' && this.options.modifiers.y == 'top'){
- var parent = element.getOffsetParent(),
- styles = element.getStyles('left', 'top');
- if (parent && (styles.left == 'auto' || styles.top == 'auto')){
- element.setPosition(element.getPosition(parent));
- }
- }
+ if (typeOf(this.element) != 'element') this.element = document.id(this.element.getDocument().body);
- if (element.getStyle('position') == 'static') element.setStyle('position', 'absolute');
+ if (this.options.wheelStops){
+ var stopper = this.element,
+ cancel = this.cancel.pass(false, this);
+ this.addEvent('start', function(){
+ stopper.addEvent('mousewheel', cancel);
+ }, true);
+ this.addEvent('complete', function(){
+ stopper.removeEvent('mousewheel', cancel);
+ }, true);
}
-
- this.addEvent('start', this.checkDroppables, true);
- this.overed = null;
},
- start: function(event){
- if (this.container) this.options.limit = this.calculateLimit();
+ set: function(){
+ var now = Array.flatten(arguments);
+ this.element.scrollTo(now[0], now[1]);
+ return this;
+ },
- if (this.options.precalculate){
- this.positions = this.droppables.map(function(el){
- return el.getCoordinates();
- });
- }
+ compute: function(from, to, delta){
+ return [0, 1].map(function(i){
+ return Fx.compute(from[i], to[i], delta);
+ });
+ },
- this.parent(event);
+ start: function(x, y){
+ if (!this.check(x, y)) return this;
+ var scroll = this.element.getScroll();
+ return this.parent([scroll.x, scroll.y], [x, y]);
},
- calculateLimit: function(){
+ calculateScroll: function(x, y){
var element = this.element,
- container = this.container,
-
- offsetParent = document.id(element.getOffsetParent()) || document.body,
- containerCoordinates = container.getCoordinates(offsetParent),
- elementMargin = {},
- elementBorder = {},
- containerMargin = {},
- containerBorder = {},
- offsetParentPadding = {};
-
- ['top', 'right', 'bottom', 'left'].each(function(pad){
- elementMargin[pad] = element.getStyle('margin-' + pad).toInt();
- elementBorder[pad] = element.getStyle('border-' + pad).toInt();
- containerMargin[pad] = container.getStyle('margin-' + pad).toInt();
- containerBorder[pad] = container.getStyle('border-' + pad).toInt();
- offsetParentPadding[pad] = offsetParent.getStyle('padding-' + pad).toInt();
- }, this);
-
- var width = element.offsetWidth + elementMargin.left + elementMargin.right,
- height = element.offsetHeight + elementMargin.top + elementMargin.bottom,
- left = 0,
- top = 0,
- right = containerCoordinates.right - containerBorder.right - width,
- bottom = containerCoordinates.bottom - containerBorder.bottom - height;
-
- if (this.options.includeMargins){
- left += elementMargin.left;
- top += elementMargin.top;
- } else {
- right += elementMargin.right;
- bottom += elementMargin.bottom;
- }
-
- if (element.getStyle('position') == 'relative'){
- var coords = element.getCoordinates(offsetParent);
- coords.left -= element.getStyle('left').toInt();
- coords.top -= element.getStyle('top').toInt();
-
- left -= coords.left;
- top -= coords.top;
- if (container.getStyle('position') != 'relative'){
- left += containerBorder.left;
- top += containerBorder.top;
- }
- right += elementMargin.left - coords.left;
- bottom += elementMargin.top - coords.top;
-
- if (container != offsetParent){
- left += containerMargin.left + offsetParentPadding.left;
- top += ((Browser.ie6 || Browser.ie7) ? 0 : containerMargin.top) + offsetParentPadding.top;
- }
- } else {
- left -= elementMargin.left;
- top -= elementMargin.top;
- if (container != offsetParent){
- left += containerCoordinates.left + containerBorder.left;
- top += containerCoordinates.top + containerBorder.top;
- }
+ scrollSize = element.getScrollSize(),
+ scroll = element.getScroll(),
+ size = element.getSize(),
+ offset = this.options.offset,
+ values = {x: x, y: y};
+
+ for (var z in values){
+ if (!values[z] && values[z] !== 0) values[z] = scroll[z];
+ if (typeOf(values[z]) != 'number') values[z] = scrollSize[z] - size[z];
+ values[z] += offset[z];
}
- return {
- x: [left, right],
- y: [top, bottom]
- };
+ return [values.x, values.y];
},
- getDroppableCoordinates: function(element){
- var position = element.getCoordinates();
- if (element.getStyle('position') == 'fixed'){
- var scroll = window.getScroll();
- position.left += scroll.x;
- position.right += scroll.x;
- position.top += scroll.y;
- position.bottom += scroll.y;
- }
- return position;
+ toTop: function(){
+ return this.start.apply(this, this.calculateScroll(false, 0));
},
- checkDroppables: function(){
- var overed = this.droppables.filter(function(el, i){
- el = this.positions ? this.positions[i] : this.getDroppableCoordinates(el);
- var now = this.mouse.now;
- return (now.x > el.left && now.x < el.right && now.y < el.bottom && now.y > el.top);
- }, this).getLast();
+ toLeft: function(){
+ return this.start.apply(this, this.calculateScroll(0, false));
+ },
- if (this.overed != overed){
- if (this.overed) this.fireEvent('leave', [this.element, this.overed]);
- if (overed) this.fireEvent('enter', [this.element, overed]);
- this.overed = overed;
- }
+ toRight: function(){
+ return this.start.apply(this, this.calculateScroll('right', false));
},
- drag: function(event){
- this.parent(event);
- if (this.options.checkDroppables && this.droppables.length) this.checkDroppables();
+ toBottom: function(){
+ return this.start.apply(this, this.calculateScroll(false, 'bottom'));
},
- stop: function(event){
- this.checkDroppables();
- this.fireEvent('drop', [this.element, this.overed, event]);
- this.overed = null;
- return this.parent(event);
- }
+ toElement: function(el, axes){
+ axes = axes ? Array.from(axes) : ['x', 'y'];
+ var scroll = isBody(this.element) ? {x: 0, y: 0} : this.element.getScroll();
+ var position = Object.map(document.id(el).getPosition(this.element), function(value, axis){
+ return axes.contains(axis) ? value + scroll[axis] : false;
+ });
+ return this.start.apply(this, this.calculateScroll(position.x, position.y));
+ },
-});
+ toElementEdge: function(el, axes, offset){
+ axes = axes ? Array.from(axes) : ['x', 'y'];
+ el = document.id(el);
+ var to = {},
+ position = el.getPosition(this.element),
+ size = el.getSize(),
+ scroll = this.element.getScroll(),
+ containerSize = this.element.getSize(),
+ edge = {
+ x: position.x + size.x,
+ y: position.y + size.y
+ };
-Element.implement({
+ ['x', 'y'].each(function(axis){
+ if (axes.contains(axis)){
+ if (edge[axis] > scroll[axis] + containerSize[axis]) to[axis] = edge[axis] - containerSize[axis];
+ if (position[axis] < scroll[axis]) to[axis] = position[axis];
+ }
+ if (to[axis] == null) to[axis] = scroll[axis];
+ if (offset && offset[axis]) to[axis] = to[axis] + offset[axis];
+ }, this);
- makeDraggable: function(options){
- var drag = new Drag.Move(this, options);
- this.store('dragger', drag);
- return drag;
+ if (to.x != scroll.x || to.y != scroll.y) this.start(to.x, to.y);
+ return this;
+ },
+
+ toElementCenter: function(el, axes, offset){
+ axes = axes ? Array.from(axes) : ['x', 'y'];
+ el = document.id(el);
+ var to = {},
+ position = el.getPosition(this.element),
+ size = el.getSize(),
+ scroll = this.element.getScroll(),
+ containerSize = this.element.getSize();
+
+ ['x', 'y'].each(function(axis){
+ if (axes.contains(axis)){
+ to[axis] = position[axis] - (containerSize[axis] - size[axis]) / 2;
+ }
+ if (to[axis] == null) to[axis] = scroll[axis];
+ if (offset && offset[axis]) to[axis] = to[axis] + offset[axis];
+ }, this);
+
+ if (to.x != scroll.x || to.y != scroll.y) this.start(to.x, to.y);
+ return this;
}
});
+
+function isBody(element){
+ return (/^(?:body|html)$/i).test(element.tagName);
+}
+
+})();
+
/*
---
-script: Sortables.js
+script: Fx.Slide.js
-name: Sortables
+name: Fx.Slide
-description: Class for creating a drag and drop sorting interface for lists of items.
+description: Effect to slide an element in and out of view.
license: MIT-style license
authors:
- - Tom Occhino
+ - Valerio Proietti
requires:
- - Core/Fx.Morph
- - /Drag.Move
+ - Core/Fx
+ - Core/Element.Style
+ - MooTools.More
-provides: [Sortables]
+provides: [Fx.Slide]
...
*/
-var Sortables = new Class({
+Fx.Slide = new Class({
- Implements: [Events, Options],
+ Extends: Fx,
- options: {/*
- onSort: function(element, clone){},
- onStart: function(element, clone){},
- onComplete: function(element){},*/
- opacity: 1,
- clone: false,
- revert: false,
- handle: false,
- dragOptions: {}
+ options: {
+ mode: 'vertical',
+ wrapper: false,
+ hideOverflow: true,
+ resetHeight: false
},
- initialize: function(lists, options){
- this.setOptions(options);
+ initialize: function(element, options){
+ element = this.element = this.subject = document.id(element);
+ this.parent(options);
+ options = this.options;
- this.elements = [];
- this.lists = [];
- this.idle = true;
+ var wrapper = element.retrieve('wrapper'),
+ styles = element.getStyles('margin', 'position', 'overflow');
- this.addLists($$(document.id(lists) || lists));
+ if (options.hideOverflow) styles = Object.append(styles, {overflow: 'hidden'});
+ if (options.wrapper) wrapper = document.id(options.wrapper).setStyles(styles);
- if (!this.options.clone) this.options.revert = false;
- if (this.options.revert) this.effect = new Fx.Morph(null, Object.merge({
- duration: 250,
- link: 'cancel'
- }, this.options.revert));
- },
+ if (!wrapper) wrapper = new Element('div', {
+ styles: styles
+ }).wraps(element);
- attach: function(){
- this.addLists(this.lists);
- return this;
+ element.store('wrapper', wrapper).setStyle('margin', 0);
+ if (element.getStyle('overflow') == 'visible') element.setStyle('overflow', 'hidden');
+
+ this.now = [];
+ this.open = true;
+ this.wrapper = wrapper;
+
+ this.addEvent('complete', function(){
+ this.open = (wrapper['offset' + this.layout.capitalize()] != 0);
+ if (this.open && this.options.resetHeight) wrapper.setStyle('height', '');
+ }, true);
},
- detach: function(){
- this.lists = this.removeLists(this.lists);
- return this;
+ vertical: function(){
+ this.margin = 'margin-top';
+ this.layout = 'height';
+ this.offset = this.element.offsetHeight;
},
- addItems: function(){
- Array.flatten(arguments).each(function(element){
- this.elements.push(element);
- var start = element.retrieve('sortables:start', function(event){
- this.start.call(this, event, element);
- }.bind(this));
- (this.options.handle ? element.getElement(this.options.handle) || element : element).addEvent('mousedown', start);
- }, this);
- return this;
+ horizontal: function(){
+ this.margin = 'margin-left';
+ this.layout = 'width';
+ this.offset = this.element.offsetWidth;
},
- addLists: function(){
- Array.flatten(arguments).each(function(list){
- this.lists.include(list);
- this.addItems(list.getChildren());
- }, this);
+ set: function(now){
+ this.element.setStyle(this.margin, now[0]);
+ this.wrapper.setStyle(this.layout, now[1]);
return this;
},
- removeItems: function(){
- return $$(Array.flatten(arguments).map(function(element){
- this.elements.erase(element);
- var start = element.retrieve('sortables:start');
- (this.options.handle ? element.getElement(this.options.handle) || element : element).removeEvent('mousedown', start);
-
- return element;
- }, this));
+ compute: function(from, to, delta){
+ return [0, 1].map(function(i){
+ return Fx.compute(from[i], to[i], delta);
+ });
},
- removeLists: function(){
- return $$(Array.flatten(arguments).map(function(list){
- this.lists.erase(list);
- this.removeItems(list.getChildren());
-
- return list;
- }, this));
- },
+ start: function(how, mode){
+ if (!this.check(how, mode)) return this;
+ this[mode || this.options.mode]();
- getClone: function(event, element){
- if (!this.options.clone) return new Element(element.tagName).inject(document.body);
- if (typeOf(this.options.clone) == 'function') return this.options.clone.call(this, event, element, this.list);
- var clone = element.clone(true).setStyles({
- margin: 0,
- position: 'absolute',
- visibility: 'hidden',
- width: element.getStyle('width')
- }).addEvent('mousedown', function(event){
- element.fireEvent('mousedown', event);
- });
- //prevent the duplicated radio inputs from unchecking the real one
- if (clone.get('html').test('radio')){
- clone.getElements('input[type=radio]').each(function(input, i){
- input.set('name', 'clone_' + i);
- if (input.get('checked')) element.getElements('input[type=radio]')[i].set('checked', true);
- });
- }
+ var margin = this.element.getStyle(this.margin).toInt(),
+ layout = this.wrapper.getStyle(this.layout).toInt(),
+ caseIn = [[margin, layout], [0, this.offset]],
+ caseOut = [[margin, layout], [-this.offset, 0]],
+ start;
- return clone.inject(this.list).setPosition(element.getPosition(element.getOffsetParent()));
+ switch (how){
+ case 'in': start = caseIn; break;
+ case 'out': start = caseOut; break;
+ case 'toggle': start = (layout == 0) ? caseIn : caseOut;
+ }
+ return this.parent(start[0], start[1]);
},
- getDroppables: function(){
- var droppables = this.list.getChildren().erase(this.clone).erase(this.element);
- if (!this.options.constrain) droppables.append(this.lists).erase(this.list);
- return droppables;
+ slideIn: function(mode){
+ return this.start('in', mode);
},
- insert: function(dragging, element){
- var where = 'inside';
- if (this.lists.contains(element)){
- this.list = element;
- this.drag.droppables = this.getDroppables();
- } else {
- where = this.element.getAllPrevious().contains(element) ? 'before' : 'after';
- }
- this.element.inject(element, where);
- this.fireEvent('sort', [this.element, this.clone]);
+ slideOut: function(mode){
+ return this.start('out', mode);
},
- start: function(event, element){
- if (
- !this.idle ||
- event.rightClick ||
- ['button', 'input', 'a', 'textarea'].contains(event.target.get('tag'))
- ) return;
+ hide: function(mode){
+ this[mode || this.options.mode]();
+ this.open = false;
+ return this.set([-this.offset, 0]);
+ },
- this.idle = false;
- this.element = element;
- this.opacity = element.getStyle('opacity');
- this.list = element.getParent();
- this.clone = this.getClone(event, element);
+ show: function(mode){
+ this[mode || this.options.mode]();
+ this.open = true;
+ return this.set([0, this.offset]);
+ },
- this.drag = new Drag.Move(this.clone, Object.merge({
-
- droppables: this.getDroppables()
- }, this.options.dragOptions)).addEvents({
- onSnap: function(){
- event.stop();
- this.clone.setStyle('visibility', 'visible');
- this.element.setStyle('opacity', this.options.opacity || 0);
- this.fireEvent('start', [this.element, this.clone]);
- }.bind(this),
- onEnter: this.insert.bind(this),
- onCancel: this.end.bind(this),
- onComplete: this.end.bind(this)
- });
+ toggle: function(mode){
+ return this.start('toggle', mode);
+ }
- this.clone.inject(this.element, 'before');
- this.drag.start(event);
- },
+});
- end: function(){
- this.drag.detach();
- this.element.setStyle('opacity', this.opacity);
- if (this.effect){
- var dim = this.element.getStyles('width', 'height'),
- clone = this.clone,
- pos = clone.computePosition(this.element.getPosition(this.clone.getOffsetParent()));
+Element.Properties.slide = {
- var destroy = function(){
- this.removeEvent('cancel', destroy);
- clone.destroy();
- };
+ set: function(options){
+ this.get('slide').cancel().setOptions(options);
+ return this;
+ },
- this.effect.element = clone;
- this.effect.start({
- top: pos.top,
- left: pos.left,
- width: dim.width,
- height: dim.height,
- opacity: 0.25
- }).addEvent('cancel', destroy).chain(destroy);
- } else {
- this.clone.destroy();
+ get: function(){
+ var slide = this.retrieve('slide');
+ if (!slide){
+ slide = new Fx.Slide(this, {link: 'cancel'});
+ this.store('slide', slide);
}
- this.reset();
- },
+ return slide;
+ }
- reset: function(){
- this.idle = true;
- this.fireEvent('complete', this.element);
- },
+};
- serialize: function(){
- var params = Array.link(arguments, {
- modifier: Type.isFunction,
- index: function(obj){
- return obj != null;
- }
- });
- var serial = this.lists.map(function(list){
- return list.getChildren().map(params.modifier || function(element){
- return element.get('id');
- }, this);
- }, this);
+Element.implement({
- var index = params.index;
- if (this.lists.length == 1) index = 0;
- return (index || index === 0) && index >= 0 && index < this.lists.length ? serial[index] : serial;
+ slide: function(how, mode){
+ how = how || 'toggle';
+ var slide = this.get('slide'), toggle;
+ switch (how){
+ case 'hide': slide.hide(mode); break;
+ case 'show': slide.show(mode); break;
+ case 'toggle':
+ var flag = this.retrieve('slide:flag', slide.open);
+ slide[flag ? 'slideOut' : 'slideIn'](mode);
+ this.store('slide:flag', !flag);
+ toggle = true;
+ break;
+ default: slide.start(how, mode);
+ }
+ if (!toggle) this.eliminate('slide:flag');
+ return this;
}
});
-
/*
---
@@ -3108,7 +3053,6 @@ Request.JSONP = new Class({
Request.JSONP.counter = 0;
Request.JSONP.request_map = {};
-
/*
---
@@ -3125,7 +3069,7 @@ authors:
requires:
- Core/Request
- - /MooTools.More
+ - MooTools.More
provides: [Request.Periodical]
@@ -3161,3 +3105,120 @@ Request.implement({
});
+/*
+---
+
+script: Date.Extras.js
+
+name: Date.Extras
+
+description: Extends the Date native object to include extra methods (on top of those in Date.js).
+
+license: MIT-style license
+
+authors:
+ - Aaron Newton
+ - Scott Kyle
+
+requires:
+ - Date
+
+provides: [Date.Extras]
+
+...
+*/
+
+Date.implement({
+
+ timeDiffInWords: function(to){
+ return Date.distanceOfTimeInWords(this, to || new Date);
+ },
+
+ timeDiff: function(to, separator){
+ if (to == null) to = new Date;
+ var delta = ((to - this) / 1000).floor().abs();
+
+ var vals = [],
+ durations = [60, 60, 24, 365, 0],
+ names = ['s', 'm', 'h', 'd', 'y'],
+ value, duration;
+
+ for (var item = 0; item < durations.length; item++){
+ if (item && !delta) break;
+ value = delta;
+ if ((duration = durations[item])){
+ value = (delta % duration);
+ delta = (delta / duration).floor();
+ }
+ vals.unshift(value + (names[item] || ''));
+ }
+
+ return vals.join(separator || ':');
+ }
+
+}).extend({
+
+ distanceOfTimeInWords: function(from, to){
+ return Date.getTimePhrase(((to - from) / 1000).toInt());
+ },
+
+ getTimePhrase: function(delta){
+ var suffix = (delta < 0) ? 'Until' : 'Ago';
+ if (delta < 0) delta *= -1;
+
+ var units = {
+ minute: 60,
+ hour: 60,
+ day: 24,
+ week: 7,
+ month: 52 / 12,
+ year: 12,
+ eon: Infinity
+ };
+
+ var msg = 'lessThanMinute';
+
+ for (var unit in units){
+ var interval = units[unit];
+ if (delta < 1.5 * interval){
+ if (delta > 0.75 * interval) msg = unit;
+ break;
+ }
+ delta /= interval;
+ msg = unit + 's';
+ }
+
+ delta = delta.round();
+ return Date.getMsg(msg + suffix, delta).substitute({delta: delta});
+ }
+
+}).defineParsers(
+
+ {
+ // "today", "tomorrow", "yesterday"
+ re: /^(?:tod|tom|yes)/i,
+ handler: function(bits){
+ var d = new Date().clearTime();
+ switch (bits[0]){
+ case 'tom': return d.increment();
+ case 'yes': return d.decrement();
+ default: return d;
+ }
+ }
+ },
+
+ {
+ // "next Wednesday", "last Thursday"
+ re: /^(next|last) ([a-z]+)$/i,
+ handler: function(bits){
+ var d = new Date().clearTime();
+ var day = d.getDay();
+ var newDay = Date.parseDay(bits[2], true);
+ var addDays = newDay - day;
+ if (newDay <= day) addDays += 7;
+ if (bits[1] == 'last') addDays -= 7;
+ return d.set('date', d.getDate() + addDays);
+ }
+ }
+
+).alias('timeAgoInWords', 'timeDiffInWords');
diff --git a/couchpotato/static/scripts/vendor/requestAnimationFrame.js b/couchpotato/static/scripts/vendor/requestAnimationFrame.js
new file mode 100644
index 0000000000..9737d47a16
--- /dev/null
+++ b/couchpotato/static/scripts/vendor/requestAnimationFrame.js
@@ -0,0 +1,100 @@
+// requestAnimationFrame() shim by Paul Irish
+// http://paulirish.com/2011/requestanimationframe-for-smart-animating/
+window.requestAnimFrame = (function() {
+ return window.requestAnimationFrame ||
+ window.webkitRequestAnimationFrame ||
+ window.mozRequestAnimationFrame ||
+ window.oRequestAnimationFrame ||
+ window.msRequestAnimationFrame ||
+ function(/* function */ callback, /* DOMElement */ element){
+ window.setTimeout(callback, 1000 / 60);
+ };
+})();
+
+/**
+ * Behaves the same as setInterval except uses requestAnimationFrame() where possible for better performance
+ * @param {function} fn The callback function
+ * @param {int} delay The delay in milliseconds
+ */
+window.requestInterval = function(fn, delay) {
+ if( !window.requestAnimationFrame &&
+ !window.webkitRequestAnimationFrame &&
+ !(window.mozRequestAnimationFrame && window.mozCancelRequestAnimationFrame) && // Firefox 5 ships without cancel support
+ !window.oRequestAnimationFrame &&
+ !window.msRequestAnimationFrame)
+ return window.setInterval(fn, delay);
+
+ var start = new Date().getTime(),
+ handle = new Object();
+
+ function loop() {
+ var current = new Date().getTime(),
+ delta = current - start;
+
+ if(delta >= delay) {
+ fn.call();
+ start = new Date().getTime();
+ }
+
+ handle.value = requestAnimFrame(loop);
+ };
+
+ handle.value = requestAnimFrame(loop);
+ return handle;
+}
+
+/**
+ * Behaves the same as clearInterval except uses cancelRequestAnimationFrame() where possible for better performance
+ * @param {int|object} fn The callback function
+ */
+window.clearRequestInterval = function(handle) {
+ window.cancelAnimationFrame ? window.cancelAnimationFrame(handle.value) :
+ window.webkitCancelAnimationFrame ? window.webkitCancelAnimationFrame(handle.value) :
+ window.webkitCancelRequestAnimationFrame ? window.webkitCancelRequestAnimationFrame(handle.value) : /* Support for legacy API */
+ window.mozCancelRequestAnimationFrame ? window.mozCancelRequestAnimationFrame(handle.value) :
+ window.oCancelRequestAnimationFrame ? window.oCancelRequestAnimationFrame(handle.value) :
+ window.msCancelRequestAnimationFrame ? window.msCancelRequestAnimationFrame(handle.value) :
+ clearInterval(handle);
+};
+
+/**
+ * Behaves the same as setTimeout except uses requestAnimationFrame() where possible for better performance
+ * @param {function} fn The callback function
+ * @param {int} delay The delay in milliseconds
+ */
+
+window.requestTimeout = function(fn, delay) {
+ if( !window.requestAnimationFrame &&
+ !window.webkitRequestAnimationFrame &&
+ !(window.mozRequestAnimationFrame && window.mozCancelRequestAnimationFrame) && // Firefox 5 ships without cancel support
+ !window.oRequestAnimationFrame &&
+ !window.msRequestAnimationFrame)
+ return window.setTimeout(fn, delay);
+
+ var start = new Date().getTime(),
+ handle = new Object();
+
+ function loop(){
+ var current = new Date().getTime(),
+ delta = current - start;
+
+ delta >= delay ? fn.call() : handle.value = requestAnimFrame(loop);
+ };
+
+ handle.value = requestAnimFrame(loop);
+ return handle;
+};
+
+/**
+ * Behaves the same as clearTimeout except uses cancelRequestAnimationFrame() where possible for better performance
+ * @param {int|object} fn The callback function
+ */
+window.clearRequestTimeout = function(handle) {
+ window.cancelAnimationFrame ? window.cancelAnimationFrame(handle.value) :
+ window.webkitCancelAnimationFrame ? window.webkitCancelAnimationFrame(handle.value) :
+ window.webkitCancelRequestAnimationFrame ? window.webkitCancelRequestAnimationFrame(handle.value) : /* Support for legacy API */
+ window.mozCancelRequestAnimationFrame ? window.mozCancelRequestAnimationFrame(handle.value) :
+ window.oCancelRequestAnimationFrame ? window.oCancelRequestAnimationFrame(handle.value) :
+ window.msCancelRequestAnimationFrame ? window.msCancelRequestAnimationFrame(handle.value) :
+ clearTimeout(handle);
+};
diff --git a/couchpotato/static/style/_fonts.scss b/couchpotato/static/style/_fonts.scss
new file mode 100644
index 0000000000..4f91e35e58
--- /dev/null
+++ b/couchpotato/static/style/_fonts.scss
@@ -0,0 +1,119 @@
+/* Fonts */
+@font-face {
+ font-family: 'icons';
+ src: url('../fonts/icons.eot?3');
+ src: url('../fonts/icons.eot?3#iefix') format('embedded-opentype'),
+ url('../fonts/icons.woff?3') format('woff'),
+ url('../fonts/icons.ttf?3') format('truetype'),
+ url('../fonts/icons.svg?3#icons') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
+[class^="icon-"]:before, [class*=" icon-"]:before {
+ font-family: "icons";
+ font-style: normal;
+ font-weight: normal;
+ speak: none;
+
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+.icon-left-arrow:before { content: '\e800'; }
+.icon-settings:before { content: '\e801'; }
+.icon-search:before { content: '\e802'; }
+.icon-dots:before { content: '\e803'; }
+.icon-filter:before { content: '\e804'; }
+.icon-thumb:before { content: '\e805'; }
+.icon-list:before { content: '\e806'; }
+.icon-notifications:before { content: '\e807'; }
+.icon-emo-cry:before { content: '\e808'; }
+.icon-emo-coffee:before { content: '\e809'; }
+.icon-emo-sunglasses:before { content: '\e80a'; }
+.icon-info:before { content: '\e80b'; }
+.icon-download:before { content: '\e80c'; }
+.icon-delete:before { content: '\e80d'; }
+.icon-cancel:before { content: '\e80e'; }
+.icon-redo:before { content: '\e80f'; }
+.icon-ok:before { content: '\e810'; }
+.icon-dropdown:before { content: '\e811'; }
+.icon-play:before { content: '\e812'; }
+.icon-plus:before { content: '\e813'; }
+.icon-eye:before { content: '\e814'; }
+.icon-error:before { content: '\e815'; }
+.icon-refresh:before { content: '\e816'; }
+.icon-home:before { content: '\e817'; }
+.icon-movie:before { content: '\e818'; }
+.icon-menu:before, .icon-handle:before { content: '\e819'; }
+.icon-star:before { content: '\e81a'; }
+.icon-star-empty:before { content: '\e81b'; }
+.icon-star-half:before { content: '\e81c'; }
+.icon-donate:before { content: '\e81d'; }
+
+@font-face {
+ font-family: 'OpenSans';
+ src: url('../fonts/OpenSans-Light-webfont.eot');
+ src: url('../fonts/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'),
+ url('../fonts/OpenSans-Light-webfont.woff') format('woff'),
+ url('../fonts/OpenSans-Light-webfont.ttf') format('truetype'),
+ url('../fonts/OpenSans-Light-webfont.svg#OpenSansRegular') format('svg');
+ font-weight: 200;
+ font-style: normal;
+
+}
+
+@font-face {
+ font-family: 'OpenSans';
+ src: url('../fonts/OpenSans-Regular-webfont.eot');
+ src: url('../fonts/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'),
+ url('../fonts/OpenSans-Regular-webfont.woff') format('woff'),
+ url('../fonts/OpenSans-Regular-webfont.ttf') format('truetype'),
+ url('../fonts/OpenSans-Regular-webfont.svg#OpenSansRegular') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'OpenSans';
+ src: url('../fonts/OpenSans-Italic-webfont.eot');
+ src: url('../fonts/OpenSans-Italic-webfont.eot?#iefix') format('embedded-opentype'),
+ url('../fonts/OpenSans-Italic-webfont.woff') format('woff'),
+ url('../fonts/OpenSans-Italic-webfont.ttf') format('truetype'),
+ url('../fonts/OpenSans-Italic-webfont.svg#OpenSansItalic') format('svg');
+ font-weight: normal;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'OpenSans';
+ src: url('../fonts/OpenSans-Bold-webfont.eot');
+ src: url('../fonts/OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'),
+ url('../fonts/OpenSans-Bold-webfont.woff') format('woff'),
+ url('../fonts/OpenSans-Bold-webfont.ttf') format('truetype'),
+ url('../fonts/OpenSans-Bold-webfont.svg#OpenSansBold') format('svg');
+ font-weight: bold;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'OpenSans';
+ src: url('../fonts/OpenSans-BoldItalic-webfont.eot');
+ src: url('../fonts/OpenSans-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'),
+ url('../fonts/OpenSans-BoldItalic-webfont.woff') format('woff'),
+ url('../fonts/OpenSans-BoldItalic-webfont.ttf') format('truetype'),
+ url('../fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic') format('svg');
+ font-weight: bold;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'Lobster';
+ src: url('../fonts/Lobster-webfont.eot');
+ src: url('../fonts/Lobster-webfont.eot?#iefix') format('embedded-opentype'),
+ url('../fonts/Lobster-webfont.woff2') format('woff2'),
+ url('../fonts/Lobster-webfont.woff') format('woff'),
+ url('../fonts/Lobster-webfont.ttf') format('truetype'),
+ url('../fonts/Lobster-webfont.svg#lobster_14regular') format('svg');
+ font-weight: normal;
+ font-style: normal;
+}
diff --git a/couchpotato/static/style/_mixins.scss b/couchpotato/static/style/_mixins.scss
new file mode 100644
index 0000000000..0c7290599c
--- /dev/null
+++ b/couchpotato/static/style/_mixins.scss
@@ -0,0 +1,101 @@
+$vars: 'primary', 'background', 'off', 'text', 'menu', 'menu_off';
+$theme_light: #ac0000, #FFF, darken(#FFF, 8), #000, #111, lighten(#111, 12);
+$theme_dark: #f85c22, #2d2d2d, lighten(#2d2d2d, 3), #FFF, #111, lighten(#111, 12);
+
+$font_size: 14px;
+$header_height: 80px;
+$header_width: 132px;
+$header_width_mobile: 44px;
+$padding: 20px;
+$border_radius: 3px;
+
+@mixin theme($property, $value) {
+ #{$property}: nth($theme_light, index($vars, $value));
+
+ .dark & {
+ #{$property}: nth($theme_dark, index($vars, $value));
+ }
+}
+
+@mixin theme-dark {
+ .dark & {
+ @content;
+ }
+}
+
+@function get-theme($property){
+ @return nth($theme_light, index($vars, $property));
+}
+
+@function get-theme-dark($property){
+ @return nth($theme_dark, index($vars, $property));
+}
+
+$cubic: cubic-bezier(0.9,0,0.1,1);
+
+$mq-phone: 320px !default;
+$mq-phablet: 480px !default;
+$mq-tablet: 768px !default;
+$mq-desktop: 1024px !default;
+$mq-desktop-plus: 1382px !default;
+
+@mixin media-phone {
+ @media (max-width : $mq-phone) {
+ @content;
+ }
+}
+
+@mixin media-phablet {
+ @media (max-width : $mq-phablet) {
+ @content;
+ }
+}
+
+@mixin media-tablet {
+ @media (max-width : $mq-tablet) {
+ @content;
+ }
+}
+
+@mixin media-desktop {
+ @media (max-width : $mq-desktop) {
+ @content;
+ }
+}
+
+@mixin media-desktop-plus {
+ @media (max-width : $mq-desktop-plus) {
+ @content;
+ }
+}
+
+
+@mixin media-phone-and-up {
+ @media (min-width : $mq-phone) {
+ @content;
+ }
+}
+
+@mixin media-phablet-and-up {
+ @media (min-width : $mq-phablet) {
+ @content;
+ }
+}
+
+@mixin media-tablet-and-up {
+ @media (min-width : $mq-tablet) {
+ @content;
+ }
+}
+
+@mixin media-desktop-and-up {
+ @media (min-width : $mq-desktop) {
+ @content;
+ }
+}
+
+@mixin media-desktop-plus-and-up {
+ @media (min-width : $mq-desktop-plus) {
+ @content;
+ }
+}
diff --git a/couchpotato/static/style/api.css b/couchpotato/static/style/api.css
deleted file mode 100644
index c63540986b..0000000000
--- a/couchpotato/static/style/api.css
+++ /dev/null
@@ -1,96 +0,0 @@
-html {
- font-size: 12px;
- line-height: 1.5;
- font-family: "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
- font-size: 14px;
-}
-
-* {
- margin: 0;
- padding: 0;
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- box-sizing: border-box;
-}
-
-h1, h2, h3, h4, h5 {
- clear: both;
- font-size: 14px;
-}
-
-h1 {
- font-size: 25px;
- padding: 20px 40px;
-}
-
-h2 {
- font-size: 20px;
-}
-
-pre {
- background: #eee;
- font-family: monospace;
- margin: 0;
- padding: 10px;
- width: 100%;
- display: block;
- font-size: 12px;
-}
-
-.api, .missing {
- overflow: hidden;
- border-bottom: 1px solid #eee;
- padding: 40px;
-}
- .api:hover {
- color: #000;
- }
-
- .api .description {
- color: #333;
- padding: 0 0 5px;
- }
-
- .api .params {
- background: #fafafa;
- width: 100%;
- }
- .api h3 {
- clear: both;
- float: left;
- width: 100px;
- }
-
- .api .params {
- float: left;
- width: 700px;
- }
-
- .api .params td, .api .params th {
- padding: 3px 5px;
- border-bottom: 1px solid #eee;
- }
- .api .params tr:last-child td, .api .params tr:last-child th {
- border: 0;
- }
-
- .api .params .param {
- vertical-align: top;
- }
-
- .api .params .param th {
- text-align: left;
- width: 100px;
- }
-
- .api .param .type {
- font-style: italic;
- margin-right: 10px;
- width: 100px;
- color: #666;
- }
-
- .api .return {
- float: left;
- width: 700px;
- }
\ No newline at end of file
diff --git a/couchpotato/static/style/api.scss b/couchpotato/static/style/api.scss
new file mode 100644
index 0000000000..b3941d82a7
--- /dev/null
+++ b/couchpotato/static/style/api.scss
@@ -0,0 +1,154 @@
+@import "_mixins";
+
+.api_docs {
+
+ h1 {
+ font-size: 25px;
+ padding: 20px 40px;
+ }
+
+ pre {
+ background: #eee;
+ font-family: monospace;
+ margin: 0;
+ padding: 10px;
+ width: 100%;
+ display: block;
+ font-size: 12px;
+ }
+
+ body {
+ display: block;
+ overflow: auto;
+ background-color: #FFF;
+ }
+
+ .api, .missing {
+ overflow: hidden;
+ border-bottom: 1px solid #eee;
+ padding: 40px;
+ }
+
+ .api {
+ &:hover {
+ color: #000;
+ }
+
+
+ .description {
+ color: #333;
+ padding: 0 0 5px;
+ }
+
+ .params {
+ background: #fafafa;
+ width: 100%;
+
+ h3 {
+ clear: both;
+ float: left;
+ width: 100px;
+ }
+
+ td, th {
+ padding: 3px 5px;
+ border-bottom: 1px solid #eee;
+ }
+
+ tr:last-child td, tr:last-child th {
+ border: 0;
+ }
+
+ .param {
+ vertical-align: top;
+
+ th {
+ text-align: left;
+ width: 100px;
+ }
+
+ .type {
+ font-style: italic;
+ margin-right: 10px;
+ width: 100px;
+ color: #666;
+ }
+ }
+
+ .return {
+ float: left;
+ width: 700px;
+ }
+ }
+ }
+
+
+ .database {
+ padding: 20px;
+ margin: 0;
+
+ * {
+ margin: 0;
+ padding: 0;
+ }
+
+ .nav {
+ li {
+ display: inline-block;
+
+ a {
+ padding: 5px;
+ }
+ }
+
+ }
+ }
+ .database table {
+ font-size: 11px;
+
+ th {
+ text-align: left;
+ }
+
+ tr:hover {
+ position: relative;
+ z-index: 20;
+ }
+
+ td {
+ vertical-align: top;
+ position: relative;
+ }
+
+ .id {
+ width: 100px;
+ }
+
+ ._rev {
+ width: 60px;
+ }
+
+ ._t {
+ width: 60px;
+ }
+
+ .form {
+ width: 600px;
+ }
+
+ form {
+ width: 600px;
+ }
+
+ textarea {
+ font-size: 12px;
+ width: 100%;
+ height: 200px;
+ }
+
+ input[type=submit] {
+ display: block;
+ }
+ }
+
+}
diff --git a/couchpotato/static/style/combined.min.css b/couchpotato/static/style/combined.min.css
new file mode 100644
index 0000000000..a36d3bec83
--- /dev/null
+++ b/couchpotato/static/style/combined.min.css
@@ -0,0 +1,997 @@
+.page.movie_details,.thumb_list .movie.hover_start .actions{pointer-events:none}
+.movies>.description a:hover,.page.movie_details .releases .buttons a:hover{text-decoration:underline}
+.update.message{background:#FFF;padding:20px;text-align:center;font-size:1.25em}
+.dark .update.message{background:#2d2d2d}
+@media (max-width:768px){.update.message{font-size:1em}
+}
+.update.message a{color:#ac0000;padding:5px}
+.dark .update.message a{color:#f85c22}
+.search_form{display:inline-block;z-index:11;width:44px;position:relative}
+.search_form *{-webkit-transform:rotateZ(360deg);transform:rotateZ(360deg)}
+.search_form .icon-search{position:absolute;z-index:2;top:50%;left:0;height:100%;text-align:center;color:#FFF;font-size:20px;-webkit-transform:translateY(-50%);transform:translateY(-50%)}
+.dark .search_form .icon-search:hover,.search_form .icon-search:hover{background:#303030}
+.search_form .wrapper{position:absolute;left:44px;bottom:0;background:#ac0000;border-radius:3px 0 0 3px;display:none;box-shadow:0 0 15px 2px rgba(0,0,0,.15)}
+.dark .search_form .wrapper{background:#f85c22;box-shadow:0 5px 15px 2px rgba(0,0,0,.4)}
+.search_form .wrapper:before{-webkit-transform:rotate(45deg);transform:rotate(45deg);content:'';display:block;position:absolute;height:10px;width:10px;background:#ac0000;left:-6px;bottom:16px;z-index:1}
+.dark .search_form .wrapper:before{background:#f85c22}
+.search_form .input{background:#FFF;border-radius:3px 0 0 3px;position:relative;left:4px;height:44px;overflow:hidden;width:100%}
+.dark .search_form .input{background:#2d2d2d}
+.search_form .input input{position:absolute;top:0;left:0;height:100%;width:100%;z-index:1}
+.search_form .input input::-ms-clear{width:0;height:0}
+.search_form .input input:focus{background:rgba(255,255,255,.2)}
+.dark .search_form .input input:focus{background:rgba(0,0,0,.2)}
+.search_form .input input:focus::-webkit-input-placeholder{opacity:.7}
+.search_form .input input:focus::-moz-placeholder{opacity:.7}
+.search_form .input input:focus:-ms-input-placeholder{opacity:.7}
+.page.home .search_form.filled .icon-search:before,.search_form.filled.focused .icon-search:before{content:'\e80e'}
+.search_form.filled .input input{background:rgba(255,255,255,.3)}
+.dark .search_form.filled .input input{background:rgba(0,0,0,.3)}
+.page.home .search_form,.search_form.focused,.search_form.shown{border-color:#04bce6}
+.page.home .search_form .wrapper,.search_form.focused .wrapper,.search_form.shown .wrapper{display:block;width:380px;-webkit-transform-origin:0 90%;transform-origin:0 90%}
+.page.home .search_form .input input,.search_form.focused .input input,.search_form.shown .input input{opacity:1}
+.search_form .results_container{min-height:50px;text-align:left;position:relative;left:4px;display:none;background:#FFF;border-radius:3px 0 0;overflow:hidden}
+.dark .search_form .results_container{background:#2d2d2d}
+.search_form .results_container .results{max-height:280px;overflow-x:hidden}
+.search_form .results_container .results .media_result{overflow:hidden;height:50px;position:relative}
+.search_form .results_container .results .media_result .options{position:absolute;height:100%;top:0;left:30px;right:0;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center;background:#ebebeb}
+.dark .search_form .results_container .results .media_result .options{background:#353535}
+.search_form .results_container .results .media_result .options>.in_library_wanted{margin-top:-7px}
+.search_form .results_container .results .media_result .options>div{border:0;display:-webkit-flex;display:-ms-flexbox;display:flex;padding:10px;-webkit-align-items:stretch;-ms-flex-align:stretch;align-items:stretch;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}
+@media (max-width:480px){.page.home .search_form .wrapper,.search_form.focused .wrapper,.search_form.shown .wrapper{width:260px}
+.search_form .results_container .results .media_result{font-size:12px}
+.search_form .results_container .results .media_result .options{left:0}
+.search_form .results_container .results .media_result .options>div{padding:3px}
+}
+.search_form .results_container .results .media_result .options select{display:block;height:100%;width:100%}
+@media (max-width:480px){.search_form .results_container .results .media_result .options select{min-width:0;margin-right:2px}
+}
+.search_form .results_container .results .media_result .options .title{margin-right:5px;width:210px}
+@media (max-width:480px){.search_form .results_container .results .media_result .options .title{width:140px;margin-right:2px}
+}
+.search_form .results_container .results .media_result .options .category,.search_form .results_container .results .media_result .options .profile{margin:0 5px 0 0}
+@media (max-width:480px){.search_form .results_container .results .media_result .options .category,.search_form .results_container .results .media_result .options .profile{margin-right:2px}
+}
+.search_form .results_container .results .media_result .options .add{width:42px;-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto}
+.search_form .results_container .results .media_result .options .add a{color:#FFF}
+.search_form .results_container .results .media_result .options .button{display:block;background:#ac0000;text-align:center;margin:0}
+.dark .search_form .results_container .results .media_result .options .button{background:#f85c22}
+.search_form .results_container .results .media_result .options .message{font-size:20px;color:#fff}
+.search_form .results_container .results .media_result .thumbnail{width:30px;min-height:100%;display:block;margin:0;vertical-align:top}
+.search_form .results_container .results .media_result .data{position:absolute;height:100%;top:0;left:30px;right:0;cursor:pointer;border-top:1px solid rgba(255,255,255,.08);transition:all .4s cubic-bezier(.9,0,.1,1);will-change:transform;-webkit-transform:translateX(0) rotateZ(360deg);transform:translateX(0) rotateZ(360deg);background:#FFF}
+.dark .search_form .results_container .results .media_result .data{background:#2d2d2d;border-color:rgba(255,255,255,.08)}
+@media (max-width:480px){.search_form .results_container .results .media_result .thumbnail{display:none}
+.search_form .results_container .results .media_result .data{left:0}
+}
+.search_form .results_container .results .media_result .data:hover{-webkit-transform:translateX(2%) rotateZ(360deg);transform:translateX(2%) rotateZ(360deg)}
+.search_form .results_container .results .media_result .data.open{-webkit-transform:translateX(100%) rotateZ(360deg);transform:translateX(100%) rotateZ(360deg)}
+.search_form .results_container .results .media_result .data .info{position:absolute;top:20%;left:15px;right:7px;vertical-align:middle}
+.search_form .results_container .results .media_result .data .info h2{margin:0;font-weight:300;font-size:1.25em;padding:0;position:absolute;width:100%;display:-webkit-flex;display:-ms-flexbox;display:flex}
+.search_form .results_container .results .media_result .data .info h2 .title{display:inline-block;margin:0;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto}
+.search_form .results_container .results .media_result .data .info h2 .year{opacity:.4;padding:0 5px;width:auto}
+.search_form .results_container .results .media_result .data .info h2 .in_library,.search_form .results_container .results .media_result .data .info h2 .in_wanted{position:absolute;top:15px;left:0;font-size:11px;color:#ac0000}
+.dark .search_form .results_container .results .media_result .data .info h2 .in_library,.dark .search_form .results_container .results .media_result .data .info h2 .in_wanted{color:#f85c22}
+.search_form .results_container .results .media_result .data .info h2.in_library_wanted .title{margin-top:-7px}
+.search_form .results_container .results .media_result:hover .info h2 .year{display:inline-block}
+.search_form .results_container .results .media_result:last-child .data{border-bottom:0}
+.search_form.focused.filled .results_container,.search_form.shown.filled .results_container{display:block}
+.search_form.focused.filled .input,.search_form.shown.filled .input{border-radius:0 0 0 3px}
+.page.home .search_form{display:block;padding:20px;width:100%;max-width:500px;margin:20px auto 0;height:106px;position:relative}
+@media (max-width:480px){.page.home .search_form{margin-top:10px;height:64px}
+}
+.page.home .search_form .icon-search{display:block;color:#000;right:20px;top:20px;width:66px;height:66px;line-height:66px;left:auto;-webkit-transform:none;transform:none;font-size:2em;opacity:.5}
+.page.home .search_form .wrapper:before,.page.movies .scroll_content{display:none}
+.dark .page.home .search_form .icon-search{color:#FFF}
+.page.home .search_form .icon-search:hover{background:0 0}
+@media (max-width:480px){.page.home .search_form .icon-search{width:44px;height:44px;line-height:44px;right:10px;top:10px;font-size:1.5em}
+}
+.page.home .search_form .wrapper{border-radius:0;box-shadow:none;bottom:auto;top:20px;left:20px;right:20px;position:absolute;width:auto}
+@media (max-width:480px){.page.home .search_form .wrapper{right:10px;top:10px;left:10px}
+}
+.page.home .search_form .wrapper .input{border-radius:0;left:0;position:absolute;top:0;height:66px}
+.page.home .search_form .wrapper .input input{box-shadow:0;font-size:2em;font-weight:400;padding-right:66px;background:#FFF}
+.dark .page.home .search_form .wrapper .input input{background:#2d2d2d}
+.page.home .search_form .wrapper .results_container{min-height:66px;position:absolute;top:66px;left:0;right:0;border:1px solid #ebebeb;border-top:0}
+.dark .page.home .search_form .wrapper .results_container{border-color:#353535}
+@media (max-width:480px){.page.home .search_form .wrapper .input{height:44px}
+.page.home .search_form .wrapper .input input{padding-right:44px;font-size:1em}
+.page.home .search_form .wrapper .results_container{top:44px;min-height:44px}
+}
+@media (min-width:480px){.page.home .search_form .wrapper .results_container .results{max-height:400px}
+.page.home .search_form .wrapper .results_container .results .media_result{height:66px}
+}
+@media (min-width:480px){.page.home .search_form .wrapper .results_container .results .media_result .thumbnail{width:40px}
+.page.home .search_form .wrapper .results_container .results .media_result .options{left:40px}
+.page.home .search_form .wrapper .results_container .results .media_result .options .title{margin-right:5px;width:320px}
+}
+@media (min-width:480px) and (max-width:480px){.page.home .search_form .wrapper .results_container .results .media_result{height:44px}
+.page.home .search_form .wrapper .results_container .results .media_result .options .title{width:140px;margin-right:2px}
+}
+@media (min-width:480px){.page.home .search_form .wrapper .results_container .results .media_result .data{left:40px}
+}
+@media (max-width:480px){.page.home .search_form .wrapper .results_container .results .media_result{height:44px}
+.page.home .search_form .wrapper .results_container .results .media_result .options .title{width:140px;margin-right:2px}
+}
+.big_search{background:#ebebeb}
+.dark .big_search{background:#353535}
+.page.movies{bottom:auto;z-index:21;height:80px}
+.page.movies_manage,.page.movies_wanted{top:80px;padding:0;will-change:top;transition:top 300ms cubic-bezier(.9,0,.1,1)}
+@media (max-width:480px){.page.movies{height:44px}
+.page.movies_manage,.page.movies_wanted{top:44px}
+}
+.mass_editing .page.movies_manage,.mass_editing .page.movies_wanted{top:124px}
+.page.movies_manage .load_more,.page.movies_wanted .load_more{text-align:center;padding:20px;font-size:2em;display:block}
+.page.movies_manage .empty_manage,.page.movies_wanted .empty_manage{padding:20px}
+.page.movies_manage .empty_manage .after_manage,.page.movies_wanted .empty_manage .after_manage{margin-top:20px}
+.movie .ripple,.movie input[type=checkbox]{display:none}
+.with_navigation .movie input[type=checkbox]{display:inline-block;position:absolute;will-change:opacity;transition:opacity 200ms;opacity:0;z-index:2;cursor:pointer}
+@media (max-width:480px){.with_navigation .movie input[type=checkbox]{display:none}
+}
+.with_navigation .movie input[type=checkbox]:hover{opacity:1!important}
+.with_navigation .movie:hover input[type=checkbox]{opacity:.5}
+.with_navigation .movie.checked input[type=checkbox]{opacity:1}
+.movie .quality{font-weight:400}
+.movie .quality span{display:inline-block;background:#ebebeb;border:1px solid transparent;color:rgba(0,0,0,.5);border-radius:1px;padding:1px 3px}
+.dark .movie .quality span{color:rgba(255,255,255,.5)}
+.movie .quality span.failed{background:#993619;color:#FFF}
+.movie .quality span.available{color:#009902;border-color:#009902;background:#FFF}
+.movie .quality span.snatched{background:#548399;color:#FFF}
+.movie .quality span.done,.movie .quality span.downloaded{background:#009902;color:#FFF}
+.dark .movie .quality span{background:0 0}
+.dark .movie .quality span.available{border-color:transparent;background:0 0}
+.dark .movie .quality span.snatched{background:#548399}
+.dark .movie .quality span.done,.dark .movie .quality span.downloaded{background:#009902;color:#FFF}
+.movie .rating .votes{opacity:.7;margin-left:4px}
+.movie.status_suggested .quality{display:none}
+.movies{position:relative}
+.movies .no_movies{display:block;padding:20px}
+@media (max-width:768px){.movies .no_movies{padding:10px}
+}
+.movies .no_movies a{color:#ac0000}
+.dark .movies .no_movies a{color:#f85c22}
+.movies .message{padding:20px 0;text-align:center}
+.movies .message a{color:#ac0000}
+.dark .movies .message a{color:#f85c22}
+.movies.movies>h2{padding:0 20px;line-height:80px}
+@media (max-width:480px){.movies.movies>h2{line-height:44px;padding:0 10px}
+}
+.movies>.description{position:absolute;top:0;right:20px;width:auto;line-height:80px;opacity:.7}
+@media (max-width:768px){.movies>.description{display:none}
+}
+.movies>.description a{color:#ac0000;display:inline}
+.dark .movies>.description a{color:#f85c22}
+.movies>.loading{background:#FFF}
+.dark .movies>.loading{background:#2d2d2d}
+.movies>.loading .message{color:#000}
+.dark .movies>.loading .message{color:#FFF}
+.movies>.loading .spinner{background-color:#FFF}
+.dark .movies>.loading .spinner{background-color:#2d2d2d}
+.movies .movie .actions{will-change:transform,opacity;-webkit-transform:rotateZ(360deg);transform:rotateZ(360deg)}
+.movies .progress div{width:50%;padding:5px 10px;display:-webkit-flex;display:-ms-flexbox;display:flex}
+.movies .progress div .folder{-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin-right:10px}
+.movies .progress div .percentage{font-weight:700}
+.list_list{font-weight:300}
+.list_list .movie{display:block;border-bottom:1px solid transparent;border-color:#ebebeb;position:relative;cursor:pointer}
+.dark .list_list .movie{border-color:#353535}
+.list_list .movie:last-child{border-bottom:none}
+.list_list .movie:hover{background:#ebebeb}
+.dark .list_list .movie:hover{background:#353535}
+.list_list .movie input[type=checkbox]{left:20px;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%)}
+.list_list .movie .poster{display:none}
+.list_list .movie .info{padding:10px 20px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row nowrap;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-align-items:center;-ms-flex-align:center;align-items:center}
+.list_list .movie .info .title{-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto}
+.list_list .movie .info .title span{transition:margin 200ms cubic-bezier(.9,0,.1,1);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+@media (max-width:768px){.movies .progress div{width:100%}
+.list_list .movie .info{display:block;padding:10px}
+.list_list .movie .info .title{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row nowrap;-ms-flex-flow:row nowrap;flex-flow:row nowrap}
+.list_list .movie .info .title span{width:100%}
+}
+.list_list .movie .info .title .year{display:inline-block;margin:0 10px;opacity:.5}
+.list_list .movie .info .eta{font-size:.8em;opacity:.5;margin-right:4px}
+@media (max-width:480px){.movies .movie .actions{pointer-events:none}
+.list_list .movie .info .eta{display:none}
+}
+.list_list .movie .info .quality{clear:both;overflow:hidden}
+.list_list .movie .info .quality span{float:left;font-size:.7em;margin:2px 0 0 2px}
+.list_list .movie .info .rating .vote{display:inline-block;min-width:60px;text-align:right}
+.list_list .movie .actions{position:absolute;right:10px;top:0;bottom:0;display:none;z-index:10}
+.list_list .movie .actions .action{display:inline-block}
+.list_list .movie .actions a{height:100%;display:block;background:#FFF;color:#ac0000;padding:10px;width:auto;float:right;text:#000}
+.list_list .movie .actions a .icon,.list_list .movie .actions a:before{display:none}
+.dark .list_list .movie .actions a{background:#2d2d2d;color:#f85c22;text:#FFF}
+.list_list .movie .actions a:hover{background:#ebebeb;color:#000}
+.dark .list_list .movie .actions a:hover{background:#353535;color:#FFF}
+.list_list .movie:hover .actions{display:block}
+@media (max-width:768px){.list_list .movie .info .quality span{margin:2px 2px 0 0}
+.list_list .movie:hover .actions{display:none}
+}
+.list_list.with_navigation .movie.checked .info .title span,.list_list.with_navigation .movie:hover .info .title span{margin-left:20px}
+.thumb_list{padding:0 5px}
+.thumb_list>div:last-child{padding:0 12px}
+.thumb_list .movie{overflow:visible;display:inline-block;vertical-align:top;margin-bottom:20px;position:relative;cursor:pointer;width:150px;border:0 solid transparent;border-width:0 6.67px}
+.thumb_list .movie .inner{will-change:transform;-webkit-transform:rotateZ(360deg);transform:rotateZ(360deg)}
+@media (min-width:4275px) and (max-width:4500px){.thumb_list .movie{width:5%}
+}
+@media (min-width:4050px) and (max-width:4275px){.thumb_list .movie{width:5.26316%}
+}
+@media (min-width:3825px) and (max-width:4050px){.thumb_list .movie{width:5.55556%}
+}
+@media (min-width:3600px) and (max-width:3825px){.thumb_list .movie{width:5.88235%}
+}
+@media (min-width:3375px) and (max-width:3600px){.thumb_list .movie{width:6.25%}
+}
+@media (min-width:3150px) and (max-width:3375px){.thumb_list .movie{width:6.66667%}
+}
+@media (min-width:2925px) and (max-width:3150px){.thumb_list .movie{width:7.14286%}
+}
+@media (min-width:2700px) and (max-width:2925px){.thumb_list .movie{width:7.69231%}
+}
+@media (min-width:2475px) and (max-width:2700px){.thumb_list .movie{width:8.33333%}
+}
+@media (min-width:2250px) and (max-width:2475px){.thumb_list .movie{width:9.09091%}
+}
+@media (min-width:2025px) and (max-width:2250px){.thumb_list .movie{width:10%}
+}
+@media (min-width:1800px) and (max-width:2025px){.thumb_list .movie{width:11.11111%}
+}
+@media (min-width:1575px) and (max-width:1800px){.thumb_list .movie{width:12.5%}
+}
+@media (min-width:1350px) and (max-width:1575px){.thumb_list .movie{width:14.28571%}
+}
+@media (min-width:1125px) and (max-width:1350px){.thumb_list .movie{width:16.66667%}
+}
+@media (min-width:900px) and (max-width:1125px){.thumb_list .movie{width:20%}
+}
+@media (min-width:675px) and (max-width:900px){.thumb_list .movie{width:25%}
+}
+@media (min-width:450px) and (max-width:675px){.thumb_list .movie{width:33.33333%}
+}
+@media (min-width:225px) and (max-width:450px){.thumb_list .movie{width:50%}
+}
+@media (min-width:0px) and (max-width:225px){.thumb_list .movie{width:100%}
+}
+@media (max-width:768px){.list_list.with_navigation .movie.checked .info .title span,.list_list.with_navigation .movie:hover .info .title span{margin-left:0}
+.thumb_list .movie{width:33.333%;border-width:0 5px}
+}
+@media (max-width:480px){.thumb_list>div:last-child{padding:0 3.33px}
+.thumb_list .movie{width:50%;border-width:0 4px}
+}
+.thumb_list .movie input[type=checkbox]{top:10px;left:10px}
+.thumb_list .movie .poster_container{border-radius:3px;position:relative;width:100%;padding-bottom:150%;overflow:hidden}
+.thumb_list .movie .poster{position:absolute;background:center no-repeat #ebebeb;background-size:cover;overflow:hidden;height:100%;width:100%}
+.dark .thumb_list .movie .poster{background-color:#353535}
+.thumb_list .movie .info{clear:both;font-size:.9em}
+.thumb_list .movie .info .title{display:-webkit-flex;display:-ms-flexbox;display:flex;padding:3px 0;font-weight:400}
+.thumb_list .movie .info .title span{-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+.thumb_list .movie .info .title .year{display:inline-block;margin-left:5px;opacity:.5}
+.thumb_list .movie .info .eta{opacity:.5;float:right;margin-left:4px}
+.thumb_list .movie .info .quality{white-space:nowrap;overflow:hidden;font-size:.9em}
+.thumb_list .movie .info .quality span{font-size:.8em;margin-right:2px}
+.thumb_list .movie .actions{background-image:linear-gradient(25deg,rgba(172,0,0,.3) 0,#ac0000 80%);will-change:opacity,visibility;transition:all 400ms;transition-property:opacity,visibility;opacity:0;visibility:hidden;position:absolute;top:0;right:0;bottom:0;left:0;text-align:right}
+.dark .thumb_list .movie .actions{background-image:linear-gradient(25deg,rgba(248,92,34,.3) 0,#f85c22 80%)}
+.thumb_list .movie .actions .action{position:relative;margin-right:10px;float:right;clear:both}
+.thumb_list .movie .actions .action:first-child{margin-top:10px}
+.thumb_list .movie .actions .action a{transition:all 150ms cubic-bezier(.9,0,.1,1);will-change:color,background;transition-property:color,background;display:block;width:auto;padding:6.67px;color:#FFF;border-radius:2px;font-weight:400}
+.thumb_list .movie .actions .action a:hover{background:#FFF;color:#ac0000}
+.dark .thumb_list .movie .actions .action a:hover{background:#2d2d2d;color:#FFF}
+.thumb_list .movie:hover .actions{opacity:1;visibility:visible}
+.thumb_list .movie .mask{bottom:44px;border-radius:3px;will-change:opacity;transition:opacity 30ms}
+@media (max-width:480px){.thumb_list .movie:hover .actions{display:none}
+.page.movie_details{left:0}
+}
+.page.movie_details .overlay{position:fixed;top:0;bottom:0;right:0;left:132px;background:rgba(0,0,0,.6);border-radius:3px 0 0 3px;opacity:0;will-change:opacity;-webkit-transform:rotateZ(360deg);transform:rotateZ(360deg);transition:opacity 300ms ease 400ms;z-index:1}
+.page.movie_details .overlay .ripple{background:#FFF}
+@media (max-width:480px){.page.movie_details .overlay{left:0;border-radius:0;transition:none}
+}
+.page.movie_details .overlay .close{display:inline-block;text-align:center;font-size:60px;line-height:80px;color:#FFF;width:100%;height:100%;opacity:0;will-change:opacity;transition:opacity 300ms ease 200ms}
+.page.movie_details .overlay .close:before{display:block;width:44px}
+.page.movie_details .scroll_content{position:fixed;z-index:2;top:0;bottom:0;right:0;left:176px;background:#FFF;border-radius:3px 0 0 3px;overflow-y:auto;will-change:transform;-webkit-transform:translateX(100%) rotateZ(360deg);transform:translateX(100%) rotateZ(360deg);transition:-webkit-transform 450ms cubic-bezier(.9,0,.1,1);transition:transform 450ms cubic-bezier(.9,0,.1,1)}
+.dark .page.movie_details .scroll_content{background:#2d2d2d}
+.page.movie_details .scroll_content>.head{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;padding:0 20px 0 10px;position:relative;z-index:2;will-change:transform,opacity;-webkit-transform:rotateZ(360deg);transform:rotateZ(360deg)}
+.page.movie_details .scroll_content>.head h1{-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto;margin:0;font-size:24px;font-weight:300;max-width:100%}
+@media (max-width:480px){.page.movie_details .overlay .close{width:44px}
+.page.movie_details .scroll_content{left:44px}
+.page.movie_details .scroll_content>.head{padding:0;line-height:44px}
+.page.movie_details .scroll_content>.head h1{min-width:100%;line-height:44px}
+.page.movie_details .scroll_content>.head h1 .more_menu{width:100%}
+}
+.page.movie_details .scroll_content>.head h1 .more_menu a{color:#000}
+.dark .page.movie_details .scroll_content>.head h1 .more_menu a{color:#FFF}
+.page.movie_details .scroll_content>.head h1 .more_menu .icon-dropdown{padding-right:30px}
+.page.movie_details .scroll_content>.head .more_menu{display:inline-block;vertical-align:top;max-width:100%;margin-bottom:0}
+.page.movie_details .scroll_content>.head .more_menu>a{float:left;line-height:80px;color:#ac0000}
+.dark .page.movie_details .scroll_content>.head .more_menu>a{color:#f85c22}
+.page.movie_details .scroll_content>.head .more_menu>a:hover{color:#000}
+.dark .page.movie_details .scroll_content>.head .more_menu>a:hover{color:#FFF}
+.page.movie_details .scroll_content>.head .more_menu .icon-dropdown{position:relative;padding:0 25px 0 10px}
+.page.movie_details .scroll_content>.head .more_menu .icon-dropdown:before{position:absolute;right:10px;top:-2px;opacity:.2}
+.page.movie_details .scroll_content>.head .more_menu .icon-dropdown:hover:before{opacity:1}
+.page.movie_details .scroll_content>.head .more_menu .wrapper{top:70px;padding-top:4px;border-radius:3px 3px 0 0;font-size:14px}
+@media (max-width:480px){.page.movie_details .scroll_content>.head h1 .more_menu .icon-dropdown:before{right:10px}
+.page.movie_details .scroll_content>.head .more_menu>a{line-height:44px}
+.page.movie_details .scroll_content>.head .more_menu .wrapper{top:25px}
+}
+.page.movie_details .scroll_content>.head .more_menu .wrapper:before{top:0;left:auto;right:22px}
+.page.movie_details .scroll_content>.head .more_menu .wrapper ul{border-radius:3px 3px 0 0;max-height:215px;overflow-y:auto}
+.page.movie_details .scroll_content>.head .more_menu .wrapper a{padding-right:30px}
+.page.movie_details .scroll_content>.head .more_menu .wrapper a:before{position:absolute;right:10px}
+.page.movie_details .scroll_content>.head .more_menu .wrapper a.icon-ok,.page.movie_details .scroll_content>.head .more_menu .wrapper a:hover{color:#ac0000}
+.dark .page.movie_details .scroll_content>.head .more_menu .wrapper a.icon-ok,.dark .page.movie_details .scroll_content>.head .more_menu .wrapper a:hover{color:#f85c22}
+.page.movie_details .scroll_content>.head .more_menu.title>a{display:inline-block;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;width:100%}
+.page.movie_details .scroll_content>.head .more_menu.title .wrapper{-webkit-transform-origin:0 0;transform-origin:0 0;left:0;right:auto}
+.page.movie_details .scroll_content>.head .more_menu.title .wrapper:before{left:22px;right:auto}
+.page.movie_details .scroll_content>.head .buttons{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}
+.page.movie_details .scroll_content>.head .buttons>a{display:inline-block;padding:0 10px;color:#ac0000;line-height:80px}
+.dark .page.movie_details .scroll_content>.head .buttons>a{color:#f85c22}
+.page.movie_details .scroll_content>.head .buttons>a:hover{background:#ebebeb;color:#000}
+.dark .page.movie_details .scroll_content>.head .buttons>a:hover{background:#353535;color:#FFF}
+.page.movie_details .scroll_content .section{padding:20px;border-top:1px solid rgba(0,0,0,.1);will-change:transform,opacity;-webkit-transform:rotateZ(360deg);transform:rotateZ(360deg)}
+.dark .page.movie_details .scroll_content .section{border-color:rgba(255,255,255,.1)}
+@media (max-width:480px){.page.movie_details .scroll_content>.head .more_menu.title .wrapper{top:30px;max-width:240px}
+.page.movie_details .scroll_content>.head .buttons{margin:0}
+.page.movie_details .scroll_content>.head .buttons>a{line-height:44px}
+.page.movie_details .scroll_content .section{padding:10px}
+}
+.page.movie_details .files span,.page.movie_details .releases .item span{white-space:nowrap;padding:6.67px 0;overflow:hidden;text-overflow:ellipsis}
+.page.movie_details.show{pointer-events:auto}
+.page.movie_details.show .overlay{opacity:1;transition-delay:0s}
+.page.movie_details.show .overlay .close{opacity:1;transition-delay:300ms}
+.page.movie_details.show .scroll_content{transition-delay:50ms;-webkit-transform:translateX(0) rotateZ(360deg);transform:translateX(0) rotateZ(360deg)}
+.page.movie_details .section_description .meta{text-align:right;font-style:italic;font-size:.9em}
+.page.movie_details .section_description .meta span{display:inline-block;margin:10px 10px 0}
+.page.movie_details .section_description .meta span:last-child{margin-right:0}
+.page.movie_details .section_add{background:#ebebeb}
+.dark .page.movie_details .section_add{background:#353535}
+.page.movie_details .section_add .options>div{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center}
+.page.movie_details .section_add .options>div select{display:block;width:100%}
+.page.movie_details .section_add .options>div .title{min-width:75px;width:2000px;margin:0 10px 0 0}
+.page.movie_details .section_add .options>div .category,.page.movie_details .section_add .options>div .profile{width:200px;min-width:50px;margin:0 10px 0 0}
+.page.movie_details .section_add .options>div .add{width:200px}
+.page.movie_details .section_add .options>div .add .button{background:#FFF;-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto;display:block;text-align:center;width:100%;margin:0}
+.dark .page.movie_details .section_add .options>div .add .button{background:#2d2d2d}
+.page.movie_details .section_add .options>div .add .button:hover{background:#ac0000}
+.dark .page.movie_details .section_add .options>div .add .button:hover{background:#f85c22}
+.page.movie_details .section_add .data,.page.movie_details .section_add .thumbnail{display:none}
+.page.movie_details .files span{text-align:center}
+.page.movie_details .files .name{text-align:left;-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto}
+.page.movie_details .files .type{min-width:80px}
+.page.movie_details .releases .buttons{margin-bottom:10px}
+.page.movie_details .releases .buttons a{display:inline;color:#ac0000}
+.dark .page.movie_details .releases .buttons a{color:#f85c22}
+@media (max-width:480px){.page.movie_details .releases .item{display:block}
+}
+.page.movie_details .releases .item:not(.head):hover{background:#ebebeb;text:#000}
+.dark .page.movie_details .releases .item:not(.head):hover{background:#353535;text:#FFF}
+.page.movie_details .releases .item span{text-align:center}
+.page.movie_details .releases .item span:before{display:none;font-weight:700;opacity:.8;margin-right:3px;width:100%;font-size:.9em}
+.page.movie_details .releases .item .name{-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto;text-align:left}
+.page.movie_details .releases .item.ignored span:not(.actions){opacity:.3}
+.page.movie_details .releases .item.ignored .name{text-decoration:line-through}
+.page.movie_details .releases .item .actions{padding:0}
+@media (max-width:480px){.page.movie_details .releases .item span:before{display:inline-block}
+.page.movie_details .releases .item span{vertical-align:top;white-space:normal;display:inline-block;width:50%;padding:0;min-width:0;max-width:none;text-align:left;margin-top:3px}
+.page.movie_details .releases .item .name{width:100%;font-weight:700}
+.page.movie_details .releases .item.head{display:none}
+.page.movie_details .releases .item .actions{width:100%;text-align:center}
+}
+.page.movie_details .releases .item .actions a{display:inline-block;vertical-align:top;padding:6.67px;min-width:26px;color:#000}
+.dark .page.movie_details .releases .item .actions a{color:#FFF}
+.page.movie_details .releases .item .actions a:hover{color:#ac0000}
+.dark .page.movie_details .releases .item .actions a:hover{color:#f85c22}
+.page.movie_details .releases .item .actions a:after{margin-left:3px;font-size:.9em}
+@media (max-width:480px){.page.movie_details .releases .item .actions a{text-align:center}
+.page.movie_details .releases .item .actions a.icon-info:after{content:"more info"}
+.page.movie_details .releases .item .actions a.icon-download:after{content:"download"}
+.page.movie_details .releases .item .actions a.icon-cancel:after{content:"ignore"}
+}
+.page.movie_details .releases .status{min-width:70px;max-width:70px}
+.page.movie_details .releases .status:before{content:"Status:"}
+.page.movie_details .releases .quality{min-width:60px;max-width:60px}
+.page.movie_details .releases .quality:before{content:"Quality:"}
+.page.movie_details .releases .size{min-width:50px;max-width:50px}
+.page.movie_details .releases .size:before{content:"Size:"}
+.page.movie_details .releases .age{min-width:40px;max-width:40px}
+.page.movie_details .releases .age:before{content:"Age:"}
+.page.movie_details .releases .score{min-width:45px;max-width:45px}
+.page.movie_details .releases .score:before{content:"Score:"}
+.page.movie_details .releases .provider{min-width:110px;max-width:110px}
+.page.movie_details .releases .provider:before{content:"Provider:"}
+.page.movie_details .releases .actions{min-width:80px;max-width:80px}
+.page.movie_details .section_trailer.section_trailer{padding:0;background:#111;max-height:450px;overflow:hidden}
+.dark .page.movie_details .section_trailer.section_trailer{background:#111}
+.page.movie_details .section_trailer.section_trailer.no_trailer{display:none}
+.page.movie_details .section_trailer.section_trailer .trailer_container{max-height:450px;position:relative;overflow:hidden;max-width:800px;margin:0 auto;cursor:pointer}
+.page.movie_details .section_trailer.section_trailer .trailer_container .background{opacity:0;background:center no-repeat;background-size:cover;position:relative;z-index:1;max-height:450px;padding-bottom:56.25%;will-change:opacity;transition:opacity 1000ms}
+.page.movie_details .section_trailer.section_trailer .trailer_container .background.visible{opacity:.4}
+.page.movie_details .section_trailer.section_trailer .trailer_container .icon-play{opacity:.9;position:absolute;z-index:2;text-align:center;width:100%;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%);will-change:opacity;transition:all 300ms;color:#FFF;font-size:110px}
+@media (max-width:1024px){.page.movie_details .section_trailer.section_trailer .trailer_container .icon-play{font-size:55px}
+}
+@media (max-width:480px){.page.movie_details .section_trailer.section_trailer{max-height:450px}
+.page.movie_details .section_trailer.section_trailer .trailer_container{margin-bottom:10px}
+.page.movie_details .section_trailer.section_trailer .trailer_container .icon-play{font-size:31.43px}
+}
+.page.movie_details .section_trailer.section_trailer .trailer_container .icon-play span{transition:all 300ms;opacity:.9;position:absolute;font-size:1em;top:50%;left:50%;margin-left:55px;-webkit-transform:translateY(-54%);transform:translateY(-54%);will-change:opacity}
+@media (max-width:1024px){.page.movie_details .section_trailer.section_trailer .trailer_container .icon-play span{margin-left:27.5px}
+}
+@media (max-width:480px){.page.movie_details .section_trailer.section_trailer .trailer_container .icon-play span{margin-left:15.71px}
+}
+.page.movie_details .section_trailer.section_trailer .trailer_container .icon-play span:first-child{margin-left:-55px;-webkit-transform:translate(-100%,-54%);transform:translate(-100%,-54%)}
+@media (max-width:1024px){.page.movie_details .section_trailer.section_trailer .trailer_container .icon-play span:first-child{margin-left:-27.5px}
+}
+@media (max-width:480px){.page.movie_details .section_trailer.section_trailer .trailer_container .icon-play span:first-child{margin-left:-15.71px}
+}
+.page.movie_details .section_trailer.section_trailer .trailer_container:hover{color:#ac0000}
+.dark .page.movie_details .section_trailer.section_trailer .trailer_container:hover{color:#f85c22}
+.page.movie_details .section_trailer.section_trailer .trailer_container:hover .icon-play,.page.movie_details .section_trailer.section_trailer .trailer_container:hover .icon-play span{opacity:1}
+.page.movie_details .section_trailer.section_trailer .trailer_container iframe{position:absolute;width:100%;height:100%;border:0;top:0;left:0;max-height:450px;z-index:10}
+.alph_nav{position:relative}
+.alph_nav .mass_edit_form{display:-webkit-flex;display:-ms-flexbox;display:flex;background:#FFF;position:fixed;top:80px;right:0;left:132px;-webkit-flex-flow:row nowrap;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-align-items:center;-ms-flex-align:center;align-items:center;will-change:max-height;transition:max-height 300ms cubic-bezier(.9,0,.1,1);max-height:0;overflow:hidden}
+.dark .alph_nav .mass_edit_form{background:#2d2d2d}
+.mass_editing .alph_nav .mass_edit_form{max-height:44px}
+.alph_nav .mass_edit_form>*{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center}
+.alph_nav .mass_edit_form .select{margin:0 10px 0 20px}
+@media (max-width:480px){.alph_nav .mass_edit_form .select{margin:0 5px 0 10px}
+}
+.alph_nav .mass_edit_form .select .count,.alph_nav .mass_edit_form .select input{margin-right:5px}
+.alph_nav .menus .button{padding:0 10px;line-height:80px}
+.alph_nav .menus .actions,.alph_nav .menus .counter,.alph_nav .menus .more_menu{float:left}
+.alph_nav .menus .actions .wrapper,.alph_nav .menus .counter .wrapper,.alph_nav .menus .more_menu .wrapper{-webkit-transform-origin:92% 0;transform-origin:92% 0;right:-7px}
+.alph_nav .menus .actions>a,.alph_nav .menus .counter>a,.alph_nav .menus .more_menu>a{display:inline-block;width:30px;line-height:80px;text-align:center;float:left}
+.alph_nav .menus .actions>a:hover,.alph_nav .menus .counter>a:hover,.alph_nav .menus .more_menu>a:hover{background:#ebebeb}
+.dark .alph_nav .menus .actions>a:hover,.dark .alph_nav .menus .counter>a:hover,.dark .alph_nav .menus .more_menu>a:hover{background:#353535}
+@media (max-width:768px){.alph_nav .menus .actions>a,.alph_nav .menus .counter>a,.alph_nav .menus .more_menu>a{line-height:44px}
+}
+.alph_nav .menus .counter{line-height:80px;padding:0 10px}
+@media (max-width:768px){.alph_nav .menus .counter{display:none}
+}
+.alph_nav .menus .actions a{display:inline-block}
+.alph_nav .menus .actions .active{display:none}
+.alph_nav .menus .filter .wrapper{width:320px}
+.alph_nav .menus .filter .button{margin-top:-2px}
+.alph_nav .menus .filter .search{position:relative}
+.alph_nav .menus .filter .search:before{position:absolute;height:100%;line-height:38px;padding-left:10px;font-size:16px;opacity:.5}
+.alph_nav .menus .filter .search input{width:100%;padding:10px 10px 10px 30px;background:#FFF;border:none #ebebeb;border-bottom:1px solid transparent}
+.dark .alph_nav .menus .filter .search input{background:#2d2d2d;border-color:#353535}
+.alph_nav .menus .filter .numbers{padding:10px}
+.alph_nav .menus .filter .numbers li{float:left;width:10%;height:30px;line-height:30px;text-align:center;opacity:.2;cursor:default;border:0}
+.alph_nav .menus .filter .numbers li.active{background:#ebebeb}
+.dark .alph_nav .menus .filter .numbers li.active{background:#353535}
+.alph_nav .menus .filter .numbers li.available{opacity:1;cursor:pointer}
+.alph_nav .menus .filter .numbers li.available:hover{background:#ebebeb}
+.dark .alph_nav .menus .filter .numbers li.available:hover{background:#353535}
+.alph_nav .menus .more_menu .wrapper{top:70px;padding-top:4px;border-radius:3px 3px 0 0;min-width:140px}
+@media (max-width:480px){.alph_nav .menus .filter .wrapper{right:-70px;-webkit-transform-origin:75% 0;transform-origin:75% 0}
+.alph_nav .menus .filter .wrapper:before{right:83px!important}
+.alph_nav .menus .filter .search input{font-size:1.2em}
+.alph_nav .menus .more_menu .wrapper{top:44px}
+}
+.alph_nav .menus .more_menu .wrapper:before{top:0;left:auto;right:22px}
+.alph_nav .menus .more_menu .wrapper ul{border-radius:3px 3px 0 0}
+.add_new_category{padding:20px;display:block;text-align:center;font-size:20px}
+.category{margin-bottom:20px;position:relative}
+.category>.delete{position:absolute;padding:6.67px 20px;right:0;cursor:pointer;opacity:.6;color:#fd5353;font-size:1.5em;z-index:2}
+.category>.delete:hover{opacity:1}
+.category .ctrlHolder:hover{background:0 0}
+.page.log .nav li.active,.page.log .nav li:hover:not(.active):not(.filter){background:rgba(255,255,255,.1)}
+.category .formHint{opacity:.1}
+.category:hover .formHint{opacity:1}
+#category_ordering ul{float:left;margin:0;width:275px;padding:0}
+#category_ordering li{cursor:-webkit-grab;cursor:grab;border-bottom:1px solid transparent;border-color:#ebebeb;padding:5px;list-style:none}
+.dark #category_ordering li{border-color:#353535}
+#category_ordering li:last-child{border:0}
+#category_ordering li .check{margin:2px 10px 0 0;vertical-align:top}
+#category_ordering li>span{display:inline-block;height:20px;vertical-align:top;line-height:20px}
+#category_ordering li .handle{width:20px;float:right}
+.page.log .nav{text-align:right;padding:0;margin:0}
+.page.log .nav li{display:inline-block;padding:5px 10px;margin:0}
+.page.log .nav li.clear,.page.log .nav li.select{cursor:pointer}
+.page.log .nav li.active{font-weight:700;cursor:default}
+.page.log .hint{font-style:italic;opacity:.5;margin-top:3px}
+@media (max-width:768px){.page.log .nav li.filter,.page.log .nav li:nth-child(10),.page.log .nav li:nth-child(11),.page.log .nav li:nth-child(12),.page.log .nav li:nth-child(7),.page.log .nav li:nth-child(8),.page.log .nav li:nth-child(9){display:none}
+.page.log .nav li:last-child{display:inline-block}
+.page.log .hint{display:none}
+}
+.page.log .container{padding:20px;overflow:hidden;line-height:150%}
+@media (max-width:480px){.page.log .container{padding:20px 10px}
+}
+.page.log .container.loading{text-align:center;font-size:20px;padding:100px 50px}
+.page.log .container select{vertical-align:top}
+.page.log .container .time{clear:both;font-size:.75em;border-top:1px solid rgba(255,255,255,.1);overflow:hidden;padding:0 3px;font-family:Lucida Console,Monaco,Nimbus Mono L,monospace,serif;display:-webkit-flex;display:-ms-flexbox;display:flex}
+@media (max-width:480px){.page.log .container .time{-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap}
+}
+.page.log .container .time.highlight{background:#ebebeb}
+.dark .page.log .container .time.highlight{background:#353535}
+.page.log .container .time span{padding:5px 0 3px;display:inline-block;vertical-align:middle;width:95px}
+.page.log .container .time .message{white-space:pre-wrap;-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto}
+@media (max-width:480px){.page.log .container .time .message{-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto;margin-top:-5px;padding:0;display:block;width:100%}
+}
+.page.log .container .time ::-moz-selection{background-color:#FFF;color:#000}
+.page.log .container .time ::selection{background-color:#FFF;color:#000}
+.dark .page.log .container .time ::-moz-selection{background-color:#2d2d2d;color:#FFF}
+.dark .page.log .container .time ::selection{background-color:#2d2d2d;color:#FFF}
+.page.log .container .type.type{margin-left:6.67px;width:40px}
+.page.log .container .error{color:#FFA4A4}
+.page.log .container .debug span{opacity:.6}
+.page.log [data-filter=DEBUG] .error,.page.log [data-filter=DEBUG] .info,.page.log [data-filter=ERROR] .debug,.page.log [data-filter=ERROR] .info,.page.log [data-filter=INFO] .debug,.page.log [data-filter=INFO] .error{display:none}
+.report_popup.report_popup{position:fixed;left:0;right:0;bottom:0;top:0;z-index:99999;font-size:14px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;opacity:1;color:#FFF;pointer-events:auto}
+.disable_hover .scroll_content>*,.mask,.ripple{pointer-events:none}
+.report_popup.report_popup .button{margin:10px 0;padding:10px;color:#FFF;background:#ac0000}
+.dark .report_popup.report_popup .button{background:#f85c22}
+.report_popup.report_popup .bug{width:80%;height:80%;max-height:800px;max-width:800px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:column nowrap;-ms-flex-flow:column nowrap;flex-flow:column nowrap}
+.report_popup.report_popup .bug>span{margin:10px 0 20px}
+.report_popup.report_popup .bug textarea{display:block;width:100%;background:#FFF;padding:20px;overflow:auto;color:#666;height:70%;font-size:12px}
+.do_report.do_report{z-index:10000;position:absolute;padding:10px;background:#ac0000;color:#FFF!important}
+.dark .do_report.do_report{background:#f85c22}
+.add_new_profile{padding:20px;display:block;text-align:center;font-size:20px;border-bottom:1px solid transparent;border-color:#ebebeb}
+.dark .add_new_profile{border-color:#353535}
+.profile{margin-bottom:20px}
+.profile .quality_label input{font-weight:700}
+.profile>.delete{position:absolute;padding:6.67px 20px;right:0;cursor:pointer;opacity:.6;color:#fd5353;font-size:1.5em;z-index:2}
+.profile>.delete:hover{opacity:1}
+.profile .ctrlHolder .types{-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto;min-width:360px}
+.profile .ctrlHolder .types .type{display:-webkit-flex;display:-ms-flexbox;display:flex;flex-row:row nowrap;-webkit-align-items:center;-ms-flex-align:center;align-items:center;padding:2px 0}
+.profile .ctrlHolder .types .type label{min-width:0;margin-left:10px}
+.profile .ctrlHolder .types .type label span{font-size:.9em}
+.profile .ctrlHolder .types .type input[type=checkbox]{margin-right:3px}
+.profile .ctrlHolder .types .type .delete,.profile .ctrlHolder .types .type .handle{margin-left:5px;width:20px;font-size:20px;opacity:.1;text-align:center;cursor:pointer}
+.profile .ctrlHolder .types .type .delete.handle,.profile .ctrlHolder .types .type .handle.handle{cursor:move;cursor:-webkit-grab;cursor:grab}
+.profile .ctrlHolder .types .type .delete:hover,.profile .ctrlHolder .types .type .handle:hover{opacity:1}
+.profile .ctrlHolder .types .type.is_empty .delete,.profile .ctrlHolder .types .type.is_empty .handle{display:none}
+.profile .ctrlHolder.wait_for.wait_for{display:block}
+.profile .ctrlHolder.wait_for.wait_for input{min-width:0;width:40px;text-align:center;margin:0 2px}
+.profile .ctrlHolder.wait_for.wait_for .advanced{display:none;color:#ac0000}
+.dark .profile .ctrlHolder.wait_for.wait_for .advanced{color:#f85c22}
+.show_advanced .profile .ctrlHolder.wait_for.wait_for .advanced{display:inline}
+#profile_ordering ul{list-style:none;margin:0;width:275px;padding:0}
+#profile_ordering li{border-bottom:1px solid transparent;border-color:#ebebeb;padding:5px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center}
+.dark #profile_ordering li{border-color:#353535}
+#profile_ordering li:hover{background:#ebebeb}
+.dark #profile_ordering li:hover{background:#353535}
+#profile_ordering li:last-child{border:0}
+#profile_ordering li input[type=checkbox]{margin:2px 10px 0 0;vertical-align:top}
+#profile_ordering li>span{display:inline-block;height:20px;vertical-align:top;line-height:20px}
+#profile_ordering li>span.profile_label{-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto}
+#profile_ordering li .handle{font-size:20px;width:20px;float:right;cursor:move;cursor:-webkit-grab;cursor:grab;opacity:.5;text-align:center}
+#profile_ordering li .handle:hover{opacity:1}
+.group_sizes .item .label{min-width:150px}
+.group_sizes .item .max,.group_sizes .item .min{display:inline-block;width:70px!important;min-width:0!important;margin-right:10px;text-align:center}
+.page.userscript{position:absolute;width:100%;top:0;bottom:0;left:0;right:0;padding:0}
+.page.userscript .frame.loading{text-align:center;font-size:20px;padding:20px}
+.page.userscript .media_result{height:140px;display:-webkit-flex;display:-ms-flexbox;display:flex}
+.page.userscript .thumbnail{width:90px}
+.page.userscript .options{left:90px;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center;padding:10px}
+.page.userscript .options>div{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}
+.page.userscript .options>div div{-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto;margin:0;padding:0 5px}
+.page.userscript .options>div .title{min-width:100%;margin-bottom:20px}
+.page.userscript .options>div .add{text-align:right}
+.page.userscript .options>div .add a{display:block;text-align:center}
+.page.userscript .options>div select{width:100%}
+.page.userscript .message{font-size:1.5em}
+.page.userscript .data,.page.userscript .year{display:none}
+.group_userscript.group_userscript{display:block}
+.empty_wanted .group_userscript.group_userscript{padding:20px 0}
+.wgroup_automation .group_userscript.group_userscript{padding:10px 0;margin-left:0}
+.group_userscript.group_userscript h2{margin:0 0 10px}
+.group_userscript.group_userscript .userscript{margin-left:20px}
+@media (max-width:768px){.group_userscript.group_userscript .userscript{margin-left:10px}
+}
+.wgroup_automation .group_userscript.group_userscript .userscript{margin-left:0}
+.group_userscript.group_userscript .bookmarklet span{margin-left:10px;display:inline-block}
+.group_userscript.group_userscript img{clear:both;margin:20px;width:100%;max-width:600px}
+@media (max-width:768px){.group_userscript.group_userscript img{margin:10px}
+}
+.wgroup_automation .group_userscript.group_userscript img{margin-left:0}
+.page.wizard{top:0!important}
+.page.wizard .navigation.navigation{display:none}
+.page.wizard .tab_content.tab_content{display:block}
+.page.wizard .tab_content.tab_content fieldset .ctrlHolder,.page.wizard .tab_content.tab_content fieldset h2{padding:5px}
+.page.wizard h1{padding:10px 0;display:block;font-size:30px;margin:80px 5px 0;font-weight:300}
+.page.wizard .description{padding:10px 5px;font-size:1.45em;line-height:1.4em;display:block}
+.page.wizard form.uniForm.containers{margin:0}
+.page.wizard form>div{min-height:300px;max-width:1024px;padding:20px;margin:0 auto}
+@media (max-width:480px){.page.wizard form>div{padding:10px}
+}
+.page.wizard .button.green{padding:20px;font-size:25px;margin:10px 0 80px;display:inline-block}
+.page.wizard .tab_nzb_providers{margin:20px 0 0}
+.api_docs h1{font-size:25px;padding:20px 40px}
+.api_docs pre{background:#eee;font-family:monospace;margin:0;padding:10px;width:100%;display:block;font-size:12px}
+.api_docs body{display:block;overflow:auto;background-color:#FFF}
+.api_docs .api,.api_docs .missing{overflow:hidden;border-bottom:1px solid #eee;padding:40px}
+.api_docs .api:hover{color:#000}
+.api_docs .api .description{color:#333;padding:0 0 5px}
+.api_docs .api .params{background:#fafafa;width:100%}
+.api_docs .api .params h3{clear:both;float:left;width:100px}
+.api_docs .api .params td,.api_docs .api .params th{padding:3px 5px;border-bottom:1px solid #eee}
+.api_docs .api .params tr:last-child td,.api_docs .api .params tr:last-child th{border:0}
+.api_docs .api .params .param{vertical-align:top}
+.api_docs .api .params .param th{text-align:left;width:100px}
+.api_docs .api .params .param .type{font-style:italic;margin-right:10px;width:100px;color:#666}
+.api_docs .api .params .return{float:left;width:700px}
+.api_docs .database{padding:20px;margin:0}
+.api_docs .database *{margin:0;padding:0}
+.api_docs .database .nav li{display:inline-block}
+.api_docs .database .nav li a{padding:5px}
+.api_docs .database table{font-size:11px}
+.api_docs .database table th{text-align:left}
+.api_docs .database table tr:hover{position:relative;z-index:20}
+.api_docs .database table td{vertical-align:top;position:relative}
+.api_docs .database table .id{width:100px}
+.api_docs .database table ._rev,.api_docs .database table ._t{width:60px}
+.api_docs .database table .form,.api_docs .database table form{width:600px}
+.api_docs .database table textarea{font-size:12px;width:100%;height:200px}
+.api_docs .database table input[type=submit]{display:block}
+.page.login{background:#FFF;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;font-size:1.25em}
+.dark .page.login{background:#2d2d2d}
+.page.login h1{padding:0 0 10px;font-size:60px;font-family:Lobster;font-weight:400;color:#ac0000;text-align:center}
+.dark .page.login h1{color:#f85c22}
+.page.login form{padding:0;width:300px}
+.page.login .ctrlHolder{padding:0;margin:0 0 20px}
+.page.login .ctrlHolder:hover{background:0 0}
+.page.login input[type=password],.page.login input[type=text]{width:100%!important}
+.page.login .remember_me{font-size:15px;float:left;width:150px}
+.page.login .button{float:right;margin:0;transition:none}
+@font-face{font-family:icons;src:url(../fonts/icons.eot?3);src:url(../fonts/icons.eot?3#iefix) format("embedded-opentype"),url(../fonts/icons.woff?3) format("woff"),url(../fonts/icons.ttf?3) format("truetype"),url(../fonts/icons.svg?3#icons) format("svg");font-weight:400;font-style:normal}
+[class*=" icon-"]:before,[class^=icon-]:before{font-family:icons;font-style:normal;font-weight:400;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
+.icon-left-arrow:before{content:'\e800'}
+.icon-settings:before{content:'\e801'}
+.icon-search:before{content:'\e802'}
+.icon-dots:before{content:'\e803'}
+.icon-filter:before{content:'\e804'}
+.icon-thumb:before{content:'\e805'}
+.icon-list:before{content:'\e806'}
+.icon-notifications:before{content:'\e807'}
+.icon-emo-cry:before{content:'\e808'}
+.icon-emo-coffee:before{content:'\e809'}
+.icon-emo-sunglasses:before{content:'\e80a'}
+.icon-info:before{content:'\e80b'}
+.icon-download:before{content:'\e80c'}
+.icon-delete:before{content:'\e80d'}
+.icon-cancel:before{content:'\e80e'}
+.icon-redo:before{content:'\e80f'}
+.icon-ok:before{content:'\e810'}
+.icon-dropdown:before{content:'\e811'}
+.icon-play:before{content:'\e812'}
+.icon-plus:before{content:'\e813'}
+.icon-eye:before{content:'\e814'}
+.icon-error:before{content:'\e815'}
+.icon-refresh:before{content:'\e816'}
+.icon-home:before{content:'\e817'}
+.icon-movie:before{content:'\e818'}
+.icon-handle:before,.icon-menu:before{content:'\e819'}
+.icon-star:before{content:'\e81a'}
+.icon-star-empty:before{content:'\e81b'}
+.icon-star-half:before{content:'\e81c'}
+.icon-donate:before{content:'\e81d'}
+@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Light-webfont.eot);src:url(../fonts/OpenSans-Light-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/OpenSans-Light-webfont.woff) format("woff"),url(../fonts/OpenSans-Light-webfont.ttf) format("truetype"),url(../fonts/OpenSans-Light-webfont.svg#OpenSansRegular) format("svg");font-weight:200;font-style:normal}
+@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Regular-webfont.eot);src:url(../fonts/OpenSans-Regular-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/OpenSans-Regular-webfont.woff) format("woff"),url(../fonts/OpenSans-Regular-webfont.ttf) format("truetype"),url(../fonts/OpenSans-Regular-webfont.svg#OpenSansRegular) format("svg");font-weight:400;font-style:normal}
+@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Italic-webfont.eot);src:url(../fonts/OpenSans-Italic-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/OpenSans-Italic-webfont.woff) format("woff"),url(../fonts/OpenSans-Italic-webfont.ttf) format("truetype"),url(../fonts/OpenSans-Italic-webfont.svg#OpenSansItalic) format("svg");font-weight:400;font-style:italic}
+@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-Bold-webfont.eot);src:url(../fonts/OpenSans-Bold-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/OpenSans-Bold-webfont.woff) format("woff"),url(../fonts/OpenSans-Bold-webfont.ttf) format("truetype"),url(../fonts/OpenSans-Bold-webfont.svg#OpenSansBold) format("svg");font-weight:700;font-style:normal}
+@font-face{font-family:OpenSans;src:url(../fonts/OpenSans-BoldItalic-webfont.eot);src:url(../fonts/OpenSans-BoldItalic-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/OpenSans-BoldItalic-webfont.woff) format("woff"),url(../fonts/OpenSans-BoldItalic-webfont.ttf) format("truetype"),url(../fonts/OpenSans-BoldItalic-webfont.svg#OpenSansBoldItalic) format("svg");font-weight:700;font-style:italic}
+@font-face{font-family:Lobster;src:url(../fonts/Lobster-webfont.eot);src:url(../fonts/Lobster-webfont.eot?#iefix) format("embedded-opentype"),url(../fonts/Lobster-webfont.woff2) format("woff2"),url(../fonts/Lobster-webfont.woff) format("woff"),url(../fonts/Lobster-webfont.ttf) format("truetype"),url(../fonts/Lobster-webfont.svg#lobster_14regular) format("svg");font-weight:400;font-style:normal}
+*{margin:0;padding:0;box-sizing:border-box;text-rendering:optimizeSpeed;-webkit-backface-visibility:hidden;backface-visibility:hidden}
+body,html{font-size:14px;line-height:1.5;font-family:OpenSans,"Helvetica Neue",Helvetica,Arial,Geneva,sans-serif;font-weight:300;height:100%;margin:0;padding:0;background:#111;color:#000;overflow:hidden}
+.dark body,.dark html{background:#111;color:#FFF}
+body{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row nowrap;-ms-flex-flow:row nowrap;flex-flow:row nowrap}
+a{position:relative;overflow:hidden;text-decoration:none;cursor:pointer;-webkit-tap-highlight-color:transparent}
+a:active,a:visited{color:inherit}
+input,select,textarea{font-size:1em;font-weight:300;padding:6.67px;border-radius:0;border:1px solid #b8b8b8;background:#ebebeb;color:#000}
+.dark input,.dark select,.dark textarea{border-color:#1b1b1b;background:#353535;color:#FFF}
+input[type=text],textarea{-webkit-appearance:none}
+.button{color:#ac0000;font-weight:300;padding:5px;cursor:pointer;border:1px solid #ac0000;border-radius:3px;margin:0 5px;transition:all 150ms}
+.dark .button{color:#f85c22;border-color:#f85c22}
+.button:hover{background:#ac0000;color:#FFF}
+.dark .button:hover{background:#f85c22}
+.ripple{position:absolute;height:10px;width:10px;border-radius:50%;background:#ac0000;will-change:transform,opacity;-webkit-transform:translate(-50%,-50%) scale(1) rotateZ(360deg);transform:translate(-50%,-50%) scale(1) rotateZ(360deg);opacity:.2;transition:all 1.5s ease;transition-property:opacity,-webkit-transform;transition-property:opacity,transform}
+.dark .ripple{background:#f85c22}
+.ripple.animate{-webkit-transform:translate(-50%,-50%) scale(100) rotateZ(360deg);transform:translate(-50%,-50%) scale(100) rotateZ(360deg);opacity:0}
+.header{width:132px;min-width:132px;position:relative;z-index:100}
+@media (max-width:480px){.header{width:44px;min-width:44px;z-index:21}
+}
+.header a{color:#FFF;letter-spacing:1px}
+.header .ripple{background:#FFF}
+.header .navigation .logo{background:#ac0000;display:block;text-align:center;position:relative;overflow:hidden;font-family:Lobster,serif;color:#FFF;font-size:38px;line-height:80px;height:80px}
+.dark .header .navigation .logo{background:#f85c22}
+.dark .header .donate:hover,.dark .header .navigation ul li a:hover,.header .donate:hover,.header .navigation ul li a:hover{background:#303030}
+.header .navigation .logo span{position:absolute;display:block;height:100%;width:100%;text-align:center;left:0}
+.header .navigation .logo span:nth-child(even){-webkit-transform:translateX(100%);transform:translateX(100%)}
+@media (max-width:480px){.header .navigation .logo{font-size:28px;line-height:44px;height:44px}
+.header .navigation .logo:after{content:'CP'}
+.header .navigation .logo span{display:none}
+}
+.header .navigation ul{padding:0;margin:0}
+.header .navigation ul li{display:block}
+.header .navigation ul li a{padding:10px 20px;display:block;position:relative}
+.header .navigation ul li a:before{position:absolute;width:100%;display:none;text-align:center;font-size:18px;text-indent:0}
+@media (max-width:480px){.header .navigation ul li{line-height:0}
+.header .navigation ul li a{line-height:24px;height:44px;padding:10px 0;text-align:center}
+.header .navigation ul li a span{display:none}
+.header .navigation ul li a:before{display:block}
+}
+.header .navigation ul li a.icon-home:before{font-size:24px}
+.header .donate{position:absolute;bottom:44px;left:0;right:0;padding:10px 20px;transition:background 200ms}
+.header .donate:before{display:none;font-size:20px;text-align:center}
+@media (max-width:480px){.header .donate{bottom:132px;padding:10px 0}
+.header .donate span{display:none}
+.header .donate:before{display:block}
+}
+.header .menu,.header .notification_menu,.header .search_form{position:absolute;z-index:21;bottom:0;width:44px;height:44px}
+.header .menu .wrapper,.header .notification_menu .wrapper,.header .search_form .wrapper{min-width:170px;-webkit-transform-origin:0 90%;transform-origin:0 90%}
+.header .menu>a,.header .notification_menu>a,.header .search_form>a{display:inline-block;height:100%;width:100%;text-align:center;line-height:44px;font-size:20px}
+.header .notification_menu{left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%)}
+.header .notification_menu .button:before{font-size:20px;top:-2px}
+.header .notification_menu .badge{position:absolute;color:#FFF;top:5px;right:0;background:#ac0000;border-radius:50%;width:18px;height:18px;line-height:16px;text-align:center;font-size:10px;font-weight:lighter;z-index:2;pointer-events:none}
+.dark .header .notification_menu .badge{background:#f85c22}
+.header .notification_menu .wrapper{width:320px}
+@media (max-width:480px){.header .notification_menu{bottom:44px}
+.header .notification_menu .wrapper{width:250px}
+}
+.header .notification_menu ul{min-height:60px;max-height:300px;overflow-y:auto!important}
+.header .notification_menu ul:empty:after{content:'No notifications (yet)';width:100%;position:absolute;line-height:60px;font-size:15px;font-style:italic;opacity:.4;left:40px}
+.header .notification_menu ul:empty:before{content:'\e808';font-family:icons;height:100%;line-height:60px;margin-left:20px;text-align:center;opacity:.4}
+.header .notification_menu ul li{padding:20px;word-wrap:break-word}
+.header .notification_menu ul li .added{font-weight:lighter;font-size:11px;display:block;text-align:right}
+.header .menu{left:0}
+.header .menu .button:before{font-size:20px;top:-2px}
+.header .search_form{right:0}
+@media (max-width:480px){.header .menu{bottom:88px;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%)}
+.header .search_form{right:auto;left:50%;-webkit-transform:translateX(-50%);transform:translateX(-50%)}
+}
+.header .more_menu .wrapper{bottom:0;left:44px;right:auto;padding-left:4px}
+.dark .header .more_menu a:hover,.header .more_menu a:hover{background:#303030}
+.corner_background{display:block;position:absolute;height:10px;width:10px;background:#ac0000;top:0;left:132px}
+.dark .corner_background{background:#f85c22}
+@media (max-width:480px){.corner_background{left:44px}
+}
+.content{position:relative;height:100%;-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:column nowrap;-ms-flex-flow:column nowrap;flex-flow:column nowrap;background:#FFF;border-radius:3px 0 0 3px}
+.dark .content{background:#2d2d2d}
+.content h1,.content h2,.content h3{padding:0;margin:0}
+.content .pages{-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto;width:100%;position:relative}
+.content .footer{width:100%}
+.page{position:absolute;top:0;left:0;right:0;bottom:0;display:none}
+.page.active{display:block}
+.page>.scroll_content{position:relative;height:100%;overflow:hidden;overflow-y:auto;-webkit-overflow-scrolling:touch}
+.page.home .scroll_content{padding:0 0 20px}
+.page h1,.page h2,.page h3,.page h4{font-weight:300}
+.page h2{font-size:24px;padding:20px}
+.page .navigation{z-index:2;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center;position:fixed;top:0;height:80px;left:152px;right:20px;background:#FFF;border-radius:3px 0 0}
+.more_menu .button,.more_menu a,.page .navigation ul li{display:inline-block}
+.more_menu,.more_menu .button:before{position:relative}
+.dark .page .navigation{background:#2d2d2d}
+@media (max-width:480px){.page h2{font-size:18px}
+.page .navigation{height:44px;left:54px;right:10px}
+}
+.page .navigation ul{-webkit-flex:1 auto;-ms-flex:1 auto;flex:1 auto;list-style:none}
+.page .navigation ul li a{display:inline-block;font-size:24px;line-height:80px;padding:0 20px;color:#000;opacity:.5;vertical-align:bottom}
+.page .navigation ul .active a,.page .navigation ul li a:hover,.question.show{opacity:1}
+.dark .page .navigation ul li a{color:#FFF}
+.page .navigation>ul>li:first-child{margin-left:-20px}
+@media (max-width:480px){.page .navigation ul li a{font-size:18px;line-height:44px;padding:0 10px}
+.page .navigation>ul>li:first-child{margin-left:-10px}
+}
+.page .navigation h2{padding:20px 20px 20px 0}
+.level_1{z-index:10}
+.level_2{z-index:20}
+.level_3{z-index:30}
+.level_4{z-index:40}
+.more_menu{line-height:1em}
+.more_menu a{float:left}
+.more_menu a:hover{background:#ebebeb}
+.dark .more_menu a:hover{background:#353535}
+.more_menu .button{font-size:24px;cursor:pointer}
+.more_menu .wrapper{display:none;position:absolute;right:0;background:#ac0000;z-index:5000;box-shadow:0 0 15px 2px rgba(0,0,0,.15);border-radius:3px 0 0 3px;-webkit-transform-origin:80% 0;transform-origin:80% 0}
+.dark .more_menu .wrapper{background:#f85c22;box-shadow:0 5px 15px 2px rgba(0,0,0,.4)}
+.more_menu .wrapper:before{-webkit-transform:rotate(45deg) translateY(-60%);transform:rotate(45deg) translateY(-60%);content:'';display:block;position:absolute;background:#ac0000;height:10px;width:10px;left:-9px;bottom:11px;z-index:1;opacity:1;border-radius:3px}
+.dark .more_menu .wrapper:before{background:#f85c22}
+.more_menu .wrapper ul{background:#FFF;position:relative;z-index:2;overflow:hidden;border-radius:3px 0 0 3px}
+.dark .more_menu .wrapper ul{background:#2d2d2d}
+.more_menu .wrapper ul li{display:block;line-height:1em;border-top:1px solid transparent;border-color:#ebebeb}
+.dark .more_menu .wrapper ul li{border-color:#353535}
+.more_menu .wrapper ul li:first-child{border-top:0}
+.more_menu .wrapper ul li a{display:block;color:#000;padding:5px 10px;font-size:1em;line-height:22px;width:100%}
+.question,.table .item{display:-webkit-flex;display:-ms-flexbox}
+.dark .more_menu .wrapper ul li a{color:#FFF}
+.more_menu .wrapper ul li a:hover{background:#ebebeb}
+.dark .more_menu .wrapper ul li a:hover{background:#353535}
+.more_menu .wrapper ul li:first-child a{padding-top:10px}
+.more_menu .wrapper ul li:last-child a{padding-bottom:10px}
+.messages{position:fixed;right:0;bottom:0;width:320px;z-index:2000;overflow:hidden;font-size:14px;font-weight:700;padding:5px}
+.messages .message{overflow:hidden;transition:all .6s cubic-bezier(.9,0,.1,1);width:100%;position:relative;max-height:0;font-size:1.1em;font-weight:400;-webkit-transform:scale(0);transform:scale(0);-webkit-transform-origin:100% 50%;transform-origin:100% 50%;background:#ac0000;margin-bottom:4px;border-radius:3px;box-shadow:0 0 15px 2px rgba(0,0,0,.15)}
+.mask,.messages .close{position:absolute;top:0;right:0}
+.dark .messages .message{background:#f85c22;box-shadow:0 5px 15px 2px rgba(0,0,0,.4)}
+.messages .message .inner{padding:15px 30px 15px 20px;background:#FFF;margin-bottom:4px;border-radius:3px}
+.dark .messages .message .inner{background:#2d2d2d}
+.messages .message.sticky{background-color:#ac0000}
+.dark .messages .message.sticky{background-color:#f85c22}
+.messages .message.show{max-height:100px;-webkit-transform:scale(1);transform:scale(1)}
+.messages .message.hide{max-height:0;padding:0 20px;margin:0;-webkit-transform:scale(0);transform:scale(0)}
+.messages .close{padding:10px 8px;color:#FFF}
+.question{position:fixed;z-index:20000;color:#FFF;padding:20px;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}
+.question .inner{width:100%;max-width:500px}
+.question h3{display:block;margin-bottom:20px;font-size:1.4em;font-weight:lighter}
+.question .hint{margin:-20px 0 20px}
+.question a{border-color:#FFF;color:#FFF;transition:none}
+.question a:hover{background:#ac0000;color:#FFF}
+.dark .question a:hover{background:#f85c22}
+.mask{background:rgba(0,0,0,.8);z-index:1000;text-align:center;bottom:0;left:0;opacity:0;transition:opacity 500ms}
+.mask .message,.mask .spinner{position:absolute;top:50%;left:50%}
+.mask .message{color:#FFF;text-align:center;width:320px;margin:-49px 0 0 -160px;font-size:16px}
+.mask .message h1{font-size:1.5em}
+.mask .spinner{width:22px;height:22px;display:block;background:#fff;margin-top:-11px;margin-left:-11px;outline:transparent solid 1px;-webkit-animation:rotating 2.5s cubic-bezier(.9,0,.1,1) infinite normal;animation:rotating 2.5s cubic-bezier(.9,0,.1,1) infinite normal;-webkit-transform:scale(0);transform:scale(0)}
+.mask.with_message .spinner{margin-top:-88px}
+.mask.show{pointer-events:auto;opacity:1}
+.mask.show .spinner{-webkit-transform:scale(1);transform:scale(1)}
+.mask.hide{opacity:0}
+.mask.hide .spinner{-webkit-transform:scale(0);transform:scale(0)}
+@-webkit-keyframes rotating{0%{-webkit-transform:rotate(0) scale(1.6);transform:rotate(0) scale(1.6);border-radius:1px}
+48%{-webkit-transform:rotate(360deg) scale(1);transform:rotate(360deg) scale(1);border-radius:50%}
+100%{-webkit-transform:rotate(720deg) scale(1.6);transform:rotate(720deg) scale(1.6);border-radius:1px}
+}
+@keyframes rotating{0%{-webkit-transform:rotate(0) scale(1.6);transform:rotate(0) scale(1.6);border-radius:1px}
+48%{-webkit-transform:rotate(360deg) scale(1);transform:rotate(360deg) scale(1);border-radius:50%}
+100%{-webkit-transform:rotate(720deg) scale(1.6);transform:rotate(720deg) scale(1.6);border-radius:1px}
+}
+.table .head{font-weight:700}
+.table .item{display:flex;border-bottom:1px solid rgba(0,0,0,.2)}
+.dark .table .item{border-color:rgba(255,255,255,.2)}
+.table .item:last-child{border-bottom:none}
+.table .item span{padding:1px 2px}
+.table .item span:first-child{padding-left:0}
+.table .item span:last-child{padding-right:0}
+.page.settings{padding-top:80px}
+.page.settings.active .scroll_content{display:-webkit-flex;display:-ms-flexbox;display:flex}
+@media (max-width:480px){.page.settings{padding-top:44px}
+.page.settings.active .scroll_content{display:block}
+}
+.page.settings .navigation{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between}
+.page.settings .navigation .advanced_toggle{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center}
+.page.settings .navigation .advanced_toggle span{margin-right:10px}
+.page.settings .tab_content{display:none}
+.page.settings .tab_content.active{display:block}
+.page.settings .tabs{margin:0 20px 20px;list-style:none;font-size:24px}
+@media (max-width:480px){.page.settings .tabs{margin:0 10px 20px}
+}
+.page.settings .tabs ul{list-style:none;font-size:14px}
+.page.settings .tabs li a{color:rgba(0,0,0,.5)}
+.dark .page.settings .tabs li a{color:rgba(255,255,255,.5)}
+.page.settings .tabs li.active a{color:#000}
+.dark .page.settings .tabs li.active a{color:#FFF}
+.page.settings form.containers{margin:0 20px 0 0;-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto}
+@media (max-width:480px){.page.settings form.containers{margin:0 10px 0 0}
+}
+.page.settings fieldset h2 .group_label,.page.settings fieldset h2 .icon{margin-right:10px}
+.page.settings fieldset{border:0;padding:10px 0;position:relative}
+.page.settings fieldset h2{display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-align-items:baseline;-ms-flex-align:baseline;align-items:baseline;padding:0 0 0 20px}
+.page.settings fieldset h2 .icon img{vertical-align:middle;position:relative;top:-1px}
+.page.settings fieldset h2 .hint{-webkit-flex:1;-ms-flex:1;flex:1;font-size:1rem}
+@media (max-width:480px){.page.settings fieldset h2{display:block;padding:0 0 0 10px}
+.page.settings fieldset h2 .hint{margin:0;display:block}
+}
+.page.settings fieldset h2 .hint a{font-weight:400;color:#ac0000;text-decoration:underline;display:inline}
+.dark .page.settings fieldset h2 .hint a{color:#f85c22}
+.page.settings fieldset .more_hint{position:relative}
+.page.settings fieldset .more_hint .tooltip{display:inline;padding:10px}
+.page.settings fieldset .more_hint .tooltip .icon-info{vertical-align:middle;display:inline-block;text-align:center;border:1px solid #ac0000;border-radius:50%;width:18px;height:18px;line-height:16px;font-size:.8em;text-decoration:none}
+.dark .page.settings fieldset .more_hint .tooltip .icon-info{border-color:#f85c22}
+.page.settings fieldset .more_hint .tooltip .tip{bottom:100%;left:0;right:0;position:absolute;background:#ebebeb;z-index:20;display:none;padding:10px;margin-left:-10px}
+.dark .page.settings fieldset .more_hint .tooltip .tip{background:#353535}
+.page.settings fieldset .more_hint .tooltip:hover .tip{display:block}
+.page.settings fieldset .ctrlHolder{padding:6.67px 20px;border-bottom:1px solid transparent;border-color:#ebebeb;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row nowrap;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-align-items:center;-ms-flex-align:center;align-items:center}
+.dark .page.settings fieldset .ctrlHolder{border-color:#353535}
+.page.settings fieldset .ctrlHolder:last-child{border-bottom:0}
+.page.settings fieldset .ctrlHolder:nth-child(2){margin-top:10px}
+.page.settings fieldset .ctrlHolder label{display:inline-block;min-width:150px}
+.page.settings fieldset .ctrlHolder input,.page.settings fieldset .ctrlHolder select,.page.settings fieldset .ctrlHolder textarea{min-width:200px}
+.page.settings fieldset .ctrlHolder input[type=checkbox]{width:auto;min-width:0}
+@media (max-width:480px){.page.settings fieldset .ctrlHolder{-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;padding:6.67px 0 6.67px 10px}
+.page.settings fieldset .ctrlHolder input,.page.settings fieldset .ctrlHolder label,.page.settings fieldset .ctrlHolder select,.page.settings fieldset .ctrlHolder textarea{-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto}
+.page.settings fieldset .ctrlHolder input[type=checkbox]{margin-right:20px;-webkit-flex:none;-ms-flex:none;flex:none}
+}
+.page.settings fieldset .ctrlHolder .select_wrapper{position:relative;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-ms-flex-align:center;align-items:center}
+.page.settings fieldset .ctrlHolder .select_wrapper select{cursor:pointer;-webkit-appearance:none;-moz-appearance:none;appearance:none;width:100%;min-width:200px;border-radius:0}
+.page.settings fieldset .ctrlHolder .select_wrapper select::-ms-expand{display:none}
+.page.settings fieldset .ctrlHolder .select_wrapper:before{vertical-align:top;pointer-events:none;position:absolute;top:0;line-height:2em;right:10px;height:100%}
+.page.settings fieldset .ctrlHolder .formHint{-webkit-flex:1;-ms-flex:1;flex:1;opacity:.8;margin-left:20px}
+.page.settings fieldset .ctrlHolder .formHint a{font-weight:400;color:#ac0000;text-decoration:underline}
+.dark .page.settings fieldset .ctrlHolder .formHint a{color:#f85c22}
+@media (max-width:480px){.page.settings fieldset .ctrlHolder .select_wrapper{width:100%}
+.page.settings fieldset .ctrlHolder .formHint{min-width:100%;margin-left:0}
+}
+.page.settings fieldset .ctrlHolder.test_button a{margin:0}
+.page.settings fieldset .ctrlHolder.test_button .success{margin-left:10px}
+.page.settings fieldset.disabled .ctrlHolder{display:none}
+.page.settings fieldset.disabled>.ctrlHolder:first-child{display:-webkit-flex;display:-ms-flexbox;display:flex}
+.page.settings fieldset.enabler{display:block}
+.page.settings fieldset.enabler.disabled:hover{background:rgba(255,255,255,.1)}
+.dark .page.settings fieldset.enabler.disabled:hover{background:rgba(0,0,0,.1)}
+.page.settings fieldset.enabler>:first-child{position:absolute;right:0;border:0;padding:0}
+.page.settings fieldset.enabler>:first-child~h2{margin-right:86px}
+@media (max-width:480px){.page.settings fieldset.enabler>:first-child~h2{margin-right:0}
+}
+.page.settings fieldset.enabler>:nth-child(2){margin-top:0}
+.page.settings fieldset.enabler>:nth-child(3){margin-top:10px}
+.page.settings fieldset .ctrlHolder.advanced,.page.settings fieldset.advanced{display:none;color:#ac0000}
+.dark .page.settings fieldset .ctrlHolder.advanced,.dark .page.settings fieldset.advanced{color:#f85c22}
+.page.settings.show_advanced fieldset.advanced{display:block}
+.page.settings.show_advanced fieldset:not(.disabled)>.ctrlHolder.advanced{display:-webkit-flex;display:-ms-flexbox;display:flex}
+.page.settings .switch{display:inline-block;background:#ac0000;height:20px;width:50px;min-width:0!important;transition:all 250ms;cursor:pointer;border-radius:20px}
+.dark .page.settings .switch{background:#f85c22}
+.page.settings .switch input{display:none}
+.page.settings .switch .toggle{background:#FFF;margin:1px;height:18px;width:18px;transition:-webkit-transform 250ms;transition:transform 250ms;-webkit-transform:translateX(30px);transform:translateX(30px);border-radius:20px}
+.dark .page.settings .switch .toggle{background:#2d2d2d}
+.page.settings fieldset.enabler.disabled .switch,.page.settings:not(.show_advanced) .advanced_toggle .switch{background:#ebebeb;border-color:#ebebeb}
+.dark .page.settings fieldset.enabler.disabled .switch,.dark .page.settings:not(.show_advanced) .advanced_toggle .switch{background:#353535;border-color:#353535}
+.page.settings fieldset.enabler.disabled .switch .toggle,.page.settings:not(.show_advanced) .advanced_toggle .switch .toggle{-webkit-transform:translateX(0);transform:translateX(0)}
+.page.settings fieldset.enabler.disabled .switch:hover,.page.settings:not(.show_advanced) .advanced_toggle .switch:hover{background:#b8b8b8;border-color:#b8b8b8}
+.dark .page.settings fieldset.enabler.disabled .switch:hover,.dark .page.settings:not(.show_advanced) .advanced_toggle .switch:hover{background:#020202;border-color:#020202}
+.page.settings .option_list{background:#FFF;margin-top:10px}
+.dark .page.settings .option_list{background:#2d2d2d}
+.page.settings .option_list fieldset{position:relative}
+.page.settings .option_list fieldset h2 .group_label{min-width:100px}
+.page.settings .option_list fieldset.disabled h2{padding:0 20px}
+.page.settings .option_list fieldset:after{position:absolute;content:'';display:block;width:100%;border-bottom:1px solid transparent;border-color:#ebebeb;bottom:0}
+.dark .page.settings .option_list fieldset:after{border-color:#353535}
+.page.settings .option_list fieldset:after:last-child{border-bottom:0}
+.page.settings .option_list h2{font-size:1em;font-weight:400}
+.page.settings .option_list h2 .hint{font-weight:300}
+.page.settings .combined_table{margin-top:20px}
+.page.settings .combined_table .head{margin:0 10px 0 46px;font-size:.8em}
+.page.settings .combined_table .head abbr{display:inline-block;font-weight:700;border-bottom:1px dotted #fff;line-height:140%;cursor:help;margin-right:10px;text-align:center}
+.page.settings .combined_table .head abbr:first-child{display:none}
+.page.settings .combined_table input{min-width:0!important;display:inline-block;margin-right:10px}
+.page.settings .combined_table .automation_ids,.page.settings .combined_table .automation_urls,.page.settings .combined_table .host{width:200px}
+.page.settings .combined_table .api_key,.page.settings .combined_table .name,.page.settings .combined_table .pass_key{width:150px}
+.page.settings .combined_table .extra_score,.page.settings .combined_table .seed_ratio,.page.settings .combined_table .seed_time{width:70px;text-align:center}
+.page.settings .combined_table .custom_tag{width:120px;text-align:center}
+.page.settings .combined_table .ctrlHolder{margin:0 0 0 20px;padding-left:0}
+.page.settings .combined_table .ctrlHolder .delete{display:none;font-size:20px;width:22px;height:22px;line-height:20px;text-align:center;vertical-align:middle}
+.page.settings .combined_table .ctrlHolder:hover .delete{display:inline-block}
+.page.settings .disabled .combined_table,.page.settings .multi_directory.is_empty .delete{display:none}
+.page.settings .combined_table .ctrlHolder.is_empty .delete,.page.settings .combined_table .ctrlHolder.is_empty input[type=checkbox]{visibility:hidden}
+.page.settings .tab_about .usenet{padding:20px 20px 0;font-size:1.5em;line-height:1.3em}
+.page.settings .tab_about .usenet a{color:#ac0000;padding:0 5px}
+.dark .page.settings .tab_about .usenet a{color:#f85c22}
+.page.settings .tab_about .usenet ul{list-style:none;float:left;width:50%;margin:10px 0;padding:0}
+.page.settings .tab_about .usenet li{font-size:.8em}
+.page.settings .tab_about .usenet li:before{margin-right:10px}
+.page.settings .tab_about .donate{float:left;width:42%;text-align:center;font-size:17px;padding:0 0 0 4%;margin:20px 0 0;border-left:1px solid rgba(0,0,0,.2)}
+.dark .page.settings .tab_about .donate{border-color:rgba(255,255,255,.2)}
+.page.settings .tab_about .donate form{padding:10px 0 0}
+.page.settings .tab_about .info{padding:20px;margin:0;overflow:hidden}
+.page.settings .tab_about .info dt{clear:both;float:left;width:17%;font-weight:700}
+.page.settings .tab_about .info dd{float:right;width:80%;padding:0;margin:0;font-style:italic}
+.page.settings .tab_about .info dd.version{cursor:pointer}
+.page.settings .tab_about .group_actions>div{padding:20px;text-align:center}
+.page.settings .tab_about .group_actions a{margin:0 10px;font-size:20px}
+@media (max-width:480px){.page.settings .directory{width:100%}
+}
+.page.settings .directory input{width:100%}
+.page.settings .multi_directory .delete{color:#ac0000;padding:0 10px;opacity:.6;font-size:1.5em}
+.dark .page.settings .multi_directory .delete{color:#f85c22}
+.page.settings .multi_directory .delete:hover{opacity:1}
+.page.settings .choice .select_wrapper{margin-left:20px;width:120px;min-width:120px}
+@media (max-width:480px){.page.settings .choice .select_wrapper{margin:10px 0 0}
+}
+.page.settings .choice .select_wrapper select{min-width:0!important}
+.page.settings .renamer_to.renamer_to{-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap}
+.page.settings .renamer_to.renamer_to .ctrlHolder{width:100%}
+.directory_list{z-index:2;position:absolute;width:450px;margin:28px 0 20px;background:#ac0000;box-shadow:0 0 15px 2px rgba(0,0,0,.15);border-radius:3px 3px 0 0}
+.dark .directory_list{background:#f85c22;box-shadow:0 5px 15px 2px rgba(0,0,0,.4)}
+.directory_list .pointer{border-right:6px solid transparent;border-left:6px solid transparent;border-bottom:6px solid transparent;border-bottom-color:#ac0000;display:block;position:absolute;width:0;margin:-6px 0 0 100px}
+.dark .directory_list .pointer{border-bottom-color:#f85c22}
+.directory_list .wrapper{background:#FFF;border-radius:3px 3px 0 0;margin-top:5px}
+.dark .directory_list .wrapper{background:#2d2d2d}
+.directory_list ul{width:92%;height:300px;overflow:auto;margin:0 20px}
+.directory_list li{padding:4px 20px 4px 0;cursor:pointer;margin:0!important;border-top:1px solid rgba(255,255,255,.1);overflow:hidden;white-space:nowrap;text-overflow:ellipsis}
+.directory_list li.blur{opacity:.3}
+.directory_list li:last-child{border-bottom:1px solid rgba(255,255,255,.1)}
+.directory_list li:hover{color:#ac0000}
+.dark .directory_list li:hover{color:#f85c22}
+.directory_list li.empty{background:0 0;height:100px;text-align:center;font-style:italic;border:none;line-height:100px;cursor:default;color:#BBB;text-shadow:none;font-size:12px}
+.directory_list .actions{clear:both;padding:20px;min-height:45px;position:relative;width:100%;text-align:right}
+.directory_list .actions label{float:right;width:auto;padding:0}
+.directory_list .actions label input{margin-left:10px}
+.directory_list .actions .back{font-weight:700;width:160px;display:inline-block;padding:0;line-height:120%;vertical-align:top;position:absolute;text-align:left;left:20px}
+.directory_list .actions:last-child{padding:20px}
+.directory_list .actions:last-child>span{padding:0 5px;text-shadow:none}
+.directory_list .actions:last-child>.clear{left:20px;position:absolute;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%);margin:0}
+.directory_list .actions:last-child>.cancel{opacity:.7}
+.directory_list .actions:last-child>.save{margin-right:0}
\ No newline at end of file
diff --git a/couchpotato/static/style/login.scss b/couchpotato/static/style/login.scss
new file mode 100644
index 0000000000..5f077c1b76
--- /dev/null
+++ b/couchpotato/static/style/login.scss
@@ -0,0 +1,50 @@
+@import "_mixins";
+
+/*** Login ***/
+.page.login {
+ @include theme(background, background);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 1.25em;
+
+ h1 {
+ padding: 0 0 10px;
+ font-size: 60px;
+ font-family: Lobster;
+ font-weight: normal;
+ @include theme(color, primary);
+ text-align: center;
+ }
+
+ form {
+ padding: 0;
+ width: 300px;
+ }
+
+ .ctrlHolder {
+ padding: 0;
+ margin: 0 0 20px;
+
+ &:hover {
+ background: none;
+ }
+ }
+
+ input[type=text],
+ input[type=password] {
+ width: 100% !important;
+ }
+
+ .remember_me {
+ font-size: 15px;
+ float: left;
+ width: 150px;
+ }
+
+ .button {
+ float: right;
+ margin: 0;
+ transition: none;
+ }
+}
diff --git a/couchpotato/static/style/main.css b/couchpotato/static/style/main.css
deleted file mode 100644
index ff292226f2..0000000000
--- a/couchpotato/static/style/main.css
+++ /dev/null
@@ -1,622 +0,0 @@
-html {
- color: #fff;
- font-size: 12px;
- line-height: 1.5;
- font-family: "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
- height: 100%;
- text-shadow: 0 1px 0 #000;
-}
-
-body {
- margin: 0;
- padding: 0;
- background: #4e5969;
- overflow-y: scroll;
- height: 100%;
-}
- body.noscroll { overflow: hidden; }
-
- #clean {
- background: transparent !important;
- }
-
-* {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
-}
-
-pre {
- white-space: pre-wrap;
- word-wrap: break-word;
-}
-
-input, textarea {
- font-size: 12px;
- font-family: "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
-}
-
-input:-moz-placeholder, textarea:-moz-placeholder {
- color: rgba(255, 255, 255, 0.6);
-}
-
-::-webkit-input-placeholder, ::-webkit-textarea-placeholder {
- color: rgba(255, 255, 255, 0.6);
-}
-
-a img {
- border:none;
-}
-
-a {
- text-decoration:none;
- color: #ebfcbc;
- outline: 0;
- cursor: pointer;
- font-weight: bold;
-}
-a:hover { color: #f3f3f3; }
-
-.page {
- display: none;
- width: 960px;
- margin: 0 auto;
- line-height: 24px;
- padding: 0 0 20px;
-}
- .page.active { display: block; }
-
- .page .noticeMe {
- background-color: lightgoldenrodyellow;
- display: block;
- padding: 20px 10px;
- margin: 0 -10px 40px;
- font-size: 19px;
- text-align: center;
- }
-
-.content {
- clear:both;
- padding: 80px 0 10px;
-}
-
-h2 {
- font-size: 30px;
- padding: 0;
- margin: 20px 0 0 0;
-}
-
-.footer {
- text-align:center;
- padding: 50px 0 0 0;
- color: #999;
- font-size: 10px;
- clear: both;
-}
-
- .footer .check {
- color: #333;
- }
-
-#toTop {
- background: black;
- position: fixed;
- bottom: 0;
- right: 0;
- padding: 10px 10px 10px 40px;
- background: #f7f7f7 url('../images/toTop.gif') no-repeat 10px center;
- border-radius: 5px 0 0 0;
-}
-
-form {
- padding:0;
- margin:0;
-}
-
-body > .spinner, .mask{
- background: rgba(0,0,0, 0.9);
- z-index: 100;
- text-align: center;
-}
- body > .mask {
- position: fixed;
- top: 0;
- left: 0;
- height: 100%;
- width: 100%;
- padding: 200px;
- }
-
-.button {
- background: #5082bc url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAyCAYAAACd+7GKAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAClJREFUeNpi/v//vwMTAwPDfzjBgMpFI/7hFSOT9Y8qRuF3JLoHAQIMAHYtMmRA+CugAAAAAElFTkSuQmCC") repeat-x;
- padding: 5px 10px 6px;
- color: #fff;
- text-decoration: none;
- font-weight: bold;
- line-height: 1;
- border-radius: 5px;
- box-shadow: 0 1px 3px rgba(0,0,0,0.5);
- text-shadow: 0 -1px 1px rgba(0,0,0,0.25);
- border-bottom: 1px solid rgba(0,0,0,0.25);
- cursor: pointer;
-}
- .button.red { background-color: #ff0000; }
- .button.green { background-color: #2aa300; }
- .button.orange { background-color: #ffa200; }
- .button.yellow { background-color: #ffe400; }
-
-/*** Icons ***/
-.icon {
- display: inline-block;
- background: center no-repeat;
-}
-.icon.delete { background-image: url('../images/icon.delete.png'); }
-.icon.download { background-image: url('../images/icon.download.png'); }
-.icon.edit { background-image: url('../images/icon.edit.png'); }
-.icon.completed { background-image: url('../images/icon.check.png'); }
-.icon.folder { background-image: url('../images/icon.folder.png'); }
-.icon.imdb { background-image: url('../images/icon.imdb.png'); }
-.icon.refresh { background-image: url('../images/icon.refresh.png'); }
-.icon.rating { background-image: url('../images/icon.rating.png'); }
-.icon.files { background-image: url('../images/icon.files.png'); }
-.icon.info { background-image: url('../images/icon.info.png'); }
-.icon.trailer { background-image: url('../images/icon.trailer.png'); }
-.icon.spinner { background-image: url('../images/icon.spinner.gif'); }
-.icon.attention { background-image: url('../images/icon.attention.png'); }
-
-/*** Navigation ***/
-.header {
- background: #4e5969;
- padding: 10px 0;
- height: 80px;
- position: fixed;
- margin: 0;
- width: 100%;
- z-index: 5;
- box-shadow: 0 20px 30px -30px rgba(0,0,0,0.05);
- transition: box-shadow .4s cubic-bezier(0.9,0,0.1,1);
-}
- .header.with_shadow {
- box-shadow: 0 20px 30px -30px rgba(0,0,0,0.3);
- }
-
-.header > div {
- width: 960px;
- margin: 0 auto;
- overflow: hidden;
-}
- .header .navigation {
- display: inline-block;
- vertical-align: middle;
- width: 67.2%;
- }
- .header .navigation ul {
- margin: 0;
- padding: 0;
- }
- .header .navigation li {
- color: #fff;
- display: inline-block;
- font-size:20px;
- font-weight: bold;
- margin: 0;
- text-align: center;
- }
-
- .header .navigation li a {
- display: block;
- padding: 15px;
- position: relative;
- }
- .header .navigation li:first-child a { padding-left: 10px; }
- .header .navigation li span {
- display: block;
- margin-top: 5px;
- }
-
- .header .navigation li a:after {
- content: '';
- display: inline-block;
- height: 2px;
- width: 76%;
- left: 12%;
- position: absolute;
- top: 46px;
- background-color: #46505e;
- outline: none;
- box-shadow: inset 0 1px 8px rgba(0,0,0,0.05), 0 1px 0px rgba(255,255,255,0.15);
- transition: all .4s cubic-bezier(0.9,0,0.1,1);
- }
-
- .header .navigation li:hover a:after { background-color: #047792; }
- .header .navigation li.active a:after { background-color: #04bce6; }
-
- .header .navigation li.disabled { color: #e5e5e5; }
- .header .navigation li a { color: #fff; }
-
- .header .navigation .backtotop {
- opacity: 0;
- display: block;
- width: 80px;
- left: 50%;
- position: absolute;
- text-align: center;
- margin: -10px 0 0 -40px;
- background: #4e5969;
- padding: 5px 0;
- border-radius: 0 0 5px 5px;
- color: rgba(255,255,255,.4);
- text-shadow: none;
- font-weight: normal;
- }
- .header:hover .navigation .backtotop { color: #fff; }
-
- .header .more_menu {
- margin-left: 12px;
- }
- .header .more_menu .wrapper {
- width: 150px;
- margin-left: -110px;
- }
- .header .more_menu .wrapper:before {
- margin-left: -34px;
- }
-
- .header .more_menu .red { color: red; }
- .header .more_menu .orange { color: orange; }
-
- .badge {
- position: absolute;
- width: 14px;
- height: 14px;
- text-align: center;
- line-height: 14px;
- border-radius: 50%;
- font-size: 8px;
- margin: -5px 0 0 15px;
- box-shadow: inset 0 1px 0 rgba(255,255,255,.6), 0 0 3px rgba(0,0,0,.7);
- background-color: #1b79b8;
- text-shadow: none;
- background-image: -*-linear-gradient(0deg, rgba(255,255,255,.3) 0%, rgba(255,255,255,.1) 100%);
- }
-
- .header .notification_menu .wrapper {
- width: 300px;
- margin-left: -260px;
- text-align: left;
- }
-
- .header .notification_menu .wrapper:before {
- left: 296px;
- }
-
- .header .notification_menu ul {
- max-height: 300px;
- overflow: auto;
- }
-
- .header .notification_menu > a {
- background-position: center -209px;
- }
-
- .header .notification_menu li > span {
- padding: 5px;
- display: block;
- border-bottom: 1px solid rgba(0,0,0,0.2);
- word-wrap: break-word;
- }
- .header .notification_menu li > span { color: #777; }
- .header .notification_menu li:last-child > span { border: 0; }
- .header .notification_menu li .added {
- display: block;
- font-size: 10px;
- color: #aaa;
- text-align: ;
- }
-
- .header .notification_menu li .more {
- text-align: center;
- }
-
- .header .message.update {
- text-align: center;
- position: relative;
- top: -70px;
- padding: 2px 0;
- background: #ff6134;
- font-size: 12px;
- border-radius: 0 0 5px 5px;
- box-shadow: 0 2px 1px rgba(0,0,0, 0.3);
- }
-
- .header .message a {
- padding: 0 10px;
- }
-
-/*** Global Styles ***/
-.check {
- display: inline-block;
- vertical-align: middle;
- height: 16px;
- width: 16px;
- cursor: pointer;
- background: url('../images/sprite.png') no-repeat -200px;
-}
- .check.highlighted { background-color: #424c59; }
- .check.checked { background-position: -2px 0; }
- .check.indeterminate { background-position: -1px -119px; }
- .check input {
- display: none !important;
- }
-
-.select {
- cursor: pointer;
- display: inline-block;
- color: #fff;
-}
-
- .select .selection {
- display: inline-block;
- padding: 0 30px 0 20px;
- border-radius:30px;
-
- box-shadow: 0 1px 1px rgba(0,0,0,0.35), inset 0 1px 0px rgba(255,255,255,0.20);
- background: url('../images/sprite.png') no-repeat 94% -53px, -*-linear-gradient(
- 270deg,
- #5b9bd1 0%,
- #406db8 100%
- );
- }
-
- .select .selection .selectionDisplay {
- display: inline-block;
- padding-right: 15px;
- border-right: 1px solid rgba(0,0,0,0.2);
-
- box-shadow: 1px 0 0 rgba(255,255,255,0.15);
- }
-
- .select .menu {
- clear: both;
- overflow: hidden;
- font-weight: bold;
- }
-
- .select .list {
- display: none;
- background: #282d34;
- border: 1px solid #1f242b;
- position: absolute;
- margin: 28px 0 0 0;
- box-shadow: 0 20px 20px -10px rgba(0,0,0,0.4);
- border-radius:3px;
- z-index: 3;
- }
- .select.active .list {
- display: block;
- }
- .select .list ul {
- display: block;
- width: 100% !important;
- }
- .select .list li {
- padding: 0 33px 0 20px;
- margin: 0 !important;
- display: block;
- border-top: 1px solid rgba(255,255,255,0.1);
- white-space: nowrap;
- }
- .select .list li.highlighted {
- background: rgba(255,255,255,0.1);
- border-color: transparent;
- }
-
- .select input { display: none; }
-
-.inlay {
- color: #fff;
- border: 0;
- border-radius:3px;
- background-color: #282d34;
- box-shadow: inset 0 1px 8px rgba(0,0,0,0.25), 0 1px 0px rgba(255,255,255,0.25);
-}
-
- .inlay.light {
- background-color: #47515f;
- outline: none;
- box-shadow: inset 0 1px 8px rgba(0,0,0,0.05), 0 1px 0px rgba(255,255,255,0.15);
- }
-
- .inlay:focus {
- background-color: #3a4350;
- outline: none;
- }
-
-.onlay, .inlay .selected, .inlay:not(.reversed) > li:hover, .inlay > li.active, .inlay.reversed > li {
- border-radius:3px;
- border: 1px solid #252930;
- box-shadow: inset 0 1px 0px rgba(255,255,255,0.20), 0 0 3px rgba(0,0,0, 0.2);
- background: rgb(55,62,74);
- background-image: -*-linear-gradient(
- 90deg,
- rgb(55,62,74) 0%,
- rgb(73,83,98) 100%
- );
-}
-.onlay:active, .inlay.reversed > li:active {
- color: #fff;
- border: 1px solid transparent;
- background-color: #282d34;
- box-shadow: inset 0 1px 8px rgba(0,0,0,0.25), 0 1px 0px rgba(255,255,255,0.25);
-}
-
-.question {
- display: block;
- width: 600px;
- padding: 20px;
- background: #f5f5f5;
- position:fixed;
- z-index:101;
- text-align: center;
- background: #5c697b;
- border-radius: 3px;
- box-shadow: 0 0 50px rgba(0,0,0,0.55);
-}
-
- .question h3 {
- font-size: 25px;
- padding: 0;
- margin: 0 0 20px;
- }
-
- .question .hint {
- font-size: 14px;
- color: #ccc;
- text-shadow: none;
- }
-
- .question .answer {
- font-size: 17px;
- display: inline-block;
- padding: 10px;
- margin: 5px 1%;
- cursor: pointer;
- width: auto;
- }
- .question .answer:hover {
- background: #000;
- }
-
- .question .answer.delete {
- background-color: #a82f12;
- }
- .question .answer.cancel {
- margin-top: 20px;
- background-color: #4c5766;
- }
-
- .more_menu {
- display: inline-block;
- vertical-align: middle;
- }
-
- .more_menu > a {
- display: block;
- background: url('../images/sprite.png') no-repeat center -137px;
- height: 25px;
- width: 25px;
- border: 1px solid rgba(0,0,0,0.3);
- transition: all 0.3s ease-in-out;
- }
- .more_menu.show > a:not(:active), .more_menu > a:hover:not(:active) {
- background-color: #406db8;
- }
-
- .more_menu .wrapper {
- display: none;
- border: 1px solid #333;
- background: rgba(255,255,255,0.98);
- border-radius: 3px;
- padding: 4px !important;
- position: absolute;
- z-index: 9;
- margin: 32px 0 0 -145px;
- width: 185px;
- box-shadow: 0 10px 10px -5px rgba(0,0,0,0.4);
- text-align: center;
- color: #000;
- text-shadow: none;
- background-image: -*-linear-gradient(
- 45deg,
- rgb(200,200,200) 0%,
- rgb(255,255,255) 100%
- );
- }
-
- .more_menu .wrapper:before {
- content: ' ';
- height: 0;
- position: relative;
- width: 0;
- border: 6px solid transparent;
- border-bottom-color: #fff;
- display: block;
- top: -16px;
- left: 146px;
- }
- .more_menu.show .wrapper {
- display: block;
- }
-
- .more_menu ul {
- padding: 0;
- margin: -12px 0 0 0;
- list-style: none;
- }
-
- .more_menu .wrapper li {
- width: 100%;
- height: auto;
- }
-
- .more_menu .wrapper li a {
- display: block;
- border-bottom: 1px solid rgba(255,255,255,0.2);
- box-shadow: none;
- font-weight: normal;
- font-size: 11px;
- text-transform: uppercase;
- letter-spacing: 1px;
- padding: 3px 0;
- color: #000;
- }
-
- .more_menu .wrapper li:last-child a {
- border: none;
- }
- .more_menu .wrapper li a:hover {
- background: rgba(0,0,0,0.05);
- }
-
-.messages {
- position: fixed;
- right: 0;
- bottom: 0;
- padding: 2px;
- width: 240px;
- z-index: 2;
- overflow: hidden;
- font-size: 14px;
- font-weight: bold;
-}
-
- .messages .message {
- text-align: center;
- border-radius: 2px;
- margin: 2px 0 0 0;
- height: 0;
- overflow: hidden;
- transition: all .6s cubic-bezier(0.9,0,0.1,1);
- box-shadow: 0 1px 1px rgba(0,0,0,0.35), inset 0 1px 0px rgba(255,255,255,0.20);
- background-image: -*-linear-gradient(
- 270deg,
- #5b9bd1 0%,
- #406db8 100%
- );
- width: 100%;
- padding: 0 5px;
- visibility: hidden;
- max-height: 0;
- }
- .messages .message.show {
- visibility: visible;
- height: auto;
- padding-top: 3px;
- padding-bottom: 3px;
- min-height: 1px;
- max-height: 400px;
- }
- .messages .message.hide {
- margin-left: 240px;
- opacity: 0;
- }
\ No newline at end of file
diff --git a/couchpotato/static/style/main.scss b/couchpotato/static/style/main.scss
new file mode 100644
index 0000000000..d89c84b348
--- /dev/null
+++ b/couchpotato/static/style/main.scss
@@ -0,0 +1,877 @@
+@import "_fonts";
+@import "_mixins";
+
+* {
+ margin: 0;
+ padding: 0;
+ box-sizing: border-box;
+ text-rendering: optimizeSpeed;
+ backface-visibility: hidden;
+}
+
+body, html {
+ font-size: $font_size;
+ line-height: 1.5;
+ font-family: OpenSans, "Helvetica Neue", Helvetica, Arial, Geneva, sans-serif;
+ font-weight: 300;
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ @include theme(background, menu);
+ @include theme(color, text);
+ overflow: hidden;
+}
+
+body {
+ display: flex;
+ flex-flow: row nowrap;
+}
+
+a {
+ position: relative;
+ overflow: hidden;
+ text-decoration: none;
+ cursor: pointer;
+ -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+
+ &:visited, &:active {
+ color: inherit;
+ }
+}
+
+input, textarea, select {
+ font-size: 1em;
+ font-weight: 300;
+ padding: $padding/3;
+ border-radius: 0;
+ border: 1px solid darken(get-theme(off), 20);
+
+ @include theme-dark {
+ border-color: darken(get-theme-dark(off), 10);
+ }
+
+ @include theme(background, off);
+ @include theme(color, text);
+}
+
+input[type=text], textarea {
+ -webkit-appearance: none;
+}
+
+.button {
+ @include theme(color, primary);
+ font-weight: 300;
+ padding: $padding/4;
+ cursor: pointer;
+ border: 1px solid transparent;
+ @include theme(border-color, primary);
+ border-radius: $border_radius;
+ margin: 0 $padding/4;
+ transition: all 150ms;
+
+ &:hover {
+ @include theme(background, primary);
+ color: #FFF;
+ }
+}
+
+.ripple {
+ position: absolute;
+ height: 10px;
+ width: 10px;
+ border-radius: 50%;
+ @include theme(background, primary);
+ will-change: transform, opacity;
+ transform: translate(-50%, -50%) scale(1) rotateZ(360deg);
+ opacity: 0.2;
+ transition: all 1.5s ease;
+ transition-property: opacity, transform;
+ pointer-events: none;
+
+ &.animate {
+ transform: translate(-50%, -50%) scale(100) rotateZ(360deg);
+ opacity: 0;
+ }
+}
+
+.disable_hover .scroll_content > * {
+ pointer-events: none;
+}
+
+/* Header */
+.header {
+ width: $header_width;
+ min-width: $header_width;
+ position: relative;
+ z-index: 100;
+
+ @include media-phablet {
+ width: $header_width_mobile;
+ min-width: $header_width_mobile;
+ z-index: 21;
+ }
+
+ a {
+ color: #FFF;
+ letter-spacing: 1px;
+ }
+
+ .ripple {
+ background: #FFF;
+ }
+
+ .navigation {
+
+ .logo {
+ @include theme(background, primary);
+ display: block;
+ text-align: center;
+ position: relative;
+ overflow: hidden;
+
+ font-family: Lobster, serif;
+ color: #FFF;
+ font-size: 38px;
+ line-height: $header_height;
+ height: $header_height;
+
+ span {
+ position: absolute;
+ display: block;
+ height: 100%;
+ width: 100%;
+ text-align: center;
+ left: 0;
+
+ &:nth-child(even){
+ transform: translateX(100%);
+ }
+ }
+
+ @include media-phablet {
+ font-size: 28px;
+ line-height: $header_width_mobile;
+ height: $header_width_mobile;
+
+ &:after {
+ content: 'CP';
+ }
+
+ span { display: none; }
+ }
+ }
+
+ ul {
+ padding: 0;
+ margin: 0;
+
+ li {
+ display: block;
+
+ @include media-phablet {
+ line-height: 0;
+ }
+ }
+
+ li a {
+ padding: $padding/2 $padding;
+ display: block;
+ position: relative;
+
+ &:hover {
+ @include theme(background, menu_off);
+ }
+
+ @include media-phablet {
+ line-height: $header_width_mobile - $padding;
+ height: $header_width_mobile;
+ padding: $padding/2 0;
+ text-align: center;
+ }
+
+ span {
+ @include media-phablet {
+ display: none;
+ }
+ }
+
+ &:before {
+ position: absolute;
+ width: 100%;
+ display: none;
+ text-align: center;
+ font-size: 18px;
+ text-indent: 0;
+
+ @include media-phablet {
+ display: block;
+ }
+ }
+
+ &.icon-home:before {
+ font-size: 24px;
+ }
+ }
+ }
+
+ }
+
+ .donate {
+ position: absolute;
+ bottom: 44px;
+ left: 0;
+ right: 0;
+ padding: $padding/2 $padding;
+ transition: background 200ms;
+
+ &:hover {
+ @include theme(background, menu_off);
+ }
+
+ &:before {
+ display: none;
+ font-size: 20px;
+ text-align: center;
+ }
+
+ @include media-phablet {
+ bottom: 44px * 3;
+ padding: $padding/2 0;
+
+ span {
+ display: none;
+ }
+
+ &:before {
+ display: block;
+ }
+ }
+ }
+
+ .menu, .search_form, .notification_menu {
+ position: absolute;
+ z-index: 21;
+ bottom: 0;
+ width: 44px;
+ height: 44px;
+
+ .wrapper {
+ min-width: 170px;
+ transform-origin: 0 90%;
+ }
+
+ > a {
+ display: inline-block;
+ height: 100%;
+ width: 100%;
+ text-align: center;
+ line-height: 44px;
+ font-size: 20px;
+ }
+ }
+
+ .notification_menu {
+ left: 50%;
+ transform: translateX(-50%);
+
+ @include media-phablet {
+ bottom: 44px;
+ }
+
+ .button:before {
+ font-size: 20px;
+ top: -2px;
+ }
+
+ .badge {
+ position: absolute;
+ color: #FFF;
+ top: 5px;
+ right: 0;
+ @include theme(background, primary);
+ border-radius: 50%;
+ width: 18px;
+ height: 18px;
+ line-height: 16px;
+ text-align: center;
+ font-size: 10px;
+ font-weight: lighter;
+ z-index: 2;
+ pointer-events: none;
+ }
+
+ .wrapper {
+ width: 320px;
+
+ @include media-phablet {
+ width: 250px;
+ }
+ }
+
+ ul {
+ min-height: 60px;
+ max-height: 300px;
+ overflow-y: auto !important;
+
+ &:empty:after {
+ content: 'No notifications (yet)';
+ width: 100%;
+ position: absolute;
+ line-height: 60px;
+ font-size: 15px;
+ font-style: italic;
+ opacity: .4;
+ left: $padding * 2;
+ }
+
+ &:empty:before {
+ content: '\e808';
+ font-family: "icons";
+ height: 100%;
+ line-height: 60px;
+ margin-left: $padding;
+ text-align: center;
+ opacity: .4;
+ }
+
+ li {
+ padding: $padding;
+ word-wrap: break-word;
+
+ .added {
+ font-weight: lighter;
+ font-size: 11px;
+ display: block;
+ text-align: right;
+ }
+ }
+ }
+ }
+
+ .menu {
+ left: 0;
+
+ @include media-phablet {
+ bottom: 88px;
+ left: 50%;
+ transform: translateX(-50%);
+ }
+
+ .button:before {
+ font-size: 20px;
+ top: -2px;
+ }
+ }
+
+ .search_form {
+ right: 0;
+
+ @include media-phablet {
+ right: auto;
+ left: 50%;
+ transform: translateX(-50%);
+ }
+ }
+
+ .more_menu {
+
+ .wrapper {
+ bottom: 0;
+ left: 44px;
+ right: auto;
+ padding-left: 4px;
+ }
+
+ a {
+ &:hover {
+ @include theme(background, menu_off);
+ }
+ }
+
+ }
+}
+
+.corner_background {
+ display: block;
+ position: absolute;
+ height: 10px;
+ width: 10px;
+ @include theme(background, primary);
+ top: 0;
+ left: $header_width;
+
+ @include media-phablet {
+ left: $header_width_mobile;
+ }
+}
+
+/* Content */
+.content {
+ position: relative;
+ height: 100%;
+ flex: 1 auto;
+
+ display: flex;
+ flex-flow: column nowrap;
+
+ @include theme(background, background);
+ border-radius: $border_radius 0 0 $border_radius;
+
+ h1, h2, h3 {
+ padding: 0;
+ margin: 0;
+ }
+
+ .pages {
+ flex: 1 auto;
+ width: 100%;
+ position: relative;
+ }
+
+ .footer {
+ width: 100%;
+ }
+}
+
+/* Page */
+.page {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ display: none;
+
+ &.active {
+ display: block;
+ }
+
+ > .scroll_content {
+ position: relative;
+ height: 100%;
+ overflow: hidden;
+ overflow-y: auto;
+ -webkit-overflow-scrolling:touch;
+ }
+
+ &.home .scroll_content {
+ padding: 0 0 $padding;
+ }
+
+ h1, h2, h3, h4 {
+ font-weight: 300;
+ }
+
+ h2 {
+ font-size: 24px;
+ padding: $padding;
+
+ @include media-phablet {
+ font-size: 18px;
+ }
+ }
+
+ .navigation {
+ z-index: 2;
+ display: flex;
+ align-items: center;
+ position: fixed;
+ top: 0;
+ height: $header_height;
+ left: $header_width + $padding;
+ right: $padding;
+ @include theme(background, background);
+ border-radius: $border_radius 0 0 0;
+
+ @include media-phablet {
+ height: $header_width_mobile;
+ left: $header_width_mobile + $padding/2;
+ right: $padding/2;
+ }
+
+ ul {
+ flex: 1 auto;
+ list-style: none;
+
+ li {
+ display: inline-block;
+
+ a {
+ display: inline-block;
+ font-size: 24px;
+ line-height: $header_height;
+ padding: 0 $padding;
+ @include theme(color, text);
+ opacity: .5;
+ vertical-align: bottom;
+
+ &:hover {
+ opacity: 1;
+ }
+
+ @include media-phablet {
+ font-size: 18px;
+ line-height: $header_width_mobile;
+ padding: 0 $padding/2;
+ }
+ }
+ }
+
+ .active a {
+ opacity: 1;
+ }
+ }
+
+ > ul > li:first-child {
+ margin-left: -$padding;
+
+ @include media-phablet {
+ margin-left: -$padding/2;
+ }
+ }
+
+ h2 {
+ padding: $padding $padding $padding 0;
+ }
+
+ }
+
+}
+
+/* Page levels */
+@for $i from 1 through 4 {
+ .level_#{$i} {
+ z-index: #{$i * 10};
+ }
+}
+
+
+/* Menu basis */
+.more_menu {
+ position: relative;
+ line-height: 1em;
+
+ a {
+ display: inline-block;
+ float: left;
+
+ &:hover {
+ @include theme(background, off);
+ }
+ }
+
+ .button {
+ font-size: 24px;
+ cursor: pointer;
+ display: inline-block;
+
+ &:before {
+ position: relative;
+ }
+ }
+
+ .wrapper {
+ display: none;
+ position: absolute;
+ right: 0;
+ @include theme(background, primary);
+ z-index: 5000;
+ box-shadow: 0 0 15px 2px rgba(0,0,0,.15);
+ border-radius: $border_radius 0 0 $border_radius;
+ transform-origin: 80% 0;
+
+ @include theme-dark {
+ box-shadow: 0 5px 15px 2px rgba(0,0,0,.4);
+ }
+
+ &:before {
+ transform: rotate(45deg) translateY(-60%);
+ content: '';
+ display: block;
+ position: absolute;
+ @include theme(background, primary);
+ height: 10px;
+ width: 10px;
+ left: -9px;
+ bottom: 11px;
+ z-index: 1;
+ opacity: 1;
+ border-radius: $border_radius;
+ }
+
+ ul {
+ @include theme(background, background);
+ position: relative;
+ z-index: 2;
+ overflow: hidden;
+ border-radius: $border_radius 0 0 $border_radius;
+ }
+
+ ul li {
+ display: block;
+ line-height: 1em;
+ border-top: 1px solid transparent;
+ @include theme(border-color, off);
+
+ &:first-child {
+ border-top: 0;
+ }
+
+ a {
+ display: block;
+ @include theme(color, text);
+ padding: $padding/4 $padding/2;
+ font-size: 1em;
+ line-height: 22px;
+ width: 100%;
+
+ &:hover {
+ @include theme(background, off);
+ }
+ }
+
+ &:first-child a {
+ padding-top: $padding/2;
+ }
+
+ &:last-child a {
+ padding-bottom: $padding/2;
+ }
+ }
+ }
+
+ //&.show {
+ //
+ // .wrapper {
+ // display: block;
+ //
+ // &:before {
+ // opacity: 1;
+ // }
+ // }
+ //}
+}
+
+/* Messages */
+.messages {
+ position: fixed;
+ right: 0;
+ bottom: 0;
+ width: 320px;
+ z-index: 2000;
+ overflow: hidden;
+ font-size: 14px;
+ font-weight: bold;
+ padding: 5px;
+
+ .message {
+ overflow: hidden;
+ transition: all .6s cubic-bezier(0.9,0,0.1,1);
+ width: 100%;
+ position: relative;
+ max-height: 0;
+ font-size: 1.1em;
+ font-weight: normal;
+ transform: scale(0);
+ transform-origin: 100% 50%;
+ @include theme(background, primary);
+ margin-bottom: 4px;
+ border-radius: $border_radius;
+ box-shadow: 0 0 15px 2px rgba(0,0,0,.15);
+
+ @include theme-dark {
+ box-shadow: 0 5px 15px 2px rgba(0,0,0,.4);
+ }
+
+ .inner {
+ padding: 15px 30px 15px 20px;
+ @include theme(background, background);
+ margin-bottom: 4px;
+ border-radius: $border_radius;
+ }
+
+ &.sticky {
+ @include theme(background-color, primary);
+ }
+
+ &.show {
+ max-height: 100px;
+ transform: scale(1);
+ }
+
+ &.hide {
+ max-height: 0;
+ padding: 0 20px;
+ margin: 0;
+ transform: scale(0);
+ }
+ }
+
+ .close {
+ position: absolute;
+ padding: 10px 8px;
+ top: 0;
+ right: 0;
+ color: #FFF;
+ }
+}
+
+/* Question */
+.question {
+ position: fixed;
+ z-index: 20000;
+ color: #FFF;
+ padding: $padding;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ &.show {
+ opacity: 1;
+ }
+
+ .inner {
+ width: 100%;
+ max-width: 500px;
+ }
+
+ h3 {
+ display: block;
+ margin-bottom: $padding;
+ font-size: 1.4em;
+ font-weight: lighter;
+ }
+
+ .hint {
+ margin: -$padding 0 $padding;
+ }
+
+ a {
+ border-color: #FFF;
+ color: #FFF;
+ transition: none;
+
+ &:hover {
+ @include theme(background, primary);
+ color: #FFF;
+ }
+ }
+}
+
+/* Mask */
+.mask {
+ background: rgba(0,0,0,.8);
+ z-index: 1000;
+ text-align: center;
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ opacity: 0;
+ transition: opacity 500ms;
+ pointer-events: none;
+
+ $spinner_size: 22px;
+
+ .message {
+ color: #FFF;
+ text-align: center;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ width: 320px;
+ margin: -($spinner_size*2 + 5px) 0 0 -160px;
+ font-size: 16px;
+
+ h1 {
+ font-size: 1.5em;
+ }
+ }
+
+ .spinner {
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ width: $spinner_size;
+ height: $spinner_size;
+ display: block;
+ background: white;
+ margin-top: -($spinner_size/2);
+ margin-left: -($spinner_size/2);
+ outline: 1px solid transparent;
+ animation: rotating 2.5s $cubic infinite normal;
+ transform: scale(0);
+ }
+
+ &.with_message {
+ .spinner {
+ margin-top: -($spinner_size*4);
+ }
+ }
+
+ &.show {
+ pointer-events: auto;
+ opacity: 1;
+
+ .spinner {
+ transform: scale(1);
+ }
+ }
+
+ &.hide {
+ opacity: 0;
+
+ .spinner {
+ transform: scale(0);
+ }
+ }
+}
+
+@keyframes rotating {
+ 0% {
+ transform: rotate(0deg) scale(1.6);
+ border-radius: 1px;
+ }
+ 48% {
+ transform: rotate(360deg) scale(1);
+ border-radius: 50%;
+ }
+ 52% {}
+ 100% {
+ transform: rotate(720deg) scale(1.6);
+ border-radius: 1px;
+ }
+}
+
+.table {
+
+ .head {
+ font-weight: bold;
+ }
+
+ .item {
+ display: flex;
+ border-bottom: 1px solid rgba(0,0,0,.2);
+
+ @include theme-dark {
+ border-color: rgba(255,255,255,.2);
+ }
+
+ &:last-child {
+ border-bottom: none;
+ }
+
+ span {
+ padding: 1px 2px;
+
+ &:first-child {
+ padding-left: 0;
+ }
+
+ &:last-child {
+ padding-right: 0;
+ }
+ }
+ }
+}
diff --git a/couchpotato/static/style/settings.css b/couchpotato/static/style/settings.css
deleted file mode 100644
index 3af7dba785..0000000000
--- a/couchpotato/static/style/settings.css
+++ /dev/null
@@ -1,651 +0,0 @@
-.page.settings:after {
- content: ".";
- display: block;
- clear: both;
- visibility: hidden;
- line-height: 0;
- height: 0;
-}
-
- .page.settings .tabs {
- float: left;
- width: 20%;
- font-size: 20px;
- text-align: right;
- list-style: none;
- padding: 40px 0;
- margin: 0;
- min-height: 470px;
- background-image: -*-linear-gradient(
- 20deg,
- rgba(0,0,0,0) 50%,
- rgba(0,0,0,0.3) 100%
- );
- }
- .page.settings .tabs a {
- display: block;
- padding: 7px 15px;
- font-weight: normal;
- transition: all 0.3s ease-in-out;
- color: rgba(255, 255, 255, 0.8);
- text-shadow: none;
- }
- .page.settings .tabs a:hover,
- .page.settings .tabs .active a {
- background: rgb(78, 89, 105);
- color: #fff;
- }
- .page.settings .tabs > li {
- border-bottom: 1px solid rgb(78, 89, 105);
- }
-
- .page.settings .tabs .subtabs {
- list-style: none;
- padding: 0;
- margin: -5px 0 10px;
- }
-
- .page.settings .tabs .subtabs a {
- font-size: 13px;
- padding: 0 15px;
- font-weight: normal;
- transition: all .3s ease-in-out;
- color: rgba(255, 255, 255, 0.7);
- }
-
- .page.settings .tabs .subtabs .active a {
- color: #fff;
- background: rgb(78, 89, 105);
- }
-
-
- .page.settings .containers {
- width: 80%;
- float: left;
- padding: 20px 2%;
- min-height: 300px;
- }
-
- .page .advanced {
- display: none;
- color: #edc07f;
- }
- .page.show_advanced .advanced { display: block; }
-
- .page.settings .tab_content {
- display: none;
- }
- .page.settings .tab_content.active { display: block; }
-
- .page fieldset {
- padding: 10px 0;
- }
- .page fieldset h2 {
- font-weight: normal;
- font-size: 25px;
- padding: 0 9px 10px 30px;
- margin: 0;
- border-bottom: 1px solid #333;
- box-shadow: 0 1px 0px rgba(255,255,255, 0.15);
- }
- .page fieldset h2 .hint {
- font-size: 12px;
- margin-left: 10px;
- }
- .page fieldset h2 .hint a {
- margin: 0 !important;
- padding: 0;
- }
-
- .page fieldset.disabled .ctrlHolder {
- display: none;
- }
- .page fieldset > .ctrlHolder:first-child {
- display: block;
- padding: 0;
- width: auto;
- margin: 0;
- position: relative;
- margin-bottom: -23px;
- border: none;
- width: 20px;
- }
-
- .page .ctrlHolder {
- line-height: 25px;
- padding: 10px 10px 10px 30px;
- font-size: 14px;
- border: 0;
- }
- .page .ctrlHolder.save_success:not(:first-child) {
- background: url('../images/icon.check.png') no-repeat 7px center;
- }
- .page .ctrlHolder:last-child { border: none; }
- .page .ctrlHolder:hover { background-color: rgba(255,255,255,0.05); }
- .page .ctrlHolder.focused { background-color: rgba(255,255,255,0.2); }
- .page .ctrlHolder.focused:first-child, .page .ctrlHolder:first-child{ background-color: transparent; }
-
- .page .ctrlHolder .formHint {
- width: 47%;
- margin: -18px 0;
- padding: 0;
- color: #fff !important;
- display: inline-block;
- vertical-align: middle;
- padding-left: 2%;
- }
-
- .page .check + .formHint {
- float: none;
- width: auto;
- display: inline-block;
- padding-left: 1% !important;
- height: 24px;
- vertical-align: middle;
- }
-
- .page .ctrlHolder label {
- font-weight: bold;
- width: 20%;
- margin: 0;
- padding: 6px 0 0;
- }
-
- .page .xsmall { width: 20px !important; text-align: center; }
-
- .page .enabler {
- display: block;
- }
-
- .page .option_list {
- margin-bottom: 20px;
- }
-
- .page .option_list .enabler {
- padding: 0;
- margin-left: 5px !important;
- }
-
- .page .option_list .enabler:not(.disabled) {
- margin: 0 0 0 30px;
- }
-
- .page .option_list .enabler:not(.disabled) .ctrlHolder:first-child {
- margin: 10px 0 -33px 0;
- }
-
- .page .option_list h3 {
- padding: 0;
- margin: 10px 5px 0;
- text-align: center;
- font-weight: normal;
- text-shadow: none;
- text-transform: uppercase;
- font-size: 12px;
- background: rgba(255,255,255,0.03);
- }
-
- .page .option_list .enabler.disabled {
- display: inline-block;
- margin: 3px 3px 3px 20px;
- padding: 4px 0;
- width: 173px;
- vertical-align: top;
- }
-
- .page .option_list .enabler.disabled h2 {
- border: none;
- box-shadow: none;
- padding: 0 10px 0 25px;
- font-size: 16px;
- }
-
- .page .option_list .enabler:not(.disabled) h2 {
- font-size: 16px;
- font-weight: bold;
- border: none;
- border-top: 1px solid rgba(255,255,255, 0.15);
- box-shadow: 0 -1px 0px #333;
- margin: 0;
- padding: 10px 0 5px 25px;
- }
- .page .option_list .enabler:not(.disabled):first-child h2 {
- border: none;
- box-shadow: none;
- }
-
- .page .option_list .enabler.disabled h2 .hint {
- display: none;
- }
- .page .option_list .enabler h2 .hint {
- font-weight: normal;
- }
-
- .page input[type=text], .page input[type=password] {
- padding: 5px 3px;
- margin: 0;
- width: 30%;
- border-radius: 3px;
- }
- .page .input.xsmall { width: 5% }
- .page .input.small { width: 10% }
- .page .input.medium { width: 15% }
- .page .input.large { width: 25% }
- .page .input.xlarge { width: 30% }
-
- .page .advanced_toggle {
- clear: both;
- display: block;
- text-align: right;
- height: 20px;
- margin: 0;
- }
- .page .advanced_toggle span { padding: 0 5px; }
- .page.show_advanced .advanced_toggle {
- color: #edc07f;
- }
-
- .page .directory {
- display: inline-block;
- padding: 0 4% 0 4px;
- font-size: 13px;
- width: 30%;
- background-image: url('../images/icon.folder.gif');
- background-repeat: no-repeat;
- background-position: 97% center;
- overflow: hidden;
- vertical-align: top;
- }
- .page .directory > span {
- height: 25px;
- display: inline-block;
- float: right;
- text-align: right;
- white-space: nowrap;
- cursor: pointer;
- }
-
- .page .directory_list {
- z-index: 2;
- position: absolute;
- width: 450px;
- margin: 28px 0 20px 18%;
- background: #5c697b;
- border-radius: 3px;
- box-shadow: 0 0 50px rgba(0,0,0,0.55);
- }
-
- .page .directory_list .pointer {
- border-right: 6px solid transparent;
- border-left: 6px solid transparent;
- border-bottom: 6px solid #5c697b;
- display: block;
- position: absolute;
- width: 0px;
- margin: -6px 0 0 22%;
- }
-
- .page .directory_list ul {
- width: 92%;
- height: 300px;
- overflow: auto;
- margin: 0 4%;
- font-size: 16px;
- }
-
- .page .directory_list li {
- padding: 4px 10px;
- cursor: pointer;
- margin: 0 !important;
- border-top: 1px solid rgba(255,255,255,0.1);
- background: url('../images/right.arrow.png') no-repeat 98% center;
- }
- .page .directory_list li:last-child {
- border-bottom: 1px solid rgba(255,255,255,0.1);
- }
-
- .page .directory_list li:hover {
- background-color: #515c68;
- }
-
- .page .directory_list li.empty {
- background: none;
- height: 100px;
- text-align: center;
- font-style: italic;
- border: none;
- line-height: 100px;
- cursor: default;
- color: #BBB;
- text-shadow: none;
- font-size: 12px;
- }
-
- .page .directory_list .actions {
- clear: both;
- padding: 4% 4% 2%;
- min-height: 25px;
- }
-
- .page .directory_list .actions label {
- float: right;
- width: auto;
- padding: 0;
- }
- .page .directory_list .actions .inlay {
- margin: -2px 0 0 7px;
- }
-
- .page .directory_list .actions .back {
- font-weight: bold;
- width: 160px;
- display: inline-block;
- padding: 0;
- line-height: 120%;
- vertical-align: top;
- }
-
- .page .directory_list .actions:last-child {
- float: right;
- padding: 4%;
- }
-
- .page .directory_list .actions:last-child > span {
- padding: 0 5px;
- text-shadow: none;
- }
-
- .page .directory_list .actions:last-child > .clear {
- left: -90%;
- position: relative;
- background-color: #af3128;
-}
-
- .page .directory_list .actions:last-child > .cancel {
- font-weight: bold;
- color: #ddd;
- }
-
- .page .directory_list .actions:last-child > .save {
- background: #9dc156;
- }
-
-
- .page .multi_directory.is_empty .delete {
- visibility: hidden;
- }
-
- .page .multi_directory .delete {
- display: none;
- }
- .page .multi_directory:hover .delete {
- display: inline-block;
- width: 22px;
- height: 24px;
- vertical-align: top;
- background-position: center;
- margin-left: 5px;
- }
-
-
- .page .tag_input select {
- width: 20%;
- display: inline-block;
- }
-
- .page .tag_input .selection {
- border-radius: 0 10px 10px 0;
- height: 26px;
- }
-
- .page .tag_input > input {
- display: none;
- }
-
- .page .tag_input > ul {
- list-style: none;
- border-radius: 3px;
- cursor: text;
- width: 30%;
- margin: 0 !important;
- min-height: 27px;
- line-height: 0;
- display: inline-block;
- }
- .page .tag_input:hover > ul {
- border-radius: 3px 0 0 3px;
- }
- .page .tag_input:hover .formHint { display: none; }
-
- .page .tag_input > ul > li {
- display: inline-block;
- min-height: 20px;
- min-width: 2px;
- font-size: 12px;
- padding: 0;
- margin: 4px 0 0 !important;
- border-width: 0;
- background: 0;
- line-height: 20px;
- }
- .page .tag_input > ul > li:first-child { min-width: 4px; }
- .page .tag_input li.choice {
- cursor: -moz-grab;
- cursor: -webkit-grab;
- cursor: grab;
- padding: 0;
- border-radius: 2px;
- }
- .page .tag_input > ul:hover > li.choice {
- background: -*-linear-gradient(
- 270deg,
- rgba(255,255,255,0.3) 0%,
- rgba(255,255,255,0.1) 100%
- );
- }
- .page .tag_input > ul > li.choice:hover,
- .page .tag_input > ul > li.choice.selected {
- background: -*-linear-gradient(
- 270deg,
- #5b9bd1 0%,
- #406db8 100%
- );
- }
-
- .page .tag_input .select {
- display: none;
- }
- .page .tag_input:hover .select { display: inline-block; }
-
- .page .tag_input li input {
- background: 0;
- border: 0;
- color: #fff;
- outline-width: 0;
- padding: 0;
- min-width: 2px;
- }
- .page .tag_input li:first-child input {
- padding-left: 2px;
- min-width: 0;
- }
-
- .page .tag_input li:not(.choice) span {
- white-space: pre;
- position: absolute;
- top: -9999px;
- }
-
- .page .tag_input .delete {
- display: none;
- height: 10px;
- width: 16px;
- position: absolute;
- margin: -9px 0 0 -16px;
- border-radius: 30px 30px 0 0;
- cursor: pointer;
- background: url('../images/icon.delete.png') no-repeat center 2px, -*-linear-gradient(
- 270deg,
- #5b9bd1 0%,
- #5b9bd1 100%
- );
- background-size: 65%;
- }
- .page .tag_input .choice:hover .delete,
- .page .tag_input .choice.selected .delete { display: inline-block; }
- .page .tag_input .choice .delete:hover {
- height: 14px;
- margin-top: -13px;
- }
-
- .page .combined_table .head {
- margin: 0 0 0 60px;
- }
- .page .disabled .head { display: none; }
- .page .combined_table .head abbr {
- display: inline-block;
- font-weight: bold;
- border-bottom: 1px dotted #fff;
- line-height: 140%;
- cursor: help;
- }
- .page .combined_table .head abbr.use, .page .combined_table .head abbr.automation_urls_use {
- display: none;
- }
- .page .combined_table .head abbr.host {
- margin-right: 197px;
- }
-
- .page .combined_table .ctrlHolder {
- padding-top: 2px;
- padding-bottom: 3px;
- }
- .page .combined_table .ctrlHolder.hide { display: none; }
-
- .page .combined_table .ctrlHolder > * {
- margin: 0 10px 0 0;
- }
-
- .page .combined_table .ctrlHolder .delete {
- display: none;
- width: 22px;
- height: 22px;
- vertical-align: middle;
- background-position: left center;
- }
- .page .combined_table .ctrlHolder:hover .delete {
- display: inline-block;
- }
-
- .page .combined_table .ctrlHolder.is_empty .delete, .page.settings .combined_table .ctrlHolder.is_empty .check {
- visibility: hidden;
-}
-
- .page .tab_about .usenet {
- padding: 20px 30px 0;
- font-size: 17px;
- }
-
- .page .tab_about .usenet a {
- padding: 0 5px;
- }
-
- .page .tab_about .usenet ul {
- float: left;
- width: 50%;
- margin: 10px 0;
- padding: 0;
- }
-
- .page .tab_about .usenet li {
- background: url('../images/icon.check.png') no-repeat left center;
- padding: 0 0 0 25px;
- }
-
- .page .tab_about .donate {
- float: left;
- width: 42%;
- text-align: center;
- font-size: 17px;
- padding: 0 0 0 4%;
- margin: 20px 0 0;
- border-left: 1px solid #333;
- box-shadow: -1px 0 0 rgba(255,255,255, 0.15);
- }
- .page .tab_about .donate form {
- padding: 10px 0 0;
- }
-
- .page .tab_about .info {
- padding: 20px 30px;
- margin: 0;
- overflow: hidden;
- }
-
- .page .tab_about .info dt {
- clear: both;
- float: left;
- width: 17%;
- font-weight: bold;
- }
-
- .page .tab_about .info dd {
- float: right;
- width: 80%;
- padding: 0;
- margin: 0;
- font-style: italic;
- }
- .page .tab_about .info dd.version { cursor: pointer; }
-
- .page .tab_about .group_actions > div {
- padding: 30px;
- text-align: center;
- }
-
- .page .tab_about .group_actions a {
- margin: 0 10px;
- font-size: 20px;
- }
-
-.group_userscript {
- background: center bottom no-repeat;
- min-height: 360px;
- font-size: 20px;
- font-weight: normal;
-}
-
- .group_userscript h2 .hint {
- display: block;
- margin: 0 !important;
- }
-
- .group_userscript .userscript {
- float: left;
- margin: 14px 0 0 25px;
- height: 36px;
- line-height: 25px;
- }
-
- .group_userscript .or {
- float: left;
- margin: 20px -10px 0 10px;
- }
-
- .group_userscript .bookmarklet {
- display: block;
- display: block;
- float: left;
- padding: 20px 15px 0 25px;
- border-radius: 5px;
- }
-
- .group_userscript .bookmarklet span {
- margin-left: 10px;
- display: inline-block;
- }
-
-.active .group_imdb_automation:not(.disabled) {
- background: url('../images/imdb_watchlist.png') no-repeat right 50px;
- min-height: 210px;
-}
\ No newline at end of file
diff --git a/couchpotato/static/style/settings.scss b/couchpotato/static/style/settings.scss
new file mode 100644
index 0000000000..73748f1ac9
--- /dev/null
+++ b/couchpotato/static/style/settings.scss
@@ -0,0 +1,766 @@
+@import "_mixins";
+
+.page.settings {
+ padding-top: $header_height;
+
+ @include media-phablet {
+ padding-top: $header_width_mobile;
+ }
+
+ &.active .scroll_content {
+ display: flex;
+
+ @include media-phablet {
+ display: block;
+ }
+ }
+
+ .navigation {
+ display: flex;
+ justify-content: space-between;
+
+ .advanced_toggle {
+ display: flex;
+ align-items: center;
+
+ span {
+ margin-right: $padding / 2;
+ }
+ }
+ }
+
+ .tab_content {
+ display: none;
+
+ &.active {
+ display: block;
+ }
+ }
+
+ .tabs {
+ margin: 0 $padding $padding;
+ list-style: none;
+ font-size: 24px;
+
+ @include media-phablet {
+ margin: 0 $padding/2 $padding;
+ }
+
+ ul {
+ list-style: none;
+ font-size: $font_size;
+ }
+
+ li {
+ a {
+ color: rgba(0,0,0,.5);
+
+ @include theme-dark {
+ color: rgba(255,255,255,.5);
+ }
+ }
+
+ &.active {
+ a {
+ @include theme(color, text);
+ }
+ }
+ }
+
+ }
+
+ form.containers {
+ margin: 0 $padding 0 0;
+ flex: 1 1 auto;
+
+ @include media-phablet {
+ margin: 0 $padding/2 0 0;
+ }
+ }
+
+ fieldset {
+ border: 0;
+ padding: $padding/2 0;
+ position: relative;
+
+ h2 {
+ display: flex;
+ flex-flow: row wrap;
+ align-items: baseline;
+ padding: 0 0 0 $padding;
+
+ @include media-phablet {
+ display: block;
+ padding: 0 0 0 $padding/2;
+ }
+
+ .icon {
+ margin-right: $padding/2;
+
+ img {
+ vertical-align: middle;
+ position: relative;
+ top: -1px;
+ }
+ }
+
+ .group_label {
+ margin-right: $padding/2;
+ }
+
+ .hint {
+ flex: 1;
+ font-size: 1rem;
+
+ @include media-phablet {
+ margin: 0;
+ display: block;
+ }
+
+ a {
+ font-weight: 400;
+ @include theme(color, primary);
+ text-decoration: underline;
+ display: inline;
+ }
+
+
+ }
+ }
+
+ .more_hint {
+ position: relative;
+
+ .tooltip {
+ display: inline;
+ padding: $padding/2;
+
+ .icon-info {
+ vertical-align: middle;
+ display: inline-block;
+ text-align: center;
+ border: 1px solid transparent;
+ @include theme(border-color, primary);
+ border-radius: 50%;
+ width: 18px;
+ height: 18px;
+ line-height: 16px;
+ font-size: .8em;
+ text-decoration: none;
+ }
+
+ .tip {
+ bottom: 100%;
+ left: 0;
+ right: 0;
+ position: absolute;
+ @include theme(background, off);
+ z-index: 20;
+ display: none;
+ padding: $padding/2;
+ margin-left: -$padding/2;
+ }
+
+ &:hover {
+ .tip {
+ display: block;
+ }
+ }
+ }
+ }
+
+ .ctrlHolder {
+ padding: $padding/3 $padding;
+ border-bottom: 1px solid transparent;
+ @include theme(border-color, off);
+ display: flex;
+ flex-flow: row nowrap;
+ align-items: center;
+
+ @include media-phablet {
+ flex-flow: row wrap;
+ padding: $padding/3 0 $padding/3 $padding/2;
+ }
+
+ &:last-child {
+ border-bottom: 0;
+ }
+
+ &:nth-child(2) {
+ margin-top: $padding/2;
+ }
+
+ label {
+ display: inline-block;
+ min-width: 150px;
+
+ @include media-phablet {
+ flex: 1 1 auto;
+ }
+ }
+
+ input, textarea, select {
+ min-width: 200px;
+
+ @include media-phablet {
+ flex: 1 1 auto;
+ }
+ }
+
+ input[type=checkbox] {
+ width: auto;
+ min-width: 0;
+
+ @include media-phablet {
+ margin-right: $padding;
+ flex: none;
+ }
+ }
+
+ .select_wrapper {
+ position: relative;
+ display: flex;
+ align-items: center;
+
+ @include media-phablet {
+ width: 100%;
+ }
+
+ select {
+ cursor: pointer;
+ appearance: none;
+ width: 100%;
+ min-width: 200px;
+ border-radius: 0;
+
+ &::-ms-expand {
+ display: none;
+ }
+ }
+
+ &:before {
+ vertical-align: top;
+ pointer-events: none;
+ position: absolute;
+ top: 0;
+ line-height: 2em;
+ right: $padding/2;
+ height: 100%;
+ }
+ }
+
+ .formHint {
+ flex: 1;
+ opacity: .8;
+ margin-left: $padding;
+
+ a {
+ font-weight: 400;
+ @include theme(color, primary);
+ text-decoration: underline;
+ }
+
+ @include media-phablet {
+ min-width: 100%;
+ margin-left: 0;
+ }
+ }
+
+ &.test_button {
+ a {
+ margin: 0;
+ }
+
+ .success {
+ margin-left: $padding / 2;
+ }
+ }
+ }
+
+ &.disabled {
+
+ .ctrlHolder {
+ display: none;
+ }
+
+ > .ctrlHolder:first-child {
+ display: flex;
+ }
+ }
+
+ &.enabler {
+ display: block;
+
+ &.disabled:hover {
+ background: rgba(255,255,255,.1);
+
+ @include theme-dark {
+ background: rgba(0,0,0,.1);
+ }
+ }
+
+ > :first-child {
+ position: absolute;
+ right: 0;
+ border: 0;
+ padding: 0;
+
+ ~ h2 {
+ margin-right: 66px + $padding;
+
+ @include media-phablet {
+ margin-right: 0;
+ }
+ }
+ }
+
+ > :nth-child(2){
+ margin-top: 0;
+ }
+
+ > :nth-child(3){
+ margin-top: $padding/2;
+ }
+
+ }
+ }
+
+ fieldset.advanced,
+ fieldset .ctrlHolder.advanced {
+ display: none;
+ @include theme(color, primary);
+ }
+
+ &.show_advanced {
+ fieldset.advanced {
+ display: block;
+ }
+ fieldset:not(.disabled) > .ctrlHolder.advanced {
+ display: flex;
+ }
+ }
+
+ .switch {
+ $switch_height: 20px;
+ display: inline-block;
+ @include theme(background, primary);
+ height: $switch_height;
+ width: $switch_height * 2.5;
+ min-width: 0 !important;
+ transition: all 250ms;
+ cursor: pointer;
+ border-radius: $switch_height;
+
+ input {
+ display: none;
+ }
+
+ .toggle {
+ @include theme(background, background);
+ margin: 1px;
+ height: $switch_height - 2px;
+ width: $switch_height - 2px;
+ transition: transform 250ms;
+ transform: translateX($switch_height*1.5);
+ border-radius: $switch_height;
+ }
+
+ }
+
+ fieldset.enabler.disabled .switch,
+ &:not(.show_advanced) .advanced_toggle .switch {
+ @include theme(background, off);
+ @include theme(border-color, off);
+
+ .toggle {
+ transform: translateX(0);
+ }
+
+
+ &:hover {
+ background: darken(get-theme(off), 20);
+ border-color: darken(get-theme(off), 20);
+
+ @include theme-dark {
+ background: darken(get-theme-dark(off), 20);
+ border-color: darken(get-theme-dark(off), 20);
+ }
+ }
+ }
+
+ /** Options list **/
+ .option_list {
+ @include theme(background, background);
+ margin-top: $padding/2;
+
+ fieldset {
+ position: relative;
+
+ h2 {
+
+ .group_label {
+ min-width: 100px;
+ }
+
+ }
+
+ &.disabled h2 {
+ padding: 0 $padding;
+ }
+ }
+
+ fieldset:after {
+ position: absolute;
+ content: '';
+ display: block;
+ width: 100%;
+ border-bottom: 1px solid transparent;
+ @include theme(border-color, off);
+ bottom: 0;
+
+ &:last-child {
+ border-bottom: 0;
+ }
+ }
+
+ h2 {
+ font-size: 1em;
+ font-weight: 400;
+
+ .hint {
+ font-weight: 300;
+ }
+ }
+ }
+
+
+ .combined_table {
+ margin-top: $padding;
+
+ .head {
+ margin: 0 ($padding/2) 0 ($padding+26px);
+ font-size: .8em;
+
+ abbr {
+ display: inline-block;
+ font-weight: bold;
+ border-bottom: 1px dotted #fff;
+ line-height: 140%;
+ cursor: help;
+ margin-right: $padding/2;
+ text-align: center;
+
+ &:first-child {
+ display: none;
+ }
+ }
+ }
+
+ input {
+ min-width: 0 !important;
+ display: inline-block;
+ margin-right: $padding/2;
+ }
+
+ .use { }
+ .host, .automation_ids, .automation_urls { width: 200px; }
+ .api_key, .pass_key { width: 150px; }
+ .name { width: 150px; }
+ .extra_score, .seed_ratio, .seed_time { width: 70px; text-align: center; }
+ .custom_tag { width: 120px; text-align: center; }
+
+ .ctrlHolder {
+ margin: 0 0 0 $padding;
+ padding-left: 0;
+
+ .delete {
+ display: none;
+ font-size: 20px;
+ width: 22px;
+ height: 22px;
+ line-height: 20px;
+ text-align: center;
+ vertical-align: middle;
+ }
+
+ &:hover .delete {
+ display: inline-block;
+ }
+
+ &.is_empty .delete,
+ &.is_empty input[type=checkbox] {
+ visibility: hidden;
+ }
+ }
+
+ }
+ .disabled .combined_table { display: none; }
+
+
+ .tab_about {
+ .usenet {
+ padding: $padding $padding 0;
+ font-size: 1.5em;
+ line-height: 1.3em;
+
+ a {
+ @include theme(color, primary);
+ padding: 0 5px;
+ }
+
+ ul {
+ list-style: none;
+ float: left;
+ width: 50%;
+ margin: 10px 0;
+ padding: 0;
+ }
+
+ li {
+ font-size: .8em;
+
+ &:before {
+ margin-right: 10px;
+ }
+ }
+ }
+
+ .donate {
+ float: left;
+ width: 42%;
+ text-align: center;
+ font-size: 17px;
+ padding: 0 0 0 4%;
+ margin: 20px 0 0;
+ border-left: 1px solid rgba(0,0,0,.2);
+
+ @include theme-dark {
+ border-color: rgba(255,255,255,.2);
+ }
+
+ form {
+ padding: 10px 0 0;
+ }
+ }
+
+ .info {
+ padding: $padding;
+ margin: 0;
+ overflow: hidden;
+
+ dt {
+ clear: both;
+ float: left;
+ width: 17%;
+ font-weight: bold;
+ }
+
+ dd {
+ float: right;
+ width: 80%;
+ padding: 0;
+ margin: 0;
+ font-style: italic;
+
+ &.version { cursor: pointer; }
+ }
+ }
+
+ .group_actions {
+
+ > div {
+ padding: $padding;
+ text-align: center;
+ }
+
+ a {
+ margin: 0 10px;
+ font-size: 20px;
+ }
+ }
+ }
+
+ .directory {
+
+ @include media-phablet {
+ width: 100%;
+ }
+
+ input {
+ width: 100%;
+ }
+ }
+
+ .multi_directory {
+
+ .delete {
+ @include theme(color, primary);
+ padding: 0 $padding/2;
+ opacity: .6;
+ font-size: 1.5em;
+
+ &:hover {
+ opacity: 1;
+ }
+ }
+
+ &.is_empty .delete {
+ display: none;
+ }
+ }
+
+ .choice {
+ .select_wrapper {
+ margin-left: $padding;
+ width: 120px;
+ min-width: 120px;
+
+ @include media-phablet {
+ margin: $padding/2 0 0;
+ }
+
+ select {
+ min-width: 0 !important;
+ }
+
+ }
+ }
+
+ .renamer_to.renamer_to {
+ flex-flow: row wrap;
+
+ .ctrlHolder {
+ width: 100%;
+ }
+ }
+
+}
+
+.directory_list {
+ z-index: 2;
+ position: absolute;
+ width: 450px;
+ margin: 28px 0 20px 0;
+ @include theme(background, primary);
+ box-shadow: 0 0 15px 2px rgba(0,0,0,.15);
+ border-radius: $border_radius $border_radius 0 0;
+
+ @include theme-dark {
+ box-shadow: 0 5px 15px 2px rgba(0,0,0,.4);
+ }
+
+ .pointer {
+ border-right: 6px solid transparent;
+ border-left: 6px solid transparent;
+ border-bottom: 6px solid transparent;
+ @include theme(border-bottom-color, primary);
+ display: block;
+ position: absolute;
+ width: 0;
+ margin: -6px 0 0 100px;
+ }
+
+ .wrapper {
+ @include theme(background, background);
+ border-radius: $border_radius $border_radius 0 0;
+ margin-top: 5px;
+ }
+
+ ul {
+ width: 92%;
+ height: 300px;
+ overflow: auto;
+ margin: 0 $padding;
+ }
+
+ li {
+ padding: 4px $padding 4px 0;
+ cursor: pointer;
+ margin: 0 !important;
+ border-top: 1px solid rgba(255,255,255,0.1);
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+
+ &.blur {
+ opacity: .3;
+ }
+
+ &:last-child {
+ border-bottom: 1px solid rgba(255,255,255,0.1);
+ }
+
+ &:hover {
+ @include theme(color, primary);
+ }
+
+ &.empty {
+ background: none;
+ height: 100px;
+ text-align: center;
+ font-style: italic;
+ border: none;
+ line-height: 100px;
+ cursor: default;
+ color: #BBB;
+ text-shadow: none;
+ font-size: 12px;
+ }
+ }
+
+ .actions {
+ clear: both;
+ padding: $padding;
+ min-height: 45px;
+ position: relative;
+ width: 100%;
+ text-align: right;
+
+ label {
+ float: right;
+ width: auto;
+ padding: 0;
+
+ input {
+ margin-left: $padding/2;
+ }
+ }
+
+ .back {
+ font-weight: bold;
+ width: 160px;
+ display: inline-block;
+ padding: 0;
+ line-height: 120%;
+ vertical-align: top;
+ position: absolute;
+ text-align: left;
+ left: $padding;
+ }
+
+ &:last-child {
+ padding: $padding;
+
+ > span {
+ padding: 0 5px;
+ text-shadow: none;
+ }
+
+ > .clear {
+ left: $padding;
+ position: absolute;
+ top: 50%;
+ transform: translateY(-50%);
+ margin: 0;
+ }
+
+ > .cancel {
+ opacity: .7;
+ }
+
+ > .save {
+ margin-right: 0;
+ }
+ }
+ }
+}
diff --git a/couchpotato/static/style/uniform.css b/couchpotato/static/style/uniform.css
deleted file mode 100644
index 91bc83fcb9..0000000000
--- a/couchpotato/static/style/uniform.css
+++ /dev/null
@@ -1,154 +0,0 @@
-/* ------------------------------------------------------------------------------
-
- Copyright (c) 2010, Dragan Babic
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- ------------------------------------------------------------------------------ */
-/* ############################# GENERALS ################################### */
-/* ------------------------------------------------------------------------------ */
-
-.uniForm{ margin: 0; padding: 0; position: relative; z-index: 1; } /* reset stuff */
-
- /* Some generals and more resets */
- .uniForm fieldset{ border: none; margin: 0; padding: 0; }
- .uniForm fieldset legend{ margin: 0; padding: 0; }
-
- /* This are the main units that contain form elements */
- .uniForm .ctrlHolder,
- .uniForm .buttonHolder{ margin: 0; padding: 0; clear: both; }
-
- /* Clear all floats */
- .uniForm:after,
- .uniForm .buttonHolder:after,
- .uniForm .ctrlHolder:after,
- .uniForm .ctrlHolder .multiField:after,
- .uniForm .inlineLabel:after{ content: "."; display: block; height: 0; line-height: 0; font-size: 0; clear: both; min-height: 0; visibility: hidden; }
-
- .uniForm label,
- .uniForm button{ cursor: pointer; }
-
-/* ------------------------------------------------------------------------------ */
-/* ########################## DEFAULT LAYOUT ################################ */
-/* ------------------------------------------------------------------------------ */
-/* Styles for form controls where labels are above the input elements */
-/* ------------------------------------------------------------------------------ */
-
- .uniForm label,
- .uniForm .label{ display: block; float: none; margin: 0 0 .5em 0; padding: 0; line-height: 100%; width: auto; }
-
- /* Float the input elements */
- .uniForm .textInput,
- .uniForm .fileUpload,
- .uniForm .selectInput,
- .uniForm select,
- .uniForm textarea{ float: left; width: 53%; margin: 0; }
-
- /* Postition the hints */
- .uniForm .formHint{ float: right; width: 43%; margin: 0; clear: none; }
-
- /* Position the elements inside combo boxes (multiple inputs/selects/checkboxes/radio buttons per unit) */
- .uniForm ul{ float: left; width: 53%; margin: 0; padding: 0; }
- .uniForm ul li{ margin: 0 0 .5em 0; list-style: none; }
- .uniForm ul li label{ margin: 0; float: none; display: block; overflow: visible; }
- /* Alternate layout */
- .uniForm ul.alternate li{ float: left; width: 30%; margin-right: 3%; }
- .uniForm ul.alternate li label{ float: none; display: block; width: 98%; }
- .uniForm ul .textInput,
- .uniForm ul .selectInput,
- .uniForm ul select,
- .uniForm ul.alternate .textInput,
- .uniForm ul.alternate .selectInput,
- .uniForm ul.alternate select{ width: 98%; margin-top: .5em; display: block; float: none; }
-
- /* Required fields asterisk styling */
- .uniForm label em,
- .uniForm .label em{ float: left; width: 1em; margin: 0 0 0 -1em; }
-
-/* ------------------------------------------------------------------------------ */
-/* ######################### ALTERNATE LAYOUT ############################### */
-/* ------------------------------------------------------------------------------ */
-/* Styles for form controls where labels are in line with the input elements */
-/* Set the class of the parent (preferably to a fieldset) to .inlineLabels */
-/* ------------------------------------------------------------------------------ */
-
- .uniForm .inlineLabels label,
- .uniForm .inlineLabels .label{ float: left; margin: .3em 2% 0 0; padding: 0; line-height: 1; position: relative; width: 32%; }
-
- /* Float the input elements */
- .uniForm .inlineLabels .textInput,
- .uniForm .inlineLabels .fileUpload,
- .uniForm .inlineLabels .selectInput,
- .uniForm .inlineLabels select,
- .uniForm .inlineLabels textarea{ float: left; width: 64%; }
-
- /* Postition the hints */
- .uniForm .inlineLabels .formHint{ clear: both; float: none; width: auto; margin-left: 34%; position: static; }
-
- /* Position the elements inside combo boxes (multiple inputs/selects/checkboxes/radio buttons per unit) */
- .uniForm .inlineLabels ul{ float: left; width: 66%; }
- .uniForm .inlineLabels ul li{ margin: .5em 0; }
- .uniForm .inlineLabels ul li label{ float: none; display: block; width: 100%; }
- /* Alternate layout */
- .uniForm .inlineLabels ul.alternate li{ margin-right: 3%; margin-top: .25em; }
- .uniForm .inlineLabels ul li label .textInput,
- .uniForm .inlineLabels ul li label textarea,
- .uniForm .inlineLabels ul li label select{ float: none; display: block; width: 98%; }
-
- /* Required fields asterisk styling */
- .uniForm .inlineLabels label em,
- .uniForm .inlineLabels .label em{ display: block; float: none; margin: 0; position: absolute; right: 0; }
-
-/* ----------------------------------------------------------------------------- */
-/* ########################### Additional Stuff ################################ */
-/* ----------------------------------------------------------------------------- */
-
- /* Generals */
- .uniForm legend{ color: inherit; }
-
- .uniForm .secondaryAction{ float: left; }
-
- /* .inlineLabel is used for inputs within labels - checkboxes and radio buttons */
- .uniForm .inlineLabel input,
- .uniForm .inlineLabels .inlineLabel input,
- .uniForm .blockLabels .inlineLabel input,
- /* class .inlineLabel is depreciated */
- .uniForm label input{ float: none; display: inline; margin: 0; padding: 0; border: none; }
-
- .uniForm .buttonHolder .inlineLabel,
- .uniForm .buttonHolder label{ float: left; margin: .5em 0 0 0; width: auto; max-width: 60%; text-align: left; }
-
- /* When you don't want to use a label */
- .uniForm .inlineLabels .noLabel ul{ margin-left: 34%; /* Match to width of label + gap to field */ }
-
- /* Classes for control of the widths of the fields */
- .uniForm .small { width: 30% !important; }
- .uniForm .medium{ width: 45% !important; }
- .uniForm .large { } /* Large is default and should match the value you set for .textInput, textarea or select */
- .uniForm .auto { width: auto !important; }
- .uniForm .small,
- .uniForm .medium,
- .uniForm .auto{ margin-right: 4px; }
-
-/* Columns */
-.uniForm .col{ float: left; }
-.uniForm .col{ width: 50%; }
\ No newline at end of file
diff --git a/couchpotato/static/style/uniform.generic.css b/couchpotato/static/style/uniform.generic.css
deleted file mode 100644
index e70a9158b9..0000000000
--- a/couchpotato/static/style/uniform.generic.css
+++ /dev/null
@@ -1,143 +0,0 @@
-/* ------------------------------------------------------------------------------
-
- UNI-FORM DEFAULT by DRAGAN BABIC (v2) | Wed, 31 Mar 10
-
- ------------------------------------------------------------------------------
-
- Copyright (c) 2010, Dragan Babic
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- ------------------------------------------------------------------------------ */
-
-.uniForm{}
-
- .uniForm legend{ font-weight: bold; font-size: 100%; margin: 0; padding: 1.5em 0; }
-
- .uniForm .ctrlHolder{ padding: 1em; border-bottom: 1px solid #efefef; }
- .uniForm .ctrlHolder.focused{ background: #fffcdf; }
-
- .uniForm .inlineLabels .noLabel{}
-
- .uniForm .buttonHolder{ background: #efefef; text-align: right; margin: 1.5em 0 0 0; padding: 1.5em;
- /* CSS3 */
- border-radius: 4px;
- }
- .uniForm .buttonHolder .primaryAction{ padding: 10px 22px; line-height: 1; background: #254a86; border: 1px solid #163362; font-size: 12px; font-weight: bold; color: #fff;
- /* CSS3 */
- border-radius: 4px;
- box-shadow: 1px 1px 0 #fff;
- text-shadow: -1px -1px 0 rgba(0,0,0,.25);
- }
- .uniForm .buttonHolder .primaryAction:active{ position: relative; top: 1px; }
- .uniForm .secondaryAction { text-align: left; }
- .uniForm button.secondaryAction { background: transparent; border: none; color: #777; margin: 1.25em 0 0 0; padding: 0; }
-
- .uniForm .inlineLabels label em,
- .uniForm .inlineLabels .label em{ font-style: normal; font-weight: bold; }
- .uniForm label small{ font-size: .75em; color: #777; }
-
- .uniForm .textInput,
- .uniForm textarea { padding: 4px 2px; border: 1px solid #aaa; background: #fff; }
- .uniForm textarea { height: 12em; }
- .uniForm select {}
- .uniForm .fileUpload {}
-
- .uniForm ul{}
- .uniForm li{}
- .uniForm ul li label{ font-size: .85em; }
-
- .uniForm .small {}
- .uniForm .medium{}
- .uniForm .large {} /* Large is default and should match the value you set for .textInput, textarea or select */
- .uniForm .auto {}
- .uniForm .small,
- .uniForm .medium,
- .uniForm .auto{}
-
- /* Get rid of the 'glow' effect in WebKit, optional */
- .uniForm .ctrlHolder .textInput:focus,
- .uniForm .ctrlHolder textarea:focus{ outline: none; }
-
- .uniForm .formHint { font-size: .85em; color: #777; }
- .uniForm .inlineLabels .formHint { padding-top: .5em; }
- .uniForm .ctrlHolder.focused .formHint{ color: #333; }
-
-/* ----------------------------------------------------------------------------- */
-/* ############################### Messages #################################### */
-/* ----------------------------------------------------------------------------- */
-
- /* Error message at the top of the form */
- .uniForm #errorMsg{ background: #ffdfdf; border: 1px solid #f3afb5; margin: 0 0 1.5em 0; padding: 0 1.5em;
- /* CSS3 */
- border-radius: 4px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- -o-border-radius: 4px;
- -khtml-border-radius: 4px;
- }
- .uniForm #errorMsg h3{} /* Feel free to use a heading level suitable to your page structure */
- .uniForm #errorMsg ol{ margin: 0 0 1.5em 0; padding: 0; }
- .uniForm #errorMsg ol li{ margin: 0 0 3px 1.5em; padding: 7px; background: #f6bec1; position: relative; font-size: .85em;
- /* CSS3 */
- border-radius: 4px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- -o-border-radius: 4px;
- -khtml-border-radius: 4px;
- }
-
- .uniForm .ctrlHolder.error,
- .uniForm .ctrlHolder.focused.error{ background: #ffdfdf; border: 1px solid #f3afb5;
- /* CSS3 */
- border-radius: 4px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- -o-border-radius: 4px;
- -khtml-border-radius: 4px;
- }
- .uniForm .ctrlHolder.error input.error,
- .uniForm .ctrlHolder.error select.error,
- .uniForm .ctrlHolder.error textarea.error{ color: #af4c4c; margin: 0 0 6px 0; padding: 4px; }
-
- /* Success messages at the top of the form */
- .uniForm #okMsg{ background: #c8ffbf; border: 1px solid #a2ef95; margin: 0 0 1.5em 0; padding: 0 1.5em; text-align: center;
- /* CSS3 */
- border-radius: 4px;
- -webkit-border-radius: 4px;
- -moz-border-radius: 4px;
- -o-border-radius: 4px;
- -khtml-border-radius: 4px;
- }
- .uniForm #OKMsg p{ margin: 0; }
-
-/* ----------------------------------------------------------------------------- */
-/* ############################### Columns ##################################### */
-/* ----------------------------------------------------------------------------- */
-
- .uniForm .col{}
- .uniForm .col.first{}
- .uniForm .col.last{}
- .uniForm .col{ margin-bottom: 1.5em; }
- /* Use .first and .last classes to control the layout/spacing of your columns */
- .uniForm .col.first{ width: 49%; float: left; clear: none; }
- .uniForm .col.last { width: 49%; float: right; clear: none; margin-right: 0; }
\ No newline at end of file
diff --git a/couchpotato/templates/_desktop.html b/couchpotato/templates/_desktop.html
deleted file mode 100644
index 1d61806632..0000000000
--- a/couchpotato/templates/_desktop.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<!doctype html>
-<html>
- <head>
- {% for url in fireEvent('clientscript.get_styles', as_html = True, location = 'front', single = True) %}
- <link rel="stylesheet" href="{{ url_for('web.index') }}{{ url }}" type="text/css">{% endfor %}
- {% for url in fireEvent('clientscript.get_scripts', as_html = True, location = 'front', single = True) %}
- <script type="text/javascript" src="{{ url_for('web.index') }}{{ url }}"></script>{% endfor %}
-
- {% for url in fireEvent('clientscript.get_scripts', as_html = True, location = 'head', single = True) %}
- <script type="text/javascript" src="{{ url_for('web.index') }}{{ url }}"></script>{% endfor %}
- {% for url in fireEvent('clientscript.get_styles', as_html = True, location = 'head', single = True) %}
- <link rel="stylesheet" href="{{ url_for('web.index') }}{{ url }}" type="text/css">{% endfor %}
-
- <link href="{{ url_for('web.static', filename='images/favicon.ico') }}" rel="icon" type="image/x-icon" />
- <link rel="apple-touch-icon" href="{{ url_for('web.static', filename='images/homescreen.png') }}" />
-
- <script type="text/javascript" src="https://www.youtube.com/player_api" defer="defer"></script>
-
- <script type="text/javascript">
- window.addEvent('domready', function() {
- new Uniform();
-
- Api.setup({
- 'url': {{ url_for('api.index')|tojson|safe }},
- 'path_sep': {{ sep|tojson|safe }},
- 'is_remote': false
- });
-
- $(document.body).set('data-api', window.location.protocol + '//' + window.location.host + Api.createUrl().replace('/default/', '/'));
-
- // Catch errors
- window.onerror = function(message, file, line){
-
- p(message, file, line);
-
- Api.request('logging.log', {
- 'data': {
- 'type': 'error',
- 'message': Browser.name + ' ' + Browser.version + ': \n' + message,
- 'page': window.location.href.replace(window.location.host, 'HOST'),
- 'file': file.replace(window.location.host, 'HOST'),
- 'line': line
- }
- });
-
- return true;
- }
-
- Quality.setup({
- 'profiles': {{ fireEvent('profile.all', single = True)|tojson|safe }},
- 'qualities': {{ fireEvent('quality.all', single = True)|tojson|safe }}
- });
-
- Status.setup({{ fireEvent('status.all', single = True)|tojson|safe }});
-
- File.Type.setup({{ fireEvent('file.types', single = True)|tojson|safe }});
-
- App.setup({
- 'base_url': {{ url_for('web.index')|tojson|safe }},
- 'args': {{ env.get('args')|tojson|safe }},
- 'options': {{ ('%s' % env.get('options'))|tojson|safe }},
- 'app_dir': {{ env.get('app_dir')|tojson|safe }},
- 'data_dir': {{ env.get('data_dir')|tojson|safe }},
- 'pid': {{ env.getPid()|tojson|safe }},
- 'userscript_version': {{ fireEvent('userscript.get_version', single = True)|tojson|safe }}
- });
- })
-
- {% if env.setting('show_wizard') %}
- if(!window.location.href.contains('wizard'))
- window.location = '{{ url_for('web.index') }}wizard/'
- {% endif %}
-
- </script>
- <title>CouchPotato
-
-
-
' + message + '
'
+ }).inject(self.message_container, 'top');
- setTimeout(function(){
- new_message.addClass('show')
+ requestTimeout(function(){
+ new_message.addClass('show');
}, 10);
- setTimeout(function(){
- new_message.addClass('hide')
- setTimeout(function(){
+ var hide_message = function(){
+ new_message.addClass('hide');
+ requestTimeout(function(){
new_message.destroy();
}, 1000);
- }, 4000);
+ };
+
+ if(sticky)
+ new_message.grab(
+ new Element('a.close.icon2', {
+ 'events': {
+ 'click': function(){
+ self.markAsRead([data._id]);
+ hide_message();
+ }
+ }
+ })
+ );
+ else
+ requestTimeout(hide_message, 4000);
},
@@ -170,10 +210,10 @@ var NotificationBase = new Class({
addTestButtons: function(){
var self = this;
- var setting_page = App.getPage('Settings')
+ var setting_page = App.getPage('Settings');
setting_page.addEvent('create', function(){
- Object.each(setting_page.tabs.notifications.groups, self.addTestButton.bind(self))
- })
+ Object.each(setting_page.tabs.notifications.groups, self.addTestButton.bind(self));
+ });
},
@@ -183,7 +223,7 @@ var NotificationBase = new Class({
if(button_name.contains('Notifications')) return;
- new Element('.ctrlHolder.test_button').adopt(
+ new Element('.ctrlHolder.test_button').grab(
new Element('a.button', {
'text': button_name,
'events': {
@@ -196,20 +236,21 @@ var NotificationBase = new Class({
button.set('text', button_name);
+ var message;
if(json.success){
- var message = new Element('span.success', {
+ message = new Element('span.success', {
'text': 'Notification successful'
- }).inject(button, 'after')
+ }).inject(button, 'after');
}
else {
- var message = new Element('span.failed', {
+ message = new Element('span.failed', {
'text': 'Notification failed. Check logs for details.'
- }).inject(button, 'after')
+ }).inject(button, 'after');
}
- (function(){
+ requestTimeout(function(){
message.destroy();
- }).delay(3000)
+ }, 3000);
}
});
}
@@ -219,7 +260,7 @@ var NotificationBase = new Class({
},
testButtonName: function(fieldset){
- var name = String(fieldset.getElement('h2').innerHTML).substring(0,String(fieldset.getElement('h2').innerHTML).indexOf("Releases need a minimum score of'}), + new Element('input.advanced.xsmall.minimum_score_input', { + 'size': 4, + 'type':'text', + 'value': data.minimum_score || 1 + }) ) ); - self.makeSortable() + self.makeSortable(); + + // Combine qualities and properties into types + if(data.qualities){ + data.types = []; + data.qualities.each(function(quality, nr){ + data.types.include({ + 'quality': quality, + 'finish': data.finish[nr] || false, + '3d': data['3d'] ? data['3d'][nr] || false : false + }); + }); + } if(data.types) - Object.each(data.types, self.addType.bind(self)) + data.types.each(self.addType.bind(self)); else self.delete_button.hide(); @@ -67,8 +96,8 @@ var Profile = new Class({ save: function(delay){ var self = this; - if(self.save_timer) clearTimeout(self.save_timer); - self.save_timer = (function(){ + if(self.save_timer) clearRequestTimeout(self.save_timer); + self.save_timer = requestTimeout(function(){ self.addType(); @@ -87,14 +116,14 @@ var Profile = new Class({ 'onComplete': function(json){ if(json.success){ self.data = json.profile; - self.type_container.getElement('li:first-child input[type=checkbox]') + self.type_container.getElement('li:first-child input.finish[type=checkbox]') .set('checked', true) .getParent().addClass('checked'); } } }); - }).delay(delay, self) + }, delay); }, @@ -102,21 +131,24 @@ var Profile = new Class({ var self = this; var data = { - 'id' : self.data.id, + 'id' : self.data._id, 'label' : self.el.getElement('.quality_label input').get('value'), - 'wait_for' : self.el.getElement('.wait_for input').get('value'), + 'wait_for' : self.el.getElement('.wait_for_input').get('value'), + 'stop_after' : self.el.getElement('.stop_after_input').get('value'), + 'minimum_score' : self.el.getElement('.minimum_score_input').get('value'), 'types': [] - } + }; Array.each(self.type_container.getElements('.type'), function(type){ - if(!type.hasClass('deleted') && type.getElement('select').get('value') > 0) + if(!type.hasClass('deleted') && type.getElement('select').get('value') != -1) data.types.include({ - 'quality_id': type.getElement('select').get('value'), - 'finish': +type.getElement('input[type=checkbox]').checked + 'quality': type.getElement('select').get('value'), + 'finish': +type.getElement('input.finish[type=checkbox]').checked, + '3d': +type.getElement('input.3d[type=checkbox]').checked }); - }) + }); - return data + return data; }, addType: function(data){ @@ -145,7 +177,7 @@ var Profile = new Class({ var self = this; return self.types.filter(function(type){ - return type.get('quality_id') + return type.get('quality'); }); }, @@ -162,7 +194,7 @@ var Profile = new Class({ (e).preventDefault(); Api.request('profile.delete', { 'data': { - 'id': self.data.id + 'id': self.data._id }, 'useSpinner': true, 'spinnerOptions': { @@ -199,15 +231,15 @@ var Profile = new Class({ }, get: function(attr){ - return this.data[attr] + return this.data[attr]; }, isCore: function(){ - return this.data.core + return this.data.core; }, toElement: function(){ - return this.el + return this.el; } }); @@ -227,6 +259,7 @@ Profile.Type = new Class({ self.addEvent('change', function(){ self.el[self.qualities.get('value') == '-1' ? 'addClass' : 'removeClass']('is_empty'); + self.el[Quality.getQuality(self.qualities.get('value')).allow_3d ? 'addClass': 'removeClass']('allow_3d'); self.deleted = self.qualities.get('value') == '-1'; }); @@ -237,36 +270,48 @@ Profile.Type = new Class({ var data = self.data; self.el = new Element('li.type').adopt( - new Element('span.quality_type').adopt( + new Element('span.quality_type.select_wrapper.icon-dropdown').grab( self.fillQualities() ), - new Element('span.finish').adopt( - self.finish = new Element('input.inlay.finish[type=checkbox]', { + self.finish_container = new Element('label.finish').adopt( + self.finish = new Element('input.finish[type=checkbox]', { 'checked': data.finish !== undefined ? data.finish : 1, 'events': { - 'change': function(e){ + 'change': function(){ if(self.el == self.el.getParent().getElement(':first-child')){ - self.finish_class.check(); - alert('Top quality always finishes the search') + alert('Top quality always finishes the search'); return; } self.fireEvent('change'); } } - }) + }), + new Element('span.check_label[text=finish]') ), - new Element('span.delete.icon', { + self['3d_container'] = new Element('label.threed').adopt( + self['3d'] = new Element('input.3d[type=checkbox]', { + 'checked': data['3d'] !== undefined ? data['3d'] : 0, + 'events': { + 'change': function(){ + self.fireEvent('change'); + } + } + }), + new Element('span.check_label[text=3D]') + ), + new Element('span.delete.icon-cancel', { 'events': { 'click': self.del.bind(self) } }), - new Element('span.handle') + new Element('span.handle.icon-handle') ); - self.el[self.data.quality_id > 0 ? 'removeClass' : 'addClass']('is_empty'); + self.el[self.data.quality ? 'removeClass' : 'addClass']('is_empty'); - self.finish_class = new Form.Check(self.finish); + if(self.data.quality && Quality.getQuality(self.data.quality).allow_3d) + self.el.addClass('allow_3d'); }, @@ -277,7 +322,7 @@ Profile.Type = new Class({ 'events': { 'change': self.fireEvent.bind(self, 'change') } - }).adopt( + }).grab( new Element('option', { 'text': '+ Add another quality', 'value': -1 @@ -287,11 +332,12 @@ Profile.Type = new Class({ Object.each(Quality.qualities, function(q){ new Element('option', { 'text': q.label, - 'value': q.id - }).inject(self.qualities) + 'value': q.identifier, + 'data-allow_3d': q.allow_3d + }).inject(self.qualities); }); - self.qualities.set('value', self.data.quality_id); + self.qualities.set('value', self.data.quality); return self.qualities; @@ -301,9 +347,10 @@ Profile.Type = new Class({ var self = this; return { - 'quality_id': self.qualities.get('value'), - 'finish': +self.finish.checked - } + 'quality': self.qualities.get('value'), + 'finish': +self.finish.checked, + '3d': +self['3d'].checked + }; }, get: function(key){ @@ -324,4 +371,4 @@ Profile.Type = new Class({ return this.el; } -}) \ No newline at end of file +}); diff --git a/couchpotato/core/plugins/profile/static/profile.scss b/couchpotato/core/plugins/profile/static/profile.scss new file mode 100644 index 0000000000..a48f09ae95 --- /dev/null +++ b/couchpotato/core/plugins/profile/static/profile.scss @@ -0,0 +1,167 @@ +@import "_mixins"; + +.add_new_profile { + padding: 20px; + display: block; + text-align: center; + font-size: 20px; + border-bottom: 1px solid transparent; + @include theme(border-color, off); +} + +.profile { + margin-bottom: 20px; + + .quality_label input { + font-weight: bold; + } + + > .delete { + position: absolute; + padding: $padding/3 $padding; + right: 0; + cursor: pointer; + opacity: 0.6; + color: #fd5353; + font-size: 1.5em; + z-index: 2; + + &:hover { + opacity: 1; + } + } + + .ctrlHolder { + + .types { + flex: 1 1 auto; + min-width: 360px; + + .type { + display: flex; + flex-row: row nowrap; + align-items: center; + padding: 2px 0; + + label { + min-width: 0; + margin-left: $padding/2; + + span { + font-size: .9em; + } + } + + input[type=checkbox] { + margin-right: 3px; + } + + .delete, .handle { + margin-left: $padding/4; + width: 20px; + font-size: 20px; + opacity: .1; + text-align: center; + cursor: pointer; + + &.handle { + cursor: move; + cursor: grab; + } + + &:hover { + opacity: 1; + } + } + + &.is_empty { + .delete, .handle { + display: none; + } + } + } + + } + + &.wait_for.wait_for { + display: block; + + input { + min-width: 0; + width: 40px; + text-align: center; + margin: 0 2px; + } + + .advanced { + display: none; + @include theme(color, primary); + + .show_advanced & { + display: inline; + } + } + + } + + .formHint { + } + + } +} + +#profile_ordering { + ul { + list-style: none; + margin: 0; + width: 275px; + padding: 0; + } + + li { + border-bottom: 1px solid transparent; + @include theme(border-color, off); + padding: 5px; + display: flex; + align-items: center; + + &:hover { + @include theme(background, off); + } + + &:last-child { border: 0; } + + input[type=checkbox] { + margin: 2px 10px 0 0; + vertical-align: top; + } + + > span { + display: inline-block; + height: 20px; + vertical-align: top; + line-height: 20px; + + &.profile_label { + flex: 1 1 auto; + } + } + + .handle { + font-size: 20px; + width: 20px; + float: right; + cursor: move; + cursor: grab; + opacity: .5; + text-align: center; + + &:hover { + opacity: 1; + } + } + } + + .formHint { + } +} diff --git a/couchpotato/core/plugins/quality/__init__.py b/couchpotato/core/plugins/quality/__init__.py index e1b97ad0d8..7710251c7c 100644 --- a/couchpotato/core/plugins/quality/__init__.py +++ b/couchpotato/core/plugins/quality/__init__.py @@ -1,6 +1,5 @@ from .main import QualityPlugin -def start(): - return QualityPlugin() -config = [] +def autoload(): + return QualityPlugin() diff --git a/couchpotato/core/plugins/quality/index.py b/couchpotato/core/plugins/quality/index.py new file mode 100644 index 0000000000..7804397216 --- /dev/null +++ b/couchpotato/core/plugins/quality/index.py @@ -0,0 +1,18 @@ +from hashlib import md5 + +from CodernityDB.hash_index import HashIndex + + +class QualityIndex(HashIndex): + _version = 1 + + def __init__(self, *args, **kwargs): + kwargs['key_format'] = '32s' + super(QualityIndex, self).__init__(*args, **kwargs) + + def make_key(self, key): + return md5(key).hexdigest() + + def make_key_value(self, data): + if data.get('_t') == 'quality' and data.get('identifier'): + return md5(data.get('identifier')).hexdigest(), None diff --git a/couchpotato/core/plugins/quality/main.py b/couchpotato/core/plugins/quality/main.py index 4cd5b8de68..3ed1a7a4a7 100644 --- a/couchpotato/core/plugins/quality/main.py +++ b/couchpotato/core/plugins/quality/main.py @@ -1,42 +1,59 @@ -from couchpotato import get_session +from math import fabs, ceil +import traceback +import re + +from CodernityDB.database import RecordNotFound +from couchpotato import get_db from couchpotato.api import addApiView -from couchpotato.core.event import addEvent -from couchpotato.core.helpers.encoding import toUnicode -from couchpotato.core.helpers.request import jsonified, getParams -from couchpotato.core.helpers.variable import mergeDicts, md5, getExt +from couchpotato.core.event import addEvent, fireEvent +from couchpotato.core.helpers.encoding import toUnicode, ss +from couchpotato.core.helpers.variable import mergeDicts, getExt, tryInt, splitString, tryFloat from couchpotato.core.logger import CPLog from couchpotato.core.plugins.base import Plugin -from couchpotato.core.settings.model import Quality, Profile, ProfileType -from sqlalchemy.sql.expression import or_ -import os.path -import re -import time +from couchpotato.core.plugins.quality.index import QualityIndex + log = CPLog(__name__) class QualityPlugin(Plugin): + _database = { + 'quality': QualityIndex + } + qualities = [ - {'identifier': 'bd50', 'hd': True, 'size': (15000, 60000), 'label': 'BR-Disk', 'alternative': ['bd25'], 'allow': ['1080p'], 'ext':[], 'tags': ['bdmv', 'certificate', ('complete', 'bluray')]}, - {'identifier': '1080p', 'hd': True, 'size': (5000, 20000), 'label': '1080P', 'width': 1920, 'height': 1080, 'alternative': [], 'allow': [], 'ext':['mkv', 'm2ts'], 'tags': ['m2ts']}, - {'identifier': '720p', 'hd': True, 'size': (3500, 10000), 'label': '720P', 'width': 1280, 'height': 720, 'alternative': [], 'allow': [], 'ext':['mkv', 'ts']}, - {'identifier': 'brrip', 'hd': True, 'size': (700, 7000), 'label': 'BR-Rip', 'alternative': ['bdrip'], 'allow': ['720p', '1080p'], 'ext':['avi']}, - {'identifier': 'dvdr', 'size': (3000, 10000), 'label': 'DVD-R', 'alternative': [], 'allow': [], 'ext':['iso', 'img'], 'tags': ['pal', 'ntsc', 'video_ts', 'audio_ts']}, - {'identifier': 'dvdrip', 'size': (600, 2400), 'label': 'DVD-Rip', 'width': 720, 'alternative': ['dvdrip'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg'], 'tags': [('dvd', 'rip'), ('dvd', 'xvid'), ('dvd', 'divx')]}, - {'identifier': 'scr', 'size': (600, 1600), 'label': 'Screener', 'alternative': ['screener', 'dvdscr', 'ppvrip'], 'allow': ['dvdr', 'dvd'], 'ext':['avi', 'mpg', 'mpeg']}, - {'identifier': 'r5', 'size': (600, 1000), 'label': 'R5', 'alternative': [], 'allow': ['dvdr'], 'ext':['avi', 'mpg', 'mpeg']}, - {'identifier': 'tc', 'size': (600, 1000), 'label': 'TeleCine', 'alternative': ['telecine'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg']}, - {'identifier': 'ts', 'size': (600, 1000), 'label': 'TeleSync', 'alternative': ['telesync', 'hdts'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg']}, - {'identifier': 'cam', 'size': (600, 1000), 'label': 'Cam', 'alternative': ['camrip', 'hdcam'], 'allow': [], 'ext':['avi', 'mpg', 'mpeg']} + {'identifier': 'bd50', 'hd': True, 'allow_3d': True, 'size': (20000, 60000), 'median_size': 40000, 'label': 'BR-Disk', 'alternative': ['bd25', ('br', 'disk')], 'allow': ['1080p'], 'ext':['iso', 'img'], 'tags': ['bdmv', 'certificate', ('complete', 'bluray'), 'avc', 'mvc']}, + {'identifier': '1080p', 'hd': True, 'allow_3d': True, 'size': (4000, 20000), 'median_size': 10000, 'label': '1080p', 'width': 1920, 'height': 1080, 'alternative': [], 'allow': [], 'ext':['mkv', 'm2ts', 'ts'], 'tags': ['m2ts', 'x264', 'h264', '1080']}, + {'identifier': '720p', 'hd': True, 'allow_3d': True, 'size': (3000, 10000), 'median_size': 5500, 'label': '720p', 'width': 1280, 'height': 720, 'alternative': [], 'allow': [], 'ext':['mkv', 'ts'], 'tags': ['x264', 'h264', '720']}, + {'identifier': 'brrip', 'hd': True, 'allow_3d': True, 'size': (700, 7000), 'median_size': 2000, 'label': 'BR-Rip', 'alternative': ['bdrip', ('br', 'rip'), 'hdtv', 'hdrip'], 'allow': ['720p', '1080p'], 'ext':['mp4', 'avi'], 'tags': ['webdl', ('web', 'dl')]}, + {'identifier': 'dvdr', 'size': (3000, 10000), 'median_size': 4500, 'label': 'DVD-R', 'alternative': ['br2dvd', ('dvd', 'r')], 'allow': [], 'ext':['iso', 'img', 'vob'], 'tags': ['pal', 'ntsc', 'video_ts', 'audio_ts', ('dvd', 'r'), 'dvd9']}, + {'identifier': 'dvdrip', 'size': (600, 2400), 'median_size': 1500, 'label': 'DVD-Rip', 'width': 720, 'alternative': [('dvd', 'rip')], 'allow': [], 'ext':['avi'], 'tags': [('dvd', 'rip'), ('dvd', 'xvid'), ('dvd', 'divx')]}, + {'identifier': 'scr', 'size': (600, 1600), 'median_size': 700, 'label': 'Screener', 'alternative': ['screener', 'dvdscr', 'ppvrip', 'dvdscreener', 'hdscr', 'webrip', ('web', 'rip')], 'allow': ['dvdr', 'dvdrip', '720p', '1080p'], 'ext':[], 'tags': []}, + {'identifier': 'r5', 'size': (600, 1000), 'median_size': 700, 'label': 'R5', 'alternative': ['r6'], 'allow': ['dvdr', '720p', '1080p'], 'ext':[]}, + {'identifier': 'tc', 'size': (600, 1000), 'median_size': 700, 'label': 'TeleCine', 'alternative': ['telecine'], 'allow': ['720p', '1080p'], 'ext':[]}, + {'identifier': 'ts', 'size': (600, 1000), 'median_size': 700, 'label': 'TeleSync', 'alternative': ['telesync', 'hdts'], 'allow': ['720p', '1080p'], 'ext':[]}, + {'identifier': 'cam', 'size': (600, 1000), 'median_size': 700, 'label': 'Cam', 'alternative': ['camrip', 'hdcam'], 'allow': ['720p', '1080p'], 'ext':[]} ] pre_releases = ['cam', 'ts', 'tc', 'r5', 'scr'] + threed_tags = { + 'sbs': [('half', 'sbs'), 'hsbs', ('full', 'sbs'), 'fsbs'], + 'ou': [('half', 'ou'), 'hou', ('full', 'ou'), 'fou'], + '3d': ['2d3d', '3d2d', '3d'], + } + + cached_qualities = None + cached_order = None def __init__(self): addEvent('quality.all', self.all) addEvent('quality.single', self.single) addEvent('quality.guess', self.guess) addEvent('quality.pre_releases', self.preReleases) + addEvent('quality.order', self.getOrder) + addEvent('quality.ishigher', self.isHigher) + addEvent('quality.isfinish', self.isFinish) + addEvent('quality.fill', self.fill) addApiView('quality.size.save', self.saveSize) addApiView('quality.list', self.allView, docs = { @@ -49,37 +66,55 @@ def __init__(self): addEvent('app.initialize', self.fill, priority = 10) + addEvent('app.test', self.doTest) + + self.order = [] + self.addOrder() + + def addOrder(self): + self.order = [] + for q in self.qualities: + self.order.append(q.get('identifier')) + + def getOrder(self): + return self.order + def preReleases(self): return self.pre_releases - def allView(self): + def allView(self, **kwargs): - return jsonified({ + return { 'success': True, 'list': self.all() - }) + } def all(self): - db = get_session() + if self.cached_qualities: + return self.cached_qualities - qualities = db.query(Quality).all() + db = get_db() temp = [] - for quality in qualities: - q = mergeDicts(self.getQuality(quality.identifier), quality.to_dict()) + for quality in self.qualities: + quality_doc = db.get('quality', quality.get('identifier'), with_doc = True)['doc'] + q = mergeDicts(quality, quality_doc) temp.append(q) + if len(temp) == len(self.qualities): + self.cached_qualities = temp + return temp def single(self, identifier = ''): - db = get_session() + db = get_db() quality_dict = {} - quality = db.query(Quality).filter(or_(Quality.identifier == identifier, Quality.id == identifier)).first() + quality = db.get('quality', identifier, with_doc = True)['doc'] if quality: - quality_dict = dict(self.getQuality(quality.identifier), **quality.to_dict()) + quality_dict = mergeDicts(self.getQuality(quality['identifier']), quality) return quality_dict @@ -89,128 +124,393 @@ def getQuality(self, identifier): if identifier == q.get('identifier'): return q - def saveSize(self): + def saveSize(self, **kwargs): - params = getParams() + try: + db = get_db() + quality = db.get('quality', kwargs.get('identifier'), with_doc = True) - db = get_session() - quality = db.query(Quality).filter_by(identifier = params.get('identifier')).first() + if quality: + quality['doc'][kwargs.get('value_type')] = tryInt(kwargs.get('value')) + db.update(quality['doc']) - if quality: - setattr(quality, params.get('value_type'), params.get('value')) - db.commit() + self.cached_qualities = None - return jsonified({ - 'success': True - }) + return { + 'success': True + } + except: + log.error('Failed: %s', traceback.format_exc()) + + return { + 'success': False + } def fill(self): - db = get_session(); + try: + db = get_db() + + order = 0 + for q in self.qualities: + + existing = None + try: + existing = db.get('quality', q.get('identifier')) + except RecordNotFound: + pass + + if not existing: + db.insert({ + '_t': 'quality', + 'order': order, + 'identifier': q.get('identifier'), + 'size_min': tryInt(q.get('size')[0]), + 'size_max': tryInt(q.get('size')[1]), + }) + + log.info('Creating profile: %s', q.get('label')) + db.insert({ + '_t': 'profile', + 'order': order + 20, # Make sure it goes behind other profiles + 'core': True, + 'qualities': [q.get('identifier')], + 'label': toUnicode(q.get('label')), + 'finish': [True], + 'wait_for': [0], + }) + + order += 1 + + return True + except: + log.error('Failed: %s', traceback.format_exc()) + + return False + + def guess(self, files, extra = None, size = None, use_cache = True): + if not extra: extra = {} - order = 0 - for q in self.qualities: + # Create hash for cache + cache_key = str([f.replace('.' + getExt(f), '') if len(getExt(f)) < 4 else f for f in files]) + if use_cache: + cached = self.getCache(cache_key) + if cached and len(extra) == 0: + return cached - # Create quality - qual = db.query(Quality).filter_by(identifier = q.get('identifier')).first() + qualities = self.all() - if not qual: - log.info('Creating quality: %s', q.get('label')) - qual = Quality() - qual.order = order - qual.identifier = q.get('identifier') - qual.label = toUnicode(q.get('label')) - qual.size_min, qual.size_max = q.get('size') + # Start with 0 + score = {} + for quality in qualities: + score[quality.get('identifier')] = { + 'score': 0, + '3d': {} + } - db.add(qual) + # Use metadata titles as extra check + if extra and extra.get('titles'): + files.extend(extra.get('titles')) - # Create single quality profile - prof = db.query(Profile).filter( - Profile.core == True - ).filter( - Profile.types.any(quality = qual) - ).all() + for cur_file in files: + words = re.split('\W+', cur_file.lower()) + name_year = fireEvent('scanner.name_year', cur_file, file_name = cur_file, single = True) + threed_words = words + if name_year and name_year.get('name'): + split_name = splitString(name_year.get('name'), ' ') + threed_words = [x for x in words if x not in split_name] - if not prof: - log.info('Creating profile: %s', q.get('label')) - prof = Profile( - core = True, - label = toUnicode(qual.label), - order = order - ) - db.add(prof) + for quality in qualities: + contains_score = self.containsTagScore(quality, words, cur_file) + threedscore = self.contains3D(quality, threed_words, cur_file) if quality.get('allow_3d') else (0, None) - profile_type = ProfileType( - quality = qual, - profile = prof, - finish = True, - order = 0 - ) - prof.types.append(profile_type) + self.calcScore(score, quality, contains_score, threedscore, penalty = contains_score) - order += 1 + size_scores = [] + for quality in qualities: - db.commit() + # Evaluate score based on size + size_score = self.guessSizeScore(quality, size = size) + loose_score = self.guessLooseScore(quality, extra = extra) - time.sleep(0.3) # Wait a moment + if size_score > 0: + size_scores.append(quality) - return True + self.calcScore(score, quality, size_score + loose_score) - def guess(self, files, extra = {}): + # Add additional size score if only 1 size validated + if len(size_scores) == 1: + self.calcScore(score, size_scores[0], 7) + del size_scores - # Create hash for cache - hash = md5(str([f.replace('.' + getExt(f), '') for f in files])) - cached = self.getCache(hash) - if cached and extra is {}: return cached + # Return nothing if all scores are <= 0 + has_non_zero = 0 + for s in score: + if score[s]['score'] > 0: + has_non_zero += 1 - for cur_file in files: - size = (os.path.getsize(cur_file) / 1024 / 1024) if os.path.isfile(cur_file) else 0 - words = re.split('\W+', cur_file.lower()) + if not has_non_zero: + return None + + heighest_quality = max(score, key = lambda p: score[p]['score']) + if heighest_quality: + for quality in qualities: + if quality.get('identifier') == heighest_quality: + quality['is_3d'] = False + if score[heighest_quality].get('3d'): + quality['is_3d'] = True + return self.setCache(cache_key, quality) - for quality in self.all(): + return None - # Check tags - if quality['identifier'] in words: - log.debug('Found via identifier "%s" in %s', (quality['identifier'], cur_file)) - return self.setCache(hash, quality) + def containsTagScore(self, quality, words, cur_file = ''): + cur_file = ss(cur_file) + score = 0.0 - if list(set(quality.get('alternative', [])) & set(words)): - log.debug('Found %s via alt %s in %s', (quality['identifier'], quality.get('alternative'), cur_file)) - return self.setCache(hash, quality) + extension = words[-1] + words = words[:-1] - for tag in quality.get('tags', []): - if isinstance(tag, tuple) and '.'.join(tag) in '.'.join(words): - log.debug('Found %s via tag %s in %s', (quality['identifier'], quality.get('tags'), cur_file)) - return self.setCache(hash, quality) + points = { + 'identifier': 25, + 'label': 25, + 'alternative': 20, + 'tags': 11, + 'ext': 5, + } - if list(set(quality.get('tags', [])) & set(words)): - log.debug('Found %s via tag %s in %s', (quality['identifier'], quality.get('tags'), cur_file)) - return self.setCache(hash, quality) + scored_on = [] - # Try again with loose testing - quality = self.guessLoose(hash, extra = extra) - if quality: - return self.setCache(hash, quality) + # Check alt and tags + for tag_type in ['identifier', 'alternative', 'tags', 'label']: + qualities = quality.get(tag_type, []) + qualities = [qualities] if isinstance(qualities, (str, unicode)) else qualities - log.debug('Could not identify quality for: %s', files) - return None + for alt in qualities: + if isinstance(alt, tuple): + if len(set(words) & set(alt)) == len(alt): + log.debug('Found %s via %s %s in %s', (quality['identifier'], tag_type, quality.get(tag_type), cur_file)) + score += points.get(tag_type) + + if isinstance(alt, (str, unicode)) and ss(alt.lower()) in words and ss(alt.lower()) not in scored_on: + log.debug('Found %s via %s %s in %s', (quality['identifier'], tag_type, quality.get(tag_type), cur_file)) + score += points.get(tag_type) + + # Don't score twice on same tag + scored_on.append(ss(alt).lower()) + + # Check extention + for ext in quality.get('ext', []): + if ext == extension: + log.debug('Found %s with .%s extension in %s', (quality['identifier'], ext, cur_file)) + score += points['ext'] + + return score + + def contains3D(self, quality, words, cur_file = ''): + cur_file = ss(cur_file) + + for key in self.threed_tags: + tags = self.threed_tags.get(key, []) - def guessLoose(self, hash, extra): + for tag in tags: + if isinstance(tag, tuple): + if len(set(words) & set(tag)) == len(tag): + log.debug('Found %s in %s', (tag, cur_file)) + return 1, key + elif tag in words: + log.debug('Found %s in %s', (tag, cur_file)) + return 1, key - for quality in self.all(): + return 0, None + + def guessLooseScore(self, quality, extra = None): + + score = 0 + + if extra: # Check width resolution, range 20 - if (quality.get('width', 720) - 20) <= extra.get('resolution_width', 0) <= (quality.get('width', 720) + 20): - log.debug('Found %s via resolution_width: %s == %s', (quality['identifier'], quality.get('width', 720), extra.get('resolution_width', 0))) - return self.setCache(hash, quality) + if quality.get('width') and (quality.get('width') - 20) <= extra.get('resolution_width', 0) <= (quality.get('width') + 20): + log.debug('Found %s via resolution_width: %s == %s', (quality['identifier'], quality.get('width'), extra.get('resolution_width', 0))) + score += 10 # Check height resolution, range 20 - if (quality.get('height', 480) - 20) <= extra.get('resolution_height', 0) <= (quality.get('height', 480) + 20): - log.debug('Found %s via resolution_height: %s == %s', (quality['identifier'], quality.get('height', 480), extra.get('resolution_height', 0))) - return self.setCache(hash, quality) + if quality.get('height') and (quality.get('height') - 20) <= extra.get('resolution_height', 0) <= (quality.get('height') + 20): + log.debug('Found %s via resolution_height: %s == %s', (quality['identifier'], quality.get('height'), extra.get('resolution_height', 0))) + score += 5 + + if quality.get('identifier') == 'dvdrip' and 480 <= extra.get('resolution_width', 0) <= 720: + log.debug('Add point for correct dvdrip resolutions') + score += 1 + + return score + + + def guessSizeScore(self, quality, size = None): + + score = 0 + + if size: + + size = tryFloat(size) + size_min = tryFloat(quality['size_min']) + size_max = tryFloat(quality['size_max']) + + if size_min <= size <= size_max: + log.debug('Found %s via release size: %s MB < %s MB < %s MB', (quality['identifier'], size_min, size, size_max)) + + proc_range = size_max - size_min + size_diff = size - size_min + size_proc = (size_diff / proc_range) + + median_diff = quality['median_size'] - size_min + median_proc = (median_diff / proc_range) + + max_points = 8 + score += ceil(max_points - (fabs(size_proc - median_proc) * max_points)) + else: + score -= 5 + + return score + + def calcScore(self, score, quality, add_score, threedscore = (0, None), penalty = 0): + + score[quality['identifier']]['score'] += add_score + + threedscore, threedtag = threedscore + if threedscore and threedtag: + if threedscore not in score[quality['identifier']]['3d']: + score[quality['identifier']]['3d'][threedtag] = 0 + + score[quality['identifier']]['3d'][threedtag] += threedscore + + # Set order for allow calculation (and cache) + if not self.cached_order: + self.cached_order = {} + for q in self.qualities: + self.cached_order[q.get('identifier')] = self.qualities.index(q) + + if penalty and add_score != 0: + for allow in quality.get('allow', []): + score[allow]['score'] -= ((penalty * 2) if self.cached_order[allow] < self.cached_order[quality['identifier']] else penalty) * 2 + + # Give panelty for all other qualities + for q in self.qualities: + if quality.get('identifier') != q.get('identifier') and score.get(q.get('identifier')): + score[q.get('identifier')]['score'] -= 1 + + def isFinish(self, quality, profile, release_age = 0): + if not isinstance(profile, dict) or not profile.get('qualities'): + # No profile so anything (scanned) is good enough + return True + + try: + index = [i for i, identifier in enumerate(profile['qualities']) if identifier == quality['identifier'] and bool(profile['3d'][i] if profile.get('3d') else False) == bool(quality.get('is_3d', False))][0] + + if index == 0 or (profile['finish'][index] and int(release_age) >= int(profile.get('stop_after', [0])[0])): + return True + + return False + except: + return False + + def isHigher(self, quality, compare_with, profile = None): + if not isinstance(profile, dict) or not profile.get('qualities'): + profile = fireEvent('profile.default', single = True) + + # Try to find quality in profile, if not found: a quality we do not want is lower than anything else + try: + quality_order = [i for i, identifier in enumerate(profile['qualities']) if identifier == quality['identifier'] and bool(profile['3d'][i] if profile.get('3d') else 0) == bool(quality.get('is_3d', 0))][0] + except: + log.debug('Quality %s not found in profile identifiers %s', (quality['identifier'] + (' 3D' if quality.get('is_3d', 0) else ''), \ + [identifier + (' 3D' if (profile['3d'][i] if profile.get('3d') else 0) else '') for i, identifier in enumerate(profile['qualities'])])) + return 'lower' + + # Try to find compare quality in profile, if not found: anything is higher than a not wanted quality + try: + compare_order = [i for i, identifier in enumerate(profile['qualities']) if identifier == compare_with['identifier'] and bool(profile['3d'][i] if profile.get('3d') else 0) == bool(compare_with.get('is_3d', 0))][0] + except: + log.debug('Compare quality %s not found in profile identifiers %s', (compare_with['identifier'] + (' 3D' if compare_with.get('is_3d', 0) else ''), \ + [identifier + (' 3D' if (profile['3d'][i] if profile.get('3d') else 0) else '') for i, identifier in enumerate(profile['qualities'])])) + return 'higher' + + # Note to self: a lower number means higher quality + if quality_order > compare_order: + return 'lower' + elif quality_order == compare_order: + return 'equal' + else: + return 'higher' + + def doTest(self): + + tests = { + 'Movie Name (1999)-DVD-Rip.avi': {'size': 700, 'quality': 'dvdrip'}, + 'Movie Name 1999 720p Bluray.mkv': {'size': 4200, 'quality': '720p'}, + 'Movie Name 1999 BR-Rip 720p.avi': {'size': 1000, 'quality': 'brrip'}, + 'Movie Name 1999 720p Web Rip.avi': {'size': 1200, 'quality': 'scr'}, + 'Movie Name 1999 Web DL.avi': {'size': 800, 'quality': 'brrip'}, + 'Movie.Name.1999.1080p.WEBRip.H264-Group': {'size': 1500, 'quality': 'scr'}, + 'Movie.Name.1999.DVDRip-Group': {'size': 750, 'quality': 'dvdrip'}, + 'Movie.Name.1999.DVD-Rip-Group': {'size': 700, 'quality': 'dvdrip'}, + 'Movie.Name.1999.DVD-R-Group': {'size': 4500, 'quality': 'dvdr'}, + 'Movie.Name.Camelie.1999.720p.BluRay.x264-Group': {'size': 5500, 'quality': '720p'}, + 'Movie.Name.2008.German.DL.AC3.1080p.BluRay.x264-Group': {'size': 8500, 'extra': {'resolution_width': 1920, 'resolution_height': 1080} , 'quality': '1080p'}, + 'Movie.Name.2004.GERMAN.AC3D.DL.1080p.BluRay.x264-Group': {'size': 8000, 'quality': '1080p'}, + 'Movie.Name.2013.BR-Disk-Group.iso': {'size': 48000, 'quality': 'bd50'}, + 'Movie.Name.2013.2D+3D.BR-Disk-Group.iso': {'size': 52000, 'quality': 'bd50', 'is_3d': True}, + 'Movie.Rising.Name.Girl.2011.NTSC.DVD9-GroupDVD': {'size': 7200, 'quality': 'dvdr'}, + 'Movie Name (2013) 2D + 3D': {'size': 49000, 'quality': 'bd50', 'is_3d': True}, + 'Movie Monuments 2013 BrRip 1080p': {'size': 1800, 'quality': 'brrip'}, + 'Movie Monuments 2013 BrRip 720p': {'size': 1300, 'quality': 'brrip'}, + 'The.Movie.2014.3D.1080p.BluRay.AVC.DTS-HD.MA.5.1-GroupName': {'size': 30000, 'quality': 'bd50', 'is_3d': True}, + '/home/namehou/Movie Monuments (2012)/Movie Monuments.mkv': {'size': 5500, 'quality': '720p', 'is_3d': False}, + '/home/namehou/Movie Monuments (2012)/Movie Monuments Full-OU.mkv': {'size': 5500, 'quality': '720p', 'is_3d': True}, + '/home/namehou/Movie Monuments (2013)/Movie Monuments.mkv': {'size': 10000, 'quality': '1080p', 'is_3d': False}, + '/home/namehou/Movie Monuments (2013)/Movie Monuments Full-OU.mkv': {'size': 10000, 'quality': '1080p', 'is_3d': True}, + '/volume1/Public/3D/Moviename/Moviename (2009).3D.SBS.ts': {'size': 7500, 'quality': '1080p', 'is_3d': True}, + '/volume1/Public/Moviename/Moviename (2009).ts': {'size': 7500, 'quality': '1080p'}, + '/movies/BluRay HDDVD H.264 MKV 720p EngSub/QuiQui le fou (criterion collection #123, 1915)/QuiQui le fou (1915) 720p x264 BluRay.mkv': {'size': 5500, 'quality': '720p'}, + 'C:\\movies\QuiQui le fou (collection #123, 1915)\QuiQui le fou (1915) 720p x264 BluRay.mkv': {'size': 5500, 'quality': '720p'}, + 'C:\\movies\QuiQui le fou (collection #123, 1915)\QuiQui le fou (1915) half-sbs 720p x264 BluRay.mkv': {'size': 5500, 'quality': '720p', 'is_3d': True}, + 'Moviename 2014 720p HDCAM XviD DualAudio': {'size': 4000, 'quality': 'cam'}, + 'Moviename (2014) - 720p CAM x264': {'size': 2250, 'quality': 'cam'}, + 'Movie Name (2014).mp4': {'size': 750, 'quality': 'brrip'}, + 'Moviename.2014.720p.R6.WEB-DL.x264.AC3-xyz': {'size': 750, 'quality': 'r5'}, + 'Movie name 2014 New Source 720p HDCAM x264 AC3 xyz': {'size': 750, 'quality': 'cam'}, + 'Movie.Name.2014.720p.HD.TS.AC3.x264': {'size': 750, 'quality': 'ts'}, + 'Movie.Name.2014.1080p.HDrip.x264.aac-ReleaseGroup': {'size': 7000, 'quality': 'brrip'}, + 'Movie.Name.2014.HDCam.Chinese.Subs-ReleaseGroup': {'size': 15000, 'quality': 'cam'}, + 'Movie Name 2014 HQ DVDRip X264 AC3 (bla)': {'size': 0, 'quality': 'dvdrip'}, + 'Movie Name1 (2012).mkv': {'size': 4500, 'quality': '720p'}, + 'Movie Name (2013).mkv': {'size': 8500, 'quality': '1080p'}, + 'Movie Name (2014).mkv': {'size': 4500, 'quality': '720p', 'extra': {'titles': ['Movie Name 2014 720p Bluray']}}, + 'Movie Name (2015).mkv': {'size': 500, 'quality': '1080p', 'extra': {'resolution_width': 1920}}, + 'Movie Name (2015).mp4': {'size': 6500, 'quality': 'brrip'}, + 'Movie Name.2014.720p Web-Dl Aac2.0 h264-ReleaseGroup': {'size': 3800, 'quality': 'brrip'}, + 'Movie Name.2014.720p.WEBRip.x264.AC3-ReleaseGroup': {'size': 3000, 'quality': 'scr'}, + 'Movie.Name.2014.1080p.HDCAM.-.ReleaseGroup': {'size': 5300, 'quality': 'cam'}, + 'Movie.Name.2014.720p.HDSCR.4PARTS.MP4.AAC.ReleaseGroup': {'size': 2401, 'quality': 'scr'}, + 'Movie.Name.2014.720p.BluRay.x264-ReleaseGroup': {'size': 10300, 'quality': '720p'}, + 'Movie.Name.2014.720.Bluray.x264.DTS-ReleaseGroup': {'size': 9700, 'quality': '720p'}, + } + + correct = 0 + for name in tests: + test_quality = self.guess(files = [name], extra = tests[name].get('extra', None), size = tests[name].get('size', None), use_cache = False) or {} + success = test_quality.get('identifier') == tests[name]['quality'] and test_quality.get('is_3d') == tests[name].get('is_3d', False) + if not success: + log.error('%s failed check, thinks it\'s "%s" expecting "%s"', (name, + test_quality.get('identifier') + (' 3D' if test_quality.get('is_3d') else ''), + tests[name]['quality'] + (' 3D' if tests[name].get('is_3d') else '') + )) + + correct += success + + if correct == len(tests): + log.info('Quality test successful') + return True + else: + log.error('Quality test failed: %s out of %s succeeded', (correct, len(tests))) - if 480 <= extra.get('resolution_width', 0) <= 720: - log.debug('Found as dvdrip') - return self.setCache(hash, self.single('dvdrip')) - return None diff --git a/couchpotato/core/plugins/quality/static/quality.css b/couchpotato/core/plugins/quality/static/quality.css deleted file mode 100644 index f71f007e8c..0000000000 --- a/couchpotato/core/plugins/quality/static/quality.css +++ /dev/null @@ -1,26 +0,0 @@ -.group_sizes { - -} - - .group_sizes .head { - font-weight: bold; - } - - .group_sizes .ctrlHolder { - padding-top: 4px !important; - padding-bottom: 4px !important; - font-size: 12px; - } - - .group_sizes .label { - max-width: 120px; - } - - .group_sizes .min, .group_sizes .max { - text-align: center; - width: 50px; - max-width: 50px; - margin: 0 5px !important; - padding: 0 3px; - display: inline-block; - } \ No newline at end of file diff --git a/couchpotato/core/plugins/quality/static/quality.js b/couchpotato/core/plugins/quality/static/quality.js index bd2ff2acbc..60a24498e2 100644 --- a/couchpotato/core/plugins/quality/static/quality.js +++ b/couchpotato/core/plugins/quality/static/quality.js @@ -8,40 +8,47 @@ var QualityBase = new Class({ self.qualities = data.qualities; - self.profiles = [] + self.profiles_list = null; + self.profiles = []; Array.each(data.profiles, self.createProfilesClass.bind(self)); - App.addEvent('load', self.addSettings.bind(self)) + App.addEvent('loadSettings', self.addSettings.bind(self)); }, getProfile: function(id){ return this.profiles.filter(function(profile){ - return profile.data.id == id - }).pick() + return profile.data._id == id; + }).pick(); }, // Hide items when getting profiles getActiveProfiles: function(){ return Array.filter(this.profiles, function(profile){ - return !profile.data.hide + return !profile.data.hide; }); }, - getQuality: function(id){ - return this.qualities.filter(function(q){ - return q.id == id; - }).pick(); + getQuality: function(identifier){ + try { + return this.qualities.filter(function(q){ + return q.identifier == identifier; + }).pick(); + } + catch(e){} + + return {}; }, addSettings: function(){ var self = this; - self.settings = App.getPage('Settings') + self.settings = App.getPage('Settings'); self.settings.addEvent('create', function(){ var tab = self.settings.createSubTab('profile', { 'label': 'Quality', - 'name': 'profile' + 'name': 'profile', + 'subtab_label': 'Qualities' }, self.settings.tabs.searcher ,'searcher'); self.tab = tab.tab; @@ -51,7 +58,7 @@ var QualityBase = new Class({ self.createProfileOrdering(); self.createSizes(); - }) + }); }, @@ -61,7 +68,7 @@ var QualityBase = new Class({ createProfiles: function(){ var self = this; - var non_core_profiles = Array.filter(self.profiles, function(profile){ return !profile.isCore() }); + var non_core_profiles = Array.filter(self.profiles, function(profile){ return !profile.isCore(); }); var count = non_core_profiles.length; self.settings.createGroup({ @@ -74,7 +81,7 @@ var QualityBase = new Class({ 'events': { 'click': function(){ var profile = self.createProfilesClass(); - $(profile).inject(self.profile_container) + $(profile).inject(self.profile_container); } } }) @@ -82,7 +89,7 @@ var QualityBase = new Class({ // Add profiles, that aren't part of the core (for editing) Array.each(non_core_profiles, function(profile){ - $(profile).inject(self.profile_container) + $(profile).inject(self.profile_container); }); }, @@ -90,9 +97,9 @@ var QualityBase = new Class({ createProfilesClass: function(data){ var self = this; - var data = data || {'id': randomString()} - var profile = new Profile(data) - self.profiles.include(profile) + data = data || {'id': randomString()}; + var profile = new Profile(data); + self.profiles.include(profile); return profile; }, @@ -100,23 +107,23 @@ var QualityBase = new Class({ createProfileOrdering: function(){ var self = this; - var profile_list; - var group = self.settings.createGroup({ - 'label': 'Profile Defaults' - }).adopt( + self.settings.createGroup({ + 'label': 'Profile Defaults', + 'description': '(Needs refresh \'' +(App.isMac() ? 'CMD+R' : 'F5')+ '\' after editing)' + }).grab( new Element('.ctrlHolder#profile_ordering').adopt( new Element('label[text=Order]'), - profile_list = new Element('ul'), + self.profiles_list = new Element('ul'), new Element('p.formHint', { 'html': 'Change the order the profiles are in the dropdown list. Uncheck to hide it completely.
First one will be default.' }) ) - ).inject(self.content) + ).inject(self.content); Array.each(self.profiles, function(profile){ var check; - new Element('li', {'data-id': profile.data.id}).adopt( - check = new Element('input.inlay[type=checkbox]', { + new Element('li', {'data-id': profile.data._id}).adopt( + check = new Element('input[type=checkbox]', { 'checked': !profile.data.hide, 'events': { 'change': self.saveProfileOrdering.bind(self) @@ -125,30 +132,35 @@ var QualityBase = new Class({ new Element('span.profile_label', { 'text': profile.data.label }), - new Element('span.handle') - ).inject(profile_list); - - new Form.Check(check); - + new Element('span.handle.icon-handle') + ).inject(self.profiles_list); }); // Sortable - self.profile_sortable = new Sortables(profile_list, { + var sorted_changed = false; + self.profile_sortable = new Sortables(self.profiles_list, { 'revert': true, - 'handle': '', + 'handle': '.handle', 'opacity': 0.5, - 'onComplete': self.saveProfileOrdering.bind(self) + 'onSort': function(){ + sorted_changed = true; + }, + 'onComplete': function(){ + if(sorted_changed){ + self.saveProfileOrdering(); + sorted_changed = false; + } + } }); }, saveProfileOrdering: function(){ - var self = this; - - var ids = []; - var hidden = []; + var self = this, + ids = [], + hidden = []; - self.profile_sortable.list.getElements('li').each(function(el, nr){ + self.profiles_list.getElements('li').each(function(el, nr){ ids.include(el.get('data-id')); hidden[nr] = +!el.getElement('input[type=checkbox]').get('checked'); }); @@ -173,35 +185,34 @@ var QualityBase = new Class({ 'description': 'Edit the minimal and maximum sizes (in MB) for each quality.', 'advanced': true, 'name': 'sizes' - }).inject(self.content) - + }).inject(self.content); new Element('div.item.head.ctrlHolder').adopt( new Element('span.label', {'text': 'Quality'}), new Element('span.min', {'text': 'Min'}), new Element('span.max', {'text': 'Max'}) - ).inject(group) + ).inject(group); Array.each(self.qualities, function(quality){ new Element('div.ctrlHolder.item').adopt( new Element('span.label', {'text': quality.label}), - new Element('input.min.inlay[type=text]', { + new Element('input.min[type=text]', { 'value': quality.size_min, 'events': { 'keyup': function(e){ - self.changeSize(quality.identifier, 'size_min', e.target.get('value')) + self.changeSize(quality.identifier, 'size_min', e.target.get('value')); } } }), - new Element('input.max.inlay[type=text]', { + new Element('input.max[type=text]', { 'value': quality.size_max, 'events': { 'keyup': function(e){ - self.changeSize(quality.identifier, 'size_max', e.target.get('value')) + self.changeSize(quality.identifier, 'size_max', e.target.get('value')); } } }) - ).inject(group) + ).inject(group); }); }, @@ -210,9 +221,9 @@ var QualityBase = new Class({ changeSize: function(identifier, type, value){ var self = this; - if(self.size_timer[identifier + type]) clearTimeout(self.size_timer[identifier + type]); + if(self.size_timer[identifier + type]) clearRequestTimeout(self.size_timer[identifier + type]); - self.size_timer[identifier + type] = (function(){ + self.size_timer[identifier + type] = requestTimeout(function(){ Api.request('quality.size.save', { 'data': { 'identifier': identifier, @@ -220,7 +231,7 @@ var QualityBase = new Class({ 'value': value } }); - }).delay(300) + }, 300); } diff --git a/couchpotato/core/plugins/quality/static/quality.scss b/couchpotato/core/plugins/quality/static/quality.scss new file mode 100644 index 0000000000..c2aa9f99b7 --- /dev/null +++ b/couchpotato/core/plugins/quality/static/quality.scss @@ -0,0 +1,19 @@ +@import "_mixins"; + +.group_sizes { + + .item { + .label { + min-width: 150px; + } + + .min, .max { + display: inline-block; + width: 70px !important; + min-width: 0 !important; + margin-right: $padding/2; + text-align: center; + } + } + +} diff --git a/couchpotato/core/plugins/release/__init__.py b/couchpotato/core/plugins/release/__init__.py index b6a667c219..e6e60c4bbd 100644 --- a/couchpotato/core/plugins/release/__init__.py +++ b/couchpotato/core/plugins/release/__init__.py @@ -1,6 +1,5 @@ from .main import Release -def start(): - return Release() -config = [] +def autoload(): + return Release() diff --git a/couchpotato/core/plugins/release/index.py b/couchpotato/core/plugins/release/index.py new file mode 100644 index 0000000000..8265fe332d --- /dev/null +++ b/couchpotato/core/plugins/release/index.py @@ -0,0 +1,64 @@ +from hashlib import md5 + +from CodernityDB.hash_index import HashIndex +from CodernityDB.tree_index import TreeBasedIndex + + +class ReleaseIndex(TreeBasedIndex): + _version = 1 + + def __init__(self, *args, **kwargs): + kwargs['key_format'] = '32s' + super(ReleaseIndex, self).__init__(*args, **kwargs) + + def make_key(self, key): + return key + + def make_key_value(self, data): + if data.get('_t') == 'release' and data.get('media_id'): + return data['media_id'], None + + +class ReleaseStatusIndex(TreeBasedIndex): + _version = 1 + + def __init__(self, *args, **kwargs): + kwargs['key_format'] = '32s' + super(ReleaseStatusIndex, self).__init__(*args, **kwargs) + + def make_key(self, key): + return md5(key).hexdigest() + + def make_key_value(self, data): + if data.get('_t') == 'release' and data.get('status'): + return md5(data.get('status')).hexdigest(), {'media_id': data.get('media_id')} + + +class ReleaseIDIndex(HashIndex): + _version = 1 + + def __init__(self, *args, **kwargs): + kwargs['key_format'] = '32s' + super(ReleaseIDIndex, self).__init__(*args, **kwargs) + + def make_key(self, key): + return md5(key).hexdigest() + + def make_key_value(self, data): + if data.get('_t') == 'release' and data.get('identifier'): + return md5(data.get('identifier')).hexdigest(), {'media_id': data.get('media_id')} + + +class ReleaseDownloadIndex(HashIndex): + _version = 2 + + def __init__(self, *args, **kwargs): + kwargs['key_format'] = '32s' + super(ReleaseDownloadIndex, self).__init__(*args, **kwargs) + + def make_key(self, key): + return md5(key.lower()).hexdigest() + + def make_key_value(self, data): + if data.get('_t') == 'release' and data.get('download_info') and data['download_info']['id'] and data['download_info']['downloader']: + return md5(('%s-%s' % (data['download_info']['downloader'], data['download_info']['id'])).lower()).hexdigest(), None diff --git a/couchpotato/core/plugins/release/main.py b/couchpotato/core/plugins/release/main.py index 02843f855a..8320a247d5 100644 --- a/couchpotato/core/plugins/release/main.py +++ b/couchpotato/core/plugins/release/main.py @@ -1,24 +1,34 @@ -from couchpotato import get_session +from inspect import ismethod, isfunction +import os +import time +import traceback + +from CodernityDB.database import RecordDeleted, RecordNotFound +from couchpotato import md5, get_db from couchpotato.api import addApiView from couchpotato.core.event import fireEvent, addEvent -from couchpotato.core.helpers.encoding import ss -from couchpotato.core.helpers.request import getParam, jsonified +from couchpotato.core.helpers.encoding import toUnicode, sp +from couchpotato.core.helpers.variable import getTitle, tryInt from couchpotato.core.logger import CPLog from couchpotato.core.plugins.base import Plugin -from couchpotato.core.plugins.scanner.main import Scanner -from couchpotato.core.settings.model import File, Release as Relea, Movie -from sqlalchemy.sql.expression import and_, or_ -import os +from .index import ReleaseIndex, ReleaseStatusIndex, ReleaseIDIndex, ReleaseDownloadIndex +from couchpotato.environment import Env + log = CPLog(__name__) class Release(Plugin): - def __init__(self): - addEvent('release.add', self.add) + _database = { + 'release': ReleaseIndex, + 'release_status': ReleaseStatusIndex, + 'release_identifier': ReleaseIDIndex, + 'release_download': ReleaseDownloadIndex + } - addApiView('release.download', self.download, docs = { + def __init__(self): + addApiView('release.manual_download', self.manualDownload, docs = { 'desc': 'Send a release manually to the downloaders', 'params': { 'id': {'type': 'id', 'desc': 'ID of the release object in release-table'} @@ -37,160 +47,522 @@ def __init__(self): } }) + addEvent('release.add', self.add) + addEvent('release.download', self.download) + addEvent('release.try_download_result', self.tryDownloadResult) + addEvent('release.create_from_search', self.createFromSearch) addEvent('release.delete', self.delete) addEvent('release.clean', self.clean) + addEvent('release.update_status', self.updateStatus) + addEvent('release.with_status', self.withStatus) + addEvent('release.for_media', self.forMedia) - def add(self, group): - db = get_session() - - identifier = '%s.%s.%s' % (group['library']['identifier'], group['meta_data'].get('audio', 'unknown'), group['meta_data']['quality']['identifier']) - - # Add movie - done_status = fireEvent('status.get', 'done', single = True) - movie = db.query(Movie).filter_by(library_id = group['library'].get('id')).first() - if not movie: - movie = Movie( - library_id = group['library'].get('id'), - profile_id = 0, - status_id = done_status.get('id') - ) - db.add(movie) - db.commit() - - # Add Release - snatched_status = fireEvent('status.get', 'snatched', single = True) - rel = db.query(Relea).filter( - or_( - Relea.identifier == identifier, - and_(Relea.identifier.startswith(group['library']['identifier']), Relea.status_id == snatched_status.get('id')) - ) - ).first() - if not rel: - rel = Relea( - identifier = identifier, - movie = movie, - quality_id = group['meta_data']['quality'].get('id'), - status_id = done_status.get('id') - ) - db.add(rel) - db.commit() - - # Add each file type - for type in group['files']: - for cur_file in group['files'][type]: - added_file = self.saveFile(cur_file, type = type, include_media_info = type is 'movie') - try: - added_file = db.query(File).filter_by(id = added_file.get('id')).one() - rel.files.append(added_file) - db.commit() - except Exception, e: - log.debug('Failed to attach "%s" to release: %s', (cur_file, e)) + # Clean releases that didn't have activity in the last week + addEvent('app.load', self.cleanDone, priority = 1000) + fireEvent('schedule.interval', 'movie.clean_releases', self.cleanDone, hours = 12) - fireEvent('movie.restatus', movie.id) + def cleanDone(self): + log.debug('Removing releases from dashboard') - return True + now = time.time() + week = 604800 + db = get_db() - def saveFile(self, filepath, type = 'unknown', include_media_info = False): + # Get (and remove) parentless releases + releases = db.all('release', with_doc = False) + media_exist = [] + reindex = 0 + for release in releases: + if release.get('key') in media_exist: + continue - properties = {} + try: - # Get media info for files - if include_media_info: - properties = {} + try: + doc = db.get('id', release.get('_id')) + except RecordDeleted: + reindex += 1 + continue - # Check database and update/insert if necessary - return fireEvent('file.add', path = filepath, part = fireEvent('scanner.partnumber', file, single = True), type_tuple = Scanner.file_types.get(type), properties = properties, single = True) + db.get('id', release.get('key')) + media_exist.append(release.get('key')) - def deleteView(self): + try: + if doc.get('status') == 'ignore': + doc['status'] = 'ignored' + db.update(doc) + except: + log.error('Failed fixing mis-status tag: %s', traceback.format_exc()) + except ValueError: + fireEvent('database.delete_corrupted', release.get('key'), traceback_error = traceback.format_exc(0)) + reindex += 1 + except RecordDeleted: + db.delete(doc) + log.debug('Deleted orphaned release: %s', doc) + reindex += 1 + except: + log.debug('Failed cleaning up orphaned releases: %s', traceback.format_exc()) + + if reindex > 0: + db.reindex() + + del media_exist + + # get movies last_edit more than a week ago + medias = fireEvent('media.with_status', ['done', 'active'], single = True) + + for media in medias: + if media.get('last_edit', 0) > (now - week): + continue + + for rel in self.forMedia(media['_id']): + + # Remove all available releases + if rel['status'] in ['available']: + self.delete(rel['_id']) + + # Set all snatched and downloaded releases to ignored to make sure they are ignored when re-adding the media + elif rel['status'] in ['snatched', 'downloaded']: + self.updateStatus(rel['_id'], status = 'ignored') + + if 'recent' in media.get('tags', []): + fireEvent('media.untag', media.get('_id'), 'recent', single = True) + + def add(self, group, update_info = True, update_id = None): + + try: + db = get_db() + + release_identifier = '%s.%s.%s' % (group['identifier'], group['meta_data'].get('audio', 'unknown'), group['meta_data']['quality']['identifier']) + + # Add movie if it doesn't exist + try: + media = db.get('media', 'imdb-%s' % group['identifier'], with_doc = True)['doc'] + except: + media = fireEvent('movie.add', params = { + 'identifier': group['identifier'], + 'profile_id': None, + }, search_after = False, update_after = update_info, notify_after = False, status = 'done', single = True) + + release = None + if update_id: + try: + release = db.get('id', update_id) + release.update({ + 'identifier': release_identifier, + 'last_edit': int(time.time()), + 'status': 'done', + }) + except: + log.error('Failed updating existing release: %s', traceback.format_exc()) + else: + + # Add Release + if not release: + release = { + '_t': 'release', + 'media_id': media['_id'], + 'identifier': release_identifier, + 'quality': group['meta_data']['quality'].get('identifier'), + 'is_3d': group['meta_data']['quality'].get('is_3d', 0), + 'last_edit': int(time.time()), + 'status': 'done' + } - release_id = getParam('id') + try: + r = db.get('release_identifier', release_identifier, with_doc = True)['doc'] + r['media_id'] = media['_id'] + except: + log.debug('Failed updating release by identifier "%s". Inserting new.', release_identifier) + r = db.insert(release) - return jsonified({ - 'success': self.delete(release_id) - }) + # Update with ref and _id + release.update({ + '_id': r['_id'], + '_rev': r['_rev'], + }) - def delete(self, id): + # Empty out empty file groups + release['files'] = dict((k, [toUnicode(x) for x in v]) for k, v in group['files'].items() if v) + db.update(release) - db = get_session() + fireEvent('media.restatus', media['_id'], allowed_restatus = ['done'], single = True) - rel = db.query(Relea).filter_by(id = id).first() - if rel: - rel.delete() - db.commit() return True + except: + log.error('Failed: %s', traceback.format_exc()) return False - def clean(self, id): + def deleteView(self, id = None, **kwargs): + + return { + 'success': self.delete(id) + } - db = get_session() + def delete(self, release_id): + + try: + db = get_db() + rel = db.get('id', release_id) + db.delete(rel) + return True + except RecordDeleted: + log.debug('Already deleted: %s', release_id) + return True + except: + log.error('Failed: %s', traceback.format_exc()) + + return False - rel = db.query(Relea).filter_by(id = id).first() - if rel: - for release_file in rel.files: - if not os.path.isfile(ss(release_file.path)): - db.delete(release_file) - db.commit() + def clean(self, release_id): - if len(rel.files) == 0: - self.delete(id) + try: + db = get_db() + rel = db.get('id', release_id) + raw_files = rel.get('files') + + if len(raw_files) == 0: + self.delete(rel['_id']) + else: + + files = {} + for file_type in raw_files: + + for release_file in raw_files.get(file_type, []): + if os.path.isfile(sp(release_file)): + if file_type not in files: + files[file_type] = [] + files[file_type].append(release_file) + + rel['files'] = files + db.update(rel) return True + except: + log.error('Failed: %s', traceback.format_exc()) return False - def ignore(self): + def ignore(self, id = None, **kwargs): - db = get_session() - id = getParam('id') + db = get_db() - rel = db.query(Relea).filter_by(id = id).first() - if rel: - ignored_status = fireEvent('status.get', 'ignored', single = True) - available_status = fireEvent('status.get', 'available', single = True) - rel.status_id = available_status.get('id') if rel.status_id is ignored_status.get('id') else ignored_status.get('id') - db.commit() + try: + if id: + rel = db.get('id', id, with_doc = True) + self.updateStatus(id, 'available' if rel['status'] in ['ignored', 'failed'] else 'ignored') - return jsonified({ - 'success': True - }) + return { + 'success': True + } + except: + log.error('Failed: %s', traceback.format_exc()) - def download(self): + return { + 'success': False + } + + def manualDownload(self, id = None, **kwargs): - db = get_session() - id = getParam('id') - status_snatched = fireEvent('status.add', 'snatched', single = True) + db = get_db() - rel = db.query(Relea).filter_by(id = id).first() - if rel: - item = {} - for info in rel.info: - item[info.identifier] = info.value + try: + release = db.get('id', id) + item = release['info'] + movie = db.get('id', release['media_id']) + + fireEvent('notify.frontend', type = 'release.manual_download', data = True, message = 'Snatching "%s"' % item['name']) # Get matching provider provider = fireEvent('provider.belongs_to', item['url'], provider = item.get('provider'), single = True) - if item['type'] != 'torrent_magnet': - item['download'] = provider.download + if item.get('protocol') != 'torrent_magnet': + item['download'] = provider.loginDownload if provider.urls.get('login') else provider.download - success = fireEvent('searcher.download', data = item, movie = rel.movie.to_dict({ - 'profile': {'types': {'quality': {}}}, - 'releases': {'status': {}, 'quality': {}}, - 'library': {'titles': {}, 'files':{}}, - 'files': {} - }), manual = True, single = True) + success = self.download(data = item, media = movie, manual = True) if success: - rel.status_id = status_snatched.get('id') - db.commit() + fireEvent('notify.frontend', type = 'release.manual_download', data = True, message = 'Successfully snatched "%s"' % item['name']) - return jsonified({ - 'success': success - }) - else: - log.error('Couldn\'t find release with id: %s', id) + return { + 'success': success == True + } - return jsonified({ - 'success': False - }) + except: + log.error('Couldn\'t find release with id: %s: %s', (id, traceback.format_exc())) + return { + 'success': False + } + + def download(self, data, media, manual = False): + + # Test to see if any downloaders are enabled for this type + downloader_enabled = fireEvent('download.enabled', manual, data, single = True) + if not downloader_enabled: + log.info('Tried to download, but none of the "%s" downloaders are enabled or gave an error', data.get('protocol')) + return False + + # Download NZB or torrent file + filedata = None + if data.get('download') and (ismethod(data.get('download')) or isfunction(data.get('download'))): + try: + filedata = data.get('download')(url = data.get('url'), nzb_id = data.get('id')) + except: + log.error('Tried to download, but the "%s" provider gave an error: %s', (data.get('protocol'), traceback.format_exc())) + return False + + if filedata == 'try_next': + return filedata + elif not filedata: + return False + + # Send NZB or torrent file to downloader + download_result = fireEvent('download', data = data, media = media, manual = manual, filedata = filedata, single = True) + if not download_result: + log.info('Tried to download, but the "%s" downloader gave an error', data.get('protocol')) + return False + log.debug('Downloader result: %s', download_result) + + try: + db = get_db() + + try: + rls = db.get('release_identifier', md5(data['url']), with_doc = True)['doc'] + except: + log.error('No release found to store download information in') + return False + + renamer_enabled = Env.setting('enabled', 'renamer') + + # Save download-id info if returned + if isinstance(download_result, dict): + rls['download_info'] = download_result + db.update(rls) + + log_movie = '%s (%s) in %s' % (getTitle(media), media['info'].get('year'), rls['quality']) + snatch_message = 'Snatched "%s": %s from %s' % (data.get('name'), log_movie, (data.get('provider', '') + data.get('provider_extra', ''))) + log.info(snatch_message) + fireEvent('%s.snatched' % data['type'], message = snatch_message, data = media) + + # Mark release as snatched + if renamer_enabled: + self.updateStatus(rls['_id'], status = 'snatched') + + # If renamer isn't used, mark media done if finished or release downloaded + else: + + if media['status'] == 'active': + profile = db.get('id', media['profile_id']) + if fireEvent('quality.isfinish', {'identifier': rls['quality'], 'is_3d': rls.get('is_3d', False)}, profile, single = True): + log.info('Renamer disabled, marking media as finished: %s', log_movie) + + # Mark release done + self.updateStatus(rls['_id'], status = 'done') + + # Mark media done + fireEvent('media.restatus', media['_id'], single = True) + + return True + + # Assume release downloaded + self.updateStatus(rls['_id'], status = 'downloaded') + + except: + log.error('Failed storing download status: %s', traceback.format_exc()) + return False + + return True + + def tryDownloadResult(self, results, media, quality_custom): + + wait_for = False + let_through = False + filtered_results = [] + minimum_seeders = tryInt(Env.setting('minimum_seeders', section = 'torrent', default = 1)) + + # Filter out ignored and other releases we don't want + for rel in results: + + if rel['status'] in ['ignored', 'failed']: + log.info('Ignored: %s', rel['name']) + continue + + if rel['score'] < quality_custom.get('minimum_score'): + log.info('Ignored, score "%s" to low, need at least "%s": %s', (rel['score'], quality_custom.get('minimum_score'), rel['name'])) + continue + + if rel['size'] <= 50: + log.info('Ignored, size "%sMB" to low: %s', (rel['size'], rel['name'])) + continue + + if 'seeders' in rel and rel.get('seeders') < minimum_seeders: + log.info('Ignored, not enough seeders, has %s needs %s: %s', (rel.get('seeders'), minimum_seeders, rel['name'])) + continue + + # If a single release comes through the "wait for", let through all + rel['wait_for'] = False + if quality_custom.get('index') != 0 and quality_custom.get('wait_for', 0) > 0 and rel.get('age') <= quality_custom.get('wait_for', 0): + rel['wait_for'] = True + else: + let_through = True + + filtered_results.append(rel) + + # Loop through filtered results + for rel in filtered_results: + + # Only wait if not a single release is old enough + if rel.get('wait_for') and not let_through: + log.info('Ignored, waiting %s days: %s', (quality_custom.get('wait_for') - rel.get('age'), rel['name'])) + wait_for = True + continue + + downloaded = fireEvent('release.download', data = rel, media = media, single = True) + if downloaded is True: + return True + elif downloaded != 'try_next': + break + + return wait_for + + def createFromSearch(self, search_results, media, quality): + + try: + db = get_db() + + found_releases = [] + + is_3d = False + try: is_3d = quality['custom']['3d'] + except: pass + + for rel in search_results: + + rel_identifier = md5(rel['url']) + + release = { + '_t': 'release', + 'identifier': rel_identifier, + 'media_id': media.get('_id'), + 'quality': quality.get('identifier'), + 'is_3d': is_3d, + 'status': rel.get('status', 'available'), + 'last_edit': int(time.time()), + 'info': {} + } + + # Add downloader info if provided + try: + release['download_info'] = rel['download_info'] + del rel['download_info'] + except: + pass + + try: + rls = db.get('release_identifier', rel_identifier, with_doc = True)['doc'] + except: + rls = db.insert(release) + rls.update(release) + + # Update info, but filter out functions + for info in rel: + try: + if not isinstance(rel[info], (str, unicode, int, long, float)): + continue + + rls['info'][info] = toUnicode(rel[info]) if isinstance(rel[info], (str, unicode)) else rel[info] + except: + log.debug('Couldn\'t add %s to ReleaseInfo: %s', (info, traceback.format_exc())) + + db.update(rls) + + # Update release in search_results + rel['status'] = rls.get('status') + + if rel['status'] == 'available': + found_releases.append(rel_identifier) + + return found_releases + except: + log.error('Failed: %s', traceback.format_exc()) + + return [] + + def updateStatus(self, release_id, status = None): + if not status: return False + + try: + db = get_db() + + rel = db.get('id', release_id) + if rel and rel.get('status') != status: + + release_name = None + if rel.get('files'): + for file_type in rel.get('files', {}): + if file_type == 'movie': + for release_file in rel['files'][file_type]: + release_name = os.path.basename(release_file) + break + + if not release_name and rel.get('info'): + release_name = rel['info'].get('name') + + #update status in Db + log.debug('Marking release %s as %s', (release_name, status)) + rel['status'] = status + rel['last_edit'] = int(time.time()) + + db.update(rel) + + #Update all movie info as there is no release update function + fireEvent('notify.frontend', type = 'release.update_status', data = rel) + + return True + except: + log.error('Failed: %s', traceback.format_exc()) + + return False + + def withStatus(self, status, with_doc = True): + + db = get_db() + + status = list(status if isinstance(status, (list, tuple)) else [status]) + + for s in status: + for ms in db.get_many('release_status', s): + if with_doc: + try: + doc = db.get('id', ms['_id']) + yield doc + except RecordNotFound: + log.debug('Record not found, skipping: %s', ms['_id']) + else: + yield ms + + def forMedia(self, media_id): + + db = get_db() + raw_releases = db.get_many('release', media_id) + + releases = [] + for r in raw_releases: + try: + doc = db.get('id', r.get('_id')) + releases.append(doc) + except RecordDeleted: + pass + except (ValueError, EOFError): + fireEvent('database.delete_corrupted', r.get('_id'), traceback_error = traceback.format_exc(0)) + + releases = sorted(releases, key = lambda k: k.get('info', {}).get('score', 0), reverse = True) + + # Sort based on preferred search method + download_preference = self.conf('preferred_method', section = 'searcher') + if download_preference != 'both': + releases = sorted(releases, key = lambda k: k.get('info', {}).get('protocol', '')[:3], reverse = (download_preference == 'torrent')) + + return releases or [] diff --git a/couchpotato/core/plugins/renamer.py b/couchpotato/core/plugins/renamer.py new file mode 100755 index 0000000000..fd710d5a41 --- /dev/null +++ b/couchpotato/core/plugins/renamer.py @@ -0,0 +1,1488 @@ +import fnmatch +import os +import re +import shutil +import time +import traceback + +from couchpotato import get_db +from couchpotato.api import addApiView +from couchpotato.core.event import addEvent, fireEvent, fireEventAsync +from couchpotato.core.helpers.encoding import toUnicode, ss, sp +from couchpotato.core.helpers.variable import getExt, mergeDicts, getTitle, \ + getImdb, link, symlink, tryInt, splitString, fnEscape, isSubFolder, \ + getIdentifier, randomString, getFreeSpace, getSize +from couchpotato.core.logger import CPLog +from couchpotato.core.plugins.base import Plugin +from couchpotato.environment import Env +from unrar2 import RarFile +import six +from six.moves import filter + + +log = CPLog(__name__) + +autoload = 'Renamer' + + +class Renamer(Plugin): + + renaming_started = False + checking_snatched = False + + def __init__(self): + addApiView('renamer.scan', self.scanView, docs = { + 'desc': 'For the renamer to check for new files to rename in a folder', + 'params': { + 'async': {'desc': 'Optional: Set to 1 if you dont want to fire the renamer.scan asynchronous.'}, + 'to_folder': {'desc': 'Optional: The folder to move releases to. Leave empty for default folder.'}, + 'media_folder': {'desc': 'Optional: The folder of the media to scan. Keep empty for default renamer folder.'}, + 'files': {'desc': 'Optional: Provide the release files if more releases are in the same media_folder, delimited with a \'|\'. Note that no dedicated release folder is expected for releases with one file.'}, + 'base_folder': {'desc': 'Optional: The folder to find releases in. Leave empty for default folder.'}, + 'downloader': {'desc': 'Optional: The downloader the release has been downloaded with. \'download_id\' is required with this option.'}, + 'download_id': {'desc': 'Optional: The nzb/torrent ID of the release in media_folder. \'downloader\' is required with this option.'}, + 'status': {'desc': 'Optional: The status of the release: \'completed\' (default) or \'seeding\''}, + }, + }) + + addApiView('renamer.progress', self.getProgress, docs = { + 'desc': 'Get the progress of current renamer scan', + 'return': {'type': 'object', 'example': """{ + 'progress': False || True, +}"""}, + }) + + addEvent('renamer.scan', self.scan) + addEvent('renamer.check_snatched', self.checkSnatched) + + addEvent('app.load', self.scan) + addEvent('app.load', self.setCrons) + + # Enable / disable interval + addEvent('setting.save.renamer.enabled.after', self.setCrons) + addEvent('setting.save.renamer.run_every.after', self.setCrons) + addEvent('setting.save.renamer.force_every.after', self.setCrons) + + def setCrons(self): + + fireEvent('schedule.remove', 'renamer.check_snatched') + if self.isEnabled() and self.conf('run_every') > 0: + fireEvent('schedule.interval', 'renamer.check_snatched', self.checkSnatched, minutes = self.conf('run_every'), single = True) + + fireEvent('schedule.remove', 'renamer.check_snatched_forced') + if self.isEnabled() and self.conf('force_every') > 0: + fireEvent('schedule.interval', 'renamer.check_snatched_forced', self.scan, hours = self.conf('force_every'), single = True) + + return True + + def getProgress(self, **kwargs): + return { + 'progress': self.renaming_started + } + + def scanView(self, **kwargs): + + async = tryInt(kwargs.get('async', 0)) + base_folder = kwargs.get('base_folder') + media_folder = sp(kwargs.get('media_folder')) + to_folder = kwargs.get('to_folder') + + # Backwards compatibility, to be removed after a few versions :) + if not media_folder: + media_folder = sp(kwargs.get('movie_folder')) + + downloader = kwargs.get('downloader') + download_id = kwargs.get('download_id') + files = [sp(filename) for filename in splitString(kwargs.get('files'), '|')] + status = kwargs.get('status', 'completed') + + release_download = None + if not base_folder and media_folder: + release_download = {'folder': media_folder} + + if download_id: + release_download.update({ + 'id': download_id, + 'downloader': downloader, + 'status': status, + 'files': files + }) + + fire_handle = fireEvent if not async else fireEventAsync + fire_handle('renamer.scan', base_folder = base_folder, release_download = release_download, to_folder = to_folder) + + return { + 'success': True + } + + def scan(self, base_folder = None, release_download = None, to_folder = None): + if not release_download: release_download = {} + + if self.isDisabled(): + return + + if self.renaming_started is True: + log.info('Renamer is already running, if you see this often, check the logs above for errors.') + return + + if not base_folder: + base_folder = sp(self.conf('from')) + + from_folder = sp(self.conf('from')) + + if not to_folder: + to_folder = sp(self.conf('to')) + + # Get media folder to process + media_folder = sp(release_download.get('folder')) + + # Get all folders that should not be processed + no_process = [to_folder] + cat_list = fireEvent('category.all', single = True) or [] + no_process.extend([item['destination'] for item in cat_list]) + + # Check to see if the no_process folders are inside the "from" folder. + if not os.path.isdir(base_folder) or not os.path.isdir(to_folder): + log.error('Both the "To" and "From" folder have to exist.') + return + else: + for item in no_process: + if isSubFolder(item, base_folder): + log.error('To protect your data, the media libraries can\'t be inside of or the same as the "from" folder. "%s" in "%s"', (item, base_folder)) + return + + # Check to see if the no_process folders are inside the provided media_folder + if media_folder and not os.path.isdir(media_folder): + log.debug('The provided media folder %s does not exist. Trying to find it in the \'from\' folder.', media_folder) + + # Update to the from folder + if len(release_download.get('files', [])) == 1: + new_media_folder = sp(from_folder) + else: + new_media_folder = sp(os.path.join(from_folder, os.path.basename(media_folder))) + + if not os.path.isdir(new_media_folder): + log.error('The provided media folder %s does not exist and could also not be found in the \'from\' folder.', media_folder) + return + + # Update the files + new_files = [os.path.join(new_media_folder, os.path.relpath(filename, media_folder)) for filename in release_download.get('files', [])] + if new_files and not os.path.isfile(new_files[0]): + log.error('The provided media folder %s does not exist and its files could also not be found in the \'from\' folder.', media_folder) + return + + # Update release_download info to the from folder + log.debug('Release %s found in the \'from\' folder.', media_folder) + release_download['folder'] = new_media_folder + release_download['files'] = new_files + media_folder = new_media_folder + + if media_folder: + for item in no_process: + if isSubFolder(item, media_folder): + log.error('To protect your data, the media libraries can\'t be inside of or the same as the provided media folder. "%s" in "%s"', (item, media_folder)) + return + + # Make sure a checkSnatched marked all downloads/seeds as such + if not release_download and self.conf('run_every') > 0: + self.checkSnatched(fire_scan = False) + + self.renaming_started = True + + # make sure the media folder name is included in the search + folder = None + files = [] + if media_folder: + log.info('Scanning media folder %s...', media_folder) + folder = os.path.dirname(media_folder) + + release_files = release_download.get('files', []) + if release_files: + files = release_files + + # If there is only one file in the torrent, the downloader did not create a subfolder + if len(release_files) == 1: + folder = media_folder + else: + # Get all files from the specified folder + try: + for root, folders, names in os.walk(media_folder): + files.extend([sp(os.path.join(root, name)) for name in names]) + except: + log.error('Failed getting files from %s: %s', (media_folder, traceback.format_exc())) + + db = get_db() + + # Extend the download info with info stored in the downloaded release + keep_original = self.moveTypeIsLinked() + is_torrent = False + if release_download: + release_download = self.extendReleaseDownload(release_download) + is_torrent = self.downloadIsTorrent(release_download) + keep_original = True if is_torrent and self.conf('file_action') not in ['move'] else keep_original + + # Unpack any archives + extr_files = None + if self.conf('unrar'): + folder, media_folder, files, extr_files = self.extractFiles(folder = folder, media_folder = media_folder, files = files, + cleanup = self.conf('cleanup') and not keep_original) + + groups = fireEvent('scanner.scan', folder = folder if folder else base_folder, + files = files, release_download = release_download, return_ignored = False, single = True) or [] + + folder_name = self.conf('folder_name') + file_name = self.conf('file_name') + trailer_name = self.conf('trailer_name') + nfo_name = self.conf('nfo_name') + separator = self.conf('separator') + + if len(file_name) == 0: + log.error('Please fill in the filename option under renamer settings. Forcing it on
Maybe first start with importing your movies from the previous CouchPotato', - 'content': new Element('div', { - 'styles': { - 'margin': '0 0 0 30px' - } - }).adopt( - new Element('div', { - 'html': 'Select the data.db. It should be in your CouchPotato root directory.' - }), - self.import_iframe = new Element('iframe', { - 'styles': { - 'height': 40, - 'width': 300, - 'border': 0, - 'overflow': 'hidden' - } - }) - ), - 'event': function(){ - self.import_iframe.set('src', Api.createUrl('v1.import')) - } - }, - 'general': { - 'title': 'General', - 'description': 'If you want to access CP from outside your local network, you better secure it a bit with a username & password.' - }, - 'downloaders': { - 'title': 'What download apps are you using?', - 'description': 'CP needs an external download app to work with. Choose one below. For more downloaders check settings after you have filled in the wizard. If your download app isn\'t in the list, use the default Blackhole.' - }, - 'providers': { - 'title': 'Are you registered at any of these sites?', - 'description': 'CP uses these sites to search for movies. A few free are enabled by default, but it\'s always better to have a few more. Check settings for the full list of available providers.' - }, - 'renamer': { - 'title': 'Move & rename the movies after downloading?', - 'description': 'The coolest part of CP is that it can move and organize your downloaded movies automagically. Check settings and you can even download trailers, subtitles and other data when it has finished downloading. It\'s awesome!' - }, - 'automation': { - 'title': 'Easily add movies to your wanted list!', - 'description': 'You can easily add movies from your favorite movie site, like IMDB, Rotten Tomatoes, Apple Trailers and more. Just install the userscript or drag the bookmarklet to your browsers bookmarks.' + - '
Once installed, just click the bookmarklet on a movie page and watch the magic happen ;)', - 'content': function(){ - return App.createUserscriptButtons().setStyles({ - 'background-image': "url('"+Api.createUrl('static/userscript/userscript.png')+"')" - }) - } - }, - 'finish': { - 'title': 'Finishing Up', - 'description': 'Are you done? Did you fill in everything as much as possible?' + - '
Be sure to check the settings to see what more CP can do!
' + - '
After you\'ve used CP for a while, and you like it (which of course you will), consider supporting CP. Maybe even by writing some code.
Or by getting a subscription at Usenet Server or Newshosting.
',
- 'content': new Element('div').adopt(
- new Element('a.button.green', {
- 'styles': {
- 'margin-top': 20
- },
- 'text': 'I\'m ready to start the awesomeness, wow this button is big and green!',
- 'events': {
- 'click': function(e){
- (e).preventDefault();
- Api.request('settings.save', {
- 'data': {
- 'section': 'core',
- 'name': 'show_wizard',
- 'value': 0
- },
- 'useSpinner': true,
- 'spinnerOptions': {
- 'target': self.el
- },
- 'onComplete': function(){
- window.location = App.createUrl();
- }
- });
- }
- }
- })
- )
- }
- },
- groups: ['welcome', 'general', 'downloaders', 'searcher', 'providers', 'renamer', 'automation', 'finish'],
-
- open: function(action, params){
- var self = this;
-
- if(!self.initialized){
- App.fireEvent('unload');
- App.getBlock('header').hide();
-
- self.parent(action, params);
-
- self.addEvent('create', function(){
- self.order();
- });
-
- self.initialized = true;
-
- self.scroll = new Fx.Scroll(document.body, {
- 'transition': 'quint:in:out'
- });
- }
- else
- (function(){
- var sc = self.el.getElement('.wgroup_'+action);
- self.scroll.start(0, sc.getCoordinates().top-80);
- }).delay(1)
- },
-
- order: function(){
- var self = this;
-
- var form = self.el.getElement('.uniForm');
- var tabs = self.el.getElement('.tabs');
-
- self.groups.each(function(group, nr){
-
- if(self.headers[group]){
- group_container = new Element('.wgroup_'+group, {
- 'styles': {
- 'opacity': 0.2
- },
- 'tween': {
- 'duration': 350
- }
- });
-
- if(self.headers[group].include){
- self.headers[group].include.each(function(inc){
- group_container.addClass('wgroup_'+inc);
- })
- }
-
- var content = self.headers[group].content
- group_container.adopt(
- new Element('h1', {
- 'text': self.headers[group].title
- }),
- self.headers[group].description ? new Element('span.description', {
- 'html': self.headers[group].description
- }) : null,
- content ? (typeOf(content) == 'function' ? content() : content) : null
- ).inject(form);
- }
-
- var tab_navigation = tabs.getElement('.t_'+group);
-
- if(!tab_navigation && self.headers[group] && self.headers[group].include){
- tab_navigation = []
- self.headers[group].include.each(function(inc){
- tab_navigation.include(tabs.getElement('.t_'+inc));
- })
- }
-
- if(tab_navigation && group_container){
- tabs.adopt(tab_navigation); // Tab navigation
-
- if(self.headers[group] && self.headers[group].include){
-
- self.headers[group].include.each(function(inc){
- self.el.getElement('.tab_'+inc).inject(group_container);
- })
-
- new Element('li.t_'+group).adopt(
- new Element('a', {
- 'href': App.createUrl('wizard/'+group),
- 'text': (self.headers[group].label || group).capitalize()
- })
- ).inject(tabs);
-
- }
- else
- self.el.getElement('.tab_'+group).inject(group_container); // Tab content
-
- if(tab_navigation.getElement && self.headers[group]){
- var a = tab_navigation.getElement('a');
- a.set('text', (self.headers[group].label || group).capitalize());
- var url_split = a.get('href').split('wizard')[1].split('/');
- if(url_split.length > 3)
- a.set('href', a.get('href').replace(url_split[url_split.length-3]+'/', ''));
-
- }
- }
- else {
- new Element('li.t_'+group).adopt(
- new Element('a', {
- 'href': App.createUrl('wizard/'+group),
- 'text': (self.headers[group].label || group).capitalize()
- })
- ).inject(tabs);
- }
-
- if(self.headers[group] && self.headers[group].event)
- self.headers[group].event.call()
- });
-
- // Remove toggle
- self.el.getElement('.advanced_toggle').destroy();
-
- // Hide retention
- self.el.getElement('.tab_searcher').hide();
- self.el.getElement('.t_searcher').hide();
-
- // Add pointer
- new Element('.tab_wrapper').wraps(tabs).adopt(
- self.pointer = new Element('.pointer', {
- 'tween': {
- 'transition': 'quint:in:out'
- }
- })
- );
-
- // Add nav
- var minimum = self.el.getSize().y-window.getSize().y;
- self.groups.each(function(group, nr){
-
- var g = self.el.getElement('.wgroup_'+group);
- if(!g || !g.isVisible()) return;
- var t = self.el.getElement('.t_'+group);
- if(!t) return;
-
- var func = function(){
- var ct = t.getCoordinates();
- self.pointer.tween('left', ct.left+(ct.width/2)-(self.pointer.getWidth()/2));
- g.tween('opacity', 1);
- }
-
- if(nr == 0)
- func();
-
-
- var ss = new ScrollSpy( {
- min: function(){
- var c = g.getCoordinates();
- var top = c.top-(window.getSize().y/2);
- return top > minimum ? minimum : top
- },
- max: function(){
- var c = g.getCoordinates();
- return c.top+(c.height/2)
- },
- onEnter: func,
- onLeave: function(){
- g.tween('opacity', 0.2)
- }
- });
- });
-
- }
-
-});
\ No newline at end of file
+Page.Wizard = new Class({
+
+ Extends: Page.Settings,
+
+ order: 70,
+ name: 'wizard',
+ current: 'welcome',
+ has_tab: false,
+ wizard_only: true,
+
+ headers: {
+ 'welcome': {
+ 'title': 'Welcome to the new CouchPotato',
+ 'description': 'To get started, fill in each of the following settings as much as you can.',
+ 'content': new Element('div', {
+ 'styles': {
+ 'margin': '0 0 0 30px'
+ }
+ })
+ },
+ 'general': {
+ 'title': 'General',
+ 'description': 'If you want to access CP from outside your local network, you better secure it a bit with a username & password.'
+ },
+ 'downloaders': {
+ 'title': 'What download apps are you using?',
+ 'description': 'CP needs an external download app to work with. Choose one below. For more downloaders check settings after you have filled in the wizard. If your download app isn\'t in the list, use the default Blackhole.'
+ },
+ 'searcher': {
+ 'label': 'Providers',
+ 'title': 'Are you registered at any of these sites?',
+ 'description': 'CP uses these sites to search for movies. A few free are enabled by default, but it\'s always better to have more.'
+ },
+ 'renamer': {
+ 'title': 'Move & rename the movies after downloading?',
+ 'description': 'The coolest part of CP is that it can move and organize your downloaded movies automagically. Check settings and you can even download trailers, subtitles and other data when it has finished downloading. It\'s awesome!'
+ },
+ 'automation': {
+ 'title': 'Easily add movies to your wanted list!',
+ 'description': 'You can easily add movies from your favorite movie site, like IMDB, Rotten Tomatoes, Apple Trailers and more. Just install the extension or drag the bookmarklet to your bookmarks.' +
+ 'Or by getting a subscription at Usenet Server or Newshosting.
Once installed, just click the bookmarklet on a movie page and watch the magic happen ;)', + 'content': function(){ + return App.createUserscriptButtons(); + } + }, + 'finish': { + 'title': 'Finishing Up', + 'description': 'Are you done? Did you fill in everything as much as possible?' + + '
Be sure to check the settings to see what more CP can do!
' + + '
After you\'ve used CP for a while, and you like it (which of course you will), consider supporting CP. Maybe even by writing some code.
Or by getting a subscription at Usenet Server or Newshosting.
',
+ 'content': new Element('div').grab(
+ new Element('a.button.green', {
+ 'styles': {
+ 'margin-top': 20
+ },
+ 'text': 'I\'m ready to start the awesomeness!',
+ 'events': {
+ 'click': function(e){
+ (e).preventDefault();
+ Api.request('settings.save', {
+ 'data': {
+ 'section': 'core',
+ 'name': 'show_wizard',
+ 'value': 0
+ },
+ 'useSpinner': true,
+ 'spinnerOptions': {
+ 'target': self.el
+ },
+ 'onComplete': function(){
+ window.location = App.createUrl('wanted');
+ }
+ });
+ }
+ }
+ })
+ )
+ }
+ },
+
+ groups: ['welcome', 'general', 'downloaders', 'searcher', 'renamer', 'automation', 'finish'],
+
+ open: function(action, params){
+ var self = this;
+
+ if(!self.initialized){
+ App.fireEvent('unload');
+ App.getBlock('header').hide();
+
+ self.parent(action, params);
+
+ self.el.addClass('settings');
+
+ self.addEvent('create', function(){
+ self.orderGroups();
+ });
+
+ self.initialized = true;
+
+ self.scroll = new Fx.Scroll(document.body, {
+ 'transition': 'quint:in:out'
+ });
+ }
+ else
+ requestTimeout(function(){
+ var sc = self.el.getElement('.wgroup_'+action);
+ self.scroll.start(0, sc.getCoordinates().top-80);
+ }, 1);
+ },
+
+ orderGroups: function(){
+ var self = this;
+
+ var form = self.el.getElement('.uniForm');
+ var tabs = self.el.getElement('.tabs').hide();
+
+ self.groups.each(function(group){
+
+ var group_container;
+ if(self.headers[group]){
+ group_container = new Element('.wgroup_'+group);
+
+ if(self.headers[group].include){
+ self.headers[group].include.each(function(inc){
+ group_container.addClass('wgroup_'+inc);
+ });
+ }
+
+ var content = self.headers[group].content;
+ group_container.adopt(
+ new Element('h1', {
+ 'text': self.headers[group].title
+ }),
+ self.headers[group].description ? new Element('span.description', {
+ 'html': self.headers[group].description
+ }) : null,
+ content ? (typeOf(content) == 'function' ? content() : content) : null
+ ).inject(form);
+ }
+
+ var tab_navigation = tabs.getElement('.t_'+group);
+
+ if(!tab_navigation && self.headers[group] && self.headers[group].include){
+ tab_navigation = [];
+ self.headers[group].include.each(function(inc){
+ tab_navigation.include(tabs.getElement('.t_'+inc));
+ });
+ }
+
+ if(tab_navigation && group_container){
+ tabs.adopt(tab_navigation); // Tab navigation
+
+ if(self.headers[group] && self.headers[group].include){
+
+ self.headers[group].include.each(function(inc){
+ self.el.getElement('.tab_'+inc).inject(group_container);
+ });
+
+ new Element('li.t_'+group).grab(
+ new Element('a', {
+ 'href': App.createUrl('wizard/'+group),
+ 'text': (self.headers[group].label || group).capitalize()
+ })
+ ).inject(tabs);
+
+ }
+ else
+ self.el.getElement('.tab_'+group).inject(group_container); // Tab content
+
+ if(tab_navigation.getElement && self.headers[group]){
+ var a = tab_navigation.getElement('a');
+ a.set('text', (self.headers[group].label || group).capitalize());
+ var url_split = a.get('href').split('wizard')[1].split('/');
+ if(url_split.length > 3)
+ a.set('href', a.get('href').replace(url_split[url_split.length-3]+'/', ''));
+
+ }
+ }
+ else {
+ new Element('li.t_'+group).grab(
+ new Element('a', {
+ 'href': App.createUrl('wizard/'+group),
+ 'text': (self.headers[group].label || group).capitalize()
+ })
+ ).inject(tabs);
+ }
+
+ if(self.headers[group] && self.headers[group].event)
+ self.headers[group].event.call();
+ });
+
+ // Remove toggle
+ self.el.getElement('.advanced_toggle').destroy();
+
+ // Hide retention
+ self.el.getElement('.section_nzb').hide();
+
+ }
+
+});
diff --git a/couchpotato/core/plugins/wizard/static/wizard.scss b/couchpotato/core/plugins/wizard/static/wizard.scss
new file mode 100644
index 0000000000..20b01d8019
--- /dev/null
+++ b/couchpotato/core/plugins/wizard/static/wizard.scss
@@ -0,0 +1,63 @@
+@import "_mixins";
+
+.page.wizard {
+ top: 0 !important;
+
+ .navigation.navigation {
+ display: none;
+ }
+
+ .tab_content.tab_content {
+ display: block;
+
+ fieldset {
+
+ .ctrlHolder, h2 {
+ padding: $padding/4;
+ }
+
+ }
+ }
+
+ h1 {
+ padding: 10px 0;
+ display: block;
+ font-size: 30px;
+ margin: $header_height 5px 0;
+ font-weight: 300;
+ }
+
+ .description {
+ padding: $padding/2 $padding/4;
+ font-size: 1.45em;
+ line-height: 1.4em;
+ display: block;
+ }
+
+ form.uniForm.containers {
+ margin: 0;
+ }
+
+ form > div {
+ min-height: 300px;
+ max-width: $mq-desktop;
+ padding: $padding;
+ margin: 0 auto;
+
+ @include media-phablet {
+ padding: $padding/2;
+ }
+ }
+
+ .button.green {
+ padding: 20px;
+ font-size: 25px;
+ margin: 10px 0 $header_height;
+ display: inline-block;
+ }
+
+ .tab_nzb_providers {
+ margin: 20px 0 0 0;
+ }
+
+}
diff --git a/couchpotato/core/providers/automation/__init__.py b/couchpotato/core/providers/automation/__init__.py
deleted file mode 100644
index a217948a42..0000000000
--- a/couchpotato/core/providers/automation/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-config = {
- 'name': 'automation_providers',
- 'groups': [
- {
- 'label': 'Watchlists',
- 'description': 'Check watchlists for new movies',
- 'type': 'list',
- 'name': 'watchlist_providers',
- 'tab': 'automation',
- 'options': [],
- },
- {
- 'label': 'Automated',
- 'description': 'Uses minimal requirements',
- 'type': 'list',
- 'name': 'automation_providers',
- 'tab': 'automation',
- 'options': [],
- },
- ],
-}
diff --git a/couchpotato/core/providers/automation/base.py b/couchpotato/core/providers/automation/base.py
deleted file mode 100644
index 8d08f9136d..0000000000
--- a/couchpotato/core/providers/automation/base.py
+++ /dev/null
@@ -1,74 +0,0 @@
-from couchpotato.core.event import addEvent, fireEvent
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.base import Provider
-from couchpotato.environment import Env
-import time
-
-log = CPLog(__name__)
-
-
-class Automation(Provider):
-
- enabled_option = 'automation_enabled'
-
- interval = 86400
- last_checked = 0
-
- def __init__(self):
- addEvent('automation.get_movies', self._getMovies)
-
- def _getMovies(self):
-
- if self.isDisabled():
- return
-
- if not self.canCheck():
- log.debug('Just checked, skipping %s', self.getName())
- return []
-
- self.last_checked = time.time()
-
- return self.getIMDBids()
-
- def search(self, name, year = None, imdb_only = False):
-
- prop_name = 'automation.cached.%s.%s' % (name, year)
- cached_imdb = Env.prop(prop_name, default = False)
- if cached_imdb and imdb_only:
- return cached_imdb
-
- result = fireEvent('movie.search', q = '%s %s' % (name, year if year else ''), limit = 1, merge = True)
-
- if len(result) > 0:
- if imdb_only and result[0].get('imdb'):
- Env.prop(prop_name, result[0].get('imdb'))
-
- return result[0].get('imdb') if imdb_only else result[0]
- else:
- return None
-
- def isMinimalMovie(self, movie):
- if not movie.get('rating'):
- return False
-
- if movie['rating'] and movie['rating'].get('imdb'):
- movie['votes'] = movie['rating']['imdb'][1]
- movie['rating'] = movie['rating']['imdb'][0]
-
- for minimal_type in ['year', 'rating', 'votes']:
- type_value = movie.get(minimal_type, 0)
- type_min = self.getMinimal(minimal_type)
- if type_value < type_min:
- log.info('%s too low for %s, need %s has %s', (minimal_type, movie['imdb'], type_min, type_value))
- return False
-
- return True
-
- def getMinimal(self, min_type):
- return Env.setting(min_type, 'automation')
-
- def getIMDBids(self):
- return []
-
- def canCheck(self):
- return time.time() > self.last_checked + self.interval
diff --git a/couchpotato/core/providers/automation/bluray/__init__.py b/couchpotato/core/providers/automation/bluray/__init__.py
deleted file mode 100644
index b916b0af60..0000000000
--- a/couchpotato/core/providers/automation/bluray/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from .main import Bluray
-
-def start():
- return Bluray()
-
-config = [{
- 'name': 'bluray',
- 'groups': [
- {
- 'tab': 'automation',
- 'list': 'automation_providers',
- 'name': 'bluray_automation',
- 'label': 'Blu-ray.com',
- 'description': 'Imports movies from blu-ray.com. (uses minimal requirements)',
- 'options': [
- {
- 'name': 'automation_enabled',
- 'default': False,
- 'type': 'enabler',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/automation/bluray/main.py b/couchpotato/core/providers/automation/bluray/main.py
deleted file mode 100644
index 235a1e5f95..0000000000
--- a/couchpotato/core/providers/automation/bluray/main.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.automation.base import Automation
-
-log = CPLog(__name__)
-
-
-class Bluray(Automation, RSS):
-
- interval = 1800
- rss_url = 'http://www.blu-ray.com/rss/newreleasesfeed.xml'
-
- def getIMDBids(self):
-
- movies = []
-
- rss_movies = self.getRSSData(self.rss_url)
-
- for movie in rss_movies:
- name = self.getTextElement(movie, 'title').lower().split('blu-ray')[0].strip('(').rstrip()
- year = self.getTextElement(movie, 'description').split('|')[1].strip('(').strip()
-
- if not name.find('/') == -1: # make sure it is not a double movie release
- continue
-
- if tryInt(year) < self.getMinimal('year'):
- continue
-
- imdb = self.search(name, year)
-
- if imdb:
- if self.isMinimalMovie(imdb):
- movies.append(imdb['imdb'])
-
- return movies
diff --git a/couchpotato/core/providers/automation/cp/__init__.py b/couchpotato/core/providers/automation/cp/__init__.py
deleted file mode 100644
index a4b55a83c5..0000000000
--- a/couchpotato/core/providers/automation/cp/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from .main import CP
-
-def start():
- return CP()
-
-config = []
diff --git a/couchpotato/core/providers/automation/cp/main.py b/couchpotato/core/providers/automation/cp/main.py
deleted file mode 100644
index 22b7942a5a..0000000000
--- a/couchpotato/core/providers/automation/cp/main.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.automation.base import Automation
-
-log = CPLog(__name__)
-
-
-class CP(Automation):
-
- def getMovies(self):
-
- return []
diff --git a/couchpotato/core/providers/automation/goodfilms/__init__.py b/couchpotato/core/providers/automation/goodfilms/__init__.py
deleted file mode 100644
index 795e21da49..0000000000
--- a/couchpotato/core/providers/automation/goodfilms/__init__.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from .main import Goodfilms
-
-def start():
- return Goodfilms()
-
-config = [{
- 'name': 'goodfilms',
- 'groups': [
- {
- 'tab': 'automation',
- 'list': 'watchlist_providers',
- 'name': 'goodfilms_automation',
- 'label': 'Goodfilms',
- 'description': 'import movies from your Goodfilms queue',
- 'options': [
- {
- 'name': 'automation_enabled',
- 'default': False,
- 'type': 'enabler',
- },
- {
- 'name': 'automation_username',
- 'label': 'Username',
- },
- ],
- },
- ],
-}]
\ No newline at end of file
diff --git a/couchpotato/core/providers/automation/goodfilms/main.py b/couchpotato/core/providers/automation/goodfilms/main.py
deleted file mode 100644
index dd4b1aef64..0000000000
--- a/couchpotato/core/providers/automation/goodfilms/main.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.automation.base import Automation
-from bs4 import BeautifulSoup
-
-log = CPLog(__name__)
-
-
-class Goodfilms(Automation):
-
- url = 'http://goodfil.ms/%s/queue'
-
- def getIMDBids(self):
-
- if not self.conf('automation_username'):
- log.error('Please fill in your username')
- return []
-
- movies = []
-
- for movie in self.getWatchlist():
- imdb_id = self.search(movie.get('title'), movie.get('year'), imdb_only = True)
- movies.append(imdb_id)
-
- return movies
-
- def getWatchlist(self):
-
- url = self.url % self.conf('automation_username')
- soup = BeautifulSoup(self.getHTMLData(url))
-
- movies = []
-
- for movie in soup.find_all('div', attrs = { 'class': 'movie', 'data-film-title': True }):
- movies.append({ 'title': movie['data-film-title'], 'year': movie['data-film-year'] })
-
- return movies
diff --git a/couchpotato/core/providers/automation/imdb/__init__.py b/couchpotato/core/providers/automation/imdb/__init__.py
deleted file mode 100644
index 8a91d42e30..0000000000
--- a/couchpotato/core/providers/automation/imdb/__init__.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from .main import IMDB
-
-def start():
- return IMDB()
-
-config = [{
- 'name': 'imdb',
- 'groups': [
- {
- 'tab': 'automation',
- 'list': 'watchlist_providers',
- 'name': 'imdb_automation',
- 'label': 'IMDB',
- 'description': 'From any public IMDB watchlists. Url should be the RSS link.',
- 'options': [
- {
- 'name': 'automation_enabled',
- 'default': False,
- 'type': 'enabler',
- },
- {
- 'name': 'automation_urls_use',
- 'label': 'Use',
- },
- {
- 'name': 'automation_urls',
- 'label': 'url',
- 'type': 'combined',
- 'combine': ['automation_urls_use', 'automation_urls'],
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/automation/imdb/main.py b/couchpotato/core/providers/automation/imdb/main.py
deleted file mode 100644
index 75a2d75c52..0000000000
--- a/couchpotato/core/providers/automation/imdb/main.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.helpers.variable import getImdb, splitString, tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.automation.base import Automation
-import traceback
-
-log = CPLog(__name__)
-
-
-class IMDB(Automation, RSS):
-
- interval = 1800
-
- def getIMDBids(self):
-
- movies = []
-
- enablers = [tryInt(x) for x in splitString(self.conf('automation_urls_use'))]
- urls = splitString(self.conf('automation_urls'))
-
- index = -1
- for url in urls:
-
- index += 1
- if not enablers[index]:
- continue
-
- try:
- rss_data = self.getHTMLData(url)
- imdbs = getImdb(rss_data, multiple = True) if rss_data else []
-
- for imdb in imdbs:
- movies.append(imdb)
-
- except:
- log.error('Failed loading IMDB watchlist: %s %s', (url, traceback.format_exc()))
-
- return movies
diff --git a/couchpotato/core/providers/automation/itunes/__init__.py b/couchpotato/core/providers/automation/itunes/__init__.py
deleted file mode 100644
index b5c565f6a2..0000000000
--- a/couchpotato/core/providers/automation/itunes/__init__.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from .main import ITunes
-
-def start():
- return ITunes()
-
-config = [{
- 'name': 'itunes',
- 'groups': [
- {
- 'tab': 'automation',
- 'list': 'automation_providers',
- 'name': 'itunes_automation',
- 'label': 'iTunes',
- 'description': 'From any iTunes Store feed. Url should be the RSS link. (uses minimal requirements)',
- 'options': [
- {
- 'name': 'automation_enabled',
- 'default': False,
- 'type': 'enabler',
- },
- {
- 'name': 'automation_urls_use',
- 'label': 'Use',
- 'default': ',',
- },
- {
- 'name': 'automation_urls',
- 'label': 'url',
- 'type': 'combined',
- 'combine': ['automation_urls_use', 'automation_urls'],
- 'default': 'https://itunes.apple.com/rss/topmovies/limit=25/xml,',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/automation/itunes/main.py b/couchpotato/core/providers/automation/itunes/main.py
deleted file mode 100644
index 14ca2a8234..0000000000
--- a/couchpotato/core/providers/automation/itunes/main.py
+++ /dev/null
@@ -1,63 +0,0 @@
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.helpers.variable import md5, splitString, tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.automation.base import Automation
-from xml.etree.ElementTree import QName
-import datetime
-import traceback
-import xml.etree.ElementTree as XMLTree
-
-log = CPLog(__name__)
-
-
-class ITunes(Automation, RSS):
-
- interval = 1800
-
- def getIMDBids(self):
-
- if self.isDisabled():
- return
-
- movies = []
-
- enablers = [tryInt(x) for x in splitString(self.conf('automation_urls_use'))]
- urls = splitString(self.conf('automation_urls'))
-
- namespace = 'http://www.w3.org/2005/Atom'
- namespaceIM = 'http://itunes.apple.com/rss'
-
- index = -1
- for url in urls:
-
- index += 1
- if not enablers[index]:
- continue
-
- try:
- cache_key = 'itunes.rss.%s' % md5(url)
- rss_data = self.getCache(cache_key, url)
-
- data = XMLTree.fromstring(rss_data)
-
- if data is not None:
- entry_tag = str(QName(namespace, 'entry'))
- rss_movies = self.getElements(data, entry_tag)
-
- for movie in rss_movies:
- name_tag = str(QName(namespaceIM, 'name'))
- name = self.getTextElement(movie, name_tag)
-
- releaseDate_tag = str(QName(namespaceIM, 'releaseDate'))
- releaseDateText = self.getTextElement(movie, releaseDate_tag)
- year = datetime.datetime.strptime(releaseDateText, '%Y-%m-%dT00:00:00-07:00').strftime("%Y")
-
- imdb = self.search(name, year)
-
- if imdb and self.isMinimalMovie(imdb):
- movies.append(imdb['imdb'])
-
- except:
- log.error('Failed loading iTunes rss feed: %s %s', (url, traceback.format_exc()))
-
- return movies
diff --git a/couchpotato/core/providers/automation/kinepolis/__init__.py b/couchpotato/core/providers/automation/kinepolis/__init__.py
deleted file mode 100644
index d3b8e89852..0000000000
--- a/couchpotato/core/providers/automation/kinepolis/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from .main import Kinepolis
-
-def start():
- return Kinepolis()
-
-config = [{
- 'name': 'kinepolis',
- 'groups': [
- {
- 'tab': 'automation',
- 'list': 'automation_providers',
- 'name': 'kinepolis_automation',
- 'label': 'Kinepolis',
- 'description': 'Imports movies from the current top 10 of kinepolis. (uses minimal requirements)',
- 'options': [
- {
- 'name': 'automation_enabled',
- 'default': False,
- 'type': 'enabler',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/automation/kinepolis/main.py b/couchpotato/core/providers/automation/kinepolis/main.py
deleted file mode 100644
index 4158d4885a..0000000000
--- a/couchpotato/core/providers/automation/kinepolis/main.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.automation.base import Automation
-import datetime
-
-log = CPLog(__name__)
-
-
-class Kinepolis(Automation, RSS):
-
- interval = 1800
- rss_url = 'http://kinepolis.be/nl/top10-box-office/feed'
-
- def getIMDBids(self):
-
- movies = []
-
- rss_movies = self.getRSSData(self.rss_url)
-
- for movie in rss_movies:
- name = self.getTextElement(movie, 'title')
- year = datetime.datetime.now().strftime('%Y')
-
- imdb = self.search(name, year)
-
- if imdb and self.isMinimalMovie(imdb):
- movies.append(imdb['imdb'])
-
- return movies
diff --git a/couchpotato/core/providers/automation/moviemeter/__init__.py b/couchpotato/core/providers/automation/moviemeter/__init__.py
deleted file mode 100644
index 773bed45ef..0000000000
--- a/couchpotato/core/providers/automation/moviemeter/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from .main import Moviemeter
-
-def start():
- return Moviemeter()
-
-config = [{
- 'name': 'moviemeter',
- 'groups': [
- {
- 'tab': 'automation',
- 'list': 'automation_providers',
- 'name': 'moviemeter_automation',
- 'label': 'Moviemeter',
- 'description': 'Imports movies from the current top 10 of moviemeter.nl. (uses minimal requirements)',
- 'options': [
- {
- 'name': 'automation_enabled',
- 'default': False,
- 'type': 'enabler',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/automation/moviemeter/main.py b/couchpotato/core/providers/automation/moviemeter/main.py
deleted file mode 100644
index dae764bf56..0000000000
--- a/couchpotato/core/providers/automation/moviemeter/main.py
+++ /dev/null
@@ -1,28 +0,0 @@
-from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.automation.base import Automation
-
-log = CPLog(__name__)
-
-
-class Moviemeter(Automation, RSS):
-
- interval = 1800
- rss_url = 'http://www.moviemeter.nl/rss/cinema'
-
- def getIMDBids(self):
-
- movies = []
-
- rss_movies = self.getRSSData(self.rss_url)
-
- for movie in rss_movies:
-
- name_year = fireEvent('scanner.name_year', self.getTextElement(movie, 'title'), single = True)
- imdb = self.search(name_year.get('name'), name_year.get('year'))
-
- if imdb and self.isMinimalMovie(imdb):
- movies.append(imdb['imdb'])
-
- return movies
diff --git a/couchpotato/core/providers/automation/movies_io/__init__.py b/couchpotato/core/providers/automation/movies_io/__init__.py
deleted file mode 100644
index 9b28093060..0000000000
--- a/couchpotato/core/providers/automation/movies_io/__init__.py
+++ /dev/null
@@ -1,34 +0,0 @@
-from .main import MoviesIO
-
-def start():
- return MoviesIO()
-
-config = [{
- 'name': 'moviesio',
- 'groups': [
- {
- 'tab': 'automation',
- 'list': 'watchlist_providers',
- 'name': 'moviesio',
- 'label': 'Movies.IO',
- 'description': 'Imports movies from Movies.io RSS watchlists',
- 'options': [
- {
- 'name': 'automation_enabled',
- 'default': False,
- 'type': 'enabler',
- },
- {
- 'name': 'automation_urls_use',
- 'label': 'Use',
- },
- {
- 'name': 'automation_urls',
- 'label': 'url',
- 'type': 'combined',
- 'combine': ['automation_urls_use', 'automation_urls'],
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/automation/movies_io/main.py b/couchpotato/core/providers/automation/movies_io/main.py
deleted file mode 100644
index 0737e2e696..0000000000
--- a/couchpotato/core/providers/automation/movies_io/main.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from couchpotato.core.event import fireEvent
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.helpers.variable import tryInt, splitString
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.automation.base import Automation
-
-log = CPLog(__name__)
-
-
-class MoviesIO(Automation, RSS):
-
- interval = 1800
-
- def getIMDBids(self):
-
- movies = []
-
- enablers = [tryInt(x) for x in splitString(self.conf('automation_urls_use'))]
-
- index = -1
- for rss_url in splitString(self.conf('automation_urls')):
-
- index += 1
- if not enablers[index]:
- continue
-
- rss_movies = self.getRSSData(rss_url, headers = {'Referer': ''})
-
- for movie in rss_movies:
-
- nameyear = fireEvent('scanner.name_year', self.getTextElement(movie, 'title'), single = True)
- imdb = self.search(nameyear.get('name'), nameyear.get('year'), imdb_only = True)
-
- if not imdb:
- continue
-
- movies.append(imdb)
-
- return movies
diff --git a/couchpotato/core/providers/automation/rottentomatoes/__init__.py b/couchpotato/core/providers/automation/rottentomatoes/__init__.py
deleted file mode 100644
index dd96fe456e..0000000000
--- a/couchpotato/core/providers/automation/rottentomatoes/__init__.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from .main import Rottentomatoes
-
-def start():
- return Rottentomatoes()
-
-config = [{
- 'name': 'rottentomatoes',
- 'groups': [
- {
- 'tab': 'automation',
- 'list': 'automation_providers',
- 'name': 'rottentomatoes_automation',
- 'label': 'Rottentomatoes',
- 'description': 'Imports movies from the rottentomatoes "in theaters"-feed.',
- 'options': [
- {
- 'name': 'automation_enabled',
- 'default': False,
- 'type': 'enabler',
- },
- {
- 'name': 'tomatometer_percent',
- 'default': '80',
- 'label': 'Tomatometer'
- }
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/automation/rottentomatoes/main.py b/couchpotato/core/providers/automation/rottentomatoes/main.py
deleted file mode 100644
index 053b79e839..0000000000
--- a/couchpotato/core/providers/automation/rottentomatoes/main.py
+++ /dev/null
@@ -1,48 +0,0 @@
-from couchpotato.core.helpers.rss import RSS
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.automation.base import Automation
-from xml.etree.ElementTree import QName
-import datetime
-import re
-
-log = CPLog(__name__)
-
-class Rottentomatoes(Automation, RSS):
-
- interval = 1800
- urls = {
- 'namespace': 'http://www.rottentomatoes.com/xmlns/rtmovie/',
- 'theater': 'http://www.rottentomatoes.com/syndication/rss/in_theaters.xml',
- }
-
- def getIMDBids(self):
-
- movies = []
-
- rss_movies = self.getRSSData(self.urls['theater'])
- rating_tag = str(QName(self.urls['namespace'], 'tomatometer_percent'))
-
- for movie in rss_movies:
-
- value = self.getTextElement(movie, "title")
- result = re.search('(?<=%\s).*', value)
-
- if result:
-
- log.info2('Something smells...')
- rating = tryInt(self.getTextElement(movie, rating_tag))
- name = result.group(0)
-
- if rating < tryInt(self.conf('tomatometer_percent')):
- log.info2('%s seems to be rotten...' % name)
- else:
-
- log.info2('Found %s fresh enough movies, enqueuing: %s' % (rating, name))
- year = datetime.datetime.now().strftime("%Y")
- imdb = self.search(name, year)
-
- if imdb:
- movies.append(imdb['imdb'])
-
- return movies
diff --git a/couchpotato/core/providers/automation/trakt/__init__.py b/couchpotato/core/providers/automation/trakt/__init__.py
deleted file mode 100644
index cbaaece3ec..0000000000
--- a/couchpotato/core/providers/automation/trakt/__init__.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from .main import Trakt
-
-def start():
- return Trakt()
-
-config = [{
- 'name': 'trakt',
- 'groups': [
- {
- 'tab': 'automation',
- 'list': 'watchlist_providers',
- 'name': 'trakt_automation',
- 'label': 'Trakt',
- 'description': 'import movies from your own watchlist',
- 'options': [
- {
- 'name': 'automation_enabled',
- 'default': False,
- 'type': 'enabler',
- },
- {
- 'name': 'automation_api_key',
- 'label': 'Apikey',
- },
- {
- 'name': 'automation_username',
- 'label': 'Username',
- },
- {
- 'name': 'automation_password',
- 'label': 'Password',
- 'type': 'password',
- 'description': 'When you have "Protect my data" checked on trakt.',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/automation/trakt/main.py b/couchpotato/core/providers/automation/trakt/main.py
deleted file mode 100644
index 0109daf382..0000000000
--- a/couchpotato/core/providers/automation/trakt/main.py
+++ /dev/null
@@ -1,44 +0,0 @@
-from couchpotato.core.event import addEvent
-from couchpotato.core.helpers.variable import sha1
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.automation.base import Automation
-import base64
-
-log = CPLog(__name__)
-
-
-class Trakt(Automation):
-
- urls = {
- 'base': 'http://api.trakt.tv/',
- 'watchlist': 'user/watchlist/movies.json/%s/',
- }
-
- def __init__(self):
- super(Trakt, self).__init__()
-
- addEvent('setting.save.trakt.automation_password', self.sha1Password)
-
- def sha1Password(self, value):
- return sha1(value) if value else ''
-
- def getIMDBids(self):
-
- movies = []
- for movie in self.getWatchlist():
- movies.append(movie.get('imdb_id'))
-
- return movies
-
- def getWatchlist(self):
- method = (self.urls['watchlist'] % self.conf('automation_api_key')) + self.conf('automation_username')
- return self.call(method)
-
- def call(self, method_url):
-
- headers = {}
- if self.conf('automation_password'):
- headers['Authorization'] = 'Basic %s' % base64.encodestring('%s:%s' % (self.conf('automation_username'), self.conf('automation_password')))[:-1]
-
- data = self.getJsonData(self.urls['base'] + method_url, headers = headers)
- return data if data else []
diff --git a/couchpotato/core/providers/base.py b/couchpotato/core/providers/base.py
deleted file mode 100644
index 855f3c7295..0000000000
--- a/couchpotato/core/providers/base.py
+++ /dev/null
@@ -1,274 +0,0 @@
-from couchpotato.core.event import addEvent, fireEvent
-from couchpotato.core.helpers.variable import tryFloat, mergeDicts, md5, \
- possibleTitles, getTitle
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.environment import Env
-from urlparse import urlparse
-import cookielib
-import json
-import re
-import time
-import traceback
-import urllib2
-import xml.etree.ElementTree as XMLTree
-
-
-log = CPLog(__name__)
-
-
-class Provider(Plugin):
-
- type = None # movie, nzb, torrent, subtitle, trailer
- http_time_between_calls = 10 # Default timeout for url requests
-
- last_available_check = {}
- is_available = {}
-
- def isAvailable(self, test_url):
-
- if Env.get('dev'): return True
-
- now = time.time()
- host = urlparse(test_url).hostname
-
- if self.last_available_check.get(host) < now - 900:
- self.last_available_check[host] = now
-
- try:
- self.urlopen(test_url, 30)
- self.is_available[host] = True
- except:
- log.error('"%s" unavailable, trying again in an 15 minutes.', host)
- self.is_available[host] = False
-
- return self.is_available.get(host, False)
-
- def getJsonData(self, url, **kwargs):
-
- cache_key = '%s%s' % (md5(url), md5('%s' % kwargs.get('params', {})))
- data = self.getCache(cache_key, url, **kwargs)
-
- if data:
- try:
- return json.loads(data)
- except:
- log.error('Failed to parsing %s: %s', (self.getName(), traceback.format_exc()))
-
- return []
-
- def getRSSData(self, url, item_path = 'channel/item', **kwargs):
-
- cache_key = '%s%s' % (md5(url), md5('%s' % kwargs.get('params', {})))
- data = self.getCache(cache_key, url, **kwargs)
-
- if data:
- try:
- data = XMLTree.fromstring(data)
- return self.getElements(data, item_path)
- except:
- log.error('Failed to parsing %s: %s', (self.getName(), traceback.format_exc()))
-
- return []
-
- def getHTMLData(self, url, **kwargs):
-
- cache_key = '%s%s' % (md5(url), md5('%s' % kwargs.get('params', {})))
- return self.getCache(cache_key, url, **kwargs)
-
-
-class YarrProvider(Provider):
-
- cat_ids = []
-
- sizeGb = ['gb', 'gib']
- sizeMb = ['mb', 'mib']
- sizeKb = ['kb', 'kib']
-
- login_opener = None
-
- def __init__(self):
- addEvent('provider.enabled_types', self.getEnabledProviderType)
- addEvent('provider.belongs_to', self.belongsTo)
- addEvent('yarr.search', self.search)
- addEvent('%s.search' % self.type, self.search)
-
- def getEnabledProviderType(self):
- if self.isEnabled():
- return self.type
- else:
- return []
-
- def login(self):
-
- try:
- cookiejar = cookielib.CookieJar()
- opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookiejar))
- urllib2.install_opener(opener)
- log.info2('Logging into %s', self.urls['login'])
- f = opener.open(self.urls['login'], self.getLoginParams())
- output = f.read()
- f.close()
-
- if self.loginSuccess(output):
- self.login_opener = opener
- return True
- except:
- log.error('Failed to login %s: %s', (self.getName(), traceback.format_exc()))
-
- return False
-
- def loginSuccess(self, output):
- return True
-
- def loginDownload(self, url = '', nzb_id = ''):
- try:
- if not self.login_opener and not self.login():
- log.error('Failed downloading from %s', self.getName())
- return self.urlopen(url, opener = self.login_opener)
- except:
- log.error('Failed downloading from %s: %s', (self.getName(), traceback.format_exc()))
-
- def getLoginParams(self):
- return ''
-
- def download(self, url = '', nzb_id = ''):
- try:
- return self.urlopen(url, headers = {'User-Agent': Env.getIdentifier()}, show_error = False)
- except:
- log.error('Failed getting nzb from %s: %s', (self.getName(), traceback.format_exc()))
-
- return 'try_next'
-
- def search(self, movie, quality):
-
- if self.isDisabled():
- return []
-
- # Login if needed
- if self.urls.get('login') and (not self.login_opener and not self.login()):
- log.error('Failed to login to: %s', self.getName())
- return []
-
- # Create result container
- imdb_results = hasattr(self, '_search')
- results = ResultList(self, movie, quality, imdb_results = imdb_results)
-
- # Do search based on imdb id
- if imdb_results:
- self._search(movie, quality, results)
- # Search possible titles
- else:
- for title in possibleTitles(getTitle(movie['library'])):
- self._searchOnTitle(title, movie, quality, results)
-
- return results
-
- def belongsTo(self, url, provider = None, host = None):
- try:
- if provider and provider == self.getName():
- return self
-
- hostname = urlparse(url).hostname
- if host and hostname in host:
- return self
- else:
- for url_type in self.urls:
- download_url = self.urls[url_type]
- if hostname in download_url:
- return self
- except:
- log.debug('Url % s doesn\'t belong to %s', (url, self.getName()))
-
- return
-
- def parseSize(self, size):
-
- sizeRaw = size.lower()
- size = tryFloat(re.sub(r'[^0-9.]', '', size).strip())
-
- for s in self.sizeGb:
- if s in sizeRaw:
- return size * 1024
-
- for s in self.sizeMb:
- if s in sizeRaw:
- return size
-
- for s in self.sizeKb:
- if s in sizeRaw:
- return size / 1024
-
- return 0
-
- def getCatId(self, identifier):
-
- for cats in self.cat_ids:
- ids, qualities = cats
- if identifier in qualities:
- return ids
-
- return [self.cat_backup_id]
-
-
-class ResultList(list):
-
- result_ids = None
- provider = None
- movie = None
- quality = None
-
- def __init__(self, provider, movie, quality, **kwargs):
-
- self.result_ids = []
- self.provider = provider
- self.movie = movie
- self.quality = quality
- self.kwargs = kwargs
-
- super(ResultList, self).__init__()
-
- def extend(self, results):
- for r in results:
- self.append(r)
-
- def append(self, result):
-
- new_result = self.fillResult(result)
-
- is_correct_movie = fireEvent('searcher.correct_movie',
- nzb = new_result, movie = self.movie, quality = self.quality,
- imdb_results = self.kwargs.get('imdb_results', False), single = True)
-
- if is_correct_movie and new_result['id'] not in self.result_ids:
- new_result['score'] += fireEvent('score.calculate', new_result, self.movie, single = True)
-
- self.found(new_result)
- self.result_ids.append(result['id'])
-
- super(ResultList, self).append(new_result)
-
- def fillResult(self, result):
-
- defaults = {
- 'id': 0,
- 'type': self.provider.type,
- 'provider': self.provider.getName(),
- 'download': self.provider.download,
- 'url': '',
- 'name': '',
- 'age': 0,
- 'size': 0,
- 'description': '',
- 'score': 0
- }
-
- return mergeDicts(defaults, result)
-
- def found(self, new_result):
- if not new_result.get('provider_extra'):
- new_result['provider_extra'] = ''
- else:
- new_result['provider_extra'] = ', %s' % new_result['provider_extra']
-
- log.info('Found: score(%(score)s) on %(provider)s%(provider_extra)s: %(name)s', new_result)
diff --git a/couchpotato/core/providers/metadata/base.py b/couchpotato/core/providers/metadata/base.py
deleted file mode 100644
index b41960a05c..0000000000
--- a/couchpotato/core/providers/metadata/base.py
+++ /dev/null
@@ -1,98 +0,0 @@
-from couchpotato.core.event import addEvent, fireEvent
-from couchpotato.core.helpers.variable import mergeDicts
-from couchpotato.core.logger import CPLog
-from couchpotato.core.plugins.base import Plugin
-from couchpotato.environment import Env
-import os
-import shutil
-import traceback
-
-log = CPLog(__name__)
-
-
-class MetaDataBase(Plugin):
-
- enabled_option = 'meta_enabled'
-
- def __init__(self):
- addEvent('renamer.after', self.create)
-
- def create(self, message = None, group = {}):
- if self.isDisabled(): return
-
- log.info('Creating %s metadata.', self.getName())
-
- # Update library to get latest info
- try:
- updated_library = fireEvent('library.update', group['library']['identifier'], force = True, single = True)
- group['library'] = mergeDicts(group['library'], updated_library)
- except:
- log.error('Failed to update movie, before creating metadata: %s', traceback.format_exc())
-
- root_name = self.getRootName(group)
- meta_name = os.path.basename(root_name)
- root = os.path.dirname(root_name)
-
- movie_info = group['library'].get('info')
-
- for file_type in ['nfo', 'thumbnail', 'fanart']:
- try:
- # Get file path
- name = getattr(self, 'get' + file_type.capitalize() + 'Name')(meta_name, root)
-
- if name and self.conf('meta_' + file_type):
-
- # Get file content
- content = getattr(self, 'get' + file_type.capitalize())(movie_info = movie_info, data = group)
- if content:
- log.debug('Creating %s file: %s', (file_type, name))
- if os.path.isfile(content):
- shutil.copy2(content, name)
- else:
- self.createFile(name, content)
- group['renamed_files'].append(name)
-
- try:
- os.chmod(name, Env.getPermission('file'))
- except:
- log.debug('Failed setting permissions for %s: %s', (name, traceback.format_exc()))
-
- except:
- log.error('Unable to create %s file: %s', (file_type, traceback.format_exc()))
-
- def getRootName(self, data):
- return
-
- def getFanartName(self, name, root):
- return
-
- def getThumbnailName(self, name, root):
- return
-
- def getNfoName(self, name, root):
- return
-
- def getNfo(self, movie_info = {}, data = {}):
- return
-
- def getThumbnail(self, movie_info = {}, data = {}, wanted_file_type = 'poster_original'):
- file_types = fireEvent('file.types', single = True)
- for file_type in file_types:
- if file_type.get('identifier') == wanted_file_type:
- break
-
- # See if it is in current files
- for cur_file in data['library'].get('files', []):
- if cur_file.get('type_id') is file_type.get('id') and os.path.isfile(cur_file.get('path')):
- return cur_file.get('path')
-
- # Download using existing info
- try:
- images = data['library']['info']['images'][wanted_file_type]
- file_path = fireEvent('file.download', url = images[0], single = True)
- return file_path
- except:
- pass
-
- def getFanart(self, movie_info = {}, data = {}):
- return self.getThumbnail(movie_info = movie_info, data = data, wanted_file_type = 'backdrop_original')
diff --git a/couchpotato/core/providers/metadata/xbmc/__init__.py b/couchpotato/core/providers/metadata/xbmc/__init__.py
deleted file mode 100644
index ea426dba66..0000000000
--- a/couchpotato/core/providers/metadata/xbmc/__init__.py
+++ /dev/null
@@ -1,69 +0,0 @@
-from .main import XBMC
-
-def start():
- return XBMC()
-
-config = [{
- 'name': 'xbmc',
- 'groups': [
- {
- 'tab': 'renamer',
- 'subtab': 'metadata',
- 'name': 'xbmc_metadata',
- 'label': 'XBMC',
- 'description': 'Enable metadata XBMC can understand',
- 'options': [
- {
- 'name': 'meta_enabled',
- 'default': False,
- 'type': 'enabler',
- },
- {
- 'name': 'meta_nfo',
- 'label': 'NFO',
- 'default': True,
- 'type': 'bool',
- },
- {
- 'name': 'meta_nfo_name',
- 'label': 'NFO filename',
- 'default': '%s.nfo',
- 'advanced': True,
- 'description': '%s is the rootname of the movie. For example "/path/to/movie cd1.mkv" will be "/path/to/movie"'
- },
- {
- 'name': 'meta_url_only',
- 'label': 'Only IMDB URL',
- 'default': False,
- 'advanced': True,
- 'description': 'Create a nfo with only the IMDB url inside',
- 'type': 'bool',
- },
- {
- 'name': 'meta_fanart',
- 'label': 'Fanart',
- 'default': True,
- 'type': 'bool',
- },
- {
- 'name': 'meta_fanart_name',
- 'label': 'Fanart filename',
- 'default': '%s-fanart.jpg',
- 'advanced': True,
- },
- {
- 'name': 'meta_thumbnail',
- 'label': 'Thumbnail',
- 'default': True,
- 'type': 'bool',
- },
- {
- 'name': 'meta_thumbnail_name',
- 'label': 'Thumbnail filename',
- 'default': '%s.tbn',
- 'advanced': True,
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/metadata/xbmc/main.py b/couchpotato/core/providers/metadata/xbmc/main.py
deleted file mode 100644
index 1fd95846ad..0000000000
--- a/couchpotato/core/providers/metadata/xbmc/main.py
+++ /dev/null
@@ -1,115 +0,0 @@
-from couchpotato.core.helpers.encoding import toUnicode
-from couchpotato.core.helpers.variable import getTitle
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.metadata.base import MetaDataBase
-from xml.etree.ElementTree import Element, SubElement, tostring
-import os
-import re
-import traceback
-import xml.dom.minidom
-
-log = CPLog(__name__)
-
-class XBMC(MetaDataBase):
-
- def getRootName(self, data = {}):
- return os.path.join(data['destination_dir'], data['filename'])
-
- def getFanartName(self, name, root):
- return self.createMetaName(self.conf('meta_fanart_name'), name, root)
-
- def getThumbnailName(self, name, root):
- return self.createMetaName(self.conf('meta_thumbnail_name'), name, root)
-
- def getNfoName(self, name, root):
- return self.createMetaName(self.conf('meta_nfo_name'), name, root)
-
- def createMetaName(self, basename, name, root):
- return os.path.join(root, basename.replace('%s', name))
-
- def getNfo(self, movie_info = {}, data = {}):
-
- # return imdb url only
- if self.conf('meta_url_only'):
- return 'http://www.imdb.com/title/%s/' % toUnicode(data['library']['identifier'])
-
- nfoxml = Element('movie')
-
- # Title
- try:
- el = SubElement(nfoxml, 'title')
- el.text = toUnicode(getTitle(data['library']))
- except:
- pass
-
- # IMDB id
- try:
- el = SubElement(nfoxml, 'id')
- el.text = toUnicode(data['library']['identifier'])
- except:
- pass
-
- # Runtime
- try:
- runtime = SubElement(nfoxml, 'runtime')
- runtime.text = '%s min' % movie_info.get('runtime')
- except:
- pass
-
- # Other values
- types = ['year', 'mpaa', 'originaltitle:original_title', 'outline', 'plot', 'tagline', 'premiered:released']
- for type in types:
-
- if ':' in type:
- name, type = type.split(':')
- else:
- name = type
-
- try:
- if data['library'].get(type):
- el = SubElement(nfoxml, name)
- el.text = toUnicode(movie_info.get(type, ''))
- except:
- pass
-
- # Rating
- for rating_type in ['imdb', 'rotten', 'tmdb']:
- try:
- r, v = movie_info['rating'][rating_type]
- rating = SubElement(nfoxml, 'rating')
- rating.text = str(r)
- votes = SubElement(nfoxml, 'votes')
- votes.text = str(v)
- break
- except:
- log.debug('Failed adding rating info from %s: %s', (rating_type, traceback.format_exc()))
-
- # Genre
- for genre in movie_info.get('genres', []):
- genres = SubElement(nfoxml, 'genre')
- genres.text = toUnicode(genre)
-
- # Actors
- for actor in movie_info.get('actors', []):
- actors = SubElement(nfoxml, 'actor')
- name = SubElement(actors, 'name')
- name.text = toUnicode(actor)
-
- # Directors
- for director_name in movie_info.get('directors', []):
- director = SubElement(nfoxml, 'director')
- director.text = toUnicode(director_name)
-
- # Writers
- for writer in movie_info.get('writers', []):
- writers = SubElement(nfoxml, 'credits')
- writers.text = toUnicode(writer)
-
-
- # Clean up the xml and return it
- nfoxml = xml.dom.minidom.parseString(tostring(nfoxml))
- xml_string = nfoxml.toprettyxml(indent = ' ')
- text_re = re.compile('>\n\s+([^<>\s].*?)\n\s+\g<1> 0:
- log.info('Found: %s', result['titles'][0] + ' (' + str(result['year']) + ')')
- return [result]
-
- return []
-
- return []
-
- def getInfo(self, identifier = None):
-
- if not identifier:
- return {}
-
- cache_key = 'omdbapi.cache.%s' % identifier
- cached = self.getCache(cache_key, self.urls['info'] % identifier, timeout = 3)
-
- if cached:
- result = self.parseMovie(cached)
- if result.get('titles') and len(result.get('titles')) > 0:
- log.info('Found: %s', result['titles'][0] + ' (' + str(result['year']) + ')')
- return result
-
- return {}
-
- def parseMovie(self, movie):
-
- movie_data = {}
- try:
-
- try:
- if isinstance(movie, (str, unicode)):
- movie = json.loads(movie)
- except ValueError:
- log.info('No proper json to decode')
- return movie_data
-
- if movie.get('Response') == 'Parse Error' or movie.get('Response') == 'False':
- return movie_data
-
- tmp_movie = movie.copy()
- for key in tmp_movie:
- if tmp_movie.get(key).lower() == 'n/a':
- del movie[key]
-
- year = tryInt(movie.get('Year', ''))
-
- movie_data = {
- 'via_imdb': True,
- 'titles': [movie.get('Title')] if movie.get('Title') else [],
- 'original_title': movie.get('Title', ''),
- 'images': {
- 'poster': [movie.get('Poster', '')] if movie.get('Poster') and len(movie.get('Poster', '')) > 4 else [],
- },
- 'rating': {
- 'imdb': (tryFloat(movie.get('imdbRating', 0)), tryInt(movie.get('imdbVotes', '').replace(',', ''))),
- #'rotten': (tryFloat(movie.get('tomatoRating', 0)), tryInt(movie.get('tomatoReviews', '').replace(',', ''))),
- },
- 'imdb': str(movie.get('imdbID', '')),
- 'runtime': self.runtimeToMinutes(movie.get('Runtime', '')),
- 'released': movie.get('Released', ''),
- 'year': year if isinstance(year, (int)) else None,
- 'plot': movie.get('Plot', ''),
- 'genres': splitString(movie.get('Genre', '')),
- 'directors': splitString(movie.get('Director', '')),
- 'writers': splitString(movie.get('Writer', '')),
- 'actors': splitString(movie.get('Actors', '')),
- }
- except:
- log.error('Failed parsing IMDB API json: %s', traceback.format_exc())
-
- return movie_data
-
- def runtimeToMinutes(self, runtime_str):
- runtime = 0
-
- regex = '(\d*.?\d+).(h|hr|hrs|mins|min)+'
- matches = re.findall(regex, runtime_str)
- for match in matches:
- nr, size = match
- runtime += tryInt(nr) * (60 if 'h' is str(size)[0] else 1)
-
- return runtime
diff --git a/couchpotato/core/providers/movie/themoviedb/__init__.py b/couchpotato/core/providers/movie/themoviedb/__init__.py
deleted file mode 100644
index 66ac536a3f..0000000000
--- a/couchpotato/core/providers/movie/themoviedb/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from .main import TheMovieDb
-
-def start():
- return TheMovieDb()
-
-config = [{
- 'name': 'themoviedb',
- 'groups': [
- {
- 'tab': 'providers',
- 'name': 'tmdb',
- 'label': 'TheMovieDB',
- 'hidden': True,
- 'description': 'Used for all calls to TheMovieDB.',
- 'options': [
- {
- 'name': 'api_key',
- 'default': '9b939aee0aaafc12a65bf448e4af9543',
- 'label': 'Api Key',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/movie/themoviedb/main.py b/couchpotato/core/providers/movie/themoviedb/main.py
deleted file mode 100644
index 0554a9015c..0000000000
--- a/couchpotato/core/providers/movie/themoviedb/main.py
+++ /dev/null
@@ -1,214 +0,0 @@
-from couchpotato.core.event import addEvent
-from couchpotato.core.helpers.encoding import simplifyString, toUnicode
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.movie.base import MovieProvider
-from libs.themoviedb import tmdb
-import traceback
-
-log = CPLog(__name__)
-
-
-class TheMovieDb(MovieProvider):
-
- def __init__(self):
- addEvent('movie.by_hash', self.byHash)
- addEvent('movie.search', self.search, priority = 2)
- addEvent('movie.info', self.getInfo, priority = 2)
- addEvent('movie.info_by_tmdb', self.getInfoByTMDBId)
-
- # Use base wrapper
- tmdb.configure(self.conf('api_key'))
-
- def byHash(self, file):
- ''' Find movie by hash '''
-
- if self.isDisabled():
- return False
-
- cache_key = 'tmdb.cache.%s' % simplifyString(file)
- results = self.getCache(cache_key)
-
- if not results:
- log.debug('Searching for movie by hash: %s', file)
- try:
- raw = tmdb.searchByHashingFile(file)
-
- results = []
- if raw:
- try:
- results = self.parseMovie(raw)
- log.info('Found: %s', results['titles'][0] + ' (' + str(results['year']) + ')')
-
- self.setCache(cache_key, results)
- return results
- except SyntaxError, e:
- log.error('Failed to parse XML response: %s', e)
- return False
- except:
- log.debug('No movies known by hash for: %s', file)
- pass
-
- return results
-
- def search(self, q, limit = 12):
- ''' Find movie by name '''
-
- if self.isDisabled():
- return False
-
- search_string = simplifyString(q)
- cache_key = 'tmdb.cache.%s.%s' % (search_string, limit)
- results = self.getCache(cache_key)
-
- if not results:
- log.debug('Searching for movie: %s', q)
-
- raw = None
- try:
- raw = tmdb.search(search_string)
- except:
- log.error('Failed searching TMDB for "%s": %s', (search_string, traceback.format_exc()))
-
- results = []
- if raw:
- try:
- nr = 0
-
- for movie in raw:
- results.append(self.parseMovie(movie))
-
- nr += 1
- if nr == limit:
- break
-
- log.info('Found: %s', [result['titles'][0] + ' (' + str(result['year']) + ')' for result in results])
-
- self.setCache(cache_key, results)
- return results
- except SyntaxError, e:
- log.error('Failed to parse XML response: %s', e)
- return False
-
- return results
-
- def getInfo(self, identifier = None):
-
- if not identifier:
- return {}
-
- cache_key = 'tmdb.cache.%s' % identifier
- result = self.getCache(cache_key)
-
- if not result:
- result = {}
- movie = None
-
- try:
- log.debug('Getting info: %s', cache_key)
- movie = tmdb.imdbLookup(id = identifier)
- except:
- pass
-
- if movie:
- result = self.parseMovie(movie[0])
- self.setCache(cache_key, result)
-
- return result
-
- def getInfoByTMDBId(self, id = None):
-
- cache_key = 'tmdb.cache.%s' % id
- result = self.getCache(cache_key)
-
- if not result:
- result = {}
- movie = None
-
- try:
- log.debug('Getting info: %s', cache_key)
- movie = tmdb.getMovieInfo(id = id)
- except:
- pass
-
- if movie:
- result = self.parseMovie(movie)
- self.setCache(cache_key, result)
-
- return result
-
- def parseMovie(self, movie):
-
- # Images
- poster = self.getImage(movie, type = 'poster', size = 'cover')
- #backdrop = self.getImage(movie, type = 'backdrop', size = 'w1280')
- poster_original = self.getImage(movie, type = 'poster', size = 'original')
- backdrop_original = self.getImage(movie, type = 'backdrop', size = 'original')
-
- # Genres
- try:
- genres = self.getCategory(movie, 'genre')
- except:
- genres = []
-
- # 1900 is the same as None
- year = str(movie.get('released', 'none'))[:4]
- if year == '1900' or year.lower() == 'none':
- year = None
-
- movie_data = {
- 'via_tmdb': True,
- 'tmdb_id': int(movie.get('id', 0)),
- 'titles': [toUnicode(movie.get('name'))],
- 'original_title': movie.get('original_name'),
- 'images': {
- 'poster': [poster] if poster else [],
- #'backdrop': [backdrop] if backdrop else [],
- 'poster_original': [poster_original] if poster_original else [],
- 'backdrop_original': [backdrop_original] if backdrop_original else [],
- },
- 'imdb': movie.get('imdb_id'),
- 'runtime': movie.get('runtime'),
- 'released': movie.get('released'),
- 'year': year,
- 'plot': movie.get('overview', ''),
- 'tagline': '',
- 'genres': genres,
- }
-
- # Add alternative names
- for alt in ['original_name', 'alternative_name']:
- alt_name = toUnicode(movie.get(alt))
- if alt_name and not alt_name in movie_data['titles'] and alt_name.lower() != 'none' and alt_name != None:
- movie_data['titles'].append(alt_name)
-
- return movie_data
-
- def getImage(self, movie, type = 'poster', size = 'cover'):
-
- image_url = ''
- for image in movie.get('images', []):
- if(image.get('type') == type) and image.get(size):
- image_url = image.get(size)
- break
-
- return image_url
-
- def getCategory(self, movie, type = 'genre'):
-
- cats = movie.get('categories', {}).get(type)
-
- categories = []
- for category in cats:
- try:
- categories.append(category)
- except:
- pass
-
- return categories
-
- def isDisabled(self):
- if self.conf('api_key') == '':
- log.error('No API key provided.')
- True
- else:
- False
diff --git a/couchpotato/core/providers/nzb/__init__.py b/couchpotato/core/providers/nzb/__init__.py
deleted file mode 100644
index 651ae8b9f5..0000000000
--- a/couchpotato/core/providers/nzb/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-config = {
- 'name': 'nzb_providers',
- 'groups': [
- {
- 'label': 'Usenet',
- 'description': 'Providers searching usenet for new releases',
- 'wizard': True,
- 'type': 'list',
- 'name': 'nzb_providers',
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'options': [],
- },
- ],
-}
diff --git a/couchpotato/core/providers/nzb/base.py b/couchpotato/core/providers/nzb/base.py
deleted file mode 100644
index f11382ba0b..0000000000
--- a/couchpotato/core/providers/nzb/base.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from couchpotato.core.providers.base import YarrProvider
-import time
-
-
-class NZBProvider(YarrProvider):
- type = 'nzb'
-
- def calculateAge(self, unix):
- return int(time.time() - unix) / 24 / 60 / 60
diff --git a/couchpotato/core/providers/nzb/binsearch/__init__.py b/couchpotato/core/providers/nzb/binsearch/__init__.py
deleted file mode 100644
index f4288b11f5..0000000000
--- a/couchpotato/core/providers/nzb/binsearch/__init__.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from .main import BinSearch
-
-def start():
- return BinSearch()
-
-config = [{
- 'name': 'binsearch',
- 'groups': [
- {
- 'tab': 'searcher',
- 'subtab': 'providers',
- 'list': 'nzb_providers',
- 'name': 'binsearch',
- 'description': 'Free provider, less accurate. See BinSearch',
- 'wizard': True,
- 'options': [
- {
- 'name': 'enabled',
- 'type': 'enabler',
- },
- ],
- },
- ],
-}]
diff --git a/couchpotato/core/providers/nzb/binsearch/main.py b/couchpotato/core/providers/nzb/binsearch/main.py
deleted file mode 100644
index 1d86300283..0000000000
--- a/couchpotato/core/providers/nzb/binsearch/main.py
+++ /dev/null
@@ -1,98 +0,0 @@
-from bs4 import BeautifulSoup
-from couchpotato.core.helpers.encoding import tryUrlencode
-from couchpotato.core.helpers.variable import tryInt
-from couchpotato.core.logger import CPLog
-from couchpotato.core.providers.nzb.base import NZBProvider
-from couchpotato.environment import Env
-import re
-import traceback
-
-log = CPLog(__name__)
-
-
-class BinSearch(NZBProvider):
-
- urls = {
- 'download': 'https://www.binsearch.info/fcgi/nzb.fcgi?q=%s',
- 'detail': 'https://www.binsearch.info%s',
- 'search': 'https://www.binsearch.info/index.php?%s',
- }
-
- http_time_between_calls = 4 # Seconds
-
- def _search(self, movie, quality, results):
-
- arguments = tryUrlencode({
- 'q': movie['library']['identifier'],
- 'm': 'n',
- 'max': 400,
- 'adv_age': Env.setting('retention', 'nzb'),
- 'adv_sort': 'date',
- 'adv_col': 'on',
- 'adv_nfo': 'on',
- 'minsize': quality.get('size_min'),
- 'maxsize': quality.get('size_max'),
- })
-
- data = self.getHTMLData(self.urls['search'] % arguments)
-
- if data:
- try:
-
- html = BeautifulSoup(data)
- main_table = html.find('table', attrs = {'id':'r2'})
-
- if not main_table:
- return
-
- items = main_table.find_all('tr')
-
- for row in items:
- title = row.find('span', attrs = {'class':'s'})
-
- if not title: continue
-
- nzb_id = row.find('input', attrs = {'type':'checkbox'})['name']
- info = row.find('span', attrs = {'class':'d'})
- size_match = re.search('size:.(?POr by getting a subscription at Usenet Server or Newshosting.