Skip to content

Commit

Permalink
W.i.p. switching to Trakt.TV as main api. Re #27
Browse files Browse the repository at this point in the history 
W.i.p importexport freature to backup settings for upgrading and transferring.
  • Loading branch information
@SchizoDuckie
SchizoDuckie committed Mar 31, 2014
1 parent 2c24ae7 commit 3e8cc73
Show file tree
Hide file tree
Showing 16 changed files with 1,338 additions and 1,062 deletions.
197 changes: 113 additions & 84 deletions js/CRUD.entities.js
View file
@@ -1,101 +1,130 @@
var Serie = CRUD.define({
className: 'Serie',
table : 'Series',
primary : 'ID_Serie',
fields: ['ID_Serie', 'name', 'banner', 'overview', 'TVDB_ID', 'IMDB_ID', 'TVRage_ID', 'networkid', 'seriesid', 'zap2it_id', 'actors', 'airs_dayofweek', 'airs_time', 'contentrating', 'firstaired', 'genre', 'language', 'network', 'rating', 'ratingcount', 'runtime', 'status', 'added', 'addedby', 'fanart', 'poster', 'lastupdated', 'lastfetched', 'nextupdate'],
relations: {
'Episode': CRUD.RELATION_FOREIGN
},
createStatement: 'CREATE TABLE "Series" ("ID_Serie" INTEGER PRIMARY KEY NOT NULL, "name" VARCHAR(250) DEFAULT(NULL), "banner" VARCHAR(1024) DEFAULT(NULL), "overview" TEXT DEFAULT(NULL), "TVDB_ID" INTEGER UNIQUE NOT NULL, "IMDB_ID" INTEGER DEFAULT(NULL), "TVRage_ID" INTEGER DEFAULT(NULL), "networkid" VARCHAR(50) DEFAULT(NULL), "seriesid" VARCHAR(50) DEFAULT(NULL), "zap2it_id" VARCHAR(50) DEFAULT(NULL), "actors" VARCHAR(1024) DEFAULT(NULL), "airs_dayofweek" VARCHAR(10) DEFAULT(NULL), "airs_time" VARCHAR(15) DEFAULT(NULL), "contentrating" VARCHAR(20) DEFAULT(NULL), "firstaired" DATE DEFAULT(NULL), "genre" VARCHAR(50) DEFAULT(NULL), "language" VARCHAR(50) DEFAULT(NULL), "network" VARCHAR(50) DEFAULT(NULL), "rating" VARCHAR(10) DEFAULT(NULL), "ratingcount" VARCHAR(10) DEFAULT(NULL), "runtime" VARCHAR(50) DEFAULT(NULL), "status" VARCHAR(50) DEFAULT(NULL), "added" DATE DEFAULT(NULL), "addedby" VARCHAR(50) DEFAULT(NULL), "fanart" VARCHAR(150) DEFAULT(NULL), "poster" VARCHAR(150) DEFAULT(NULL), "lastupdated" TIMESTAMP DEFAULT (NULL), "lastfetched" TIMESTAMP DEFAULT (NULL), "nextupdate" TIMESTAMP DEFAULT (NULL) )',
adapter: 'dbAdapter',
defaultValues: {

},
fixtures: [

]

}, {

getEpisodes: function() {
console.log("Fetching episodes for ", this);
return this.Find('Episode', {}).then(function(res) {
console.log("Found episodes! ", res);
return res;
}, function(err) {
console.log("GETEPISODES ERROR!", err);
})
}
});
className: 'Serie',
table: 'Series',
primary: 'ID_Serie',
fields: ['ID_Serie', 'name', 'banner', 'overview', 'TVDB_ID', 'IMDB_ID', 'TVRage_ID', 'networkid', 'seriesid', 'zap2it_id', 'actors', 'airs_dayofweek', 'airs_time', 'contentrating', 'firstaired', 'genre', 'language', 'network', 'rating', 'ratingcount', 'runtime', 'status', 'added', 'addedby', 'fanart', 'poster', 'lastupdated', 'lastfetched', 'nextupdate'],
relations: {
'Episode': CRUD.RELATION_FOREIGN
},
createStatement: 'CREATE TABLE "Series" ("ID_Serie" INTEGER PRIMARY KEY NOT NULL, "name" VARCHAR(250) DEFAULT(NULL), "banner" VARCHAR(1024) DEFAULT(NULL), "overview" TEXT DEFAULT(NULL), "TVDB_ID" INTEGER UNIQUE NOT NULL, "IMDB_ID" INTEGER DEFAULT(NULL), "TVRage_ID" INTEGER DEFAULT(NULL), "networkid" VARCHAR(50) DEFAULT(NULL), "seriesid" VARCHAR(50) DEFAULT(NULL), "zap2it_id" VARCHAR(50) DEFAULT(NULL), "actors" VARCHAR(1024) DEFAULT(NULL), "airs_dayofweek" VARCHAR(10) DEFAULT(NULL), "airs_time" VARCHAR(15) DEFAULT(NULL), "contentrating" VARCHAR(20) DEFAULT(NULL), "firstaired" DATE DEFAULT(NULL), "genre" VARCHAR(50) DEFAULT(NULL), "language" VARCHAR(50) DEFAULT(NULL), "network" VARCHAR(50) DEFAULT(NULL), "rating" VARCHAR(10) DEFAULT(NULL), "ratingcount" VARCHAR(10) DEFAULT(NULL), "runtime" VARCHAR(50) DEFAULT(NULL), "status" VARCHAR(50) DEFAULT(NULL), "added" DATE DEFAULT(NULL), "addedby" VARCHAR(50) DEFAULT(NULL), "fanart" VARCHAR(150) DEFAULT(NULL), "poster" VARCHAR(150) DEFAULT(NULL), "lastupdated" TIMESTAMP DEFAULT (NULL), "lastfetched" TIMESTAMP DEFAULT (NULL), "nextupdate" TIMESTAMP DEFAULT (NULL) )',
adapter: 'dbAdapter',
defaultValues: {

},
fixtures: [

]

}, {

getEpisodes: function() {
console.log("Fetching episodes for ", this);
return this.Find('Episode', {}).then(function(res) {
console.log("Found episodes! ", res);
return res;
}, function(err) {
console.log("GETEPISODES ERROR!", err);
})
}
});



