![(please configure the [header_logo] section in trac.ini)](/openaaf/chrome/common/titannit_trac_banner.png)
Changeset 3735 for ipk/source/system_addonmanager_2_0
- Timestamp:
- Aug 8, 2010, 1:41:58 PM (16 years ago)
- Location:
- ipk/source/system_addonmanager_2_0
- Files:
-
- 2 edited
-
CONTROL/control (modified) (2 diffs)
-
usr/lib/enigma2/python/Plugins/Extensions/AddonManager/downloader.py (modified) (43 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ipk/source/system_addonmanager_2_0/CONTROL/control
r3117 r3735 1 1 Package: enigma2-plugin-system-addonmanager 2 Version: 2.0 2 Version: 2.06 3 3 Architecture: sh4 4 4 OE: This is the AAF- AddonManager. Maybe you know the plugin from BA / FullUSB images! … … 7 7 Maintainer: AAF 8 8 Homepage: http://www.aaf-digital.info 9 Description: AddonManager v2.0 9 Description: AddonManager v2.06 10 10 Source: http://www.aaf-digital.info -
ipk/source/system_addonmanager_2_0/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/downloader.py
r3393 r3735 27 27 from Components.MultiContent import MultiContentEntryText 28 28 from Tools.Directories import fileExists 29 from Screens.Console import Console 29 30 30 31 from os import system, remove, path, walk, makedirs, listdir … … 75 76 config.AddonManager.ba_usersettings_on = ConfigInteger(0, limits=(0, 1)) 76 77 77 version = "2.00" 78 config.AddonManager2 = ConfigSubsection() 79 config.AddonManager2.sett_on = ConfigInteger(1, limits=(0, 1)) 80 config.AddonManager2.camconfig_on = ConfigInteger(1, limits=(0, 1)) 81 config.AddonManager2.plug_on = ConfigInteger(1, limits=(0, 1)) 82 config.AddonManager2.network_on = ConfigInteger(1, limits=(0, 1)) 83 config.AddonManager2.samba_on = ConfigInteger(1, limits=(0, 1)) 84 config.AddonManager2.bilder_on = ConfigInteger(0, limits=(0, 1)) 85 config.AddonManager2.sonstige_on = ConfigInteger(1, limits=(0, 1)) 86 87 version = "2.06" 78 88 serverurl = "" 79 89 activenam = "" … … 90 100 activenam = "Addons-Server" 91 101 serverurl = activesource + "/E2/" 102 103 # Boytyp lesen 104 file = open("/proc/stb/info/model", "r") 105 box = file.readline().strip() 106 file.close() 107 108 # dm8000 is a vu-box 109 #box = "dm8000" 110 if box == "dm8000": 111 serverurl = activesource + "/vuplus/" 112 92 113 93 114 def applySkinVars(skin,dict): … … 113 134 os.system("rm /tmp/command.txt") 114 135 return comandline 136 137 def restore(): 138 ffile = open("/var/etc/restore.cfg", "w") 139 if config.AddonManager2.sett_on.value == 1: 140 ffile.write("settings=y") 141 else: 142 ffile.write("settings=n") 143 ffile.write("\n") 144 if config.AddonManager2.camconfig_on.value == 1: 145 ffile.write("camconfig=y") 146 else: 147 ffile.write("camconfig=n") 148 ffile.write("\n") 149 if config.AddonManager2.plug_on.value == 1: 150 ffile.write("plugins=y") 151 else: 152 ffile.write("plugins=n") 153 ffile.write("\n") 154 if config.AddonManager2.network_on.value == 1: 155 ffile.write("network=y") 156 else: 157 ffile.write("network=n") 158 ffile.write("\n") 159 if config.AddonManager2.samba_on.value == 1: 160 ffile.write("samba=y") 161 else: 162 ffile.write("samba=n") 163 ffile.write("\n") 164 if config.AddonManager2.bilder_on.value == 1: 165 ffile.write("bilder=y") 166 else: 167 ffile.write("bilder=n") 168 ffile.write("\n") 169 if config.AddonManager2.sonstige_on.value == 1: 170 ffile.write("sonstige=y") 171 else: 172 ffile.write("sonstige=n") 173 ffile.write("\n") 174 ffile.close() 175 176 restore() 115 177 116 178 #----- Class Cancel ------------------------------------------------------- … … 368 430 self.ThumbTimer.callback.append(self.list_download) 369 431 370 self["actions"] = ActionMap(["OkCancelActions", "ColorActions", "DirectionActions", "EPGSelectActions", "MenuActions", "InfobarTeletextActions", "NumberActions", "MovieSelectionActions"], 371 { 372 "cancel": self.closeCB, 373 "red": self.plugins_download, 374 "green": self.ipks_download, #"green": self.patches_download, 375 "yellow": self.emusconfig_download, 376 "blue": self.emus_download, 377 378 "1": self.settings_download, 379 "2": self.bootbilder_download, 380 "3": self.radiobilder_download, 381 "4": self.image_download, 382 "7": self.skins_download, 383 "8": self.beta_download, 384 "9": self.sh_preview, 385 "0": self.update, 386 387 "prevBouquet": self.switchList, 388 "nextBouquet": self.switchList, 389 "ok": self.check_download, 390 "left": self.left, 391 "right": self.right, 392 "up": self.up, 393 "upRepeated": self.up, 394 "downRepeated": self.down, 395 "menu": self.settings_menu, 396 "startTeletext": self.switch_ListTyp, 397 "showEventInfo": self.info, 398 "showEpg": self.usb_load, 399 "down": self.down 400 }, -1) 432 #self.box = "dm8000" 433 if box == "dm8000": 434 self["actions"] = ActionMap(["OkCancelActions", "ColorActions", "DirectionActions", "EPGSelectActions", "MenuActions", "InfobarTeletextActions", "NumberActions", "MovieSelectionActions"], 435 { 436 "cancel": self.closeCB, 437 "red": self.plugins_download, 438 "green": self.ipks_download, 439 "yellow": self.skins_download, 440 "blue": self.emus_download, 441 "1": self.settings_download, 442 "2": self.picons_download, 443 "5": self.settings_backup, 444 "6": self.settings_restore, 445 "8": self.beta_download, 446 "9": self.sh_preview, 447 "0": self.update, 448 449 "prevBouquet": self.switchList, 450 "nextBouquet": self.switchList, 451 "ok": self.check_download, 452 "left": self.left, 453 "right": self.right, 454 "up": self.up, 455 "upRepeated": self.up, 456 "downRepeated": self.down, 457 "menu": self.settings_menu, 458 "startTeletext": self.switch_ListTyp, 459 "showEventInfo": self.info, 460 "showEpg": self.usb_load, 461 "down": self.down 462 }, -1) 463 else: 464 self["actions"] = ActionMap(["OkCancelActions", "ColorActions", "DirectionActions", "EPGSelectActions", "MenuActions", "InfobarTeletextActions", "NumberActions", "MovieSelectionActions"], 465 { 466 "cancel": self.closeCB, 467 "red": self.plugins_download, 468 "green": self.ipks_download, 469 "yellow": self.emusconfig_download, 470 "blue": self.emus_download, 471 472 "1": self.settings_download, 473 "2": self.bootbilder_download, 474 "3": self.radiobilder_download, 475 "4": self.image_download, 476 "5": self.settings_backup, 477 "6": self.settings_restore, 478 "7": self.skins_download, 479 "8": self.beta_download, 480 "9": self.sh_preview, 481 "0": self.update, 482 483 "prevBouquet": self.switchList, 484 "nextBouquet": self.switchList, 485 "ok": self.check_download, 486 "left": self.left, 487 "right": self.right, 488 "up": self.up, 489 "upRepeated": self.up, 490 "downRepeated": self.down, 491 "menu": self.settings_menu, 492 "startTeletext": self.switch_ListTyp, 493 "showEventInfo": self.info, 494 "showEpg": self.usb_load, 495 "down": self.down 496 }, -1) 401 497 402 498 … … 443 539 self["key_red"].text = _("Plugin") 444 540 self["key_green"].text = (_("IPK")) 445 self["key_yellow"].text = (_("EmuConfig")) 541 #self.box = "dm8000" 542 if box == "dm8000": 543 self["key_yellow"].text = (_("Skins")) 544 self["key_1"].text = _("(1) Settings") 545 self["key_2"].text = (_("(2) Picons")) 546 self["key_3"].text = (_("(5) Backup")) 547 self["key_4"].text = (_("(6) Restore")) 548 else: 549 self["key_yellow"].text = (_("EmuConfig")) 550 self["key_1"].text = _("(1) Settings") 551 self["key_2"].text = (_("(2) Bootbilder")) 552 self["key_3"].text = (_("(3) Radiobilder")) 553 446 554 self["key_blue"].text = (_("Emus")) 447 self["key_1"].text = _("(1) Settings")448 self["key_2"].text = (_("(2) Bootbilder"))449 self["key_3"].text = (_("(3) Radiobilder"))450 555 451 556 if os.path.exists("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ufs922") is False: … … 454 559 else: 455 560 #self["key_4"].text = (_("(4) BAold-Image")) 456 self["key_4"].text = (_(" ")) 561 if box <> "dm8000": 562 self["key_4"].text = (_("(5,6) Back/Rest")) 457 563 458 564 self.read_Boxtyp() … … 560 666 561 667 def info(self): 562 evfd.getInstance().vfd_write_string("Version V " + version) 668 if box <> "dm8000": 669 evfd.getInstance().vfd_write_string("Version V " + version) 563 670 message = "%s %s\n\n%s" % (_("AAF Addon-Manager\n\n Version "), version, _(" AAF-Team\n\n@Bauernbub 2009")) 564 671 self.session.openWithCallback(self.update_now, MessageBox, message, MessageBox.TYPE_INFO) … … 573 680 print "[Addon-Manager] gleich" 574 681 message = "%s %s\n%s %s\n\n%s" % (_("Version am Server:"), version_server, _("Version in der Box:"), version, _("Ein Update ist nicht erforderlich!")) 575 evfd.getInstance().vfd_write_string("No Update") 682 if box <> "dm8000": 683 evfd.getInstance().vfd_write_string("No Update") 576 684 self.session.open( MessageBox, message, MessageBox.TYPE_INFO) 577 685 else: 578 686 if version_server > version: 579 687 message = "%s %s\n%s %s\n\n%s" % (_("Version am Server:"), version_server, _("Version in der Box:"), version, _("Ein Update ist empfehlenswert!")) 580 evfd.getInstance().vfd_write_string("UPDATE is here") 688 if box <> "dm8000": 689 evfd.getInstance().vfd_write_string("UPDATE is here") 581 690 self.session.openWithCallback(self.update_now, MessageBox, message, MessageBox.TYPE_YESNO) 582 691 else: 583 692 message = "%s %s\n%s %s\n\n%s" % (_("\nKlingt wie ein Scherz, aber die Version am Server ist aelter als die auf ihrer Box!\n\nVersion am Server:"), version_server, _("Version in der Box:"), version, _("NICHT UPDATEN, sie besitzen vermutlich eine fortgeschrittene Betaversion!")) 584 evfd.getInstance().vfd_write_string("Update is older") 693 if box <> "dm8000": 694 evfd.getInstance().vfd_write_string("Update is older") 585 695 self.session.openWithCallback(self.update_now, MessageBox, message, MessageBox.TYPE_YESNO) 586 696 … … 588 698 self.downloading(False) 589 699 if answer == True: 590 versurl = activesource + "/addon-man_e2.tar.gz" 700 701 if box <> "dm8000": 702 versurl = activesource + "/addon-man_e2.tar.gz" 703 else: 704 versurl = activesource + "/addon-man_vu_e2.tar.gz" 705 591 706 h = urllib.urlretrieve(versurl, "/tmp/aaf/addon-man_e2.tar.gz") 707 592 708 os.system("cd /tmp/aaf; tar -xzf addon-man_e2.tar.gz") 593 709 if os.path.exists("/tmp/aaf/addon-man_e2.tar.gz") is True: … … 596 712 os.system("cd / ; rm *tar.gz") 597 713 os.system("mkdir /tmp/aaf") 598 evfd.getInstance().vfd_write_string("rebooting ....") 714 if box <> "dm8000": 715 evfd.getInstance().vfd_write_string("rebooting ....") 599 716 message = "%s" % (_("Der Addon-Manager hat einen Neustart angefordert!\nDie Box wird nun neu gestartet!")) 600 717 self.session.openWithCallback(self.update_now, MessageBox, message, MessageBox.TYPE_YESNO) … … 607 724 self.downloading(True) 608 725 self.download = self.feed_download 726 print "[feed-download]" + self.feed_base + "index.txt" 727 609 728 if os.path.exists("/tmp/aaf") is False: 610 729 os.system("mkdir /tmp/aaf") … … 629 748 self.downloading(False) 630 749 750 #self.box = "dm8000" 751 631 752 if self.plug == "ipk": 632 753 fileresultmask = re.compile("(?P<name>.*?)\#\#(?P<url>.*?_sh4.ipk)", re.DOTALL) 633 754 elif self.plug == "ipkimage": 634 755 fileresultmask = re.compile("(?P<name>.*?)\#\#(?P<url>.*?.img)", re.DOTALL) 756 elif box == "dm8000": 757 fileresultmask = re.compile("(?P<name>.*?)\#\#(?P<url>.*?.ipk)", re.DOTALL) 635 758 else: 636 759 fileresultmask = re.compile("(?P<name>.*?)\#\#(?P<url>.*?.gz)", re.DOTALL) … … 828 951 if self.box == "cuberevo" or self.box == "cuberevo-mini" or self.box == "cuberevo-mini2": 829 952 self.box = "cuberevo" 830 if self.box == "ufs910" or self.box == "hdbox": 831 self.box = "ufs910" 832 print "[Addon-Manager]" + self.box 953 #if self.box == "ufs910" or self.box == "UFS922": 954 # self.box = "ufs" 833 955 834 956 #----- you press au Menu-key, define the urls---------------------------------- … … 838 960 print "[Addon-Manager] you are in AAF-Betasection" 839 961 self.previewtimeout = 600 840 evfd.getInstance().vfd_write_string("BETA-Section") 962 if box <> "dm8000": 963 evfd.getInstance().vfd_write_string("BETA-Section") 841 964 self.plug = "beta" 842 serverurlbeta = "http://addons.aaf-board.net/E2/" 965 serverurlbeta = "http://kati910.aaf-board.info/dbase/E2/" 966 #serverurlbeta = "http://addons.aaf-board.net/E2/" old server 843 967 self.feed_base = serverurlbeta + "%s/" % self.plug 844 968 self.plugin_filter = "" # "release" # only show IPKs containing this string, or all if "" … … 847 971 def plugins_download(self): 848 972 self.plug = "plugins" 849 evfd.getInstance().vfd_write_string("Plugins") 973 if box <> "dm8000": 974 evfd.getInstance().vfd_write_string("Plugins") 850 975 self.feed_base = serverurl + "%s/" % self.plug 851 976 self.plugin_filter = "" # "release" # only show IPKs containing this string, or all if "" … … 854 979 def patches_download(self): 855 980 self.plug = "patches" 856 evfd.getInstance().vfd_write_string("Patches") 981 if box <> "dm8000": 982 evfd.getInstance().vfd_write_string("Patches") 857 983 self.feed_base = serverurl + "%s/" % self.plug 858 984 self.plugin_filter = "" # "release" # only show IPKs containing this string, or all if "" … … 861 987 def emus_download(self): 862 988 self.plug = "emus" 863 evfd.getInstance().vfd_write_string("Emus") 989 if box <> "dm8000": 990 evfd.getInstance().vfd_write_string("Emus") 864 991 self.feed_base = serverurl + "%s/" % self.plug 865 992 self.plugin_filter = "" # "release" # only show IPKs containing this string, or all if "" … … 868 995 def emusconfig_download(self): 869 996 self.plug = "emusconfig" 870 evfd.getInstance().vfd_write_string("EmusConfig") 997 if box <> "dm8000": 998 evfd.getInstance().vfd_write_string("EmusConfig") 871 999 self.feed_base = serverurl + "%s/" % self.plug 872 1000 self.plugin_filter = "" # "release" # only show IPKs containing this string, or all if "" … … 875 1003 def settings_download(self): 876 1004 self.plug = "settings" 877 evfd.getInstance().vfd_write_string("Settings") 1005 if box <> "dm8000": 1006 evfd.getInstance().vfd_write_string("Settings") 878 1007 self.feed_base = serverurl + "%s/" % self.plug 879 1008 self.plugin_filter = "" # "release" # only show IPKs containing this string, or all if "" … … 886 1015 if self.box == "cuberevo": 887 1016 self.plug = "skins_cuberevo" 888 evfd.getInstance().vfd_write_string("Skins") 1017 if box <> "dm8000": 1018 evfd.getInstance().vfd_write_string("Skins") 889 1019 self.feed_base = serverurl + "%s/" % self.plug 890 1020 self.plugin_filter = "" # "release" # only show IPKs containing this string, or all if "" … … 892 1022 893 1023 def ipks_download(self): 894 self.plug = "ipk" 895 evfd.getInstance().vfd_write_string("IPK") 896 if os.path.exists("/var/etc/ipkg/official-feed.conf") is True: 1024 self.read_Boxtyp() 1025 print "Boxtyp=" + self.box 1026 if box == "dm8000": 1027 self.ipks_vudownload() 1028 else: 1029 self.plug = "ipk" 1030 if box <> "dm8000": 1031 evfd.getInstance().vfd_write_string("IPK") 1032 if os.path.exists("/var/etc/ipkg/official-feed.conf") is True: 897 1033 file = open("/var/etc/ipkg/official-feed.conf", "r") 898 1034 self.feed_base = file.readline().strip() … … 900 1036 self.feed_base = str(self.feed_base) + "/" 901 1037 self.plugin_filter = "" # "release" # only show IPKs containing this string, or all if "" 902 elif os.path.exists("/etc/ipkg/official-feed.conf") is True:1038 elif os.path.exists("/etc/ipkg/official-feed.conf") is True: 903 1039 file = open("/etc/ipkg/official-feed.conf", "r") 904 1040 self.feed_base = file.readline().strip() 905 1041 self.feed_base = self.feed_base.replace(u"src/gz cross ","") 906 1042 self.feed_base = str(self.feed_base) + "/" 907 else:1043 else: 908 1044 self.feed_base = serverurl + "%s/" % self.plug 909 1045 self.plugin_filter = "" # "release" # only show IPKs containing this string, or all if "" 1046 self.feed_download() 1047 1048 def ipks_vudownload(self): 1049 self.plug = "ipkvu" 1050 if box <> "dm8000": 1051 evfd.getInstance().vfd_write_string("IPK-VU") 1052 self.feed_base = serverurl + "ipk/" 1053 self.plugin_filter = "" 1054 print "DownTyp=" + self.feed_base 910 1055 self.feed_download() 911 1056 912 1057 def bootbilder_download(self): 913 1058 self.plug = "bootbilder" 914 evfd.getInstance().vfd_write_string("Bootbilder") 1059 if box <> "dm8000": 1060 evfd.getInstance().vfd_write_string("Bootbilder") 915 1061 self.feed_base = serverurl + "%s/" % self.plug 916 1062 self.plugin_filter = "" # "release" # only show IPKs containing this string, or all if "" … … 919 1065 def radiobilder_download(self): 920 1066 self.plug = "radiobilder" 921 evfd.getInstance().vfd_write_string("Radiobilder") 1067 if box <> "dm8000": 1068 evfd.getInstance().vfd_write_string("Radiobilder") 922 1069 self.feed_base = serverurl + "%s/" % self.plug 923 1070 self.plugin_filter = "" # "release" # only show IPKs containing this string, or all if "" … … 926 1073 def spiele_download(self): 927 1074 self.plug = "spiele" 928 evfd.getInstance().vfd_write_string("Spiele") 1075 if box <> "dm8000": 1076 evfd.getInstance().vfd_write_string("Spiele") 929 1077 self.feed_base = serverurl + "%s/" % self.plug 930 1078 self.plugin_filter = "" 1079 self.feed_download() 1080 1081 def picons_download(self): 1082 self.plug = "picons" 1083 if box <> "dm8000": 1084 evfd.getInstance().vfd_write_string("Picons") 1085 self.feed_base = serverurl + "%s/" % self.plug 1086 self.plugin_filter = "" 931 1087 self.feed_download() 932 1088 … … 935 1091 if os.path.exists("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ufs922") is False: 936 1092 self.plug = "image" 937 evfd.getInstance().vfd_write_string("BA-Image") 1093 if box <> "dm8000": 1094 evfd.getInstance().vfd_write_string("BA-Image") 938 1095 self.feed_base = serverurl + "%s/" % self.plug 939 1096 self.plugin_filter = "" 940 1097 self.feed_download() 1098 1099 def settings_backup(self): 1100 self["statusbar"].text = _("Backup der Einstellungen ist gestartet ....") 1101 self.CpString = "/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/backup.sh" 1102 #self.showlog(self.CpString) 1103 self.session.open(Console, title = _("Backup - Settings"), cmdlist = ["%s" % self.CpString], closeOnSuccess = False) 1104 self["statusbar"].text = _(" ") 1105 1106 1107 def settings_restore(self): 1108 self["statusbar"].text = _("Restore der Einstellungen laueft ....") 1109 self.CpString = "/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/restore.sh" 1110 #self.showlog(self.CpString) 1111 self.session.open(Console, title = _("Restore - Settings"), cmdlist = ["%s" % self.CpString], closeOnSuccess = False) 1112 941 1113 942 1114 #----- plugin download ------------------------------------------------------------ … … 955 1127 print "[Addon-Manager] Flashname: ", self.flashname 956 1128 self.PLUGINlocal = "/var/swap/images/" + str(self.flashname) 957 evfd.getInstance().vfd_write_string("load USBImage") 1129 if box <> "dm8000": 1130 evfd.getInstance().vfd_write_string("load USBImage") 958 1131 959 1132 os.system("rm /tmp/nochmals") … … 975 1148 if len(str(self.foundipk)) == 4: 976 1149 self.PLUGINlocal = '/tmp/aaf/downfile.tar.gz' 977 evfd.getInstance().vfd_write_string("load Tarfile") 1150 if box <> "dm8000": 1151 evfd.getInstance().vfd_write_string("load Tarfile") 978 1152 else: 979 1153 self.PLUGINlocal = '/tmp/aaf/downfile.sh4.ipk' 980 evfd.getInstance().vfd_write_string("load IPK") 1154 if box <> "dm8000": 1155 evfd.getInstance().vfd_write_string("load IPK") 1156 1157 #self.box = "dm8000" 1158 if box == "dm8000": 1159 self.PLUGINlocal = '/tmp/aaf/downfile.sh4.ipk' 1160 if box <> "dm8000": 1161 evfd.getInstance().vfd_write_string("load IPK") 981 1162 982 1163 self.PluginPath = "E2/image" … … 1033 1214 1034 1215 self.PLUGINlocal = '/var/baroot/UFS_Images/%s' % self.urlname 1035 evfd.getInstance().vfd_write_string("load Image") 1216 if box <> "dm8000": 1217 evfd.getInstance().vfd_write_string("load Image") 1036 1218 1037 1219 pngpath = "/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/install.png" … … 1086 1268 if os.path.exists("/bootp.conf") is True: 1087 1269 if self.BAtyp == "new": 1088 evfd.getInstance().vfd_write_string("install Image") 1270 if box <> "dm8000": 1271 evfd.getInstance().vfd_write_string("install Image") 1089 1272 self["statusbar"].text = _("Decompressing Image in progress...") 1090 1273 self.urlnameorg = self.urlname … … 1188 1371 # and now we copy the settings 1189 1372 if config.AddonManager.ba_settings_on.value == 1: 1190 evfd.getInstance().vfd_write_string("install Settings") 1373 if box <> "dm8000": 1374 evfd.getInstance().vfd_write_string("install Settings") 1191 1375 self["statusbar"].text = _("Settings werden uebernommen....") 1192 1376 … … 1285 1469 os.system("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/ba_script.sh") 1286 1470 1287 evfd.getInstance().vfd_write_string("Image Ready!") 1471 if box <> "dm8000": 1472 evfd.getInstance().vfd_write_string("Image Ready!") 1288 1473 restartbox = self.session.openWithCallback(self.restart,MessageBox,_("Das Image ist nun fertig installiert!\nSoll ein Neustart durchgefuehrt werden?"), MessageBox.TYPE_YESNO) 1289 1474 restartbox.setTitle(_("UFS-Box starten?")) 1290 1475 else: 1291 # no tan ipk-file1476 # no image and an ipk-file 1292 1477 if len(str(self.foundipk)) == 4: 1293 1478 ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/inst.log","a") … … 1332 1517 print "[Addon-Manager] Flash=", freesize 1333 1518 #GOst ---> cut -c1-4 -nach-> cut -d\t -f1 1334 os.system("du -sc /tmp/aaf |grep total|cut -d \t -f1 >/tmp/free2.txt")1519 os.system("du -sc /tmp/aaf |grep total|cut -dt -f1 >/tmp/free2.txt") 1335 1520 if os.path.exists("/tmp/free2.txt") is True: 1336 1521 f = open("/tmp/free2.txt", "r" ) … … 1354 1539 else: 1355 1540 print "[Addon-Manager] FreeSpace Error in Flash!" 1541 #def __init__(self, session, title = "Console", cmdlist = None, finishedCallback = None, closeOnSuccess = False): 1542 1356 1543 self["statusbar"].text = _("FreeSpace Error!") 1357 1544 print "[Addon-Manager] frei=", freesize,"File=",filesize … … 1405 1592 # und nun in der ufs910 im Flash den emu installieren 1406 1593 os.system("rm /tmp/aaf/*.tar.gz ; sync") 1407 #os.system("cp -RP /tmp/aaf/* / ; sync") # error when by softlink 1408 os.system("(. /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/cp_r.func; cd /tmp/aaf; cp_r /tmp/aaf /)" ) 1409 1594 os.system("cp -RP /tmp/aaf/* / ; sync") 1410 1595 if self.swaptest == True: 1411 1596 os.system("cd /usr/lib/enigma2/python/Plugins/Extensions/AddonManager; ./do_link.sh") 1412 1597 print "[Addon-Manager] Emu wude nach /var/swap/bin verlinkt" 1413 1598 1414 # 14.03.2010 abgeschaltet wegen TF Softlink1415 1599 if os.path.exists("/tmp/aaf/inst.sh") is True: 1416 1600 print "[Addon-Manager] Preinst gefunden (inst.sh)" 1417 #os.system("(. /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/cp_r.func; cd /tmp/aaf; ./inst.sh)" ) 1418 os.system("(. /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/cp_r.func; cd /tmp/aaf; cp_r /tmp/aaf /; sync)" ) 1419 1601 #os.system("sed -e 's/cp -RP /. \/usr\/lib\/enigma2\/python\/Plugins\/Extensions\/AddonManager\/cp_r.func; cp_r \/tmp\/aaf\//g' -i /tmp/aaf/inst.sh") 1602 #os.system("sed -e 's/cp -RP /cp_r /g' -i /tmp/aaf/inst.sh") 1603 #os.system("cd /tmp/aaf; ./inst.sh" ) 1604 os.system("(. /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/cp_r.func; cd /tmp/aaf; ./inst.sh)" ) 1605 #os.system("rm -r /tmp/aaf") 1606 #os.system("cd / ; rm *tar.gz ; rm inst.sh") 1420 1607 else: 1421 1608 # Boxtyp lesen … … 1424 1611 file.close() 1425 1612 # Topfield "TF7700HDPVR" 1613 1614 #self.box ="dm8000" 1426 1615 ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/inst.log","a") 1427 1616 ffile.write("erkannter Boxtyp:" + self.box) … … 1509 1698 # es ist ein Flash aber keine ufs910 1510 1699 else: 1511 ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/inst.log","a") 1512 ffile.write("es ist ein Flashimage aber keine ufs910") 1513 ffile.write("\n") 1514 ffile.write("cp_r /tmp/aaf / ; sync") 1515 ffile.write("\n") 1516 ffile.close() 1517 #GOst begin 1518 #os.system("cp -RP /tmp/aaf/* / ; sync") 1519 os.system("(. /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/cp_r.func; cd /tmp/aaf; cp_r /tmp/aaf / ; sync)" ) 1520 1521 #os.system("(cd /tmp/aaf; tar -xzf *tar.gz -C / ; sync)") 1522 #GOst end 1700 #self.box = "dm8000" 1701 if box == "dm8000": 1702 ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/inst.log","a") 1703 ffile.write("es ist ein Flashimage aber keine ufs910") 1704 ffile.write("\n") 1705 ffile.write("IPKvu wird entpackt!") 1706 ffile.write("\n") 1707 ffile.close() 1708 self["statusbar"].text = _("Decompressing IPK-File...") 1709 os.system("cd /tmp/aaf ; ipkg install /tmp/aaf/downfile.sh4.ipk") 1710 #os.system("rm -r /tmp/aaf") 1711 else: 1712 ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/inst.log","a") 1713 ffile.write("es ist ein Flashimage aber keine ufs910") 1714 ffile.write("\n") 1715 ffile.write("cp -RP /tmp/aaf/* / ; sync") 1716 ffile.write("\n") 1717 ffile.close() 1718 #GOst begin 1719 #os.system("cp -RP /tmp/aaf/* / ; sync") 1720 os.system("(cd /tmp/aaf; tar -xzf *tar.gz -C / ; sync)") 1721 #GOst end 1523 1722 1524 1723 # es ist kein Flash 1525 1724 else: 1526 ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/inst.log","a") 1527 ffile.write("es ist kein Flashimage") 1528 ffile.write("\n") 1529 ffile.write("cp_r /tmp/aaf / ; sync") 1530 ffile.write("\n") 1531 ffile.close() 1532 #GOst begin 1533 os.system("(. /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/cp_r.func; cp_r /tmp/aaf / ; sync)") 1534 #os.system("(cd /tmp/aaf; tar -xzf *tar.gz -C / ; sync)") 1535 #GOst end 1536 1537 os.system("rm -r /tmp/aaf") 1538 os.system("cd / ; rm *tar.gz") 1725 if box == "dm8000": 1726 ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/inst.log","a") 1727 ffile.write("IPKvu wird entpackt!") 1728 ffile.write("\n") 1729 ffile.close() 1730 self["statusbar"].text = _("Decompressing IPK-File...") 1731 os.system("cd /tmp/aaf ; ipkg install /tmp/aaf/downfile.sh4.ipk") 1732 os.system("rm -r /tmp/aaf") 1733 else: 1734 ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/inst.log","a") 1735 ffile.write("es ist kein Flashimage") 1736 ffile.write("\n") 1737 ffile.write("cp -RP /tmp/aaf/* / ; sync") 1738 ffile.write("\n") 1739 ffile.close() 1740 #GOst begin 1741 #os.system("(. /usr/lib/enigma2/python/Plugins/Extensions/AddonManager/cp_r.func; cp_r /tmp/aaf / ; sync)") 1742 os.system("(cd /tmp/aaf; tar -xzf *tar.gz -C / ; sync)") 1743 #GOst end 1744 1745 #os.system("rm -r /tmp/aaf") 1746 #os.system("cd / ; rm *tar.gz") 1539 1747 else: 1540 1748 ffile = open("/usr/lib/enigma2/python/Plugins/Extensions/AddonManager/inst.log","a") … … 1545 1753 self["statusbar"].text = _("Decompressing IPK-File...") 1546 1754 os.system("cd /tmp/aaf ; ipkg install /tmp/aaf/downfile.sh4.ipk") 1547 os.system("rm -r /tmp/aaf") 1548 1549 1550 os.system("rm -r /tmp/aaf") 1551 os.system("cd / ; rm *tar.gz") 1755 #os.system("rm -r /tmp/aaf") 1756 1552 1757 os.system("mkdir /tmp/aaf") 1553 1758 self["statusbar"].text = _("Installation OK!") … … 1629 1834 skin = """ 1630 1835 <screen position="{screen.pos}" size="650,400" title="Addon-Manager Setup" > 1631 <widget name="config" position="40,10" size="570,3 60" scrollbarMode="showOnDemand" />1836 <widget name="config" position="40,10" size="570,325" scrollbarMode="showOnDemand" /> 1632 1837 <widget name="buttonred" position="40,360" size="100,40" backgroundColor="red" valign="center" halign="center" zPosition="2" foregroundColor="white" font="Regular;18"/> 1633 1838 <widget name="buttongreen" position="160,360" size="100,40" backgroundColor="green" valign="center" halign="center" zPosition="2" foregroundColor="white" font="Regular;18"/> … … 1669 1874 self.list.append(getConfigListEntry(_("BA temp.Image nach Download entfernen (1=Ein, 0=Aus)"), config.AddonManager.ba_remove_on)) 1670 1875 self.list.append(getConfigListEntry(_("BA Defaultsettings kopieren (1=Ein, 0=Aus)"), config.AddonManager.ba_usersettings_on)) 1876 self.list.append(getConfigListEntry(_("Restore Settings (1=Ein, 0=Aus)"), config.AddonManager2.sett_on)) 1877 self.list.append(getConfigListEntry(_("Restore CamConfig (1=Ein, 0=Aus)"), config.AddonManager2.camconfig_on)) 1878 self.list.append(getConfigListEntry(_("Restore Plugins(1=Ein, 0=Aus)"), config.AddonManager2.plug_on)) 1879 self.list.append(getConfigListEntry(_("Restore Netzwerk (1=Ein, 0=Aus)"), config.AddonManager2.network_on)) 1880 self.list.append(getConfigListEntry(_("Restore Samba (1=Ein, 0=Aus)"), config.AddonManager2.samba_on)) 1881 self.list.append(getConfigListEntry(_("Restore Bootbilder (1=Ein, 0=Aus)"), config.AddonManager2.bilder_on)) 1882 self.list.append(getConfigListEntry(_("Restore sonstiges (1=Ein, 0=Aus)"), config.AddonManager2.sonstige_on)) 1671 1883 1672 1884 ConfigListScreen.__init__(self, self.list) … … 1693 1905 1694 1906 if config.AddonManager.which_server.value == 1: 1695 activesource = "http:// addons.aaf-board.net"1907 activesource = "http://kati910.aaf-board.info/dbase" 1696 1908 activenam = "Primary-Server" 1697 1909 else: … … 1700 1912 #if self.betacode == True: 1701 1913 # self.previewtimeout = 600 1914 #restore() 1702 1915 self.close() 1703 1916 … … 1707 1920 x[1].cancel() 1708 1921 self.close(False) 1922 1923 class RestoreConfigScreen(ConfigListScreen,Screen): 1924 skin = """ 1925 <screen position="{screen.pos}" size="650,400" title="Backup Restore Setup" > 1926 <widget name="config" position="40,10" size="570,325" scrollbarMode="showOnDemand" /> 1927 <widget name="buttonred" position="40,360" size="100,40" backgroundColor="red" valign="center" halign="center" zPosition="2" foregroundColor="white" font="Regular;18"/> 1928 <widget name="buttongreen" position="160,360" size="100,40" backgroundColor="green" valign="center" halign="center" zPosition="2" foregroundColor="white" font="Regular;18"/> 1929 </screen>""" 1930 1931 def __init__(self, session, args = 0): 1932 self.session = session 1933 #switch automatic to current skin 1934 current_w = getDesktop(0).size().width() 1935 current_h = getDesktop(0).size().height() 1936 print "[Addon-Manager] DESKTOPsize is",current_w,current_h 1937 size_w = 650 1938 size_h = 400 1939 1940 # calculate Skin koordinates 1941 pos_w = (current_w - size_w)/2 1942 pos_h = (current_h - size_h)/2 1943 1944 # set Skinvariables 1945 self.dict = { 1946 'screen.size': "%i,%i"%(size_w,size_h), 1947 'screen.pos': "%i,%i"%(pos_w,pos_h), 1948 } 1949 1950 self.skin = applySkinVars(RestoreConfigScreen.skin,self.dict) 1951 Screen.__init__(self, session) 1952 self.list = [] 1953 self.list.append(getConfigListEntry(_("Restore Settings (1=Ein, 0=Aus)"), config.AddonManager2.sett_on)) 1954 self.list.append(getConfigListEntry(_("Restore CamConfig (1=Ein, 0=Aus)"), config.AddonManager2.camconfig_on)) 1955 self.list.append(getConfigListEntry(_("Restore Plugins(1=Ein, 0=Aus)"), config.AddonManager2.plug_on)) 1956 self.list.append(getConfigListEntry(_("Restore Netzwerk (1=Ein, 0=Aus)"), config.AddonManager2.network_on)) 1957 self.list.append(getConfigListEntry(_("Restore Samba (1=Ein, 0=Aus)"), config.AddonManager2.samba_on)) 1958 self.list.append(getConfigListEntry(_("Restore Bootbilder (1=Ein, 0=Aus)"), config.AddonManager2.bilder_on)) 1959 self.list.append(getConfigListEntry(_("Restore sonstiges (1=Ein, 0=Aus)"), config.AddonManager2.sonstige_on)) 1960 1961 ConfigListScreen.__init__(self, self.list) 1962 self["buttonred"] = Label(_("cancel")) 1963 self["buttongreen"] = Label(_("ok")) 1964 self["setupActions"] = ActionMap(["SetupActions"], 1965 { 1966 "green": self.save, 1967 "red": self.cancel, 1968 "save": self.save, 1969 "cancel": self.cancel, 1970 "ok": self.save, 1971 }, -2) 1972 1973 def save(self): 1974 global activesource, activenam 1975 for x in self["config"].list: 1976 x[1].save() 1977 config.save() 1978 1979 restore() 1980 self.close() 1981 1982 def cancel(self): 1983 print "[Addon-Manager] cancel" 1984 for x in self["config"].list: 1985 x[1].cancel() 1986 self.close(False) 1987 1709 1988 1710 1989 #-----------------------------------------------------------------
Note:
See TracChangeset
for help on using the changeset viewer.
