diff --git a/Makefile b/Makefile index b58edb4..c92cd76 100644 --- a/Makefile +++ b/Makefile @@ -20,9 +20,9 @@ clean: delpyc rm -Rf bin include lib local node_modules compass/.sass-cache install: - virtualenv --no-site-packages . - bin/pip install -r pip-requirements/basic.txt - bin/pip install psutil + virtualenv --no-site-packages --python=/usr/bin/python2.7 . + bin/python -m pip install -r pip-requirements/basic.txt + bin/python -m pip install psutil bin/python manage.py migrate install-dev: install diff --git a/README.md b/README.md index 162acf4..96ed765 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,8 @@ -# WARNING: THIS PROJECT IS NOT MAINTAINED ANYMORE. Feel free to fork and work on it. - -# Retropie-Manager -Recalbox-Manager fork for RetroPie 4.x - -![alt tag](https://github.com/RetroPie/RetroPie-Manager/blob/retropie/screenshot.png) +# Retropie-Manager-Plus # About - -This a Recalbox-Manager fork aimed to be used with RetroPie 4.x. - -Original repository: https://github.com/recalbox/recalbox-manager +This an enhanced RetroPie-Manager fork. +Original RetroPie-Manager repository: https://github.com/RetroPie/RetroPie-Manager # Features With Retropie-Manager you can @@ -22,19 +15,9 @@ With Retropie-Manager you can - Manage your ROMS # Limitations - -- In this release the virtual gamepad page has been removed. -- It doesn't support subdirectories at ROMs dir (as reported [here](https://github.com/RetroPie/RetroPie-Manager/issues/5)) - +- It doesn't support subdirectories at ROMs dir (as reported [here](https://github.com/botolo78/RetroPie-Manager/issues/5)) # Install - -## RetroPie-Setup script - -Execute the RetroPie-Setup, choose "Manage packages" -> "Manage experimental packages" -> "retropie-manager". - -## Old Method - **Dependencies on Raspberry Pi** ```sh @@ -50,8 +33,8 @@ sudo apt-get install python-virtualenv python-dev **Installing RetroPie-Manager** ```sh cd -git clone https://github.com/RetroPie/RetroPie-Manager.git -cd RetroPie-Manager +git clone https://github.com/NicholasBerryman/RetroPie-Manager-Plus.git +cd RetroPie-Manager-Plus make install ``` @@ -100,17 +83,13 @@ user uses both, only the first works. # Autostart -To make Retropie-Manager to start with your raspberry edit your autostart.sh - -```sh -sudo nano /opt/retropie/configs/all/autostart.sh +To make Retropie-Manager to start with your RetroPie machine simply add it as a reboot Cronjob. +First, run +```crontab -e``` +Then, add the following line to the end of the file: ``` -and add this command before **emulationstation #auto** [replace `/PATH/TO/` with the RetroPie-Manager's full path.] - -```sh -/PATH/TO/RetroPie-Manager/rpmanager.sh --start 2>&1 & +@reboot /opt/retropie/supplementary/retropie-manager-plus/rpmanager.sh --start ``` - # Update ```sh sudo kill -9 $(pgrep -f RetroPie-Manager) @@ -127,11 +106,20 @@ make install sudo kill -9 $(pgrep -f RetroPie-Manager) cd rm -rf Retropie-Manager -git clone https://github.com/RetroPie/RetroPie-Manager.git +git clone https://github.com/botolo78/RetroPie-Manager.git cd RetroPie-Manager make install ``` -# Known bugs - -- (FIXED) You'll get a 404 error trying to delete roms +# Additions to the base RetroPie-Manager: +- Adds .pbp as a valid PSX ROM extension (DONE) +- Fixes PSX BIOS hashes (DONE) +- Increases max uploadable rom size to 10GB from 256MB (DONE) +- Adds real-time updating to Monitoring page (MOSTLY DONE) + * Updates all values on the monitoring screen every 3 seconds (DONE) + * Updates file system table if devices are added/removed e.g. a USB (TODO) + * **Requires Javascript** +- Adds custom-data monitoring (TODO) +- Allows rom sub-directories (TODO) +- Re-introduces save management (TODO) +- Migrate to Python 3 (TODO) diff --git a/__init__.pyc b/__init__.pyc index 1a7f066..781273b 100644 Binary files a/__init__.pyc and b/__init__.pyc differ diff --git a/package.json b/package.json index a4626f1..a1023df 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.1.4.1", "private": true, "dependencies": { - "debug": "~2.2.0", + "debug": "~4.1.1", "grunt": "^0.4.5", "grunt-contrib-cssmin": "~0.12.3", "grunt-contrib-uglify": "~0.9.1", diff --git a/project/MANIFEST.xml b/project/MANIFEST.xml index 5aec785..ab9abbe 100644 --- a/project/MANIFEST.xml +++ b/project/MANIFEST.xml @@ -389,12 +389,13 @@ bin iso cue + pbp - SCPH1001.BIN scph5500.bin - scph5501.bin - scph5502.bin + scph5501.bin + scph1001.bin + scph5502.bin diff --git a/project/MANIFEST_KINDA_OLD.xml b/project/MANIFEST_KINDA_OLD.xml new file mode 100644 index 0000000..5aec785 --- /dev/null +++ b/project/MANIFEST_KINDA_OLD.xml @@ -0,0 +1,540 @@ + + + + + iso + + + panafz10.bin + + + + + adf + uae + hdf + lzx + + + kick13.rom + kick20.rom + kick31.rom + + + + + dsk + cpc + + + + + zip + + + + + a26 + bin + gz + rom + zip + + + + + a52 + bin + + + ATARIBAS.ROM + ATARIOSA.ROM + ATARIOSB.ROM + ATARIXL.ROM + 5200.rom + + + + + a78 + bin + zip + + + 7800 BIOS (U).rom + + + + + atr + bas + bin + com + dcm + gz + xex + xfd + + + ATARIBAS.ROM + ATARIOSA.ROM + ATARIOSB.ROM + ATARIXL.ROM + 5200.rom + + + + + j64 + jag + + + + + lnx + zip + + + lynxboot.img + + + + + ctr + img + ipf + raw + rom + st + stx + + + + + asc + bas + cas + ccc + dmk + dsk + jvc + os9 + rom + sna + vdk + wav + + + bas13.rom + + + + + bin + col + rom + zip + + + coleco.rom + + + + + crt + d64 + g64 + t64 + tap + x64 + + + + + .daphne + + + + + asc + bas + cas + ccc + dmk + dsk + jvc + os9 + rom + sna + vdk + wav + + + d32.rom + + + + + cdi + gdi + + + dc_boot.bin + dc_flash.bin + + + + + fba + zip + + + + + fds + zip + + + disksys.rom + + + + + gg + zip + + + + + gb + zip + + + + + gba + zip + + + gba_bios.bin + + + + + gb + gbc + zip + + + + + gen + md + smd + bin + zip + + + + + mgw + zip + + + http://bot.libretro.com/assets/cores/gw/ + + + + + bin + int + + + exec.bin + grom.bin + + + + + img + rom + + + + + zip + + + + + zip + + + + + zip + + + + + sms + zip + + + + + gen + md + smd + bin + zip + + + + + mx1 + mx2 + zip + + + CARTS.SHA + CYRILLIC.FNT + DISK.ROM + FMPAC16.ROM + FMPAC.ROM + ITALIC.FNT + KANJI.ROM + MSX2EXT.ROM + MSX2PEXT.ROM + MSX2P.ROM + MSX2.ROM + MSXDOS2.ROM + MSX.ROM + PAINTER.ROM + RS232.ROM + + + + + n64 + v64 + z64 + + + + + bin + nds + + + + + zip + + + + + nes + zip + + + + + ngp + zip + + + + + ngc + zip + + + + + dsk + tap + + + + + bat + com + exe + sh + + + + + pce + cue + ccd + sgx + zip + + + syscard3.pce + + + + + cso + iso + pbp + + + + + img + bin + iso + cue + + + SCPH1001.BIN + scph5500.bin + scph5501.bin + scph5502.bin + + + + + dsk + mgt + sad + sbt + + + + + bin + iso + mdf + + + saturn_bios.bin + + + + + svn + + + + + 32x + smd + bin + zip + + + 32X_G_BIOS.BIN + 32X_M_BIOS.BIN + 32X_S_BIOS.BIN + + + + + cue + + + us_scd2_9306.bin + eu_mcd2_9306.bin + jp_mcd1_9112.bin + bios_CD_U.bin + bios_CD_E.bin + bios_CD_J.bin + + + + + sg + zip + + + + + sfc + smc + zip + + + + + ctg + + + TI-994A.ctg + + + + + dsk + + + level2.rom + + + + + vec + zip + + + + + bin + + + o2rom.bin + + + + + vb + zip + + + + + ws + zip + + + + + wsc + zip + + + + + dat + z1 + z2 + z3 + z4 + z5 + z6 + z7 + z8 + zip + + + + + sna + szx + z80 + tap + tzx + gz + udi + mgt + img + trd + scl + dsk + + + diff --git a/project/assets_cartographer/__init__.pyc b/project/assets_cartographer/__init__.pyc index 3056282..5d75c09 100644 Binary files a/project/assets_cartographer/__init__.pyc and b/project/assets_cartographer/__init__.pyc differ diff --git a/project/assets_cartographer/parser.pyc b/project/assets_cartographer/parser.pyc index 55945a3..3a01b02 100644 Binary files a/project/assets_cartographer/parser.pyc and b/project/assets_cartographer/parser.pyc differ diff --git a/project/assets_cartographer/registry.pyc b/project/assets_cartographer/registry.pyc index 5aa0735..f124b15 100644 Binary files a/project/assets_cartographer/registry.pyc and b/project/assets_cartographer/registry.pyc differ diff --git a/project/assets_cartographer/templatetags/assets.pyc b/project/assets_cartographer/templatetags/assets.pyc index 4f956d7..0c57aed 100644 Binary files a/project/assets_cartographer/templatetags/assets.pyc and b/project/assets_cartographer/templatetags/assets.pyc differ diff --git a/project/manager_frontend/__init__.pyc b/project/manager_frontend/__init__.pyc index c1666d6..fcb8c2f 100644 Binary files a/project/manager_frontend/__init__.pyc and b/project/manager_frontend/__init__.pyc differ diff --git a/project/manager_frontend/admin.pyc b/project/manager_frontend/admin.pyc index 767e388..b77b641 100644 Binary files a/project/manager_frontend/admin.pyc and b/project/manager_frontend/admin.pyc differ diff --git a/project/manager_frontend/crumbs.pyc b/project/manager_frontend/crumbs.pyc index 54f928e..dbc9332 100644 Binary files a/project/manager_frontend/crumbs.pyc and b/project/manager_frontend/crumbs.pyc differ diff --git a/project/manager_frontend/forms/__init__.pyc b/project/manager_frontend/forms/__init__.pyc index 4bfb74e..9ce4fdf 100644 Binary files a/project/manager_frontend/forms/__init__.pyc and b/project/manager_frontend/forms/__init__.pyc differ diff --git a/project/manager_frontend/forms/bios.pyc b/project/manager_frontend/forms/bios.pyc index 132f8dc..bfc1451 100644 Binary files a/project/manager_frontend/forms/bios.pyc and b/project/manager_frontend/forms/bios.pyc differ diff --git a/project/manager_frontend/forms/config.pyc b/project/manager_frontend/forms/config.pyc index 943ce32..8c44480 100644 Binary files a/project/manager_frontend/forms/config.pyc and b/project/manager_frontend/forms/config.pyc differ diff --git a/project/manager_frontend/forms/roms.pyc b/project/manager_frontend/forms/roms.pyc index 857617e..50e85c8 100644 Binary files a/project/manager_frontend/forms/roms.pyc and b/project/manager_frontend/forms/roms.pyc differ diff --git a/project/manager_frontend/forms/systems.pyc b/project/manager_frontend/forms/systems.pyc index d2e0186..a64d483 100644 Binary files a/project/manager_frontend/forms/systems.pyc and b/project/manager_frontend/forms/systems.pyc differ diff --git a/project/manager_frontend/models.pyc b/project/manager_frontend/models.pyc index 2ced915..2a70389 100644 Binary files a/project/manager_frontend/models.pyc and b/project/manager_frontend/models.pyc differ diff --git a/project/manager_frontend/templates/manager_frontend/.monitoring.html.swp b/project/manager_frontend/templates/manager_frontend/.monitoring.html.swp new file mode 100644 index 0000000..d9a058d Binary files /dev/null and b/project/manager_frontend/templates/manager_frontend/.monitoring.html.swp differ diff --git a/project/manager_frontend/templates/manager_frontend/base.html b/project/manager_frontend/templates/manager_frontend/base.html index 505fe1c..7678a86 100644 --- a/project/manager_frontend/templates/manager_frontend/base.html +++ b/project/manager_frontend/templates/manager_frontend/base.html @@ -11,4 +11,6 @@ {% block manager_content %}{% endblock %} {% endspaceless %} -{% endblock %} \ No newline at end of file + + +{% endblock %} diff --git a/project/manager_frontend/templates/manager_frontend/monitoring.html b/project/manager_frontend/templates/manager_frontend/monitoring.html index dfb1b93..094065a 100644 --- a/project/manager_frontend/templates/manager_frontend/monitoring.html +++ b/project/manager_frontend/templates/manager_frontend/monitoring.html @@ -3,9 +3,98 @@ {% block manager_content %} {% if PSUTIL_AVAILABLE %} + + + + +
-
+