var Season = CRUD.define({
className: 'Season',
table: 'seasons',
primary: 'ID_Season',
fields: ['ID_Season', 'ID_Serie', 'poster', 'seasonname', 'seasonnumber'],
relations: {
'Serie': CRUD.RELATION_FOREIGN
},
createStatement: 'CREATE TABLE Episodes ( ID_Episode INTEGER PRIMARY KEY NOT NULL,ID_Serie INTEGER NOT NULL, poster VARCHAR(255), seasonname VARCHAR(20), seasonnumber INTEGER)',
adapter: 'dbAdapter',
defaultValues: {
watched: 0
},
fixtures: [

]
}, {

getFormattedEpisode: function() {
var sn = this.get('seasonnumber').toString(),
en = this.get('episodenumber').toString(),
out = ['S', sn.length == 1 ? '0' + sn : sn, 'E', en.length == 1 ? '0' + en : en].join('');
return out;
}
});

var Episode = CRUD.define({
className: 'Episode',
table : 'Episodes',
primary : 'ID_Episode',
fields: ['ID_Episode','ID_Serie','TVDB_ID','director','episodename','episodenumber','firstaired','gueststars','imdb_id','language','overview','rating','ratingcount','seasonnumber','writer','filename','lastupdated','seasonid','seriesid','lastchecked', 'watched', 'watchedAt'],
relations: {
'Serie': CRUD.RELATION_FOREIGN
},
createStatement: 'CREATE TABLE Episodes ( ID_Episode INTEGER PRIMARY KEY NOT NULL,ID_Serie INTEGER NOT NULL,TVDB_ID INTEGER NOT NULL,director VARCHAR(255), episodename VARCHAR(255), episodenumber INTEGER , firstaired DATE , gueststars VARCHAR(255), imdb_id VARCHAR(20), language VARCHAR(3), overview TEXT , rating VARCHAR(5), ratingcount INTEGER NULL , seasonnumber INTEGER NULL , writer VARCHAR(100) , filename VARCHAR(255) , lastupdated TIMESTAMP , seasonid INTEGER NULL , seriesid INTEGER NULL , lastchecked TIMESTAMP NULL, watched VARCHAR(1), watchedAt TIMESTAMP NULL )',
adapter: 'dbAdapter',
defaultValues: {
watched: 0
},
fixtures: [

]
}, {

getFormattedEpisode: function() {
var sn = this.get('seasonnumber').toString(), en = this.get('episodenumber').toString(), out = ['S', sn.length == 1 ? '0'+sn : sn, 'E', en.length == 1 ? '0'+en : en].join('');
return out;
}
});
className: 'Episode',
table: 'Episodes',
primary: 'ID_Episode',
fields: ['ID_Episode', 'ID_Serie', 'TVDB_ID', 'director', 'episodename', 'episodenumber', 'firstaired', 'gueststars', 'imdb_id', 'language', 'overview', 'rating', 'ratingcount', 'seasonnumber', 'writer', 'filename', 'lastupdated', 'seasonid', 'seriesid', 'lastchecked', 'watched', 'watchedAt'],
relations: {
'Serie': CRUD.RELATION_FOREIGN
},
createStatement: 'CREATE TABLE Episodes ( ID_Episode INTEGER PRIMARY KEY NOT NULL,ID_Serie INTEGER NOT NULL,TVDB_ID INTEGER NOT NULL,director VARCHAR(255), episodename VARCHAR(255), episodenumber INTEGER , firstaired DATE , gueststars VARCHAR(255), imdb_id VARCHAR(20), language VARCHAR(3), overview TEXT , rating VARCHAR(5), ratingcount INTEGER NULL , seasonnumber INTEGER NULL , writer VARCHAR(100) , filename VARCHAR(255) , lastupdated TIMESTAMP , seasonid INTEGER NULL , seriesid INTEGER NULL , lastchecked TIMESTAMP NULL, watched VARCHAR(1), watchedAt TIMESTAMP NULL )',
adapter: 'dbAdapter',
defaultValues: {
watched: 0
},
fixtures: [

]
}, {

getFormattedEpisode: function() {
var sn = this.get('seasonnumber').toString(),
en = this.get('episodenumber').toString(),
out = ['S', sn.length == 1 ? '0' + sn : sn, 'E', en.length == 1 ? '0' + en : en].join('');
return out;
}
});


