Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1.9.1' into devel

This commit is contained in:
James 2011-09-13 10:50:54 -04:00
parent e918f3b29a 1850b4f0d0
commit e6f7640c90
2 changed files with 99 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
install_minimal/upgrades/airtime-1.9.4/airtime-upgrade.php
View File

@ -20,10 +20,57 @@ class Airtime194Upgrade{
exec("cp -R ".$AIRTIME_SRC."/* ".$phpDir);
}
public static function ModifyHtAccessTimezone($phpDir){
$file = realpath($phpDir)."/public/.htaccess";
$fn = "/etc/timezone";
$handle = @fopen($fn, "r");
if ($handle){
$timezone = trim(fgets($handle, 4096));
fclose($handle);
} else {
echo "Could not open $fn";
}
$key = "php_value date.timezone";
//the best way to do this is use cli utility "sed", but I don't have time to learn this
$handle = @fopen($file, "r");
if ($handle) {
while (($buffer = fgets($handle, 4096)) !== false) {
if (strlen($key) > $buffer){
if (substr($buffer, 0, strlen($key)) == $key){
$output[] = "$key \"$timezone\"".PHP_EOL;
} else {
$output[] = $buffer;
}
} else {
$output[] = $buffer;
}
}
if (!feof($handle)) {
echo "Error: unexpected fgets() fail\n";
}
fclose($handle);
} else {
echo "Could not open $file";
}
$handle = @fopen($file, 'w');
if ($handle) {
foreach ($output as $line){
fwrite($handle, $line);
}
fclose($handle);
} else {
echo "Could not open $file";
}
}
}
$values = parse_ini_file(AirtimeIni194::CONF_FILE_AIRTIME, true);
$values = parse_ini_file(Airtime194Upgrade::CONF_FILE_AIRTIME, true);
$phpDir = $values['general']['airtime_dir'];
Airtime194Upgrade::InstallAirtimePhpServerCode($phpDir);
Airtime194Upgrade::ModifyHtAccessTimezone($phpDir);
Airtime194Upgrade::upgradeLiquidsoapCfgPerms();

34
utils/airtime-import/airtime-import.py
View File

@ -31,6 +31,7 @@ api_client = apc.api_client_factory(config)
# copy or move files
# flag should be 'copy' or 'move'
def copy_or_move_files_to(paths, dest, flag):
try:
for path in paths:
if (path[0] == "/" or path[0] == "~"):
path = os.path.realpath(path)
@ -59,6 +60,8 @@ def copy_or_move_files_to(paths, dest, flag):
shutil.move(path, destfile)
else:
print "Cannot find file or path: %s" % path
except Exception as e:
print "Error: ", e
def format_dir_string(path):
if(path[-1] != '/'):
@ -84,10 +87,8 @@ def checkOtherOption(args):
def errorIfMultipleOption(args, msg=''):
if(checkOtherOption(args)):
if(msg != ''):
printHelp()
raise OptionValueError(msg)
else:
printHelp()
raise OptionValueError("This option cannot be combined with other options")
def printHelp():
@ -123,18 +124,17 @@ There are two ways to import audio files into Airtime:
def CopyAction(option, opt, value, parser):
errorIfMultipleOption(parser.rargs)
if(len(parser.rargs) == 0 ):
printHelp()
raise OptionValueError("No argument found. This option requires at least one argument.")
stor = helper_get_stor_dir()
if(stor is None):
exit("Unable to connect to the Airtime server.")
print "Unable to connect to the Airtime server."
return
dest = stor+"organize/"
copy_or_move_files_to(parser.rargs, dest, 'copy')
def MoveAction(option, opt, value, parser):
errorIfMultipleOption(parser.rargs)
if(len(parser.rargs) == 0 ):
printHelp()
raise OptionValueError("No argument found. This option requires at least one argument.")
stor = helper_get_stor_dir()
if(stor is None):
@ -145,10 +145,8 @@ def MoveAction(option, opt, value, parser):
def WatchAddAction(option, opt, value, parser):
errorIfMultipleOption(parser.rargs)
if(len(parser.rargs) > 1):
printHelp()
raise OptionValueError("Too many arguments. This option requires exactly one argument.")
elif(len(parser.rargs) == 0 ):
printHelp()
raise OptionValueError("No argument found. This option requires exactly one argument.")
path = parser.rargs[0]
if (path[0] == "/" or path[0] == "~"):
@ -171,7 +169,6 @@ def WatchAddAction(option, opt, value, parser):
def WatchListAction(option, opt, value, parser):
errorIfMultipleOption(parser.rargs)
if(len(parser.rargs) > 0):
printHelp()
raise OptionValueError("This option doesn't take any arguments.")
res = api_client.list_all_watched_dirs()
if(res is None):
@ -188,10 +185,8 @@ def WatchListAction(option, opt, value, parser):
def WatchRemoveAction(option, opt, value, parser):
errorIfMultipleOption(parser.rargs)
if(len(parser.rargs) > 1):
printHelp()
raise OptionValueError("Too many arguments. This option requires exactly one argument.")
elif(len(parser.rargs) == 0 ):
printHelp()
raise OptionValueError("No argument found. This option requires exactly one argument.")
path = parser.rargs[0]
if (path[0] == "/" or path[0] == "~"):
@ -234,10 +229,8 @@ def StorageSetAction(option, opt, value, parser):
sys.exit(1)
if(len(parser.rargs) > 1):
printHelp()
raise OptionValueError("Too many arguments. This option requires exactly one argument.")
elif(len(parser.rargs) == 0 ):
printHelp()
raise OptionValueError("No argument found. This option requires exactly one argument.")
path = parser.rargs[0]
@ -261,10 +254,13 @@ def StorageSetAction(option, opt, value, parser):
def StorageGetAction(option, opt, value, parser):
errorIfMultipleOption(parser.rargs)
if(len(parser.rargs) > 0):
printHelp()
raise OptionValueError("This option does not take any arguments.")
print helper_get_stor_dir()
class OptionValueError(RuntimeError):
def __init__(self, msg):
self.msg = msg
usage = """[-c|--copy FILE/DIR [FILE/DIR...]] [-m|--move FILE/DIR [FILE/DIR...]]
[--watch-add DIR] [--watch-list] [--watch-remove DIR]
[--storage-dir-set DIR] [--storage-dir-get]"""
@ -294,7 +290,19 @@ if(len(sys.argv) == 1 or '-' not in sys.argv[1]):
printHelp()
sys.exit()
try:
(option, args) = parser.parse_args()
except Exception, e:
printHelp()
if hasattr(e, 'msg'):
print "Error: "+e.msg
else:
print "Error: ",e
sys.exit()
except SystemExit:
printHelp()
sys.exit()
if option.help:
printHelp()
sys.exit()