{% trans "CPU" %}

@@ -16,9 +105,9 @@

{% blocktrans with number=forloop.counter %}Core {{ number }}{% endblocktrans %}

-
- - {{ core_int }}% +
+ + {{ core_int }}%
@@ -35,16 +124,16 @@

{% trans "Memory" %}

-
+
{% blocktrans with size=memory_infos.free_unified|filesizeformat %}Free: {{ size }}{% endblocktrans %}
- - {{ memory_usage_int }}% + + {{ memory_usage_int }}%
-
+
{% blocktrans with size=memory_infos.total|filesizeformat %}Total: {{ size }}{% endblocktrans %}
{% endwith %} @@ -52,8 +141,8 @@

{% trans "CPU Temperature" %}

-

{{ cpu_thermal_infos.current }}°c

-

{% trans "Max" %}: {{ cpu_thermal_infos.max }}°c

+

{{ cpu_thermal_infos.current }}°c

+

{% trans "Max" %}: {{ cpu_thermal_infos.max }}°c

@@ -76,7 +165,7 @@ {% for disk in filesystem_infos %}{% with usage_percent=disk.used_percent|floatformat:"0" %} - + {{ disk.device }} {{ disk.mountpoint }} {{ disk.fstype }} @@ -98,4 +187,4 @@
{% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/project/manager_frontend/templates/manager_frontend/rom_list.html b/project/manager_frontend/templates/manager_frontend/rom_list.html index d72f409..3ea2ad0 100644 --- a/project/manager_frontend/templates/manager_frontend/rom_list.html +++ b/project/manager_frontend/templates/manager_frontend/rom_list.html @@ -15,7 +15,8 @@ }); }, 'url': "{% url 'manager:roms-upload' system=system %}", - 'paramName': "{{ upload_form.rom.name }}" + 'paramName': "{{ upload_form.rom.name }}", + 'maxFilesize': 10240 }; //]]> diff --git a/project/manager_frontend/templatetags/manager_tags.pyc b/project/manager_frontend/templatetags/manager_tags.pyc index 82d680c..04c797f 100644 Binary files a/project/manager_frontend/templatetags/manager_tags.pyc and b/project/manager_frontend/templatetags/manager_tags.pyc differ diff --git a/project/manager_frontend/urls.py b/project/manager_frontend/urls.py index 6ef3fbd..9913532 100644 --- a/project/manager_frontend/urls.py +++ b/project/manager_frontend/urls.py @@ -11,6 +11,7 @@ #from .views.saves import SavesListView from .views.systems import SystemsListView from .views.monitor import MonitoringView +from .views.monitor import update_context urlpatterns = [ url(r'^$', HomeView.as_view(), name='home'), @@ -36,4 +37,6 @@ url(r'^systems/roms/(?P\w+)/$', RomListView.as_view(), name='roms-list'), url(r'^systems/roms/(?P[-\w]+)/upload/$', RomUploadJsonView.as_view(), name='roms-upload'), + url(r'^monitor_update/$', update_context, name="monitor-update"), + ] diff --git a/project/manager_frontend/urls.pyc b/project/manager_frontend/urls.pyc index e348765..49112ad 100644 Binary files a/project/manager_frontend/urls.pyc and b/project/manager_frontend/urls.pyc differ diff --git a/project/manager_frontend/utils/views.pyc b/project/manager_frontend/utils/views.pyc index 9dbf6e8..9deb325 100644 Binary files a/project/manager_frontend/utils/views.pyc and b/project/manager_frontend/utils/views.pyc differ diff --git a/project/manager_frontend/views/__init__.pyc b/project/manager_frontend/views/__init__.pyc index 3f35e5a..ee72ec7 100644 Binary files a/project/manager_frontend/views/__init__.pyc and b/project/manager_frontend/views/__init__.pyc differ diff --git a/project/manager_frontend/views/bios.pyc b/project/manager_frontend/views/bios.pyc index ce10116..c53e7ad 100644 Binary files a/project/manager_frontend/views/bios.pyc and b/project/manager_frontend/views/bios.pyc differ diff --git a/project/manager_frontend/views/config.pyc b/project/manager_frontend/views/config.pyc index b77f257..17d4343 100644 Binary files a/project/manager_frontend/views/config.pyc and b/project/manager_frontend/views/config.pyc differ diff --git a/project/manager_frontend/views/configas.pyc b/project/manager_frontend/views/configas.pyc new file mode 100644 index 0000000..66928df Binary files /dev/null and b/project/manager_frontend/views/configas.pyc differ diff --git a/project/manager_frontend/views/configes.pyc b/project/manager_frontend/views/configes.pyc new file mode 100644 index 0000000..48109ed Binary files /dev/null and b/project/manager_frontend/views/configes.pyc differ diff --git a/project/manager_frontend/views/logs.pyc b/project/manager_frontend/views/logs.pyc index 98190e4..978ad8b 100644 Binary files a/project/manager_frontend/views/logs.pyc and b/project/manager_frontend/views/logs.pyc differ diff --git a/project/manager_frontend/views/monitor.py b/project/manager_frontend/views/monitor.py index 76a295c..ca7fd0a 100644 --- a/project/manager_frontend/views/monitor.py +++ b/project/manager_frontend/views/monitor.py @@ -5,6 +5,7 @@ from django.conf import settings from django.views.generic import TemplateView +from django.http import JsonResponse # TODO: move to settings RECALBOX_THERMAL_BASEDIR = '/sys/class/thermal' @@ -103,3 +104,14 @@ def get_context_data(self, **kwargs): 'cpu_thermal_infos': self.get_thermal_infos(os.path.join(RECALBOX_THERMAL_BASEDIR, RECALBOX_THERMAL_DEVICE_CPU_DIR)), }) return context + + +def update_context(request, *args, **kwargs): + monitor = MonitoringView() + data = { + 'cpu_infos': monitor.get_cpu_infos(), + 'memory_infos': monitor.get_memory_infos(), + 'filesystem_infos': monitor.get_filesystem_infos(), + 'cpu_thermal_infos': monitor.get_thermal_infos(os.path.join(RECALBOX_THERMAL_BASEDIR, RECALBOX_THERMAL_DEVICE_CPU_DIR)), + } + return JsonResponse(data) diff --git a/project/manager_frontend/views/monitor.pyc b/project/manager_frontend/views/monitor.pyc index cc3f378..6eb23c3 100644 Binary files a/project/manager_frontend/views/monitor.pyc and b/project/manager_frontend/views/monitor.pyc differ diff --git a/project/manager_frontend/views/roms.pyc b/project/manager_frontend/views/roms.pyc index 17aa8d5..45a6177 100644 Binary files a/project/manager_frontend/views/roms.pyc and b/project/manager_frontend/views/roms.pyc differ diff --git a/project/manager_frontend/views/systems.pyc b/project/manager_frontend/views/systems.pyc index d59561c..405022e 100644 Binary files a/project/manager_frontend/views/systems.pyc and b/project/manager_frontend/views/systems.pyc differ diff --git a/project/recalbox_manifest/__init__.pyc b/project/recalbox_manifest/__init__.pyc index 8379cd5..c292ee6 100644 Binary files a/project/recalbox_manifest/__init__.pyc and b/project/recalbox_manifest/__init__.pyc differ diff --git a/project/recalbox_manifest/parser.pyc b/project/recalbox_manifest/parser.pyc index c338b61..8a47534 100644 Binary files a/project/recalbox_manifest/parser.pyc and b/project/recalbox_manifest/parser.pyc differ diff --git a/project/recalbox_manifest/registry.pyc b/project/recalbox_manifest/registry.pyc index 65ef277..da1ec94 100644 Binary files a/project/recalbox_manifest/registry.pyc and b/project/recalbox_manifest/registry.pyc differ diff --git a/project/settings.pyc b/project/settings.pyc index 77b44c3..8f64fb6 100644 Binary files a/project/settings.pyc and b/project/settings.pyc differ diff --git a/project/settings_production.pyc b/project/settings_production.pyc index 9d28f1f..46285da 100644 Binary files a/project/settings_production.pyc and b/project/settings_production.pyc differ diff --git a/project/templates/skeleton.html b/project/templates/skeleton.html index 30716b3..4252a2d 100644 --- a/project/templates/skeleton.html +++ b/project/templates/skeleton.html @@ -42,7 +42,7 @@
    diff --git a/project/urls.pyc b/project/urls.pyc index 471c663..afa4b5e 100644 Binary files a/project/urls.pyc and b/project/urls.pyc differ diff --git a/project/utils/__init__.pyc b/project/utils/__init__.pyc index ca9a18c..54836fa 100644 Binary files a/project/utils/__init__.pyc and b/project/utils/__init__.pyc differ diff --git a/project/utils/context_processors.pyc b/project/utils/context_processors.pyc index 472aa6a..71edd98 100644 Binary files a/project/utils/context_processors.pyc and b/project/utils/context_processors.pyc differ diff --git a/project/utils/imports.pyc b/project/utils/imports.pyc index 7a47865..bac73f6 100644 Binary files a/project/utils/imports.pyc and b/project/utils/imports.pyc differ diff --git a/project/utils/views.pyc b/project/utils/views.pyc index 22d5757..0770a6c 100644 Binary files a/project/utils/views.pyc and b/project/utils/views.pyc differ diff --git a/project/webapp_statics/MANIFEST.xml b/project/webapp_statics/MANIFEST.xml index 7ca33ab..9bf0f34 100644 --- a/project/webapp_statics/MANIFEST.xml +++ b/project/webapp_statics/MANIFEST.xml @@ -244,12 +244,16 @@ img bin iso + pbp http://www.mondemul.net/machine.php?type=psx - SCPH1001.BIN + scph1001.bin + scph5500.bin + scph5501.bin + scph5502.bin diff --git a/project/wsgi.pyc b/project/wsgi.pyc index a6b7aa2..a116b15 100644 Binary files a/project/wsgi.pyc and b/project/wsgi.pyc differ