Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/midgetspy/Sick-Beard into T…
Browse files Browse the repository at this point in the history
…hePirateBay
  • Loading branch information
mr-orange committed Jan 8, 2012
2 parents 0778475 + 9427d92 commit 584c2c1
Show file tree
Hide file tree
Showing 10 changed files with 462 additions and 1,233 deletions.
24 changes: 18 additions & 6 deletions data/interfaces/default/apiBuilder.tmpl
Expand Up @@ -58,6 +58,7 @@ addList("Command", "Show.Delete", "?cmd=show.delete", "tvdbid", "", "", "action"
addList("Command", "Show.GetBanner", "?cmd=show.getbanner", "tvdbid", "", "", "action");
addList("Command", "Show.GetPoster", "?cmd=show.getposter", "tvdbid", "", "", "action");
addList("Command", "Show.GetQuality", "?cmd=show.getquality", "tvdbid", "", "", "action");
addList("Command", "Show.Pause", "?cmd=show.pause", "show.pause", "", "", "action");
addList("Command", "Show.Refresh", "?cmd=show.refresh", "tvdbid", "", "", "action");
addList("Command", "Show.SeasonList", "?cmd=show.seasonlist", "show.seasonlist", "", "", "action");
addList("Command", "Show.Seasons", "?cmd=show.seasons", "seasons", "", "", "action");
Expand Down Expand Up @@ -268,12 +269,16 @@ addList("future", "Sort by Network", "&sort=network", "future-type");
addList("future", "Sort by Show Name", "&sort=show", "future-type");

addOption("future-type", "Optional Param", "", 1);
addOption("future-type", "Show All Types", "&type=today|missed|soon|later");
addOption("future-type", "Show Today", "&type=today");
addOption("future-type", "Show Missed", "&type=missed");
addOption("future-type", "Show Soon", "&type=soon");
addOption("future-type", "Show Later", "&type=later");
addOption("future-type", "Show Today & Missed", "&type=today|missed");
addList("future-type", "Show All Types", "&type=today|missed|soon|later", "future-paused");
addList("future-type", "Show Today", "&type=today", "future-paused");
addList("future-type", "Show Missed", "&type=missed", "future-paused");
addList("future-type", "Show Soon", "&type=soon", "future-paused");
addList("future-type", "Show Later", "&type=later", "future-paused");
addList("future-type", "Show Today & Missed", "&type=today|missed", "future-paused");

addOption("future-paused", "Optional Param", "", 1);
addOption("future-paused", "Include Paused Shows", "&paused=1");
addOption("future-paused", "Exclude Paused Shows", "&paused=0");

addOption("history", "Optional Param", "", 1);
addList("history", "Show Only Downloaded", "&type=downloaded", "history-type");
Expand Down Expand Up @@ -314,6 +319,13 @@ addOption("sb.deleterootdir", "C:\\Temp", "&location=C:\\Temp", "", 1);
addOption("sb.deleterootdir", "/usr/bin", "&location=/usr/bin/");
addOption("sb.deleterootdir", "S:\\Invalid_Location", "&location=S:\\Invalid_Location");

#for $curShow in $sortedShowList:
addList("show.pause", "$curShow.name", "&tvdbid=$curShow.tvdbid", "show.pause-opt");
#end for
addOption("show.pause-opt", "Optional Param", "", 1);
addOption("show.pause-opt", "Unpause", "&pause=0");
addOption("show.pause-opt", "Pause", "&pause=1");

</script>
</head>

Expand Down
264 changes: 58 additions & 206 deletions lib/simplejson/__init__.py 100755 → 100644

Large diffs are not rendered by default.

0 comments on commit 584c2c1

Please sign in to comment.