var ScheduledEvent = CRUD.define({
className: 'ScheduledEvent',
table : 'EventSchedule',
primary : 'ID_Event',
fields: ['ID_Event','type','eventchannel','data'],
createStatement: 'CREATE TABLE EventSchedule ( ID_Event INTEGER PRIMARY KEY NOT NULL,type varchar(25) NOT NULL, eventchannel VARCHAR(255) NULL, data TEXT NULL)',
adapter: 'dbAdapter'
}, {
className: 'ScheduledEvent',
table: 'EventSchedule',
primary: 'ID_Event',
fields: ['ID_Event', 'type', 'eventchannel', 'data'],
createStatement: 'CREATE TABLE EventSchedule ( ID_Event INTEGER PRIMARY KEY NOT NULL,type varchar(25) NOT NULL, eventchannel VARCHAR(255) NULL, data TEXT NULL)',
adapter: 'dbAdapter'
}, {

});

var WatchListItem = CRUD.define({
className: 'WatchListItem',
table : 'WatchList',
primary : 'ID_WatchListItem',
fields: ['ID_WatchListItem','searchstring','watchservice','downloaded','watched', 'lastchecked'],
createStatement: 'CREATE TABLE WatchList ( ID_WatchListItem INTEGER PRIMARY KEY NOT NULL, searchstring varchar(255) NOT NULL, watchservice VARCHAR(25) NULL, downloaded SMALLINT, watched SMALLINT, lastchecked TIMESTAMP)',
adapter: 'dbAdapter',
relations: {
'WatchListObject': CRUD.RELATION_FOREIGN
},
defaultValues: {
watched: '0',
downloaded: '0',
}
}, {
imdb: null
className: 'WatchListItem',
table: 'WatchList',
primary: 'ID_WatchListItem',
fields: ['ID_WatchListItem', 'searchstring', 'watchservice', 'downloaded', 'watched', 'lastchecked'],
createStatement: 'CREATE TABLE WatchList ( ID_WatchListItem INTEGER PRIMARY KEY NOT NULL, searchstring varchar(255) NOT NULL, watchservice VARCHAR(25) NULL, downloaded SMALLINT, watched SMALLINT, lastchecked TIMESTAMP)',
adapter: 'dbAdapter',
relations: {
'WatchListObject': CRUD.RELATION_FOREIGN
},
defaultValues: {
watched: '0',
downloaded: '0',
}
}, {
imdb: null

});

