diff options
Diffstat (limited to 'abs/core')
| -rwxr-xr-x | abs/core/LinHES-system/PKGBUILD | 6 | ||||
| -rwxr-xr-x | abs/core/LinHES-system/balance_storage_groups.py | 6 | ||||
| -rwxr-xr-x | abs/core/LinHES-system/empty_storage_groups.py | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index a7104ea..9a630bb 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.4 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -101,8 +101,8 @@ md5sums=('c03d5e54f00e404c561c7dc69fff9168' '74e17d6f7453c52d56fecaed5c3f6ad5' '47e093e8cfe4b5b96602358e1f540832' 'e270f46a1737a52e8f6b915830ef65f7' - '8ed2474fa52775769255cfb0dba00a1a' - '7753c7ce3f0db5944b7372f5d19bb374' + '0c81e5cad656f6260e39cd7585b1421a' + 'e5bb027c54a2727d0bcf8d6fb357ba32' '2c005d95312018bef80092136f80f254' 'c8db6a83ecc089ea37ab7fcb0f7a01cf' 'ca63946920ba33de1f15abda83e74e40' diff --git a/abs/core/LinHES-system/balance_storage_groups.py b/abs/core/LinHES-system/balance_storage_groups.py index e088cb5..27de6a9 100755 --- a/abs/core/LinHES-system/balance_storage_groups.py +++ b/abs/core/LinHES-system/balance_storage_groups.py @@ -80,12 +80,12 @@ if __name__ == '__main__': SGDIRSdata = sorted(SGDIRSdata, reverse=True, key=operator.itemgetter(1)) #print SGDIRSdata - # Check if SG has any mpg or nuv files + # Check if SG has any ts, mpg or nuv files i=0 for dir in SGDIRSdata: mostFull = SGDIRSdata[i] i=i+1 - if len(glob.glob1(mostFull[0],"*.mpg")) or len(glob.glob1(mostFull[0],"*.nuv")): + if len(glob.glob1(mostFull[0],"*.ts")) or len(glob.glob1(mostFull[0],"*.mpg")) or len(glob.glob1(mostFull[0],"*.nuv")): break else: if i == 1: @@ -106,7 +106,7 @@ if __name__ == '__main__': sys.exit() # Get random file from most used dir - fileToMove = random.choice([f for f in os.listdir(mostFull[0]) if f.endswith(".mpg") or f.endswith(".nuv")]) + fileToMove = random.choice([f for f in os.listdir(mostFull[0]) if f.endswith(".ts") or f.endswith(".mpg") or f.endswith(".nuv")]) filePathToMove = mostFull[0] + "/" + fileToMove # Check that the file isn't too big for least used dir diff --git a/abs/core/LinHES-system/empty_storage_groups.py b/abs/core/LinHES-system/empty_storage_groups.py index a143d7d..63adfe9 100755 --- a/abs/core/LinHES-system/empty_storage_groups.py +++ b/abs/core/LinHES-system/empty_storage_groups.py @@ -101,7 +101,7 @@ if __name__ == '__main__': print " " + directory + " - Not Mounted" continue # Check if SG has data files to move - if len(glob.glob1(directory,"*.mpg")) or len(glob.glob1(directory,"*.nuv")) or len(glob.glob1(directory,"*.jpg")): + if len(glob.glob1(directory,"*.ts")) or len(glob.glob1(directory,"*.mpg")) or len(glob.glob1(directory,"*.nuv")) or len(glob.glob1(directory,"*.jpg")): freePcent = getFreePercentForDir(directory) freeSize = getFreeSpaceForDir(directory) SGDIRSdata.append([directory, freePcent, freeSize]) @@ -139,7 +139,7 @@ if __name__ == '__main__': leastFull = SGDIRSdata[-2] # Get random file from user selected dir - fileToMove = random.choice([f for f in os.listdir(SGselectdata[0]) if f.endswith(".mpg") or f.endswith(".nuv") or f.endswith(".jpg")]) + fileToMove = random.choice([f for f in os.listdir(SGselectdata[0]) if f.endswith(".ts") or f.endswith(".mpg") or f.endswith(".nuv") or f.endswith(".jpg")]) filePathToMove = SGselectdata[0] + "/" + fileToMove # Check that the file isn't too big for least used dir |