Please merge this new and improved, working version of RetroPie-Manager into RetroPie.

.gitignore

@@ -0,0 +1,32 @@
+*.pyc
+
+# Various directory index, temp file and editor's config
+*.DS_Store
+*.idea
+.*.swp
+
+# virtualenv
+/bin
+/include
+/lib
+/lib64
+/build
+/local
+
+# buildout
+*.egg-info
+.installed.cfg
+/develop-eggs
+/django-apps-src
+/eggs
+/parts
+/etc
+
+# Ruby
+*.bundle
+
+# Various
+/node_modules
+/foundation5
+
+*.sqlite3

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

README.md

@@ -1,40 +1,23 @@
-# 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
+With Retropie-Manager-Plus you can
 - Monitor the system health and disk space
 - Edit the Emulation Station config file
 - Edit the RetroArch config file
 - Edit the autostart.sh script
 - View the Emulation Station log file
 - Manage your BIOS files
-- Manage your ROMS
+- Manage your ROM files
 
 # 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
@@ -47,17 +30,17 @@ sudo apt-get install virtualenv python-dev
 sudo apt-get install python-virtualenv python-dev
 ```
 
-**Installing RetroPie-Manager**
+**Installing RetroPie-Manager-Plus**
 ```sh
 cd
-git clone https://github.com/RetroPie/RetroPie-Manager.git
-cd RetroPie-Manager
+git clone https://github.com/taleden/RetroPie-Manager-Plus.git
+cd RetroPie-Manager-Plus
 make install
 ```
 
 # Usage
 
-You must be at the RetroPie-Manager's directory to use the `rpmanager.sh` like in the examples below.
+You must be at the RetroPie-Manager-Plus's directory to use the `rpmanager.sh` like in the examples below.
 
 **Start**
 ```sh
@@ -79,17 +62,17 @@ The OPTIONS are:
 
 -h|--help           print this message and exit
 
---start             start the RetroPie-Manager
+--start             start the RetroPie-Manager-Plus
 
---stop              stop the RetroPie-Manager
+--stop              stop the RetroPie-Manager-Plus
 
---isrunning         show if RetroPie-Manager is running and the
+--isrunning         show if RetroPie-Manager-Plus is running and the
                     listening port and exit
 
 --log               save the log messages (optional, default: not save log
                     messages, only works with --start)
 
--u|--user USER      start RetroPie-Manager as USER (only available for
+-u|--user USER      start RetroPie-Manager-Plus as USER (only available for
                     privileged users, only works with --start, USER must 
                     be a RetroPie user)
 
@@ -100,22 +83,18 @@ 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-Plus 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)
+sudo kill -9 $(pgrep -fi RetroPie-Manager)
 cd 
-cd Retropie-Manager
+cd Retropie-Manager-Plus
 make clean
 git reset --hard HEAD
 git pull
@@ -124,14 +103,24 @@ make install
 
 # Reinstall
 ```sh
-sudo kill -9 $(pgrep -f RetroPie-Manager)
+sudo kill -9 $(pgrep -fi RetroPie-Manager)
 cd 
-rm -rf Retropie-Manager
-git clone https://github.com/RetroPie/RetroPie-Manager.git
-cd RetroPie-Manager
+rm -rf Retropie-Manager-Plus
+git clone https://github.com/taleden/RetroPie-Manager-Plus.git
+cd RetroPie-Manager-Plus
 make install
 ```
 
-# Known bugs
-
-- (FIXED) You'll get a 404 error trying to delete roms
+# Additions to the base RetroPie-Manager:
+- Adds .zip as a valid N64 ROM extension
+- Adds .pbp as a valid PSX ROM extension
+- Fixes PSX BIOS hashes
+- Increases max uploadable rom size to 10GB from 256MB
+- Adds real-time updating to Monitoring page (**Requires Javascript**)
+
+# Planned Features
+- Update file system monitoring table if devices are added/removed e.g. a USB
+- Adds custom-data monitoring
+- Allows rom sub-directories
+- Re-introduces save management
+- Migrate to Python 3

compass/.gitignore

@@ -0,0 +1,2 @@
+.sass-cache
+Gemfile.lock

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",

project/MANIFEST.xml

@@ -319,6 +319,7 @@
          <extension>n64</extension>
          <extension>v64</extension>
          <extension>z64</extension>
+         <extension>zip</extension>
       </extensions>
    </system>
    <system key="nds" name="Nintendo DS">
@@ -389,12 +390,13 @@
          <extension>bin</extension>
          <extension>iso</extension>
          <extension>cue</extension>
+         <extension>pbp</extension>   
       </extensions>
       <bios>
-         <file md5="924e392ed05558ffdb115408c263dccf">SCPH1001.BIN</file>
          <file md5="8dd7d5296a650fac7319bce665a6a53c">scph5500.bin</file>
-         <file md5="924e392ed05558ffdb115408c263dccf">scph5501.bin</file>
-         <file md5="e56ec1b027e2fe8a49217d9678f7f6bb">scph5502.bin</file>
+         <file md5="490f666e1afb15b7362b406ed1cea246">scph5501.bin</file>
+         <file md5="924e392ed05558ffdb115408c263dccf">scph1001.bin</file>
+         <file md5="32736f17079d0b2b7024407c39bd3050">scph5502.bin</file>
       </bios>
    </system>
    <system key="samcoupe" name="SAM Coupé">