var WatchListObject = CRUD.define({
className: 'WatchListObject',
table : 'WatchListObject',
primary : 'ID_WatchListObject',
fields: ['ID_WatchListObject','ID_WatchListItem','property', 'json'],
createStatement: 'CREATE TABLE WatchListObject ( ID_WatchListObject INTEGER PRIMARY KEY NOT NULL, ID_WatchListItem INTEGER NOT NULL, property VARCHAR(25) NULL, json TEXT)',
adapter: 'dbAdapter',
relations: {
'WatchListItem': CRUD.RELATION_FOREIGN
},
}, {
className: 'WatchListObject',
table: 'WatchListObject',
primary: 'ID_WatchListObject',
fields: ['ID_WatchListObject', 'ID_WatchListItem', 'property', 'json'],
createStatement: 'CREATE TABLE WatchListObject ( ID_WatchListObject INTEGER PRIMARY KEY NOT NULL, ID_WatchListItem INTEGER NOT NULL, property VARCHAR(25) NULL, json TEXT)',
adapter: 'dbAdapter',
relations: {
'WatchListItem': CRUD.RELATION_FOREIGN
},

}, {

});

Expand Down
76 changes: 40 additions & 36 deletions js/app.js
View file
Expand Up @@ -3,15 +3,15 @@
*/

angular.module('DuckieTV', [
'ngRoute',
'xml',
'ngRoute',
'xml',
'datePicker',
'ui.bootstrap',
'DuckieTV.calendar',
'DuckieTV.providers',
'DuckieTV.directives',
'DuckieTV.directives',
'DuckieTV.controllers',
'DuckieTV.mirrorresolver',
'DuckieTV.mirrorresolver',
'DuckieTV.thepiratebay',
'DuckieTV.kickasstorrents',
'DuckieTV.torrentfreak',
Expand All @@ -20,21 +20,22 @@ angular.module('DuckieTV', [
'DuckieTV.thetvdb',
'DuckieTV.trakttv',
'DuckieTV.scenenames',
'DuckieTV.filereader',
'DuckieTV.imdb',
'DuckieTV.settingssync',
'colorpicker.module',
'Chrome.topSites',
'lazy-background'
])
])

/**
* Set up the xml interceptor and whitelist the chrome extension's filesystem and magnet links
*/
.config(function ($httpProvider, $compileProvider) {
$httpProvider.interceptors.push('xmlHttpInterceptor');
$compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|chrome-extension|magnet):/);
.config(function($httpProvider, $compileProvider) {
$httpProvider.interceptors.push('xmlHttpInterceptor');
$compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|chrome-extension|magnet|data):/);
$compileProvider.imgSrcSanitizationWhitelist(/^\s*(https?|ftp|file):|data:image|filesystem:chrome-extension:/);
})
})


/**
Expand All @@ -47,33 +48,35 @@ angular.module('DuckieTV', [
};
})
/**
* Routing configuration.
* Routing configuration.
*/
.config(function($routeProvider) {
$routeProvider
.when('/', {
templateUrl: 'templates/home.html',
controller: 'MainCtrl'
})
.when('/watchlist', {
templateUrl: 'templates/watchlist.html',
controller: 'WatchlistCtrl'
})
.when('/series/:id', {
templateUrl: 'templates/serie.html',
controller: 'SerieCtrl'
})
.when('/serie/:id/episode/:episode', {
templateUrl: 'templates/episode.html',
controller: 'EpisodeCtrl'
})
.when('/settings', {
templateUrl: 'templates/settings.html',
controller: 'SettingsCtrl'
})
.otherwise({redirectTo: '/'});
$routeProvider
.when('/', {
templateUrl: 'templates/home.html',
controller: 'MainCtrl'
})
.when('/watchlist', {
templateUrl: 'templates/watchlist.html',
controller: 'WatchlistCtrl'
})
.when('/series/:id', {
templateUrl: 'templates/serie.html',
controller: 'SerieCtrl'
})
.when('/serie/:id/episode/:episode', {
templateUrl: 'templates/episode.html',
controller: 'EpisodeCtrl'
})
.when('/settings', {
templateUrl: 'templates/settings.html',
controller: 'SettingsCtrl'
})
.otherwise({
redirectTo: '/'
});
}).run(function($rootScope, SettingsService, StorageSyncService) {

$rootScope.getSetting = function(key) {
return SettingsService.get(key);
}
Expand All @@ -91,9 +94,10 @@ angular.module('DuckieTV', [
}

$rootScope.$on('storage:update', function() {
if($rootScope.getSetting('storage.sync')) {
if ($rootScope.getSetting('storage.sync') == true) {
console.log("STorage sync can run!");
StorageSyncService.readIfSynced();
StorageSyncService.synchronize();
}
});
})

})

0 comments on commit 3e8cc73

Please sign in to comment.